From ac2c4f8f6b8d37660fc477138879e7436b6d4727 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 20:30:48 -0800
Subject: [PATCH 001/740] first attempt at implementing streaming replies,
 everything is implemented besides NativeAPI

---
 fdbclient/NativeAPI.actor.cpp      | 284 +++++++++++++++++++++++++
 fdbclient/NativeAPI.actor.h        |  16 ++
 fdbclient/StorageServerInterface.h |  40 ++++
 fdbrpc/FlowTransport.h             |   2 +-
 fdbrpc/fdbrpc.h                    | 329 ++++++++++++++++++++++++++++-
 fdbrpc/genericactors.actor.h       |  23 +-
 fdbserver/storageserver.actor.cpp  | 255 +++++++++++++++++++---
 flow/flow.h                        |  23 +-
 flow/genericactors.actor.h         |  10 +
 9 files changed, 945 insertions(+), 37 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index e537e17c6e7..0383ae9378b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1700,6 +1700,17 @@ Future<Standalone<RangeResultRef>> getRange(
 	TransactionInfo const& info,
 	TagSet const& tags);
 
+Future<Void> getRangeStream(
+	PromiseStream<Standalone<RangeResultRef>> const& results,
+	Database const& cx,
+	Future<Version> const& fVersion,
+	KeySelector const& begin,
+	KeySelector const& end,
+	GetRangeLimits const& limits,
+	bool const& reverse,
+	TransactionInfo const& info,
+	TagSet const& tags);
+
 ACTOR Future<Optional<Value>> getValue(Future<Version> version, Key key, Database cx, TransactionInfo info,
                                        Reference<TransactionLogInfo> trLogInfo, TagSet tags);
 
@@ -2658,6 +2669,224 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 	}
 }
 
+ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> results, Database cx, Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion,
+	KeySelector begin, KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange, bool snapshot, bool reverse,
+	TransactionInfo info, TagSet tags )
+{
+	state GetRangeLimits originalLimits( limits );
+	state KeySelector originalBegin = begin;
+	state KeySelector originalEnd = end;
+	state Standalone<RangeResultRef> output;
+	state Span span("NAPI:getRange"_loc, info.spanID);
+
+	try {
+		state Version version = wait( fVersion );
+		cx->validateVersion(version);
+
+		state double startTime = now();
+		state Version readVersion = version; // Needed for latestVersion requests; if more, make future requests at the version that the first one completed
+											 // FIXME: Is this really right?  Weaken this and see if there is a problem; if so maybe there is a much subtler problem even with this.
+
+		if( begin.getKey() == allKeys.begin && begin.offset < 1 ) {
+			output.readToBegin = true;
+			begin = KeySelector(firstGreaterOrEqual( begin.getKey() ), begin.arena());
+		}
+
+		ASSERT( !limits.isReached() );
+		ASSERT( (!limits.hasRowLimit() || limits.rows >= limits.minRows) && limits.minRows >= 0 );
+
+		loop {
+			if( end.getKey() == allKeys.begin && (end.offset < 1 || end.isFirstGreaterOrEqual()) ) {
+				getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
+				return output;
+			}
+
+			Key locationKey = reverse ? Key(end.getKey(), end.arena()) : Key(begin.getKey(), begin.arena());
+			bool locationBackward = reverse ? (end-1).isBackward() : begin.isBackward();
+			state pair<KeyRange, Reference<LocationInfo>> beginServer = wait( getKeyLocation( cx, locationKey, &StorageServerInterface::getKeyValues, info, locationBackward ) );
+			state KeyRange shard = beginServer.first;
+			state bool modifiedSelectors = false;
+			state GetKeyValuesRequest req;
+
+			req.isFetchKeys = (info.taskID == TaskPriority::FetchKeys);
+			req.version = readVersion;
+
+			if( reverse && (begin-1).isDefinitelyLess(shard.begin) &&
+				( !begin.isFirstGreaterOrEqual() || begin.getKey() != shard.begin ) ) { //In this case we would be setting modifiedSelectors to true, but not modifying anything
+
+				req.begin = firstGreaterOrEqual( shard.begin );
+				modifiedSelectors = true;
+			}
+			else req.begin = begin;
+
+			if( !reverse && end.isDefinitelyGreater(shard.end) ) {
+				req.end = firstGreaterOrEqual( shard.end );
+				modifiedSelectors = true;
+			}
+			else req.end = end;
+
+			transformRangeLimits(limits, reverse, req);
+			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
+
+			req.tags = cx->sampleReadTags() ? tags : Optional<TagSet>();
+			req.debugID = info.debugID;
+			req.spanContext = span.context;
+			try {
+				if( info.debugID.present() ) {
+					g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.Before");
+					/*TraceEvent("TransactionDebugGetRangeInfo", info.debugID.get())
+						.detail("ReqBeginKey", req.begin.getKey())
+						.detail("ReqEndKey", req.end.getKey())
+						.detail("OriginalBegin", originalBegin.toString())
+						.detail("OriginalEnd", originalEnd.toString())
+						.detail("Begin", begin.toString())
+						.detail("End", end.toString())
+						.detail("Shard", shard)
+						.detail("ReqLimit", req.limit)
+						.detail("ReqLimitBytes", req.limitBytes)
+						.detail("ReqVersion", req.version)
+						.detail("Reverse", reverse)
+						.detail("ModifiedSelectors", modifiedSelectors)
+						.detail("Servers", beginServer.second->description());*/
+				}
+
+				++cx->transactionPhysicalReads;
+				++cx->transactionGetRangeRequests;
+				state GetKeyValuesReply rep;
+				if (CLIENT_BUGGIFY) {
+					throw deterministicRandom()->randomChoice(std::vector<Error>{
+							transaction_too_old(), future_version()
+								});
+				}
+				//FIXME: load balance requests
+				if(beginServer.second->size() == 0) {
+					wait(Future<Void>(Never()));
+				}
+				state FutureStream<GetKeyValuesStreamReply> repStream = beginServer.second->getInterface(0).getKeyValuesStream.getReplyStream(req);
+				loop {
+					GetKeyValuesStreamReply rep = waitNext(repStream);
+
+					if( info.debugID.present() ) {
+						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.After");//.detail("SizeOf", rep.data.size());
+						/*TraceEvent("TransactionDebugGetRangeDone", info.debugID.get())
+							.detail("ReqBeginKey", req.begin.getKey())
+							.detail("ReqEndKey", req.end.getKey())
+							.detail("RepIsMore", rep.more)
+							.detail("VersionReturned", rep.version)
+							.detail("RowsReturned", rep.data.size());*/
+					}
+
+					ASSERT( !rep.more || rep.data.size() );
+					ASSERT( !limits.hasRowLimit() || rep.data.size() <= limits.rows );
+
+					limits.decrement( rep.data );
+
+					if(reverse && begin.isLastLessOrEqual() && rep.data.size() && rep.data.end()[-1].key == begin.getKey()) {
+						modifiedSelectors = false;
+					}
+
+					bool finished = limits.isReached() || ( !modifiedSelectors && !rep.more ) || limits.hasSatisfiedMinRows();
+					bool readThrough = modifiedSelectors && !rep.more;
+
+					// optimization: first request got all data--just return it
+					if( finished && !output.size() ) {
+						bool readToBegin = output.readToBegin;
+						bool readThroughEnd = output.readThroughEnd;
+
+						output = Standalone<RangeResultRef>( RangeResultRef( rep.data, modifiedSelectors || limits.isReached() || rep.more ), rep.arena );
+						output.readToBegin = readToBegin;
+						output.readThroughEnd = readThroughEnd;
+
+						if( BUGGIFY && limits.hasByteLimit() && output.size() > std::max(1, originalLimits.minRows) ) {
+							output.more = true;
+							output.resize(output.arena(), deterministicRandom()->randomInt(std::max(1,originalLimits.minRows),output.size()));
+							getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
+							return output;
+						}
+
+						if( readThrough ) {
+							output.arena().dependsOn( shard.arena() );
+							output.readThrough = reverse ? shard.begin : shard.end;
+						}
+
+						getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
+						return output;
+					}
+
+					output.arena().dependsOn( rep.arena );
+					output.append(output.arena(), rep.data.begin(), rep.data.size());
+
+					if( finished ) {
+						if( readThrough ) {
+							output.arena().dependsOn( shard.arena() );
+							output.readThrough = reverse ? shard.begin : shard.end;
+						}
+						output.more = modifiedSelectors || limits.isReached() || rep.more;
+
+						getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
+						return output;
+					}
+
+					readVersion = rep.version; // see above comment
+
+					if( !rep.more ) {
+						ASSERT( modifiedSelectors );
+						TEST(true);  // !GetKeyValuesReply.more and modifiedSelectors in getRange
+
+						if( !rep.data.size() ) {
+							Standalone<RangeResultRef> result = wait( getRangeFallback(cx, version, originalBegin, originalEnd, originalLimits, reverse, info, tags ) );
+							getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, result);
+							return result;
+						}
+
+						if( reverse )
+							end = firstGreaterOrEqual( shard.begin );
+						else
+							begin = firstGreaterOrEqual( shard.end );
+					} else {
+						TEST(true);  // GetKeyValuesReply.more in getRange
+						if( reverse )
+							end = firstGreaterOrEqual( output[output.size()-1].key );
+						else
+							begin = firstGreaterThan( output[output.size()-1].key );
+					}
+				}
+
+			} catch ( Error& e ) {
+				if( info.debugID.present() ) {
+					g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.Error");
+					TraceEvent("TransactionDebugError", info.debugID.get()).error(e);
+				}
+				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed ||
+					(e.code() == error_code_transaction_too_old && readVersion == latestVersion))
+				{
+					cx->invalidateCache( reverse ? end.getKey() : begin.getKey(), reverse ? (end-1).isBackward() : begin.isBackward() );
+
+					if (e.code() == error_code_wrong_shard_server) {
+						Standalone<RangeResultRef> result = wait( getRangeFallback(cx, version, originalBegin, originalEnd, originalLimits, reverse, info, tags ) );
+						getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, result);
+						return result;
+					}
+
+					wait(delay(CLIENT_KNOBS->WRONG_SHARD_SERVER_DELAY, info.taskID));
+				} else {
+					if (trLogInfo)
+						trLogInfo->addLog(FdbClientLogEvents::EventGetRangeError(startTime, cx->clientLocality.dcId(), static_cast<int>(e.code()), begin.getKey(), end.getKey()));
+
+					throw e;
+				}
+			}
+		}
+	}
+	catch(Error &e) {
+		if(conflictRange.canBeSet()) {
+			conflictRange.send(std::make_pair(Key(), Key()));
+		}
+
+		throw;
+	}
+}
+
 Future<Standalone<RangeResultRef>> getRange( Database const& cx, Future<Version> const& fVersion, KeySelector const& begin, KeySelector const& end,
 	GetRangeLimits const& limits, bool const& reverse, TransactionInfo const& info, TagSet const& tags )
 {
@@ -2967,6 +3196,61 @@ Future< Standalone<RangeResultRef> > Transaction::getRange(
 	return getRange( begin, end, GetRangeLimits( limit ), snapshot, reverse );
 }
 
+Future<Void> Transaction::getRangeStream(
+	const PromiseStream<Standalone<RangeResultRef>>& results,
+	const KeySelector& begin,
+	const KeySelector& end,
+	GetRangeLimits limits,
+	bool snapshot,
+	bool reverse )
+{
+	++cx->transactionLogicalReads;
+	++cx->transactionGetRangeRequests;
+
+	if( limits.isReached() )
+		return Standalone<RangeResultRef>();
+
+	if( !limits.isValid() )
+		return range_limits_invalid();
+
+	ASSERT(limits.rows != 0);
+
+	KeySelector b = begin;
+	if( b.orEqual ) {
+		TEST(true); // Native begin orEqual==true
+		b.removeOrEqual(b.arena());
+	}
+
+	KeySelector e = end;
+	if( e.orEqual ) {
+		TEST(true); // Native end orEqual==true
+		e.removeOrEqual(e.arena());
+	}
+
+	if( b.offset >= e.offset && b.getKey() >= e.getKey() ) {
+		TEST(true); // Native range inverted
+		return Standalone<RangeResultRef>();
+	}
+
+	Promise<std::pair<Key, Key>> conflictRange;
+	if(!snapshot) {
+		extraConflictRanges.push_back( conflictRange.getFuture() );
+	}
+
+	return forwardErrors(::getRangeStream(results, cx, trLogInfo, getReadVersion(), b, e, limits, conflictRange, snapshot, reverse, info, options.readTags), results);
+}
+
+Future<Void> Transaction::getRangeStream(
+	const PromiseStream<Standalone<RangeResultRef>>& results,
+	const KeySelector& begin,
+	const KeySelector& end,
+	int limit,
+	bool snapshot,
+	bool reverse )
+{
+	return getRangeStream( results, begin, end, GetRangeLimits( limit ), snapshot, reverse );
+}
+
 void Transaction::addReadConflictRange( KeyRangeRef const& keys ) {
 	ASSERT( !keys.empty() );
 
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 323d5af550f..10802ccfff5 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -253,6 +253,22 @@ class Transaction : NonCopyable {
 		                KeySelector(firstGreaterOrEqual(keys.end), keys.arena()), limits, snapshot, reverse);
 	}
 
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results, const KeySelector& begin, const KeySelector& end,
+	                                                          int limit, bool snapshot = false, bool reverse = false);
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results, const KeySelector& begin, const KeySelector& end,
+	                                                          GetRangeLimits limits, bool snapshot = false,
+	                                                          bool reverse = false);
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results, const KeyRange& keys, int limit, bool snapshot = false,
+	                                                          bool reverse = false) {
+		return getRangeStream(results, KeySelector(firstGreaterOrEqual(keys.begin), keys.arena()),
+		                KeySelector(firstGreaterOrEqual(keys.end), keys.arena()), limit, snapshot, reverse);
+	}
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results, const KeyRange& keys, GetRangeLimits limits,
+	                                                          bool snapshot = false, bool reverse = false) {
+		return getRangeStream(results, KeySelector(firstGreaterOrEqual(keys.begin), keys.arena()),
+		                KeySelector(firstGreaterOrEqual(keys.end), keys.arena()), limits, snapshot, reverse);
+	}
+
 	[[nodiscard]] Future<Standalone<VectorRef<const char*>>> getAddressesForKey(const Key& key);
 
 	void enableCheckWrites();
diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index bc340727fd7..f10c573bf3a 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -73,6 +73,7 @@ struct StorageServerInterface {
 	RequestStream<struct WatchValueRequest> watchValue;
 	RequestStream<struct ReadHotSubRangeRequest> getReadHotRanges;
 	RequestStream<struct SplitRangeRequest> getRangeSplitPoints;
+	RequestStream<struct GetKeyValuesStreamRequest> getKeyValuesStream;
 
 	explicit StorageServerInterface(UID uid) : uniqueID( uid ) {}
 	StorageServerInterface() : uniqueID( deterministicRandom()->randomUniqueID() ) {}
@@ -101,6 +102,7 @@ struct StorageServerInterface {
 				watchValue = RequestStream<struct WatchValueRequest>( getValue.getEndpoint().getAdjustedEndpoint(10) );
 				getReadHotRanges = RequestStream<struct ReadHotSubRangeRequest>( getValue.getEndpoint().getAdjustedEndpoint(11) );
 				getRangeSplitPoints = RequestStream<struct SplitRangeRequest>(getValue.getEndpoint().getAdjustedEndpoint(12));
+				getKeyValuesStream = RequestStream<struct GetKeyValuesStreamRequest>(getValue.getEndpoint().getAdjustedEndpoint(13));
 			}
 		} else {
 			ASSERT(Ar::isDeserializing);
@@ -129,6 +131,7 @@ struct StorageServerInterface {
 		streams.push_back(watchValue.getReceiver());
 		streams.push_back(getReadHotRanges.getReceiver());
 		streams.push_back(getRangeSplitPoints.getReceiver());
+		streams.push_back(getKeyValuesStrean.getReceiver(TaskPriority::LoadBalancedEndpoint));
 		FlowTransport::transport().addEndpoints(streams);
 	}
 };
@@ -260,6 +263,43 @@ struct GetKeyValuesRequest : TimedRequest {
 	}
 };
 
+struct GetKeyValuesStreamReply : public ReplyPromiseStreamReply {
+	constexpr static FileIdentifier file_identifier = 1783066;
+	Arena arena;
+	VectorRef<KeyValueRef, VecSerStrategy::String> data;
+	Version version; // useful when latestVersion was requested
+	bool more;
+	bool cached = false;
+
+	GetKeyValuesStreamReply() : version(invalidVersion), more(false), cached(false) {}
+
+	int expectedSize() const { return sizeof(GetKeyValuesStreamReply) + data.expectedSize(); }
+
+	template <class Ar>
+	void serialize( Ar& ar ) {
+		serializer(ar, ReplyPromiseStreamReply::acknowledgeEndpoint, data, version, more, cached, arena);
+	}
+};
+
+struct GetKeyValuesStreamRequest {
+	constexpr static FileIdentifier file_identifier = 6795746;
+	SpanID spanContext;
+	Arena arena;
+	KeySelectorRef begin, end;
+	Version version;		// or latestVersion
+	int limit, limitBytes;
+	bool isFetchKeys;
+	Optional<TagSet> tags;
+	Optional<UID> debugID;
+	ReplyPromiseStream<GetKeyValuesStreamReply> reply;
+
+	GetKeyValuesStreamRequest() : isFetchKeys(false) {}
+	template <class Ar>
+	void serialize( Ar& ar ) {
+		serializer(ar, begin, end, version, limit, limitBytes, isFetchKeys, tags, debugID, reply, spanContext, arena);
+	}
+};
+
 struct GetKeyReply : public LoadBalancedReply {
 	constexpr static FileIdentifier file_identifier = 11226513;
 	KeySelector sel;
diff --git a/fdbrpc/FlowTransport.h b/fdbrpc/FlowTransport.h
index 58b67e5d696..62bcd65a583 100644
--- a/fdbrpc/FlowTransport.h
+++ b/fdbrpc/FlowTransport.h
@@ -66,7 +66,7 @@ class Endpoint {
 		return addresses.getTLSAddress();
 	}
 
-	Endpoint getAdjustedEndpoint( uint32_t index ) {
+	Endpoint getAdjustedEndpoint( uint32_t index ) const {
 		uint32_t newIndex = token.second();
 		newIndex += index;
 		return Endpoint( addresses, UID(token.first()+(uint64_t(index)<<32), (token.second()&0xffffffff00000000LL) | newIndex) );
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 489cd6617f9..6096b9a4733 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -73,6 +73,10 @@ struct FlowReceiver : public NetworkMessageReceiver {
 		FlowTransport::transport().addWellKnownEndpoint(endpoint, this, taskID);
 	}
 
+	const Endpoint& getRawEndpoint() {
+		return endpoint;
+	}
+
 private:
 	Endpoint endpoint;
 	bool m_isLocalEndpoint;
@@ -96,6 +100,9 @@ struct NetSAV final : SAV<T>, FlowReceiver, FastAllocated<NetSAV<T>> {
 		ErrorOr<EnsureTable<T>> message;
 		reader.deserialize(message);
 		if (message.isError()) {
+			if(message.getError().code() == error_code_broken_promise) {
+				IFailureMonitor::failureMonitor().endpointNotFound( getRawEndpoint() );
+			}
 			SAV<T>::sendErrorAndDelPromiseRef(message.getError());
 		} else {
 			SAV<T>::sendAndDelPromiseRef(message.get().asUnderlyingType());
@@ -189,8 +196,6 @@ struct serializable_traits<ReplyPromise<T>> : std::true_type {
 template <class Reply>
 ReplyPromise<Reply> const& getReplyPromise(ReplyPromise<Reply> const& p) { return p; }
 
-
-
 template <class Request>
 void resetReply(Request& r) { r.reply.reset(); }
 
@@ -212,6 +217,283 @@ void setReplyPriority(ReplyPromise<Reply> & p, TaskPriority taskID) { p.getEndpo
 template <class Reply>
 void setReplyPriority(const ReplyPromise<Reply> & p, TaskPriority taskID) { p.getEndpoint(taskID); }
 
+struct ReplyPromiseStreamReply {
+	Optional<Endpoint> acknowledgeEndpoint;
+	ReplyPromiseStreamReply() {}
+};
+
+struct AcknowledgementReply {
+	constexpr static FileIdentifier file_identifier = 1378929;
+	int64_t bytes;
+
+	AcknowledgementReply() : bytes(0) {}
+	explicit AcknowledgementReply(int64_t bytes) : bytes(bytes) {}
+
+	template <class Ar>
+	void serialize( Ar& ar ) {
+		serializer(ar, bytes);
+	}
+};
+
+struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<AcknowledgementReceiver> {
+	using FastAllocated<AcknowledgementReceiver>::operator new;
+	using FastAllocated<AcknowledgementReceiver>::operator delete;
+
+	int64_t bytesSent;
+	int64_t bytesAcknowledged;
+	Promise<Void> ready;
+
+	AcknowledgementReceiver() : bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
+	AcknowledgementReceiver(const Endpoint& remoteEndpoint) : FlowReceiver(remoteEndpoint, false),
+		bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
+
+	void receive(ArenaObjectReader& reader) override {
+		ErrorOr<EnsureTable<AcknowledgementReply>> message;
+		reader.deserialize(message);
+		ASSERT(!message.isError() && message.get().asUnderlyingType().bytes > bytesAcknowledged);
+		bytesAcknowledged = message.get().asUnderlyingType().bytes;
+		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
+			queue->acknowledgements.ready.send(Void());
+		}
+	}
+};
+
+template <class T>
+struct NetNotifiedQueueWithErrors final : private SingleCallback<T>, public FlowReceiver, FastAllocated<NetNotifiedQueueWithErrors<T>> {
+	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator new;
+	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator delete;
+
+	int promises; // one for each promise (and one for an active actor if this is an actor)
+	int futures;  // one for each future and one more if there are any callbacks
+
+	// Invariant: SingleCallback<T>::next==this || (queue.empty() && !error.isValid())
+	std::queue<T, Deque<T>> queue;
+	Error error;
+	AcknowledgementReceiver acknowledgements;
+
+	NetNotifiedQueueWithErrors(int futures, int promises) : futures(futures), promises(promises),  {
+		SingleCallback<T>::next = this;
+	}
+	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
+	  : futures(futures), promises(promises), FlowReceiver(remoteEndpoint, false) {
+		SingleCallback<T>::next = this;
+	}
+
+	void receive(ArenaObjectReader& reader) override {
+		this->addPromiseRef();
+		ErrorOr<EnsureTable<T>> message;
+		reader.deserialize(message);
+
+		if (message.isError()) {
+			if(message.getError().code() == error_code_broken_promise) {
+				IFailureMonitor::failureMonitor().endpointNotFound( getRawEndpoint() );
+			}
+			this->sendError(message.getError());
+		} else {
+			if(message.get().asUnderlyingType().acknowledgeEndpoint.present()) {
+				acknowledgements = AcknowledgementReceiver(message.get().asUnderlyingType().acknowledgeEndpoint.get());
+			}
+			this->send(std::move(message.get().asUnderlyingType()));
+		}
+		this->delPromiseRef();
+	}
+
+	bool isReady() const { return !queue.empty() || error.isValid(); }
+	bool isError() const { return queue.empty() && error.isValid(); }  // the *next* thing queued is an error
+	uint32_t size() const { return queue.size(); }
+
+	T pop() {
+		if (queue.empty()) {
+			if (error.isValid()) throw error;
+			throw internal_error();
+		}
+		auto copy = std::move(queue.front());
+		if(acknowledgements.getRawEndpoint().isValid()) {
+			acknowledgements.bytesAcknowledged += copy.expectedSize();
+			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(), true);
+		}
+		queue.pop();
+		return copy;
+	}
+
+	template <class U>
+	void send(U && value) {
+		if (error.isValid()) return;
+
+		if (SingleCallback<T>::next != this) {
+			SingleCallback<T>::next->fire(std::forward<U>(value));
+		}
+		else {
+			queue.emplace(std::forward<U>(value));
+		}
+	}
+
+	void sendError(Error err) {
+		if (error.isValid()) return;
+
+		this->error = err;
+		if (SingleCallback<T>::next != this)
+			SingleCallback<T>::next->error(err);
+	}
+
+	void addPromiseRef() { promises++; }
+	void addFutureRef() { futures++; }
+
+	void delPromiseRef() {
+		if (!--promises) {
+			if (futures) {
+				sendError(broken_promise());
+			}
+			else
+				destroy();
+		}
+	}
+	void delFutureRef() {
+		if (!--futures) {
+			if (promises)
+				cancel();
+			else
+				destroy();
+		}
+	}
+
+	int getFutureReferenceCount() const { return futures; }
+	int getPromiseReferenceCount() const { return promises; }
+
+	virtual void destroy() { delete this; }
+	virtual void cancel() {}
+
+	void addCallbackAndDelFutureRef(SingleCallback<T>* cb) {
+		ASSERT(SingleCallback<T>::next == this);
+		cb->insert(this);
+	}
+	virtual void unwait() override { delFutureRef(); }
+	virtual void fire(T const&) override { ASSERT(false); }
+	virtual void fire(T&&) override { ASSERT(false); }
+};
+
+template <class T>
+class ReplyPromiseStream {
+public:
+	// stream.send( request )
+	//   Unreliable at most once delivery: Delivers request unless there is a connection failure (zero or one times)
+
+	template<class U>
+	void send(U && value) const {
+		if (queue->isRemoteEndpoint()) {
+			if(!queue->acknowledgements.getRawEndpoint().isValid()) {
+				value.acknowledgeEndpoint = queue->acknowledgements.getEndpoint();
+			}
+			queue->acknowledgements.bytesSent += value.expectedSize();
+			if((!queue->acknowledgements.ready.isValid() || queue->acknowledgements.ready.isSet()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
+				queue->acknowledgements.ready = Promise<Void>();
+			}
+			FlowTransport::transport().sendUnreliable(SerializeSource<T>(std::forward<U>(value)), getEndpoint(), true);
+		}
+		else
+			queue->send(std::forward<U>(value));
+	}
+
+	template <class E>
+	void sendError(const E& exc) const { 
+		queue->sendError(exc);
+		if(errors && errors->canBeSet()) {
+			errors->sendError(exc);
+		}
+	}
+
+	FutureStream<T> getFuture() const { queue->addFutureRef(); return FutureStream<T>(queue); }
+	ReplyPromiseStream() : queue(new NetNotifiedQueueWithErrors<T>(0, 1)), errors(new SAV<Void>(0, 1)) {}
+	ReplyPromiseStream(const ReplyPromiseStream& rhs) : queue(rhs.queue), errors(rhs.errors) { 
+		queue->addPromiseRef();
+		if(errors) {
+			errors->addPromiseRef();
+		}
+	}
+	ReplyPromiseStream(ReplyPromiseStream&& rhs) noexcept : queue(rhs.queue), errors(rhs.errors) { rhs.queue = nullptr; rhs.errors = nullptr; }
+	explicit ReplyPromiseStream(const Endpoint& endpoint) : queue(new NetNotifiedQueueWithErrors<T>(0, 1, endpoint)), errors(nullptr) {}
+
+	Future<Void> getErrorFutureAndDelPromiseRef() {
+		ASSERT(errors && errors->getPromiseReferenceCount() > 1);
+		errors->addFutureRef();
+		errors->delPromiseRef();
+		return Future<Void>(errors);
+	}
+	
+	~ReplyPromiseStream() {
+		if (queue)
+			queue->delPromiseRef();
+		if (errors)
+			errors->delPromiseRef();
+	}
+
+	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const { return queue->getEndpoint(taskID); }
+	
+	bool operator == (const ReplyPromiseStream<T>& rhs) const { return queue == rhs.queue; }
+	bool isEmpty() const { return !queue->isReady(); }
+	uint32_t size() const { return queue->size(); }
+
+	Future<Void> onReady() {
+		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
+			return Void();
+		}
+		return queue->acknowledgements.ready.getFuture();
+	}
+
+	void operator=(const ReplyPromiseStream& rhs) {
+		rhs.queue->addPromiseRef();
+		if (queue) queue->delPromiseRef();
+		queue = rhs.queue;
+		if(rhs.errors) rhs.errors->addPromiseRef();
+		if (errors) errors->delPromiseRef();
+		errors = rhs.errors;
+	}
+	void operator=(ReplyPromiseStream&& rhs) noexcept {
+		if (queue != rhs.queue) {
+			if (queue) queue->delPromiseRef();
+			queue = rhs.queue;
+			rhs.queue = 0;
+		}
+		if (errors != rhs.errors) {
+			if (errors) errors->delPromiseRef();
+			errors = rhs.errors;
+			rhs.errors = 0;
+		}
+	}
+
+private:
+	NetNotifiedQueueWithErrors<T>* queue;
+	SAV<Void>* errors;
+};
+
+template <class Ar, class T>
+void save(Ar& ar, const ReplyPromiseStream<T>& value) {
+	auto const& ep = value.getEndpoint();
+	ar << ep;
+}
+
+template <class Ar, class T>
+void load(Ar& ar, ReplyPromiseStream<T>& value) {
+	Endpoint endpoint;
+	ar >> endpoint;
+	value = ReplyPromiseStream<T>(endpoint);
+}
+
+template <class T>
+struct serializable_traits<ReplyPromiseStream<T>> : std::true_type {
+	template <class Archiver>
+	static void serialize(Archiver& ar, ReplyPromiseStream<T>& stream) {
+		if constexpr (Archiver::isDeserializing) {
+			Endpoint endpoint;
+			serializer(ar, endpoint);
+			stream = ReplyPromiseStream<T>(endpoint);
+		} else {
+			const auto& ep = stream.getEndpoint();
+			serializer(ar, ep);
+		}
+	}
+};
+
 template <class T>
 struct NetNotifiedQueue final : NotifiedQueue<T>, FlowReceiver, FastAllocated<NetNotifiedQueue<T>> {
 	using FastAllocated<NetNotifiedQueue<T>>::operator new;
@@ -322,6 +604,47 @@ class RequestStream {
 		}
 	}
 
+	//FIXME comment
+
+	template <class X>
+	FutureStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value, TaskPriority taskID) const {
+		setReplyPriority(value, taskID);
+		if (queue->isRemoteEndpoint()) {
+			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint(taskID));
+			auto& p = getReplyPromiseStream(value);
+			if (disc.isReady()) {
+				p.sendError(request_maybe_delivered());
+				return p.getFuture();
+			}
+			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(taskID), true);
+			endStreamOnDisconnect(disc, p, peer);
+			return p.getFuture();
+		}
+		send(value);
+		auto& p = getReplyPromiseStream(value);
+		return p.getFuture();
+	}
+
+	template <class X>
+	FutureStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value) const {
+		if (queue->isRemoteEndpoint()) {
+			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint());
+			auto& p = getReplyPromiseStream(value);
+			if (disc.isReady()) {
+				p.sendError(request_maybe_delivered());
+				return p.getFuture();
+			}
+			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);
+			endStreamOnDisconnect(disc, p, peer)
+			return p.getFuture();
+		}
+		else {
+			send(value);
+			auto& p = getReplyPromiseStream(value);
+			return p.getFuture();
+		}
+	}
+
 	// stream.getReplyUnlessFailedFor( request, double sustainedFailureDuration, double sustainedFailureSlope )
 	//   Reliable at least once delivery: Like getReply, delivers request at least once and returns one of the replies. However, if
 	//     the failure detector considers the endpoint failed permanently or for the given amount of time, returns failure instead.
@@ -374,7 +697,7 @@ class RequestStream {
 		//queue = (NetNotifiedQueue<T>*)0xdeadbeef;
 	}
 
-	Endpoint getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const { return queue->getEndpoint(taskID); }
+	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const { return queue->getEndpoint(taskID); }
 	void makeWellKnownEndpoint(Endpoint::Token token, TaskPriority taskID) {
 		queue->makeWellKnownEndpoint(token, taskID);
 	}
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index d5c39df1a48..d3e6dd9ab46 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -192,6 +192,21 @@ struct PeerHolder {
 	}
 };
 
+// Implements getRepyStream
+ACTOR template <class X>
+void endStreamOnDisconnect( Future<Void> signal, ReplyPromiseStream<X> stream, Reference<Peer> peer = Reference<Peer>() ) {
+	state PeerHolder holder = PeerHolder(peer);
+	choose {
+		when(wait(signal)) {
+			stream.sendError(request_maybe_delivered());
+		}
+		when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
+	}
+	return Void();
+}
+
+
+
 // Implements tryGetReply, getReplyUnlessFailedFor
 ACTOR template <class X>
 Future<ErrorOr<X>> waitValueOrSignal( Future<X> value, Future<Void> signal, Endpoint endpoint, ReplyPromise<X> holdme = ReplyPromise<X>(), Reference<Peer> peer = Reference<Peer>() ) {
@@ -211,12 +226,8 @@ Future<ErrorOr<X>> waitValueOrSignal( Future<X> value, Future<Void> signal, Endp
 			if( e.code() == error_code_actor_cancelled )
 				throw e;
 
-			// broken_promise error normally means an endpoint failure, which in tryGetReply has the same semantics as receiving the failure signal
-			if (e.code() != error_code_broken_promise || signal.isError())
-				return ErrorOr<X>(e);
-
-			IFailureMonitor::failureMonitor().endpointNotFound( endpoint );
-			value = Never();
+			ASSERT(e.code() != error_code_broken_promise);
+			return ErrorOr<X>(e);
 		}
 	}
 }
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 3b1866a581b..e8fda37615c 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -531,7 +531,7 @@ struct StorageServer {
 
 	struct Counters {
 		CounterCollection cc;
-		Counter allQueries, getKeyQueries, getValueQueries, getRangeQueries, finishedQueries, rowsQueried, bytesQueried, watchQueries, emptyQueries;
+		Counter allQueries, getKeyQueries, getValueQueries, getRangeQueries, getRangeStreamQueries, finishedQueries, rowsQueried, bytesQueried, watchQueries, emptyQueries;
 		Counter bytesInput, bytesDurable, bytesFetched,
 			mutationBytes;  // Like bytesInput but without MVCC accounting
 		Counter sampledBytesCleared;
@@ -549,6 +549,7 @@ struct StorageServer {
 			getKeyQueries("GetKeyQueries", cc),
 			getValueQueries("GetValueQueries",cc),
 			getRangeQueries("GetRangeQueries", cc),
+			getRangeStreamQueries("GetRangeStreamQueries", cc),
 			allQueries("QueryQueue", cc),
 			finishedQueries("FinishedQueries", cc),
 			rowsQueried("RowsQueried", cc),
@@ -1640,6 +1641,195 @@ ACTOR Future<Void> getKeyValuesQ( StorageServer* data, GetKeyValuesRequest req )
 	return Void();
 }
 
+ACTOR Future<Void> getKeyValuesStreamQ( StorageServer* data, GetKeyValuesStreamRequest req )
+{
+	Future<Void> disc = IFailureMonitor::failureMonitor().onDisconnectOrFailure(req.reply.getEndpoint());
+	Future<Void> work = getKeyValuesStreamWork( data, req );
+	choose {
+		when(wait(disc)) {
+			req.reply.sendError(end_of_stream());
+		}
+		when(wait(work)) {}
+	}
+	return Void();
+}
+
+ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStreamRequest req )
+// Throws a wrong_shard_server if the keys in the request or result depend on data outside this server OR if a large selector offset prevents
+// all data from being read in one range read
+{
+	state Span span("SS:getKeyValuesStream"_loc, { req.spanContext });
+	state int64_t resultSize = 0;
+
+	++data->counters.getRangeStreamQueries;
+	++data->counters.allQueries;
+	++data->readQueueSizeMetric;
+	data->maxQueryQueue = std::max<int>( data->maxQueryQueue, data->counters.allQueries.getValue() - data->counters.finishedQueries.getValue());
+
+	// Active load balancing runs at a very high priority (to obtain accurate queue lengths)
+	// so we need to downgrade here
+	if (SERVER_KNOBS->FETCH_KEYS_LOWER_PRIORITY && req.isFetchKeys) {
+		wait( delay(0, TaskPriority::FetchKeys) );
+	} else {
+		wait( delay(0, TaskPriority::DefaultEndpoint) );
+	}
+	
+	try {
+		if( req.debugID.present() )
+			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Before");
+		state Version version = wait( waitForVersion( data, req.version, span.context ) );
+
+		state uint64_t changeCounter = data->shardChangeCounter;
+//		try {
+		state KeyRange shard = getShardKeyRange( data, req.begin );
+
+		if( req.debugID.present() )
+			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterVersion");
+		//.detail("ShardBegin", shard.begin).detail("ShardEnd", shard.end);
+		//} catch (Error& e) { TraceEvent("WrongShardServer", data->thisServerID).detail("Begin", req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("Shard", "None").detail("In", "getKeyValues>getShardKeyRange"); throw e; }
+
+		if ( !selectorInRange(req.end, shard) && !(req.end.isFirstGreaterOrEqual() && req.end.getKey() == shard.end) ) {
+//			TraceEvent("WrongShardServer1", data->thisServerID).detail("Begin", req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("ShardBegin", shard.begin).detail("ShardEnd", shard.end).detail("In", "getKeyValues>checkShardExtents");
+			throw wrong_shard_server();
+		}
+
+		state int offset1;
+		state int offset2;
+		state Future<Key> fBegin = req.begin.isFirstGreaterOrEqual()
+		                               ? Future<Key>(req.begin.getKey())
+		                               : findKey(data, req.begin, version, shard, &offset1, span.context);
+		state Future<Key> fEnd = req.end.isFirstGreaterOrEqual()
+		                             ? Future<Key>(req.end.getKey())
+		                             : findKey(data, req.end, version, shard, &offset2, span.context);
+		state Key begin = wait(fBegin);
+		state Key end = wait(fEnd);
+		if( req.debugID.present() )
+			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterKeys");
+		//.detail("Off1",offset1).detail("Off2",offset2).detail("ReqBegin",req.begin.getKey()).detail("ReqEnd",req.end.getKey());
+
+		// Offsets of zero indicate begin/end keys in this shard, which obviously means we can answer the query
+		// An end offset of 1 is also OK because the end key is exclusive, so if the first key of the next shard is the end the last actual key returned must be from this shard.
+		// A begin offset of 1 is also OK because then either begin is past end or equal to end (so the result is definitely empty)
+		if ((offset1 && offset1!=1) || (offset2 && offset2!=1)) {
+			TEST(true);  // wrong_shard_server due to offset
+			// We could detect when offset1 takes us off the beginning of the database or offset2 takes us off the end, and return a clipped range rather
+			// than an error (since that is what the NativeAPI.getRange will do anyway via its "slow path"), but we would have to add some flags to the response
+			// to encode whether we went off the beginning and the end, since it needs that information.
+			//TraceEvent("WrongShardServer2", data->thisServerID).detail("Begin", req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("ShardBegin", shard.begin).detail("ShardEnd", shard.end).detail("In", "getKeyValues>checkOffsets").detail("BeginKey", begin).detail("EndKey", end).detail("BeginOffset", offset1).detail("EndOffset", offset2);
+			throw wrong_shard_server();
+		}
+
+		if (begin >= end) {
+			if( req.debugID.present() )
+				g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Send");
+			//.detail("Begin",begin).detail("End",end);
+
+			GetKeyValuesReply none;
+			none.version = version;
+			none.more = false;
+
+			data->checkChangeCounter( changeCounter, KeyRangeRef( std::min<KeyRef>(req.begin.getKey(), req.end.getKey()), std::max<KeyRef>(req.begin.getKey(), req.end.getKey()) ) );
+			req.reply.send( none );
+			req.reply.sendError( end_of_stream() );
+		} else {
+			state int remainingLimitBytes = req.limitBytes;
+			loop {
+				wait(req.reply.onReady());
+				GetKeyValuesReply _r = wait( readRange(data, version, KeyRangeRef(begin, end), req.limit, &remainingLimitBytes, span.context) );
+				GetKeyValuesReply r = _r;
+
+				if( req.debugID.present() )
+					g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");
+				//.detail("Begin",begin).detail("End",end).detail("SizeOf",r.data.size());
+				data->checkChangeCounter( changeCounter, KeyRangeRef( std::min<KeyRef>(begin, std::min<KeyRef>(req.begin.getKey(), req.end.getKey())), std::max<KeyRef>(end, std::max<KeyRef>(req.begin.getKey(), req.end.getKey())) ) );
+				if (EXPENSIVE_VALIDATION) {
+					for (int i = 0; i < r.data.size(); i++)
+						ASSERT(r.data[i].key >= begin && r.data[i].key < end);
+					ASSERT(r.data.size() <= std::abs(req.limit));
+				}
+
+				/*for( int i = 0; i < r.data.size(); i++ ) {
+					StorageMetrics m;
+					m.bytesPerKSecond = r.data[i].expectedSize();
+					m.iosPerKSecond = 1; //FIXME: this should be 1/r.data.size(), but we cannot do that because it is an int
+					data->metrics.notify(r.data[i].key, m);
+				}*/
+
+				// For performance concerns, the cost of a range read is billed to the start key and end key of the range.
+				int64_t totalByteSize = 0;
+				for (int i = 0; i < r.data.size(); i++) {
+					totalByteSize += r.data[i].expectedSize();
+				}
+				if (totalByteSize > 0 && SERVER_KNOBS->READ_SAMPLING_ENABLED) {
+					int64_t bytesReadPerKSecond = std::max(totalByteSize, SERVER_KNOBS->EMPTY_READ_PENALTY) / 2;
+					data->metrics.notifyBytesReadPerKSecond(r.data[0].key, bytesReadPerKSecond);
+					data->metrics.notifyBytesReadPerKSecond(r.data[r.data.size() - 1].key, bytesReadPerKSecond);
+				}
+
+				r.penalty = data->getPenalty();
+				req.reply.send( r );
+
+				resultSize = req.limitBytes - remainingLimitBytes;
+				data->counters.bytesQueried += resultSize;
+				data->counters.rowsQueried += r.data.size();
+				if(r.data.size() == 0) {
+					++data->counters.emptyQueries;
+				}
+				if(!r.more) {
+					req.reply.sendError(end_of_stream());
+					break;
+				}
+
+				if(req.limit >= 0) {
+					begin = keyAfter(r.data.back().key);
+				} else {
+					end = r.data.back();
+				}
+
+				if (SERVER_KNOBS->FETCH_KEYS_LOWER_PRIORITY && req.isFetchKeys) {
+					wait( delay(0, TaskPriority::FetchKeys) );
+				} else {
+					wait( delay(0, TaskPriority::DefaultEndpoint) );
+				}
+				
+				data->transactionTagCounter.addRequest(req.tags, resultSize);
+
+				//FIXME: figure out what to do with latency measurements
+				//double duration = g_network->timer() - req.requestTime();
+				//data->counters.readLatencySample.addMeasurement(duration);
+				//if(data->latencyBandConfig.present()) {
+				//	int maxReadBytes = data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());
+				//	int maxSelectorOffset = data->latencyBandConfig.get().readConfig.maxKeySelectorOffset.orDefault(std::numeric_limits<int>::max());
+				//	data->counters.readLatencyBands.addMeasurement(
+				//		duration, resultSize > maxReadBytes || abs(req.begin.offset) > maxSelectorOffset ||
+				//										abs(req.end.offset) > maxSelectorOffset);
+				//}
+			}
+		}
+	} catch (Error& e) {
+		if(!canReplyWith(e))
+			throw;
+		req.reply.sendError(e);
+	}
+
+	data->transactionTagCounter.addRequest(req.tags, resultSize);
+	++data->counters.finishedQueries;
+	--data->readQueueSizeMetric;
+
+	//FIXME: figure out what to do with latency measurements
+	//double duration = g_network->timer() - req.requestTime();
+	//data->counters.readLatencySample.addMeasurement(duration);
+	//if(data->latencyBandConfig.present()) {
+	//	int maxReadBytes = data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());
+	//	int maxSelectorOffset = data->latencyBandConfig.get().readConfig.maxKeySelectorOffset.orDefault(std::numeric_limits<int>::max());
+	//	data->counters.readLatencyBands.addMeasurement(
+	//		duration, resultSize > maxReadBytes || abs(req.begin.offset) > maxSelectorOffset ||
+	//										abs(req.end.offset) > maxSelectorOffset);
+	//}
+
+	return Void();
+}
+
 ACTOR Future<Void> getKeyQ( StorageServer* data, GetKeyRequest req ) {
 	state Span span("SS:getKey"_loc, { req.spanContext });
 	state int64_t resultSize = 0;
@@ -2057,35 +2247,39 @@ ACTOR Future<Standalone<RangeResultRef>> tryGetRange( Database cx, Version versi
 
 	try {
 		loop {
-			Standalone<RangeResultRef> rep = wait( tr.getRange( begin, end, limits, true ) );
-			limits.decrement( rep );
+			state PromiseStream<Standalone<RangeResultRef>> results;
+			state Future<Void> hold = tr.getRangeStream(results, begin, end, limits, true);
+			loop {
+				Standalone<RangeResultRef> rep = waitNext( results.getFuture() );
+				limits.decrement( rep );
+
+				if( limits.isReached() || !rep.more ) {
+					if( output.size() ) {
+						output.arena().dependsOn( rep.arena() );
+						output.append( output.arena(), rep.begin(), rep.size() );
+						if( limits.isReached() && rep.readThrough.present() )
+							output.readThrough = rep.readThrough.get();
+					} else {
+						output = rep;
+					}
 
-			if( limits.isReached() || !rep.more ) {
-				if( output.size() ) {
+					output.more = limits.isReached();
+
+					return output;
+				} else if( rep.readThrough.present() ) {
 					output.arena().dependsOn( rep.arena() );
-					output.append( output.arena(), rep.begin(), rep.size() );
-					if( limits.isReached() && rep.readThrough.present() )
-						output.readThrough = rep.readThrough.get();
+					if( rep.size() ) {
+						output.append( output.arena(), rep.begin(), rep.size() );
+						ASSERT( rep.readThrough.get() > rep.end()[-1].key );
+					} else {
+						ASSERT( rep.readThrough.get() > keys.begin );
+					}
+					begin = firstGreaterOrEqual( rep.readThrough.get() );
 				} else {
-					output = rep;
-				}
-
-				output.more = limits.isReached();
-
-				return output;
-			} else if( rep.readThrough.present() ) {
-				output.arena().dependsOn( rep.arena() );
-				if( rep.size() ) {
+					output.arena().dependsOn( rep.arena() );
 					output.append( output.arena(), rep.begin(), rep.size() );
-					ASSERT( rep.readThrough.get() > rep.end()[-1].key );
-				} else {
-					ASSERT( rep.readThrough.get() > keys.begin );
+					begin = firstGreaterThan( output.end()[-1].key );
 				}
-				begin = firstGreaterOrEqual( rep.readThrough.get() );
-			} else {
-				output.arena().dependsOn( rep.arena() );
-				output.append( output.arena(), rep.begin(), rep.size() );
-				begin = firstGreaterThan( output.end()[-1].key );
 			}
 		}
 	} catch( Error &e ) {
@@ -2217,6 +2411,7 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 			try {
 				TEST(true);		// Fetching keys for transferred shard
 
+				//FIXME: this is inefficient because we are restarting the getRangeStreaming for every block
 				state Standalone<RangeResultRef> this_block =
 				    wait(tryGetRange(data->cx, fetchVersion, keys,
 				                     GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, fetchBlockBytes), &isTooOld));
@@ -3771,6 +3966,15 @@ ACTOR Future<Void> serveGetKeyValuesRequests( StorageServer* self, FutureStream<
 	}
 }
 
+ACTOR Future<Void> serveGetKeyValuesStreamRequests( StorageServer* self, FutureStream<GetKeyValuesStreamRequest> getKeyValuesStream ) {
+	loop {
+		GetKeyValuesStreamRequest req = waitNext(getKeyValuesStream);
+		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade before doing real work
+		//FIXME: add readGuard again
+		self->actors.add(getKeyValuesStreamQ(self, req));
+	}
+}
+
 ACTOR Future<Void> serveGetKeyRequests( StorageServer* self, FutureStream<GetKeyRequest> getKey ) {
 	loop {
 		GetKeyRequest req = waitNext(getKey);
@@ -3805,6 +4009,7 @@ ACTOR Future<Void> storageServerCore( StorageServer* self, StorageServerInterfac
 	self->actors.add(checkBehind(self));
 	self->actors.add(serveGetValueRequests(self, ssi.getValue.getFuture()));
 	self->actors.add(serveGetKeyValuesRequests(self, ssi.getKeyValues.getFuture()));
+	self->actors.add(serveGetKeyValuesStreamRequests(self, ssi.getKeyValuesStream.getFuture()));
 	self->actors.add(serveGetKeyRequests(self, ssi.getKey.getFuture()));
 	self->actors.add(serveWatchValueRequests(self, ssi.watchValue.getFuture()));
 	self->actors.add(traceRole(Role::STORAGE_SERVER, ssi.id()));
diff --git a/flow/flow.h b/flow/flow.h
index a72465143d4..b33d525fdc1 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -884,6 +884,11 @@ decltype(std::declval<Request>().reply) const& getReplyPromise(Request const& r)
 	return r.reply;
 }
 
+template <class Request>
+decltype(std::declval<Request>().reply) const& getReplyPromiseStream(Request const& r) {
+	return r.reply;
+}
+
 // Neither of these implementations of REPLY_TYPE() works on both MSVC and g++, so...
 #ifdef __GNUG__
 #define REPLY_TYPE(RequestType) decltype(getReplyPromise(std::declval<RequestType>()).getFuture().getValue())
@@ -903,8 +908,22 @@ struct ReplyType<ReplyPromise<T>> {
 #define REPLY_TYPE(RequestType) typename ReplyType<RequestType>::Type
 #endif
 
-
-
+// Neither of these implementations of REPLY_TYPE() works on both MSVC and g++, so...
+#ifdef __GNUG__
+#define REPLYSTREAM_TYPE(RequestType) decltype(getReplyPromiseStream(std::declval<RequestType>()).getFuture().getValue())
+#else
+template <class T>
+struct ReplyStreamType {
+	// Doing this calculation directly in the return value declaration for PromiseStream<T>::getReply()
+	//   breaks IntelliSense in VS2010; this is a workaround.
+	typedef decltype(std::declval<T>().reply.getFuture().getValue()) Type;
+};
+template <class T> class ReplyPromiseStream;
+template <class T>
+struct ReplyStreamType<ReplyPromiseStream<T>> {
+	typedef T Type;
+};
+#define REPLYSTREAM_TYPE(RequestType) typename ReplyStreamType<RequestType>::Type
 
 template <class T>
 class PromiseStream {
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 3fcab1f7dd5..cb2f502e529 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1233,6 +1233,16 @@ ACTOR template <class T> Future<T> waitOrError(Future<T> f, Future<Void> errorSi
 	}
 }
 
+ACTOR template <class T, class V> Future<T> forwardErrors(Future<T> f, PromiseStream<V> output) {
+	try {
+		T val = wait(f);
+		return val;
+	} catch (Error& e) {
+		output.sendError(e);
+		throw;
+	}
+}
+
 struct FlowLock : NonCopyable, public ReferenceCounted<FlowLock> {
 	// FlowLock implements a nonblocking critical section: there can be only a limited number of clients executing code between
 	// wait(take()) and release(). Not thread safe. take() returns only when the number of holders of the lock is fewer than the

From 91b4ee6d94df44b3f3d8fb66cb833c1aa4e7cb51 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 20:51:10 -0800
Subject: [PATCH 002/740] fixed compile error

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 fdbrpc/genericactors.actor.h  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 0383ae9378b..b8bf5a9bf00 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2677,7 +2677,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 	state KeySelector originalBegin = begin;
 	state KeySelector originalEnd = end;
 	state Standalone<RangeResultRef> output;
-	state Span span("NAPI:getRange"_loc, info.spanID);
+	state Span span("NAPI:getRangeStream"_loc, info.spanID);
 
 	try {
 		state Version version = wait( fVersion );
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index d3e6dd9ab46..73b9c2712fe 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -202,7 +202,6 @@ void endStreamOnDisconnect( Future<Void> signal, ReplyPromiseStream<X> stream, R
 		}
 		when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
 	}
-	return Void();
 }
 
 

From 1d28619e27d616bba9539d06a259bd8398ba6198 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 20:55:41 -0800
Subject: [PATCH 003/740] commented out the NativeAPI getRangeStream actor
 while getting the rest of the code to compile

---
 fdbclient/NativeAPI.actor.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index b8bf5a9bf00..83103f4dbd8 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1700,6 +1700,7 @@ Future<Standalone<RangeResultRef>> getRange(
 	TransactionInfo const& info,
 	TagSet const& tags);
 
+/*
 Future<Void> getRangeStream(
 	PromiseStream<Standalone<RangeResultRef>> const& results,
 	Database const& cx,
@@ -1710,6 +1711,7 @@ Future<Void> getRangeStream(
 	bool const& reverse,
 	TransactionInfo const& info,
 	TagSet const& tags);
+*/
 
 ACTOR Future<Optional<Value>> getValue(Future<Version> version, Key key, Database cx, TransactionInfo info,
                                        Reference<TransactionLogInfo> trLogInfo, TagSet tags);
@@ -2669,6 +2671,7 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 	}
 }
 
+/*
 ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> results, Database cx, Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion,
 	KeySelector begin, KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange, bool snapshot, bool reverse,
 	TransactionInfo info, TagSet tags )
@@ -2747,7 +2750,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 						.detail("ReqVersion", req.version)
 						.detail("Reverse", reverse)
 						.detail("ModifiedSelectors", modifiedSelectors)
-						.detail("Servers", beginServer.second->description());*/
+						.detail("Servers", beginServer.second->description());/
 				}
 
 				++cx->transactionPhysicalReads;
@@ -2773,7 +2776,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 							.detail("ReqEndKey", req.end.getKey())
 							.detail("RepIsMore", rep.more)
 							.detail("VersionReturned", rep.version)
-							.detail("RowsReturned", rep.data.size());*/
+							.detail("RowsReturned", rep.data.size());/
 					}
 
 					ASSERT( !rep.more || rep.data.size() );
@@ -2886,6 +2889,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 		throw;
 	}
 }
+*/
 
 Future<Standalone<RangeResultRef>> getRange( Database const& cx, Future<Version> const& fVersion, KeySelector const& begin, KeySelector const& end,
 	GetRangeLimits const& limits, bool const& reverse, TransactionInfo const& info, TagSet const& tags )
@@ -3204,6 +3208,9 @@ Future<Void> Transaction::getRangeStream(
 	bool snapshot,
 	bool reverse )
 {
+	return Void();
+
+	/*
 	++cx->transactionLogicalReads;
 	++cx->transactionGetRangeRequests;
 
@@ -3238,6 +3245,7 @@ Future<Void> Transaction::getRangeStream(
 	}
 
 	return forwardErrors(::getRangeStream(results, cx, trLogInfo, getReadVersion(), b, e, limits, conflictRange, snapshot, reverse, info, options.readTags), results);
+	*/
 }
 
 Future<Void> Transaction::getRangeStream(

From 481795fde9d966dbcaf88aa015fcf3e399d48691 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 20:59:03 -0800
Subject: [PATCH 004/740] fixed test macros

---
 fdbclient/NativeAPI.actor.cpp     | 10 +++++-----
 fdbserver/storageserver.actor.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 83103f4dbd8..5fdd2f55817 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2834,7 +2834,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 					if( !rep.more ) {
 						ASSERT( modifiedSelectors );
-						TEST(true);  // !GetKeyValuesReply.more and modifiedSelectors in getRange
+						TEST(true);  // !GetKeyValuesReply.more and modifiedSelectors in getRangeStream
 
 						if( !rep.data.size() ) {
 							Standalone<RangeResultRef> result = wait( getRangeFallback(cx, version, originalBegin, originalEnd, originalLimits, reverse, info, tags ) );
@@ -2847,7 +2847,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 						else
 							begin = firstGreaterOrEqual( shard.end );
 					} else {
-						TEST(true);  // GetKeyValuesReply.more in getRange
+						TEST(true);  // GetKeyValuesReply.more in getRangeStream
 						if( reverse )
 							end = firstGreaterOrEqual( output[output.size()-1].key );
 						else
@@ -3224,18 +3224,18 @@ Future<Void> Transaction::getRangeStream(
 
 	KeySelector b = begin;
 	if( b.orEqual ) {
-		TEST(true); // Native begin orEqual==true
+		TEST(true); // Native stream begin orEqual==true
 		b.removeOrEqual(b.arena());
 	}
 
 	KeySelector e = end;
 	if( e.orEqual ) {
-		TEST(true); // Native end orEqual==true
+		TEST(true); // Native stream end orEqual==true
 		e.removeOrEqual(e.arena());
 	}
 
 	if( b.offset >= e.offset && b.getKey() >= e.getKey() ) {
-		TEST(true); // Native range inverted
+		TEST(true); // Native stream range inverted
 		return Standalone<RangeResultRef>();
 	}
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index e8fda37615c..587fa0e9898 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1711,7 +1711,7 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 		// An end offset of 1 is also OK because the end key is exclusive, so if the first key of the next shard is the end the last actual key returned must be from this shard.
 		// A begin offset of 1 is also OK because then either begin is past end or equal to end (so the result is definitely empty)
 		if ((offset1 && offset1!=1) || (offset2 && offset2!=1)) {
-			TEST(true);  // wrong_shard_server due to offset
+			TEST(true);  // wrong_shard_server due to offset in rangeStream
 			// We could detect when offset1 takes us off the beginning of the database or offset2 takes us off the end, and return a clipped range rather
 			// than an error (since that is what the NativeAPI.getRange will do anyway via its "slow path"), but we would have to add some flags to the response
 			// to encode whether we went off the beginning and the end, since it needs that information.

From ad9ea11ddca125546b6b3a9a29d68a7e12f3f0c3 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:00:55 -0800
Subject: [PATCH 005/740] missing #endif

---
 flow/flow.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flow/flow.h b/flow/flow.h
index b33d525fdc1..306f04837e3 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -924,6 +924,7 @@ struct ReplyStreamType<ReplyPromiseStream<T>> {
 	typedef T Type;
 };
 #define REPLYSTREAM_TYPE(RequestType) typename ReplyStreamType<RequestType>::Type
+#endif
 
 template <class T>
 class PromiseStream {

From d39eb5427dbc6393bf16eebf635acc5cfa3b2cd0 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:04:24 -0800
Subject: [PATCH 006/740] directly reference local variables

---
 fdbrpc/fdbrpc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 6096b9a4733..d1a77c2835f 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -252,8 +252,8 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		reader.deserialize(message);
 		ASSERT(!message.isError() && message.get().asUnderlyingType().bytes > bytesAcknowledged);
 		bytesAcknowledged = message.get().asUnderlyingType().bytes;
-		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
-			queue->acknowledgements.ready.send(Void());
+		if(bytesSent - bytesAcknowledged < 2e6) {
+			ready.send(Void());
 		}
 	}
 };

From 33d2c60b8c9edceff21dc3672e0b784f44176276 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:07:12 -0800
Subject: [PATCH 007/740] removed extra comma

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index d1a77c2835f..9b0c8bc695b 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -271,7 +271,7 @@ struct NetNotifiedQueueWithErrors final : private SingleCallback<T>, public Flow
 	Error error;
 	AcknowledgementReceiver acknowledgements;
 
-	NetNotifiedQueueWithErrors(int futures, int promises) : futures(futures), promises(promises),  {
+	NetNotifiedQueueWithErrors(int futures, int promises) : futures(futures), promises(promises) {
 		SingleCallback<T>::next = this;
 	}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)

From e9336c363354a8c714b5195251898b90b3f1d81a Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:09:49 -0800
Subject: [PATCH 008/740] more fixes

---
 fdbclient/StorageServerInterface.h | 2 +-
 fdbrpc/fdbrpc.h                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index f10c573bf3a..7efab1fd20b 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -131,7 +131,7 @@ struct StorageServerInterface {
 		streams.push_back(watchValue.getReceiver());
 		streams.push_back(getReadHotRanges.getReceiver());
 		streams.push_back(getRangeSplitPoints.getReceiver());
-		streams.push_back(getKeyValuesStrean.getReceiver(TaskPriority::LoadBalancedEndpoint));
+		streams.push_back(getKeyValuesStream.getReceiver(TaskPriority::LoadBalancedEndpoint));
 		FlowTransport::transport().addEndpoints(streams);
 	}
 };
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 9b0c8bc695b..69b25093cca 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -310,7 +310,7 @@ struct NetNotifiedQueueWithErrors final : private SingleCallback<T>, public Flow
 		auto copy = std::move(queue.front());
 		if(acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += copy.expectedSize();
-			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(), true);
+			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), true);
 		}
 		queue.pop();
 		return copy;
@@ -635,7 +635,7 @@ class RequestStream {
 				return p.getFuture();
 			}
 			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);
-			endStreamOnDisconnect(disc, p, peer)
+			endStreamOnDisconnect(disc, p, peer);
 			return p.getFuture();
 		}
 		else {

From 43c1822563dbd06badd5210296d5521846cb61a9 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:14:20 -0800
Subject: [PATCH 009/740] fixed definition order

---
 fdbserver/storageserver.actor.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 587fa0e9898..9c6d15a240f 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1641,19 +1641,6 @@ ACTOR Future<Void> getKeyValuesQ( StorageServer* data, GetKeyValuesRequest req )
 	return Void();
 }
 
-ACTOR Future<Void> getKeyValuesStreamQ( StorageServer* data, GetKeyValuesStreamRequest req )
-{
-	Future<Void> disc = IFailureMonitor::failureMonitor().onDisconnectOrFailure(req.reply.getEndpoint());
-	Future<Void> work = getKeyValuesStreamWork( data, req );
-	choose {
-		when(wait(disc)) {
-			req.reply.sendError(end_of_stream());
-		}
-		when(wait(work)) {}
-	}
-	return Void();
-}
-
 ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStreamRequest req )
 // Throws a wrong_shard_server if the keys in the request or result depend on data outside this server OR if a large selector offset prevents
 // all data from being read in one range read
@@ -1830,6 +1817,19 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 	return Void();
 }
 
+ACTOR Future<Void> getKeyValuesStreamQ( StorageServer* data, GetKeyValuesStreamRequest req )
+{
+	Future<Void> disc = IFailureMonitor::failureMonitor().onDisconnectOrFailure(req.reply.getEndpoint());
+	Future<Void> work = getKeyValuesStreamWork( data, req );
+	choose {
+		when(wait(disc)) {
+			req.reply.sendError(end_of_stream());
+		}
+		when(wait(work)) {}
+	}
+	return Void();
+}
+
 ACTOR Future<Void> getKeyQ( StorageServer* data, GetKeyRequest req ) {
 	state Span span("SS:getKey"_loc, { req.spanContext });
 	state int64_t resultSize = 0;

From 5179e42d135e13a1d55522aab4ac2287352f34f8 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:19:11 -0800
Subject: [PATCH 010/740] allow begin and end variables to be modified

---
 fdbserver/storageserver.actor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 9c6d15a240f..0d980da9f44 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1688,8 +1688,9 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 		state Future<Key> fEnd = req.end.isFirstGreaterOrEqual()
 		                             ? Future<Key>(req.end.getKey())
 		                             : findKey(data, req.end, version, shard, &offset2, span.context);
-		state Key begin = wait(fBegin);
-		state Key end = wait(fEnd);
+		wait(success(fBegin) && success(fEnd));
+		state Key begin = fBegin.get();
+		state Key end = fEnd.get();
 		if( req.debugID.present() )
 			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterKeys");
 		//.detail("Off1",offset1).detail("Off2",offset2).detail("ReqBegin",req.begin.getKey()).detail("ReqEnd",req.end.getKey());

From 492ec2f348df2f1c5b07c595c9a8fded4af816d9 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:30:07 -0800
Subject: [PATCH 011/740] misdiagnosed the previous compile error

---
 fdbserver/storageserver.actor.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 0d980da9f44..91c67a8b4d7 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1688,9 +1688,8 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 		state Future<Key> fEnd = req.end.isFirstGreaterOrEqual()
 		                             ? Future<Key>(req.end.getKey())
 		                             : findKey(data, req.end, version, shard, &offset2, span.context);
-		wait(success(fBegin) && success(fEnd));
-		state Key begin = fBegin.get();
-		state Key end = fEnd.get();
+		state Key begin = wait(fBegin);
+		state Key end = wait(fEnd);
 		if( req.debugID.present() )
 			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterKeys");
 		//.detail("Off1",offset1).detail("Off2",offset2).detail("ReqBegin",req.begin.getKey()).detail("ReqEnd",req.end.getKey());
@@ -1771,7 +1770,7 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 				if(req.limit >= 0) {
 					begin = keyAfter(r.data.back().key);
 				} else {
-					end = r.data.back();
+					end = r.data.back().key;
 				}
 
 				if (SERVER_KNOBS->FETCH_KEYS_LOWER_PRIORITY && req.isFetchKeys) {

From 52448b0077c3a984ef6e8173093511942e3ffb69 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:40:42 -0800
Subject: [PATCH 012/740] sent the wrong reply type

---
 fdbclient/StorageServerInterface.h | 1 +
 fdbserver/storageserver.actor.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index 7efab1fd20b..447013311e1 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -272,6 +272,7 @@ struct GetKeyValuesStreamReply : public ReplyPromiseStreamReply {
 	bool cached = false;
 
 	GetKeyValuesStreamReply() : version(invalidVersion), more(false), cached(false) {}
+	GetKeyValuesStreamReply(GetKeyValuesReply r) : arena(r.arena), data(r.data), version(r.version), more(r.more), cached(r.cached) {}
 
 	int expectedSize() const { return sizeof(GetKeyValuesStreamReply) + data.expectedSize(); }
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 91c67a8b4d7..d6e99c3cdc6 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1711,7 +1711,7 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 				g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Send");
 			//.detail("Begin",begin).detail("End",end);
 
-			GetKeyValuesReply none;
+			GetKeyValuesStreamReply none;
 			none.version = version;
 			none.more = false;
 
@@ -1723,7 +1723,7 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 			loop {
 				wait(req.reply.onReady());
 				GetKeyValuesReply _r = wait( readRange(data, version, KeyRangeRef(begin, end), req.limit, &remainingLimitBytes, span.context) );
-				GetKeyValuesReply r = _r;
+				GetKeyValuesStreamReply r(_r);
 
 				if( req.debugID.present() )
 					g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");

From 12502289c0ed1a3ff8b3516509d930602ab9fc19 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 4 Dec 2020 21:56:11 -0800
Subject: [PATCH 013/740] more fixes

---
 fdbrpc/fdbrpc.h                   | 2 +-
 fdbserver/storageserver.actor.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 69b25093cca..d5dc9011cae 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -382,7 +382,7 @@ class ReplyPromiseStream {
 	void send(U && value) const {
 		if (queue->isRemoteEndpoint()) {
 			if(!queue->acknowledgements.getRawEndpoint().isValid()) {
-				value.acknowledgeEndpoint = queue->acknowledgements.getEndpoint();
+				value.acknowledgeEndpoint = queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint);
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
 			if((!queue->acknowledgements.ready.isValid() || queue->acknowledgements.ready.isSet()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index d6e99c3cdc6..65c00ded0ad 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1753,7 +1753,6 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 					data->metrics.notifyBytesReadPerKSecond(r.data[r.data.size() - 1].key, bytesReadPerKSecond);
 				}
 
-				r.penalty = data->getPenalty();
 				req.reply.send( r );
 
 				resultSize = req.limitBytes - remainingLimitBytes;

From 5b54dd08ae60cd3e81a2c2990199b47a30e91b83 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 9 Dec 2020 11:18:03 -0800
Subject: [PATCH 014/740] added NativeAPI changes back

---
 fdbclient/DatabaseContext.h   |  1 +
 fdbclient/NativeAPI.actor.cpp | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index 5652ae7a14b..0dd7ada5adc 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -289,6 +289,7 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	Counter transactionGetKeyRequests;
 	Counter transactionGetValueRequests;
 	Counter transactionGetRangeRequests;
+	Counter transactionGetRangeStreamRequests;
 	Counter transactionWatchRequests;
 	Counter transactionGetAddressesForKeyRequests;
 	Counter transactionBytesRead;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 5fdd2f55817..68794bf8edc 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -859,7 +859,8 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
     transactionLogicalReads("LogicalUncachedReads", cc), transactionPhysicalReads("PhysicalReadRequests", cc),
     transactionPhysicalReadsCompleted("PhysicalReadRequestsCompleted", cc),
     transactionGetKeyRequests("GetKeyRequests", cc), transactionGetValueRequests("GetValueRequests", cc),
-    transactionGetRangeRequests("GetRangeRequests", cc), transactionWatchRequests("WatchRequests", cc),
+    transactionGetRangeRequests("GetRangeRequests", cc),
+	transactionGetRangeStreamRequests("GetRangeStreamRequests", cc), transactionWatchRequests("WatchRequests", cc),
     transactionGetAddressesForKeyRequests("GetAddressesForKeyRequests", cc), transactionBytesRead("BytesRead", cc),
     transactionKeysRead("KeysRead", cc), transactionMetadataVersionReads("MetadataVersionReads", cc),
     transactionCommittedMutations("CommittedMutations", cc),
@@ -1029,7 +1030,8 @@ DatabaseContext::DatabaseContext(const Error& err)
     transactionLogicalReads("LogicalUncachedReads", cc), transactionPhysicalReads("PhysicalReadRequests", cc),
     transactionPhysicalReadsCompleted("PhysicalReadRequestsCompleted", cc),
     transactionGetKeyRequests("GetKeyRequests", cc), transactionGetValueRequests("GetValueRequests", cc),
-    transactionGetRangeRequests("GetRangeRequests", cc), transactionWatchRequests("WatchRequests", cc),
+    transactionGetRangeRequests("GetRangeRequests", cc),
+	transactionGetRangeStreamRequests("GetRangeStreamRequests", cc), transactionWatchRequests("WatchRequests", cc),
     transactionGetAddressesForKeyRequests("GetAddressesForKeyRequests", cc), transactionBytesRead("BytesRead", cc),
     transactionKeysRead("KeysRead", cc), transactionMetadataVersionReads("MetadataVersionReads", cc),
     transactionCommittedMutations("CommittedMutations", cc),
@@ -2531,7 +2533,6 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 				}
 
 				++cx->transactionPhysicalReads;
-				++cx->transactionGetRangeRequests;
 				state GetKeyValuesReply rep;
 				try {
 					if (CLIENT_BUGGIFY) {
@@ -2754,7 +2755,6 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 				}
 
 				++cx->transactionPhysicalReads;
-				++cx->transactionGetRangeRequests;
 				state GetKeyValuesReply rep;
 				if (CLIENT_BUGGIFY) {
 					throw deterministicRandom()->randomChoice(std::vector<Error>{
@@ -3208,11 +3208,8 @@ Future<Void> Transaction::getRangeStream(
 	bool snapshot,
 	bool reverse )
 {
-	return Void();
-
-	/*
 	++cx->transactionLogicalReads;
-	++cx->transactionGetRangeRequests;
+	++cx->transactionGetRangeStreamRequests;
 
 	if( limits.isReached() )
 		return Standalone<RangeResultRef>();
@@ -3245,7 +3242,6 @@ Future<Void> Transaction::getRangeStream(
 	}
 
 	return forwardErrors(::getRangeStream(results, cx, trLogInfo, getReadVersion(), b, e, limits, conflictRange, snapshot, reverse, info, options.readTags), results);
-	*/
 }
 
 Future<Void> Transaction::getRangeStream(

From a4b6136ea00523db0cdad580b2bba33cb3dbc458 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 13 Dec 2020 21:52:55 -0800
Subject: [PATCH 015/740] based getRangeStream only on getExactRange for now to
 handle less special cases

---
 fdbclient/NativeAPI.actor.cpp | 256 ++++++++++++++++++++++++++++------
 1 file changed, 214 insertions(+), 42 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 68794bf8edc..f5a43e883bb 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1702,19 +1702,6 @@ Future<Standalone<RangeResultRef>> getRange(
 	TransactionInfo const& info,
 	TagSet const& tags);
 
-/*
-Future<Void> getRangeStream(
-	PromiseStream<Standalone<RangeResultRef>> const& results,
-	Database const& cx,
-	Future<Version> const& fVersion,
-	KeySelector const& begin,
-	KeySelector const& end,
-	GetRangeLimits const& limits,
-	bool const& reverse,
-	TransactionInfo const& info,
-	TagSet const& tags);
-*/
-
 ACTOR Future<Optional<Value>> getValue(Future<Version> version, Key key, Database cx, TransactionInfo info,
                                        Reference<TransactionLogInfo> trLogInfo, TagSet tags);
 
@@ -2672,10 +2659,209 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 	}
 }
 
-/*
 ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> results, Database cx, Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion,
 	KeySelector begin, KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange, bool snapshot, bool reverse,
 	TransactionInfo info, TagSet tags )
+{
+	//FIXME: better handling to disable row limits
+	ASSERT(!limits.hasRowLimit());
+	state Span span("NAPI:getRangeStream"_loc, info.spanID);
+
+	state Version version = wait( fVersion );
+	cx->validateVersion(version);
+
+	Future<Key> fb = resolveKey(cx, begin, version, info, tags);
+	state Future<Key> fe = resolveKey(cx, end, version, info, tags);
+
+	state Key b = wait(fb);
+	state Key e = wait(fe);
+
+	if( !snapshot ) {
+		//FIXME: this conflict range is too large, and should be updated continously as results are returned
+		conflictRange.send(std::make_pair(std::min(b, begin.getKey()), std::max(e, end.getKey())));
+	}
+
+	if (b >= e) {
+		results.send(end_of_stream());
+		return Void();
+	}
+
+	state KeyRangeRef keys(b, e);
+
+	//if e is allKeys.end, we have read through the end of the database
+	//if b is allKeys.begin, we have either read through the beginning of the database,
+	//or allKeys.begin exists in the database and will be part of the conflict range anyways
+
+	loop {
+		state vector< pair<KeyRange, Reference<LocationInfo>> > locations = wait( getKeyRangeLocations( cx, keys, CLIENT_KNOBS->GET_RANGE_SHARD_LIMIT, reverse, &StorageServerInterface::getKeyValues, info ) );
+		ASSERT( locations.size() );
+		state int shard = 0;
+		loop {
+			const KeyRangeRef& range = locations[shard].first;
+
+			GetKeyValuesStreamRequest req;
+			req.version = version;
+			req.begin = firstGreaterOrEqual( range.begin );
+			req.end = firstGreaterOrEqual( range.end );
+			req.spanContext = span.context;
+
+			transformRangeLimits(limits, reverse, req);
+			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
+
+			//FIXME: buggify byte limits on internal functions that use them, instead of globally
+			req.tags = cx->sampleReadTags() ? tags : Optional<TagSet>();
+			req.debugID = info.debugID;
+
+			try {
+				if( info.debugID.present() ) {
+					g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.RangeStream.Before");
+				}
+				++cx->transactionPhysicalReads;
+				state GetKeyValuesStreamReply rep;
+
+				if( locations[shard].second->size() == 0 ) {
+					wait(cx->connectionFileChanged());
+					results.sendError( transaction_too_old() );
+					return Void();
+				}
+
+				//FIXME: add load balancing
+				state FutureStream<GetKeyValuesStreamReply> replyStream = locations[shard].second->getInterface(0).getKeyValuesStream.getReplyStream(req);
+				loop {
+					try {
+						choose {
+							when(wait(cx->connectionFileChanged())) {
+								results.sendError( transaction_too_old() );
+								return Void();
+							}
+
+							when(GetKeyValuesStreamReply _rep = waitNext(replyStream) {
+								rep = _rep;
+							}
+						}
+						++cx->transactionPhysicalReadsCompleted;
+					} catch(Error&) {
+						++cx->transactionPhysicalReadsCompleted;
+						throw;
+					}
+					if( info.debugID.present() )
+						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
+					Standalone<RangeResultRef> output = rep.data;
+
+					bool more = rep.more;
+					// If the reply says there is more but we know that we finished the shard, then fix rep.more
+					if( reverse && more && rep.data.size() > 0 && output[output.size()-1].key == locations[shard].first.begin ) {
+						more = false;
+					}
+
+					if (more) {
+						if( !rep.data.size() ) {
+							TraceEvent(SevError, "GetRangeStreamError").detail("Reason", "More data indicated but no rows present")
+								.detail("LimitBytes", limits.bytes).detail("LimitRows", limits.rows)
+								.detail("OutputSize", output.size()).detail("OutputBytes", output.expectedSize())
+								.detail("BlockSize", rep.data.size()).detail("BlockBytes", rep.data.expectedSize());
+							ASSERT( false );
+						}
+						TEST(true);   // GetKeyValuesStreamReply.more in getRangeStream
+						// Make next request to the same shard with a beginning key just after the last key returned
+						if( reverse )
+							locations[shard].first = KeyRangeRef( locations[shard].first.begin, output[output.size()-1].key );
+						else
+							locations[shard].first = KeyRangeRef( keyAfter( output[output.size()-1].key ), locations[shard].first.end );
+					}
+
+					if (!more || locations[shard].first.empty()) {
+						TEST(true); // getRangeStream (!more || locations[shard].first.empty())
+						if(shard == locations.size()-1) {
+							const KeyRangeRef& range = locations[shard].first;
+							KeyRef begin = reverse ? keys.begin : range.end;
+							KeyRef end = reverse ? range.begin : keys.end;
+
+							if(begin >= end) {
+								output.more = false;
+								if(b == allKeys.begin) {
+									r.readToBegin = true;
+								}
+								if(e == allKeys.end) {
+									r.readThroughEnd = true;
+								}
+								int64_t bytes = 0;
+								for(const KeyValueRef &kv : result) {
+									bytes += kv.key.size() + kv.value.size();
+								}
+
+								cx->transactionBytesRead += bytes;
+								cx->transactionKeysRead += result.size();
+
+								//FIXME: figure out appropriate metrics for the client event log
+								//if( trLogInfo ) {
+								//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
+								//}
+
+								results.send(output);
+								results.sendError(end_of_stream());
+								return Void();
+							}
+
+							keys = KeyRangeRef(begin, end);
+							break;
+						}
+
+						++shard;
+					}
+
+					if(output.size() > 0) {
+						output.more = true;
+						if(b == allKeys.begin && !reverse) {
+							r.readToBegin = true;
+						}
+						if(e == allKeys.end && reverse) {
+							r.readThroughEnd = true;
+						}
+						int64_t bytes = 0;
+						for(const KeyValueRef &kv : result) {
+							bytes += kv.key.size() + kv.value.size();
+						}
+
+						cx->transactionBytesRead += bytes;
+						cx->transactionKeysRead += result.size();
+
+						//FIXME: figure out appropriate metrics for the client event log
+						//if( trLogInfo ) {
+						//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
+						//}
+						results.send(output);
+					}
+				}
+			} catch (Error& e) {
+				if (e.code() == error_code_actor_cancelled) {
+					throw;
+				}
+				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed) {
+					const KeyRangeRef& range = locations[shard].first;
+
+					if( reverse )
+						keys = KeyRangeRef( keys.begin, range.end );
+					else
+						keys = KeyRangeRef( range.begin, keys.end );
+
+					cx->invalidateCache( keys );
+					wait( delay(CLIENT_KNOBS->WRONG_SHARD_SERVER_DELAY, info.taskID ));
+					break;
+				} else {
+					results.sendError(e);
+					return Void();
+				}
+			}
+		}
+	}
+}
+
+
+/*
+ACTOR Future<Void> getRangeStreamSingleShard( PromiseStream<Standalone<RangeResultRef>> results, Database cx, Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion,
+	KeySelector begin, KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange, bool snapshot, bool reverse,
+	TransactionInfo info, TagSet tags )
 {
 	state GetRangeLimits originalLimits( limits );
 	state KeySelector originalBegin = begin;
@@ -2702,7 +2888,9 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 		loop {
 			if( end.getKey() == allKeys.begin && (end.offset < 1 || end.isFirstGreaterOrEqual()) ) {
 				getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
-				return output;
+				results.send(output);
+				results.send(end_of_stream());
+				return Void();
 			}
 
 			Key locationKey = reverse ? Key(end.getKey(), end.arena()) : Key(begin.getKey(), begin.arena());
@@ -2738,20 +2926,6 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 			try {
 				if( info.debugID.present() ) {
 					g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.Before");
-					/*TraceEvent("TransactionDebugGetRangeInfo", info.debugID.get())
-						.detail("ReqBeginKey", req.begin.getKey())
-						.detail("ReqEndKey", req.end.getKey())
-						.detail("OriginalBegin", originalBegin.toString())
-						.detail("OriginalEnd", originalEnd.toString())
-						.detail("Begin", begin.toString())
-						.detail("End", end.toString())
-						.detail("Shard", shard)
-						.detail("ReqLimit", req.limit)
-						.detail("ReqLimitBytes", req.limitBytes)
-						.detail("ReqVersion", req.version)
-						.detail("Reverse", reverse)
-						.detail("ModifiedSelectors", modifiedSelectors)
-						.detail("Servers", beginServer.second->description());/
 				}
 
 				++cx->transactionPhysicalReads;
@@ -2771,12 +2945,6 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 					if( info.debugID.present() ) {
 						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.After");//.detail("SizeOf", rep.data.size());
-						/*TraceEvent("TransactionDebugGetRangeDone", info.debugID.get())
-							.detail("ReqBeginKey", req.begin.getKey())
-							.detail("ReqEndKey", req.end.getKey())
-							.detail("RepIsMore", rep.more)
-							.detail("VersionReturned", rep.version)
-							.detail("RowsReturned", rep.data.size());/
 					}
 
 					ASSERT( !rep.more || rep.data.size() );
@@ -2888,8 +3056,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 		throw;
 	}
-}
-*/
+}*/
 
 Future<Standalone<RangeResultRef>> getRange( Database const& cx, Future<Version> const& fVersion, KeySelector const& begin, KeySelector const& end,
 	GetRangeLimits const& limits, bool const& reverse, TransactionInfo const& info, TagSet const& tags )
@@ -3211,11 +3378,15 @@ Future<Void> Transaction::getRangeStream(
 	++cx->transactionLogicalReads;
 	++cx->transactionGetRangeStreamRequests;
 
-	if( limits.isReached() )
-		return Standalone<RangeResultRef>();
+	if( limits.isReached() ) {
+		results.send(end_of_stream());
+		return Void();
+	}
 
-	if( !limits.isValid() )
-		return range_limits_invalid();
+	if( !limits.isValid() ) {
+		results.send(range_limits_invalid());
+		return Void();
+	}
 
 	ASSERT(limits.rows != 0);
 
@@ -3233,7 +3404,8 @@ Future<Void> Transaction::getRangeStream(
 
 	if( b.offset >= e.offset && b.getKey() >= e.getKey() ) {
 		TEST(true); // Native stream range inverted
-		return Standalone<RangeResultRef>();
+		results.send(end_of_stream());
+		return Void();
 	}
 
 	Promise<std::pair<Key, Key>> conflictRange;

From 42070809eeb5dc95c8fd2a2ca9c5f2acde997f57 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 13 Dec 2020 21:55:39 -0800
Subject: [PATCH 016/740] missing paratheses

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index f5a43e883bb..f257dc2997b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2735,7 +2735,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 								return Void();
 							}
 
-							when(GetKeyValuesStreamReply _rep = waitNext(replyStream) {
+							when(GetKeyValuesStreamReply _rep = waitNext(replyStream)) {
 								rep = _rep;
 							}
 						}

From e838398dc1a7d6d9342543f74eb5b9cc692d3998 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 13 Dec 2020 22:07:27 -0800
Subject: [PATCH 017/740] fixed a lot of compile errors

---
 fdbclient/NativeAPI.actor.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index f257dc2997b..762793cf5d8 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2678,11 +2678,11 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 	if( !snapshot ) {
 		//FIXME: this conflict range is too large, and should be updated continously as results are returned
-		conflictRange.send(std::make_pair(std::min(b, begin.getKey()), std::max(e, end.getKey())));
+		conflictRange.send(std::make_pair(std::min(b, Key(begin.getKey(),begin.arena)), std::max(e, Key(end.getKey(),end.arena))));
 	}
 
 	if (b >= e) {
-		results.send(end_of_stream());
+		results.sendError(end_of_stream());
 		return Void();
 	}
 
@@ -2699,13 +2699,14 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 		loop {
 			const KeyRangeRef& range = locations[shard].first;
 
-			GetKeyValuesStreamRequest req;
+			state GetKeyValuesStreamRequest req;
 			req.version = version;
 			req.begin = firstGreaterOrEqual( range.begin );
 			req.end = firstGreaterOrEqual( range.end );
 			req.spanContext = span.context;
+			req.limit = reverse ? -CLIENT_KNOBS->REPLY_BYTE_LIMIT : CLIENT_KNOBS->REPLY_BYTE_LIMIT;
+			req.limitBytes = CLIENT_KNOBS->REPLY_BYTE_LIMIT;
 
-			transformRangeLimits(limits, reverse, req);
 			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
 
 			//FIXME: buggify byte limits on internal functions that use them, instead of globally
@@ -2746,7 +2747,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 					}
 					if( info.debugID.present() )
 						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
-					Standalone<RangeResultRef> output = rep.data;
+					Standalone<RangeResultRef> output( rep.data, rep.arena );
 
 					bool more = rep.more;
 					// If the reply says there is more but we know that we finished the shard, then fix rep.more
@@ -2780,13 +2781,13 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 							if(begin >= end) {
 								output.more = false;
 								if(b == allKeys.begin) {
-									r.readToBegin = true;
+									output.readToBegin = true;
 								}
 								if(e == allKeys.end) {
-									r.readThroughEnd = true;
+									output.readThroughEnd = true;
 								}
 								int64_t bytes = 0;
-								for(const KeyValueRef &kv : result) {
+								for(const KeyValueRef &kv : output) {
 									bytes += kv.key.size() + kv.value.size();
 								}
 
@@ -2813,13 +2814,13 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 					if(output.size() > 0) {
 						output.more = true;
 						if(b == allKeys.begin && !reverse) {
-							r.readToBegin = true;
+							output.readToBegin = true;
 						}
 						if(e == allKeys.end && reverse) {
-							r.readThroughEnd = true;
+							output.readThroughEnd = true;
 						}
 						int64_t bytes = 0;
-						for(const KeyValueRef &kv : result) {
+						for(const KeyValueRef &kv : output) {
 							bytes += kv.key.size() + kv.value.size();
 						}
 

From 3fa3442b8a2d6f2bbf90ba239b5aa6222f72c5c8 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 13 Dec 2020 22:13:27 -0800
Subject: [PATCH 018/740] fixed more compile errors

---
 fdbclient/NativeAPI.actor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 762793cf5d8..ce311448d0f 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2678,7 +2678,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 	if( !snapshot ) {
 		//FIXME: this conflict range is too large, and should be updated continously as results are returned
-		conflictRange.send(std::make_pair(std::min(b, Key(begin.getKey(),begin.arena)), std::max(e, Key(end.getKey(),end.arena))));
+		conflictRange.send(std::make_pair(std::min(b, Key(begin.getKey(),begin.arena())), std::max(e, Key(end.getKey(),end.arena()))));
 	}
 
 	if (b >= e) {
@@ -2747,7 +2747,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 					}
 					if( info.debugID.present() )
 						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
-					Standalone<RangeResultRef> output( rep.data, rep.arena );
+					Standalone<RangeResultRef> output( RangeResultRef(rep.data, rep.more), rep.arena );
 
 					bool more = rep.more;
 					// If the reply says there is more but we know that we finished the shard, then fix rep.more
@@ -2792,7 +2792,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 								}
 
 								cx->transactionBytesRead += bytes;
-								cx->transactionKeysRead += result.size();
+								cx->transactionKeysRead += output.size();
 
 								//FIXME: figure out appropriate metrics for the client event log
 								//if( trLogInfo ) {
@@ -2825,7 +2825,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 						}
 
 						cx->transactionBytesRead += bytes;
-						cx->transactionKeysRead += result.size();
+						cx->transactionKeysRead += output.size();
 
 						//FIXME: figure out appropriate metrics for the client event log
 						//if( trLogInfo ) {

From dc2bf7e987618a09e657e1fdc9476ddfa2042c96 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 13 Dec 2020 22:21:58 -0800
Subject: [PATCH 019/740] more compiler fixes

---
 fdbclient/NativeAPI.actor.cpp |  6 +++---
 flow/flow.h                   | 35 +++++++++++++++++------------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index ce311448d0f..0291d952d5b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2890,7 +2890,7 @@ ACTOR Future<Void> getRangeStreamSingleShard( PromiseStream<Standalone<RangeResu
 			if( end.getKey() == allKeys.begin && (end.offset < 1 || end.isFirstGreaterOrEqual()) ) {
 				getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
 				results.send(output);
-				results.send(end_of_stream());
+				results.sendError(end_of_stream());
 				return Void();
 			}
 
@@ -3380,7 +3380,7 @@ Future<Void> Transaction::getRangeStream(
 	++cx->transactionGetRangeStreamRequests;
 
 	if( limits.isReached() ) {
-		results.send(end_of_stream());
+		results.sendError(end_of_stream());
 		return Void();
 	}
 
@@ -3405,7 +3405,7 @@ Future<Void> Transaction::getRangeStream(
 
 	if( b.offset >= e.offset && b.getKey() >= e.getKey() ) {
 		TEST(true); // Native stream range inverted
-		results.send(end_of_stream());
+		results.sendError(end_of_stream());
 		return Void();
 	}
 
diff --git a/flow/flow.h b/flow/flow.h
index 306f04837e3..8454b2647eb 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -908,24 +908,6 @@ struct ReplyType<ReplyPromise<T>> {
 #define REPLY_TYPE(RequestType) typename ReplyType<RequestType>::Type
 #endif
 
-// Neither of these implementations of REPLY_TYPE() works on both MSVC and g++, so...
-#ifdef __GNUG__
-#define REPLYSTREAM_TYPE(RequestType) decltype(getReplyPromiseStream(std::declval<RequestType>()).getFuture().getValue())
-#else
-template <class T>
-struct ReplyStreamType {
-	// Doing this calculation directly in the return value declaration for PromiseStream<T>::getReply()
-	//   breaks IntelliSense in VS2010; this is a workaround.
-	typedef decltype(std::declval<T>().reply.getFuture().getValue()) Type;
-};
-template <class T> class ReplyPromiseStream;
-template <class T>
-struct ReplyStreamType<ReplyPromiseStream<T>> {
-	typedef T Type;
-};
-#define REPLYSTREAM_TYPE(RequestType) typename ReplyStreamType<RequestType>::Type
-#endif
-
 template <class T>
 class PromiseStream {
 public:
@@ -998,6 +980,23 @@ class PromiseStream {
 	NotifiedQueue<T>* queue;
 };
 
+// Neither of these implementations of REPLY_TYPE() works on both MSVC and g++, so...
+#ifdef __GNUG__
+#define REPLYSTREAM_TYPE(RequestType) decltype(getReplyPromiseStream(std::declval<RequestType>()).getFuture().pop())
+#else
+template <class T>
+struct ReplyStreamType {
+	// Doing this calculation directly in the return value declaration for PromiseStream<T>::getReply()
+	//   breaks IntelliSense in VS2010; this is a workaround.
+	typedef decltype(std::declval<T>().reply.getFuture().pop()) Type;
+};
+template <class T> class ReplyPromiseStream;
+template <class T>
+struct ReplyStreamType<ReplyPromiseStream<T>> {
+	typedef T Type;
+};
+#define REPLYSTREAM_TYPE(RequestType) typename ReplyStreamType<RequestType>::Type
+#endif
 
 //extern int actorCount;
 

From a92d6f5a47806d707337f95867cf26917c6a59a5 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 13 Dec 2020 22:30:09 -0800
Subject: [PATCH 020/740] one more wrong send instead of sendError

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 0291d952d5b..ee09452cf3c 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3385,7 +3385,7 @@ Future<Void> Transaction::getRangeStream(
 	}
 
 	if( !limits.isValid() ) {
-		results.send(range_limits_invalid());
+		results.sendError(range_limits_invalid());
 		return Void();
 	}
 

From cc14329f8c113b38edd98b3a66e9548084f80277 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 10:59:56 -0800
Subject: [PATCH 021/740] refactored NetNotifiedQueueWithErrors to inherit from
 NotifiedQueue and override the pop method

---
 fdbrpc/fdbrpc.h                   | 89 +++----------------------------
 fdbrpc/genericactors.actor.h      |  6 ++-
 fdbserver/storageserver.actor.cpp |  2 +-
 flow/flow.h                       | 14 ++++-
 4 files changed, 27 insertions(+), 84 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index d5dc9011cae..31be9281bf7 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -259,26 +259,17 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 };
 
 template <class T>
-struct NetNotifiedQueueWithErrors final : private SingleCallback<T>, public FlowReceiver, FastAllocated<NetNotifiedQueueWithErrors<T>> {
+struct NetNotifiedQueueWithErrors final : NotifiedQueue, FlowReceiver, FastAllocated<NetNotifiedQueueWithErrors<T>> {
 	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator new;
 	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator delete;
 
-	int promises; // one for each promise (and one for an active actor if this is an actor)
-	int futures;  // one for each future and one more if there are any callbacks
-
-	// Invariant: SingleCallback<T>::next==this || (queue.empty() && !error.isValid())
-	std::queue<T, Deque<T>> queue;
-	Error error;
 	AcknowledgementReceiver acknowledgements;
 
-	NetNotifiedQueueWithErrors(int futures, int promises) : futures(futures), promises(promises) {
-		SingleCallback<T>::next = this;
-	}
+	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
-	  : futures(futures), promises(promises), FlowReceiver(remoteEndpoint, false) {
-		SingleCallback<T>::next = this;
-	}
+	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, false) {}
 
+	void destroy() override { delete this; }
 	void receive(ArenaObjectReader& reader) override {
 		this->addPromiseRef();
 		ErrorOr<EnsureTable<T>> message;
@@ -298,78 +289,14 @@ struct NetNotifiedQueueWithErrors final : private SingleCallback<T>, public Flow
 		this->delPromiseRef();
 	}
 
-	bool isReady() const { return !queue.empty() || error.isValid(); }
-	bool isError() const { return queue.empty() && error.isValid(); }  // the *next* thing queued is an error
-	uint32_t size() const { return queue.size(); }
-
-	T pop() {
-		if (queue.empty()) {
-			if (error.isValid()) throw error;
-			throw internal_error();
-		}
-		auto copy = std::move(queue.front());
+	T pop() override {
+		T res = popImpl();
 		if(acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += copy.expectedSize();
 			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), true);
 		}
-		queue.pop();
-		return copy;
-	}
-
-	template <class U>
-	void send(U && value) {
-		if (error.isValid()) return;
-
-		if (SingleCallback<T>::next != this) {
-			SingleCallback<T>::next->fire(std::forward<U>(value));
-		}
-		else {
-			queue.emplace(std::forward<U>(value));
-		}
-	}
-
-	void sendError(Error err) {
-		if (error.isValid()) return;
-
-		this->error = err;
-		if (SingleCallback<T>::next != this)
-			SingleCallback<T>::next->error(err);
-	}
-
-	void addPromiseRef() { promises++; }
-	void addFutureRef() { futures++; }
-
-	void delPromiseRef() {
-		if (!--promises) {
-			if (futures) {
-				sendError(broken_promise());
-			}
-			else
-				destroy();
-		}
-	}
-	void delFutureRef() {
-		if (!--futures) {
-			if (promises)
-				cancel();
-			else
-				destroy();
-		}
-	}
-
-	int getFutureReferenceCount() const { return futures; }
-	int getPromiseReferenceCount() const { return promises; }
-
-	virtual void destroy() { delete this; }
-	virtual void cancel() {}
-
-	void addCallbackAndDelFutureRef(SingleCallback<T>* cb) {
-		ASSERT(SingleCallback<T>::next == this);
-		cb->insert(this);
+		return res;
 	}
-	virtual void unwait() override { delFutureRef(); }
-	virtual void fire(T const&) override { ASSERT(false); }
-	virtual void fire(T&&) override { ASSERT(false); }
 };
 
 template <class T>
@@ -437,7 +364,7 @@ class ReplyPromiseStream {
 		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
 			return Void();
 		}
-		return queue->acknowledgements.ready.getFuture();
+		return queue->acknowledgements.ready.getFuture() || tagError(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint(taskID)), request_maybe_delivered());
 	}
 
 	void operator=(const ReplyPromiseStream& rhs) {
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 73b9c2712fe..3b75d243b10 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -192,7 +192,11 @@ struct PeerHolder {
 	}
 };
 
-// Implements getRepyStream
+// Implements getRepyStream, this a void actor with the same lifetime as the input ReplyPromiseStream.
+// Because this actor holds a reference to the stream, normally it would be impossible to know when there are no other references.
+// To get around this, there is a SAV inside the stream that has one less promise reference than
+// it should (caused by getErrorFutureAndDelPromiseRef()). When that SAV gets a broken promise because no one besides this void actor
+// is referencing it, this void actor will get a broken_promise dropping the final reference to the full ReplyPromiseStream
 ACTOR template <class X>
 void endStreamOnDisconnect( Future<Void> signal, ReplyPromiseStream<X> stream, Reference<Peer> peer = Reference<Peer>() ) {
 	state PeerHolder holder = PeerHolder(peer);
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 65c00ded0ad..30d7049e845 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2251,7 +2251,7 @@ ACTOR Future<Standalone<RangeResultRef>> tryGetRange( Database cx, Version versi
 			loop {
 				Standalone<RangeResultRef> rep = waitNext( results.getFuture() );
 				limits.decrement( rep );
-
+				//FIXME: this is only returning the first result from the stream and then cancelling the stream
 				if( limits.isReached() || !rep.more ) {
 					if( output.size() ) {
 						output.arena().dependsOn( rep.arena() );
diff --git a/flow/flow.h b/flow/flow.h
index 8454b2647eb..6c66c03791e 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -580,7 +580,8 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	bool isError() const { return queue.empty() && error.isValid(); }  // the *next* thing queued is an error
 	uint32_t size() const { return queue.size(); }
 
-	T pop() {
+	virtual T pop() {
+		return popImpl();
 		if (queue.empty()) {
 			if (error.isValid()) throw error;
 			throw internal_error();
@@ -644,6 +645,17 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	virtual void unwait() override { delFutureRef(); }
 	virtual void fire(T const&) override { ASSERT(false); }
 	virtual void fire(T&&) override { ASSERT(false); }
+
+	protected:
+	T popImpl() {
+		if (queue.empty()) {
+			if (error.isValid()) throw error;
+			throw internal_error();
+		}
+		auto copy = std::move(queue.front());
+		queue.pop();
+		return copy;
+	}
 };
 
 

From 0ff68756c1508174e25b59b2b13fc9afb80a2ec4 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 11:01:27 -0800
Subject: [PATCH 022/740] fix compile errors

---
 fdbrpc/fdbrpc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 31be9281bf7..3e333396564 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -259,7 +259,7 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 };
 
 template <class T>
-struct NetNotifiedQueueWithErrors final : NotifiedQueue, FlowReceiver, FastAllocated<NetNotifiedQueueWithErrors<T>> {
+struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAllocated<NetNotifiedQueueWithErrors<T>> {
 	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator new;
 	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator delete;
 
@@ -292,7 +292,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue, FlowReceiver, FastAlloc
 	T pop() override {
 		T res = popImpl();
 		if(acknowledgements.getRawEndpoint().isValid()) {
-			acknowledgements.bytesAcknowledged += copy.expectedSize();
+			acknowledgements.bytesAcknowledged += res.expectedSize();
 			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), true);
 		}
 		return res;

From c35482639ad8a02d74dcd78702cb32131ff7e1a3 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 11:04:12 -0800
Subject: [PATCH 023/740] more fixes

---
 fdbrpc/fdbrpc.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 3e333396564..34b598d8ec8 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -290,7 +290,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 	}
 
 	T pop() override {
-		T res = popImpl();
+		T res = this->popImpl();
 		if(acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += res.expectedSize();
 			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), true);
@@ -364,7 +364,8 @@ class ReplyPromiseStream {
 		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
 			return Void();
 		}
-		return queue->acknowledgements.ready.getFuture() || tagError(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint(taskID)), request_maybe_delivered());
+		return queue->acknowledgements.ready.getFuture() || 
+		       tagError(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint)), request_maybe_delivered());
 	}
 
 	void operator=(const ReplyPromiseStream& rhs) {

From f843325eec69679b56f959fee5e20500713bb986 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 11:12:06 -0800
Subject: [PATCH 024/740] added missing include

---
 fdbrpc/fdbrpc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 34b598d8ec8..5b683213622 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -24,6 +24,7 @@
 
 #include "flow/flow.h"
 #include "flow/serialize.h"
+#include "flow/genericactors.actor.h"
 #include "fdbrpc/FlowTransport.h" // NetworkMessageReceiver Endpoint
 #include "fdbrpc/FailureMonitor.h"
 #include "fdbrpc/networksender.actor.h"

From f3196ea4bdae4768e07df637cac35dc1a48eb6c1 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 11:18:10 -0800
Subject: [PATCH 025/740] fixed tag error call

---
 fdbrpc/fdbrpc.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 5b683213622..39d18442084 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -24,7 +24,6 @@
 
 #include "flow/flow.h"
 #include "flow/serialize.h"
-#include "flow/genericactors.actor.h"
 #include "fdbrpc/FlowTransport.h" // NetworkMessageReceiver Endpoint
 #include "fdbrpc/FailureMonitor.h"
 #include "fdbrpc/networksender.actor.h"
@@ -366,7 +365,7 @@ class ReplyPromiseStream {
 			return Void();
 		}
 		return queue->acknowledgements.ready.getFuture() || 
-		       tagError(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint)), request_maybe_delivered());
+		       tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint)), request_maybe_delivered());
 	}
 
 	void operator=(const ReplyPromiseStream& rhs) {

From d27ae116758ed9a5cb9fe8893fb22e4cae1eb994 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 14 Dec 2020 19:28:11 +0000
Subject: [PATCH 026/740] Basic test of ReplyPromiseStream

---
 fdbserver/NetworkTest.h         | 26 +++++++++++++++++++++++++-
 fdbserver/networktest.actor.cpp | 26 +++++++++++++++++++++-----
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/fdbserver/NetworkTest.h b/fdbserver/NetworkTest.h
index b68c7952150..98fc6c8e969 100644
--- a/fdbserver/NetworkTest.h
+++ b/fdbserver/NetworkTest.h
@@ -27,7 +27,8 @@
 #include "flow/FileIdentifier.h"
 
 struct NetworkTestInterface {
-	RequestStream< struct NetworkTestRequest > test;
+	// RequestStream< struct NetworkTestRequest > test;
+	RequestStream<struct NetworkTestStreamingRequest> test;
 	NetworkTestInterface() {}
 	NetworkTestInterface( NetworkAddress remote );
 	NetworkTestInterface( INetwork* local );
@@ -57,6 +58,29 @@ struct NetworkTestRequest {
 	}
 };
 
+struct NetworkTestStreamingReply : ReplyPromiseStreamReply {
+	constexpr static FileIdentifier file_identifier = 3726830;
+
+	int index = 0;
+	NetworkTestStreamingReply() = default;
+	explicit NetworkTestStreamingReply(int index) : index(index) {}
+	size_t expectedSize() const { return sizeof(*this); }
+
+	template <class Ar>
+	void serialize(Ar& ar) {
+		serializer(ar, ReplyPromiseStreamReply::acknowledgeEndpoint, index);
+	}
+};
+
+struct NetworkTestStreamingRequest {
+	constexpr static FileIdentifier file_identifier = 2794452;
+	ReplyPromiseStream<struct NetworkTestStreamingReply> reply;
+	template <class Ar>
+	void serialize(Ar& ar) {
+		serializer(ar, reply);
+	}
+};
+
 Future<Void> networkTestServer();
 
 Future<Void> networkTestClient( std:: string const& testServers );
diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 573dfa72ccd..abc7bb84712 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -74,9 +74,13 @@ ACTOR Future<Void> networkTestServer() {
 
 	loop {
 		choose {
-			when( NetworkTestRequest req = waitNext( interf.test.getFuture() ) ) {
+			when(NetworkTestStreamingRequest req = waitNext(interf.test.getFuture())) {
 				LatencyStats::sample sample = latency.tick();
-				req.reply.send( NetworkTestReply( Value( std::string( req.replySize, '.' ) ) ) );
+				for (int i = 0; i < 1e6; ++i) {
+					wait(req.reply.onReady());
+					req.reply.send(NetworkTestStreamingReply{ i });
+				}
+				req.reply.sendError(end_of_stream());
 				latency.tock(sample);
 				sent++;
 			}
@@ -121,9 +125,21 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 	while (moreRequestsPending(*sent)) {
 		(*sent)++;
 		sample = latency->tick();
-		NetworkTestReply rep = wait(
-		    retryBrokenPromise(interfs[deterministicRandom()->randomInt(0, interfs.size())].test,
-		                       NetworkTestRequest(StringRef(request_payload), FLOW_KNOBS->NETWORK_TEST_REPLY_SIZE)));
+		state FutureStream<NetworkTestStreamingReply> stream =
+		    interfs[deterministicRandom()->randomInt(0, interfs.size())].test.getReplyStream(
+		        NetworkTestStreamingRequest{});
+		state int j = 0;
+		try {
+			loop {
+				NetworkTestStreamingReply rep = waitNext(stream);
+				ASSERT(rep.index == j++);
+				if (rep.index % 100000 == 0) {
+					printf("%d\n", rep.index);
+				}
+			}
+		} catch (Error& e) {
+			ASSERT(e.code() == error_code_end_of_stream);
+		}
 		latency->tock(sample);
 		(*completed)++;
 	}

From e45da7609690b7051251aba7f03fa0e581a7833a Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 14 Dec 2020 19:32:11 +0000
Subject: [PATCH 027/740] Fix compilation

---
 fdbserver/networktest.actor.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index abc7bb84712..27773df761c 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -74,9 +74,10 @@ ACTOR Future<Void> networkTestServer() {
 
 	loop {
 		choose {
-			when(NetworkTestStreamingRequest req = waitNext(interf.test.getFuture())) {
-				LatencyStats::sample sample = latency.tick();
-				for (int i = 0; i < 1e6; ++i) {
+			when(state NetworkTestStreamingRequest req = waitNext(interf.test.getFuture())) {
+				state LatencyStats::sample sample = latency.tick();
+				state int i = 0;
+				for (; i < 1e6; ++i) {
 					wait(req.reply.onReady());
 					req.reply.send(NetworkTestStreamingReply{ i });
 				}

From bb1c5f3aa500cab58006b96b849151e783f60828 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 11:54:36 -0800
Subject: [PATCH 028/740] added debugging

---
 fdbserver/networktest.actor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 27773df761c..7b953a827ca 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -126,10 +126,12 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 	while (moreRequestsPending(*sent)) {
 		(*sent)++;
 		sample = latency->tick();
+		fprintf(stderr, "Before getReplyStream\n");
 		state FutureStream<NetworkTestStreamingReply> stream =
 		    interfs[deterministicRandom()->randomInt(0, interfs.size())].test.getReplyStream(
 		        NetworkTestStreamingRequest{});
 		state int j = 0;
+		fprintf(stderr, "Starting waitNext\n");
 		try {
 			loop {
 				NetworkTestStreamingReply rep = waitNext(stream);
@@ -139,6 +141,7 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 				}
 			}
 		} catch (Error& e) {
+			fprintf(stderr, "Error: %s\n", e.what());
 			ASSERT(e.code() == error_code_end_of_stream);
 		}
 		latency->tock(sample);

From d661badcc1b3b3da0745bc3adc97666a4df9d488 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 12:10:50 -0800
Subject: [PATCH 029/740] getReplyStream must return the replyPromiseStream to
 avoid broken_promise errors

---
 fdbclient/NativeAPI.actor.cpp   |  8 ++++----
 fdbrpc/fdbrpc.h                 | 16 ++++++++--------
 fdbserver/networktest.actor.cpp |  7 ++-----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index ee09452cf3c..ffd13613419 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2727,7 +2727,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 				}
 
 				//FIXME: add load balancing
-				state FutureStream<GetKeyValuesStreamReply> replyStream = locations[shard].second->getInterface(0).getKeyValuesStream.getReplyStream(req);
+				state ReplyPromiseStream<GetKeyValuesStreamReply> replyStream = locations[shard].second->getInterface(0).getKeyValuesStream.getReplyStream(req);
 				loop {
 					try {
 						choose {
@@ -2736,7 +2736,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 								return Void();
 							}
 
-							when(GetKeyValuesStreamReply _rep = waitNext(replyStream)) {
+							when(GetKeyValuesStreamReply _rep = waitNext(replyStream.getFuture())) {
 								rep = _rep;
 							}
 						}
@@ -2940,9 +2940,9 @@ ACTOR Future<Void> getRangeStreamSingleShard( PromiseStream<Standalone<RangeResu
 				if(beginServer.second->size() == 0) {
 					wait(Future<Void>(Never()));
 				}
-				state FutureStream<GetKeyValuesStreamReply> repStream = beginServer.second->getInterface(0).getKeyValuesStream.getReplyStream(req);
+				state ReplyPromiseStream<GetKeyValuesStreamReply> repStream = beginServer.second->getInterface(0).getKeyValuesStream.getReplyStream(req);
 				loop {
-					GetKeyValuesStreamReply rep = waitNext(repStream);
+					GetKeyValuesStreamReply rep = waitNext(repStream.getFuture());
 
 					if( info.debugID.present() ) {
 						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.After");//.detail("SizeOf", rep.data.size());
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 39d18442084..992066debc1 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -535,41 +535,41 @@ class RequestStream {
 	//FIXME comment
 
 	template <class X>
-	FutureStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value, TaskPriority taskID) const {
+	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value, TaskPriority taskID) const {
 		setReplyPriority(value, taskID);
 		if (queue->isRemoteEndpoint()) {
 			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint(taskID));
 			auto& p = getReplyPromiseStream(value);
 			if (disc.isReady()) {
 				p.sendError(request_maybe_delivered());
-				return p.getFuture();
+				return p;
 			}
 			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(taskID), true);
 			endStreamOnDisconnect(disc, p, peer);
-			return p.getFuture();
+			return p;
 		}
 		send(value);
 		auto& p = getReplyPromiseStream(value);
-		return p.getFuture();
+		return p;
 	}
 
 	template <class X>
-	FutureStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value) const {
+	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value) const {
 		if (queue->isRemoteEndpoint()) {
 			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint());
 			auto& p = getReplyPromiseStream(value);
 			if (disc.isReady()) {
 				p.sendError(request_maybe_delivered());
-				return p.getFuture();
+				return p;
 			}
 			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);
 			endStreamOnDisconnect(disc, p, peer);
-			return p.getFuture();
+			return p;
 		}
 		else {
 			send(value);
 			auto& p = getReplyPromiseStream(value);
-			return p.getFuture();
+			return p;
 		}
 	}
 
diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 7b953a827ca..19eee019374 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -126,22 +126,19 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 	while (moreRequestsPending(*sent)) {
 		(*sent)++;
 		sample = latency->tick();
-		fprintf(stderr, "Before getReplyStream\n");
-		state FutureStream<NetworkTestStreamingReply> stream =
+		state ReplyPromiseStream<NetworkTestStreamingReply> stream =
 		    interfs[deterministicRandom()->randomInt(0, interfs.size())].test.getReplyStream(
 		        NetworkTestStreamingRequest{});
 		state int j = 0;
-		fprintf(stderr, "Starting waitNext\n");
 		try {
 			loop {
-				NetworkTestStreamingReply rep = waitNext(stream);
+				NetworkTestStreamingReply rep = waitNext(stream.getFuture());
 				ASSERT(rep.index == j++);
 				if (rep.index % 100000 == 0) {
 					printf("%d\n", rep.index);
 				}
 			}
 		} catch (Error& e) {
-			fprintf(stderr, "Error: %s\n", e.what());
 			ASSERT(e.code() == error_code_end_of_stream);
 		}
 		latency->tock(sample);

From cc3e7f8806ef8f79ee007f94009b66bc6e4be0a1 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 12:41:04 -0800
Subject: [PATCH 030/740] getReplyStream should not fail immediately if it
 cannot communicate with the endpoint

---
 fdbrpc/FailureMonitor.actor.cpp | 9 +++++++++
 fdbrpc/FailureMonitor.h         | 6 +++++-
 fdbrpc/fdbrpc.h                 | 4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index 36600a44f69..2897b9f441d 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -144,6 +144,15 @@ Future<Void> SimpleFailureMonitor::onDisconnectOrFailure(Endpoint const& endpoin
 	return endpointKnownFailed.onChange(endpoint);
 }
 
+Future<Void> SimpleFailureMonitor::onDisconnect(Endpoint const& endpoint) {
+	// If the endpoint is permanently failed, return right away
+	if (failedEndpoints.count(endpoint)) {
+		TraceEvent("AlreadyDisconnected").detail("Addr", endpoint.getPrimaryAddress()).detail("Tok", endpoint.token);
+		return Void();
+	}
+	return endpointKnownFailed.onChange(endpoint);
+}
+
 Future<Void> SimpleFailureMonitor::onStateChanged(Endpoint const& endpoint) {
 	// Wait on endpointKnownFailed if it is false, to pick up both endpointNotFound errors (which set it to true)
 	//   and changes to addressStatus (which trigger a range).  Don't wait on endpointKnownFailed if it is true, because
diff --git a/fdbrpc/FailureMonitor.h b/fdbrpc/FailureMonitor.h
index f31b7a2d84f..637394b66aa 100644
--- a/fdbrpc/FailureMonitor.h
+++ b/fdbrpc/FailureMonitor.h
@@ -98,9 +98,12 @@ class IFailureMonitor {
 	// The next time the known status for the endpoint changes, returns the new status.
 	virtual Future<Void> onStateChanged(Endpoint const& endpoint) = 0;
 
-	// Returns when onFailed(endpoint) || transport().onDisconnect( endpoint.getPrimaryAddress() ), but more efficiently
+	// Returns when onFailed(endpoint) || transport().onDisconnect( endpoint.getPrimaryAddress() )
 	virtual Future<Void> onDisconnectOrFailure(Endpoint const& endpoint) = 0;
 
+	// Returns when transport().onDisconnect( endpoint.getPrimaryAddress() ) or the endpoint is permanently failed
+	virtual Future<Void> onDisconnect(Endpoint const& endpoint) = 0;
+
 	// Returns true if the endpoint is failed but the address of the endpoint is not failed.
 	virtual bool onlyEndpointFailed(Endpoint const& endpoint) const = 0;
 
@@ -146,6 +149,7 @@ class SimpleFailureMonitor : public IFailureMonitor {
 	FailureStatus getState(Endpoint const& endpoint) const override;
 	FailureStatus getState(NetworkAddress const& address) const override;
 	Future<Void> onDisconnectOrFailure(Endpoint const& endpoint) override;
+	Future<Void> onDisconnect(Endpoint const& endpoint) override;
 	bool onlyEndpointFailed(Endpoint const& endpoint) const override;
 	bool permanentlyFailed(Endpoint const& endpoint) const override;
 
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 992066debc1..849751be9bb 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -538,7 +538,7 @@ class RequestStream {
 	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value, TaskPriority taskID) const {
 		setReplyPriority(value, taskID);
 		if (queue->isRemoteEndpoint()) {
-			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint(taskID));
+			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint(taskID));
 			auto& p = getReplyPromiseStream(value);
 			if (disc.isReady()) {
 				p.sendError(request_maybe_delivered());
@@ -556,7 +556,7 @@ class RequestStream {
 	template <class X>
 	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value) const {
 		if (queue->isRemoteEndpoint()) {
-			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint());
+			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint());
 			auto& p = getReplyPromiseStream(value);
 			if (disc.isReady()) {
 				p.sendError(request_maybe_delivered());

From e1dbebfba68b0389c51e679e3ddaa97b0e7e6c6f Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 13:06:14 -0800
Subject: [PATCH 031/740] added debugging

---
 fdbserver/networktest.actor.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 19eee019374..62062e7c91e 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -77,10 +77,13 @@ ACTOR Future<Void> networkTestServer() {
 			when(state NetworkTestStreamingRequest req = waitNext(interf.test.getFuture())) {
 				state LatencyStats::sample sample = latency.tick();
 				state int i = 0;
-				for (; i < 1e6; ++i) {
+				for (; i < 100; ++i) {
+					fprintf(stderr, "Wait onReady %d\n", i);
 					wait(req.reply.onReady());
+					fprintf(stderr, "Send reply %d\n", i);
 					req.reply.send(NetworkTestStreamingReply{ i });
 				}
+				fprintf(stderr, "Send end_of_stream\n");
 				req.reply.sendError(end_of_stream());
 				latency.tock(sample);
 				sent++;
@@ -134,9 +137,7 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 			loop {
 				NetworkTestStreamingReply rep = waitNext(stream.getFuture());
 				ASSERT(rep.index == j++);
-				if (rep.index % 100000 == 0) {
-					printf("%d\n", rep.index);
-				}
+				printf("Result: %d\n", rep.index);
 			}
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_end_of_stream);

From 8bffc60d3f0ac45e224c64e25e65eb513fa2b110 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 13:17:45 -0800
Subject: [PATCH 032/740] more debugging

---
 fdbserver/networktest.actor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 62062e7c91e..aed98051f84 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -135,11 +135,13 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 		state int j = 0;
 		try {
 			loop {
+				printf("Wait for result\n", rep.index);
 				NetworkTestStreamingReply rep = waitNext(stream.getFuture());
 				ASSERT(rep.index == j++);
 				printf("Result: %d\n", rep.index);
 			}
 		} catch (Error& e) {
+			printf("Error: %s\n", e.what());
 			ASSERT(e.code() == error_code_end_of_stream);
 		}
 		latency->tock(sample);

From 7987c99e15687cf9b1cc5bcd816ad2bd63d89cdb Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 13:18:45 -0800
Subject: [PATCH 033/740] compiler fix

---
 fdbserver/networktest.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index aed98051f84..8a3e2ce8378 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -135,7 +135,7 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 		state int j = 0;
 		try {
 			loop {
-				printf("Wait for result\n", rep.index);
+				printf("Wait for result\n");
 				NetworkTestStreamingReply rep = waitNext(stream.getFuture());
 				ASSERT(rep.index == j++);
 				printf("Result: %d\n", rep.index);

From 3b317b6c7967408e8997ace807fad879a93e1bc7 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 13:39:36 -0800
Subject: [PATCH 034/740] fixed how messages were being sent and added logging

---
 fdbrpc/fdbrpc.h                 | 40 ++++++++++++++++++++++++---------
 fdbserver/networktest.actor.cpp |  2 +-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 849751be9bb..f92cd30e5c3 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -267,10 +267,13 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 
 	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
-	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, false) {}
+	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, false) {
+		  printf("NetNotified create with remote endpoint: %s\n", remoteEndpoint.token.toString().c_str());
+	  }
 
 	void destroy() override { delete this; }
 	void receive(ArenaObjectReader& reader) override {
+		printf("NetNotifiedReceived\n");
 		this->addPromiseRef();
 		ErrorOr<EnsureTable<T>> message;
 		reader.deserialize(message);
@@ -297,6 +300,10 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		}
 		return res;
 	}
+
+	~NetNotifiedQueueWithErrors() {
+		printf("NetNotifiedQueue destructor\n");
+	}
 };
 
 template <class T>
@@ -315,17 +322,22 @@ class ReplyPromiseStream {
 			if((!queue->acknowledgements.ready.isValid() || queue->acknowledgements.ready.isSet()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
 				queue->acknowledgements.ready = Promise<Void>();
 			}
-			FlowTransport::transport().sendUnreliable(SerializeSource<T>(std::forward<U>(value)), getEndpoint(), true);
+			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(value), getEndpoint(), false);
 		}
-		else
+		else {
 			queue->send(std::forward<U>(value));
+		}
 	}
 
 	template <class E>
 	void sendError(const E& exc) const { 
-		queue->sendError(exc);
-		if(errors && errors->canBeSet()) {
-			errors->sendError(exc);
+		if (queue->isRemoteEndpoint()) {
+			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(exc), getEndpoint(), false);
+		} else {
+			queue->sendError(exc);
+			if(errors && errors->canBeSet()) {
+				errors->sendError(exc);
+			}
 		}
 	}
 
@@ -354,7 +366,14 @@ class ReplyPromiseStream {
 			errors->delPromiseRef();
 	}
 
-	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const { return queue->getEndpoint(taskID); }
+	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const {
+		if(!queue->getRawEndpoint().isValid()) {
+			Endpoint res = queue->getEndpoint(taskID);
+			printf("Registered Endpoint: %s\n", res.token.toString());
+			return res;
+		}
+		return queue->getEndpoint(taskID); 
+	}
 	
 	bool operator == (const ReplyPromiseStream<T>& rhs) const { return queue == rhs.queue; }
 	bool isEmpty() const { return !queue->isReady(); }
@@ -396,14 +415,15 @@ class ReplyPromiseStream {
 
 template <class Ar, class T>
 void save(Ar& ar, const ReplyPromiseStream<T>& value) {
-	auto const& ep = value.getEndpoint();
+	auto const& ep = value.getEndpoint().token;
 	ar << ep;
 }
 
 template <class Ar, class T>
 void load(Ar& ar, ReplyPromiseStream<T>& value) {
-	Endpoint endpoint;
-	ar >> endpoint;
+	UID token;
+	ar >> token;
+	Endpoint endpoint = FlowTransport::transport().loadedEndpoint(token);
 	value = ReplyPromiseStream<T>(endpoint);
 }
 
diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 8a3e2ce8378..be13891d273 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -248,7 +248,7 @@ ACTOR Future<Void> networkTestClient( std:: string testServers ) {
 	}
 
 	state std::vector<Future<Void>> clients;
-	for (int i = 0; i < FLOW_KNOBS->NETWORK_TEST_CLIENT_COUNT; i++) {
+	for (int i = 0; i < 1; i++) {
 		clients.push_back(testClient(interfs, &sent, &completed, &latency));
 	}
 	clients.push_back(logger(&sent, &completed, &latency));

From b3d6f5037c6cd24b467325bb4c711ad63ffdfc86 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 13:41:29 -0800
Subject: [PATCH 035/740] fixed warnings

---
 fdbrpc/fdbrpc.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index f92cd30e5c3..2aacb9df2eb 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -368,9 +368,7 @@ class ReplyPromiseStream {
 
 	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const {
 		if(!queue->getRawEndpoint().isValid()) {
-			Endpoint res = queue->getEndpoint(taskID);
-			printf("Registered Endpoint: %s\n", res.token.toString());
-			return res;
+			printf("Registered Endpoint: %s\n", queue->getEndpoint(taskID).token.toString());
 		}
 		return queue->getEndpoint(taskID); 
 	}

From 810d0d3e47ff9bf9201b57de45fc3dc6d0d164f7 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 13:44:25 -0800
Subject: [PATCH 036/740] fixed compile error

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 2aacb9df2eb..49fae130954 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -368,7 +368,7 @@ class ReplyPromiseStream {
 
 	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const {
 		if(!queue->getRawEndpoint().isValid()) {
-			printf("Registered Endpoint: %s\n", queue->getEndpoint(taskID).token.toString());
+			printf("Registered Endpoint: %s\n", queue->getEndpoint(taskID).token.toString().c_str());
 		}
 		return queue->getEndpoint(taskID); 
 	}

From d9a9180fa25f894fb18dffad78605440b4f0b33f Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 13:53:18 -0800
Subject: [PATCH 037/740] avoid an assertion error where sending a
 broken_promise causes the object to be destroyed

---
 fdbrpc/genericactors.actor.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 3b75d243b10..799118db993 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -200,11 +200,15 @@ struct PeerHolder {
 ACTOR template <class X>
 void endStreamOnDisconnect( Future<Void> signal, ReplyPromiseStream<X> stream, Reference<Peer> peer = Reference<Peer>() ) {
 	state PeerHolder holder = PeerHolder(peer);
-	choose {
-		when(wait(signal)) {
-			stream.sendError(request_maybe_delivered());
+	try {
+		choose {
+			when(wait(signal)) {
+				stream.sendError(request_maybe_delivered());
+			}
+			when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
 		}
-		when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
+	} catch (Error &e) {
+		wait(delay(0));
 	}
 }
 

From 12b14ead8c56c51740ee84f8e879ccbd597dfc31 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 13:58:18 -0800
Subject: [PATCH 038/740] fixed an assert

---
 fdbserver/networktest.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index be13891d273..5fd903741b7 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -142,7 +142,7 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 			}
 		} catch (Error& e) {
 			printf("Error: %s\n", e.what());
-			ASSERT(e.code() == error_code_end_of_stream);
+			ASSERT(e.code() == error_code_end_of_stream || e.code() == error_code_request_maybe_delivered);
 		}
 		latency->tock(sample);
 		(*completed)++;

From 1c0d6aee803bb6a71e9d19e52a2a5cc1b4edb79d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 14:03:20 -0800
Subject: [PATCH 039/740] added more logging

---
 fdbrpc/FailureMonitor.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index 2897b9f441d..c9652cb6c0d 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -126,7 +126,7 @@ void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 }
 
 void SimpleFailureMonitor::notifyDisconnect(NetworkAddress const& address) {
-	//TraceEvent("NotifyDisconnect").detail("Address", address);
+	TraceEvent("NotifyDisconnect").detail("Address", address);
 	endpointKnownFailed.triggerRange(Endpoint({ address }, UID()), Endpoint({ address }, UID(-1, -1)));
 }
 

From 12c8b2a3e314b8c8d918b17f7e3d1a6932b34bd6 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 14:08:09 -0800
Subject: [PATCH 040/740] more logging

---
 fdbrpc/FlowTransport.actor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 0a54f57a1fa..0bba1ce410c 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -89,6 +89,7 @@ void EndpointMap::realloc() {
 }
 
 void EndpointMap::insert( NetworkMessageReceiver* r, Endpoint::Token& token, TaskPriority priority ) {
+	printf("Endpoint Map Insert: %s\n", token.toString().c_str());
 	if (firstFree == uint32_t(-1)) realloc();
 	int index = firstFree;
 	firstFree = data[index].nextFree;
@@ -148,6 +149,7 @@ TaskPriority EndpointMap::getPriority( Endpoint::Token const& token ) {
 }
 
 void EndpointMap::remove( Endpoint::Token const& token, NetworkMessageReceiver* r ) {
+	printf("Endpoint Map Remove: %s\n", token.toString().c_str());
 	uint32_t index = token.second();
 	if ( index < data.size() && data[index].token().first() == token.first() && ((data[index].token().second()&0xffffffff00000000LL)|index)==token.second() && data[index].receiver == r ) {
 		data[index].receiver = 0;

From ead866f1ca4cd656f3e22024e1356866ee7717a3 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 14:09:11 -0800
Subject: [PATCH 041/740] more logging

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 49fae130954..6c490ee399b 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -302,7 +302,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 	}
 
 	~NetNotifiedQueueWithErrors() {
-		printf("NetNotifiedQueue destructor\n");
+		printf("NetNotifiedQueue destructor %s\n", getRawEndpoint().token.toString().c_str());
 	}
 };
 

From c3a8220b90df89f52aa00f89bcabb78cc05cbe75 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 14:35:09 -0800
Subject: [PATCH 042/740] more logging

---
 fdbrpc/FlowTransport.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 0bba1ce410c..4221d2f4ccf 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1497,6 +1497,7 @@ void FlowTransport::cancelReliable( ReliablePacket* p ) {
 }
 
 Reference<Peer> FlowTransport::sendUnreliable( ISerializeSource const& what, const Endpoint& destination, bool openConnection ) {
+	printf("Send Unreliable: %s %s\n", destination.getPrimaryAddress().toString().c_str(), destination.token.toString().c_str());
 	if (self->isLocalAddress(destination.getPrimaryAddress())) {
 		sendLocal( self, what, destination );
 		return Reference<Peer>();

From 235b01fbc49ce6e5bf3f449269e8869af4e49df2 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 14:41:34 -0800
Subject: [PATCH 043/740] fixed serialization of replyPromiseStream

---
 fdbrpc/fdbrpc.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 6c490ee399b..c3aff7317f3 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -427,14 +427,15 @@ void load(Ar& ar, ReplyPromiseStream<T>& value) {
 
 template <class T>
 struct serializable_traits<ReplyPromiseStream<T>> : std::true_type {
-	template <class Archiver>
-	static void serialize(Archiver& ar, ReplyPromiseStream<T>& stream) {
+	template<class Archiver>
+	static void serialize(Archiver& ar, ReplyPromiseStream<T>& p) {
 		if constexpr (Archiver::isDeserializing) {
-			Endpoint endpoint;
-			serializer(ar, endpoint);
-			stream = ReplyPromiseStream<T>(endpoint);
+			UID token;
+			serializer(ar, token);
+			auto endpoint = FlowTransport::transport().loadedEndpoint(token);
+			p = ReplyPromiseStream<T>(endpoint);
 		} else {
-			const auto& ep = stream.getEndpoint();
+			const auto& ep = p.getEndpoint().token;
 			serializer(ar, ep);
 		}
 	}

From 014ca6eb2267daf6d64bd8b923258344de7ce178 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 14:42:07 -0800
Subject: [PATCH 044/740] solved error broken_promise better

---
 fdbrpc/fdbrpc.h              |  4 +++-
 fdbrpc/genericactors.actor.h | 12 ++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index c3aff7317f3..c56abc54b1a 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -356,7 +356,9 @@ class ReplyPromiseStream {
 		ASSERT(errors && errors->getPromiseReferenceCount() > 1);
 		errors->addFutureRef();
 		errors->delPromiseRef();
-		return Future<Void>(errors);
+		Future<Void> res(errors);
+		errors = nullptr;
+		return res;
 	}
 	
 	~ReplyPromiseStream() {
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 799118db993..3b75d243b10 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -200,15 +200,11 @@ struct PeerHolder {
 ACTOR template <class X>
 void endStreamOnDisconnect( Future<Void> signal, ReplyPromiseStream<X> stream, Reference<Peer> peer = Reference<Peer>() ) {
 	state PeerHolder holder = PeerHolder(peer);
-	try {
-		choose {
-			when(wait(signal)) {
-				stream.sendError(request_maybe_delivered());
-			}
-			when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
+	choose {
+		when(wait(signal)) {
+			stream.sendError(request_maybe_delivered());
 		}
-	} catch (Error &e) {
-		wait(delay(0));
+		when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
 	}
 }
 

From c181a6768d9ed701b865bde517f77e89a576434c Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 15:09:17 -0800
Subject: [PATCH 045/740] test acknowledgements

---
 fdbserver/NetworkTest.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/NetworkTest.h b/fdbserver/NetworkTest.h
index 98fc6c8e969..bf46c8e6d9d 100644
--- a/fdbserver/NetworkTest.h
+++ b/fdbserver/NetworkTest.h
@@ -64,7 +64,7 @@ struct NetworkTestStreamingReply : ReplyPromiseStreamReply {
 	int index = 0;
 	NetworkTestStreamingReply() = default;
 	explicit NetworkTestStreamingReply(int index) : index(index) {}
-	size_t expectedSize() const { return sizeof(*this); }
+	size_t expectedSize() const { return 4e6;/*sizeof(*this);*/ }
 
 	template <class Ar>
 	void serialize(Ar& ar) {

From a7eed27d7d34820048fe909c673e96c947cf331b Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 14 Dec 2020 23:21:37 +0000
Subject: [PATCH 046/740] Use tutorial binary for faster compilation

---
 documentation/tutorial/tutorial.actor.cpp | 49 ++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index 16904dc163e..df9116e2592 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -100,10 +100,11 @@ struct EchoServerInterface {
 	RequestStream<struct GetInterfaceRequest> getInterface;
 	RequestStream<struct EchoRequest> echo;
 	RequestStream<struct ReverseRequest> reverse;
+	RequestStream<struct StreamRequest> stream;
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, echo, reverse);
+		serializer(ar, echo, reverse, stream);
 	}
 };
 
@@ -141,6 +142,31 @@ struct ReverseRequest {
 	}
 };
 
+struct StreamReply : ReplyPromiseStreamReply {
+	constexpr static FileIdentifier file_identifier = 440804;
+
+	int index = 0;
+	StreamReply() = default;
+	explicit StreamReply(int index) : index(index) {}
+
+	size_t expectedSize() const { return 2e6; }
+
+	template <class Ar>
+	void serialize(Ar& ar) {
+		serializer(ar, ReplyPromiseStreamReply::acknowledgeEndpoint, index);
+	}
+};
+
+struct StreamRequest {
+	constexpr static FileIdentifier file_identifier = 5410805;
+	ReplyPromiseStream<StreamReply> reply;
+
+	template <class Ar>
+	void serialize(Ar& ar) {
+		serializer(ar, reply);
+	}
+};
+
 uint64_t tokenCounter = 1;
 
 ACTOR Future<Void> echoServer() {
@@ -155,6 +181,15 @@ ACTOR Future<Void> echoServer() {
 			when(ReverseRequest req = waitNext(echoServer.reverse.getFuture())) {
 				req.reply.send(std::string(req.message.rbegin(), req.message.rend()));
 			}
+			when(state StreamRequest req = waitNext(echoServer.stream.getFuture())) {
+				state int i = 0;
+				for (; i < 100; ++i) {
+					wait(req.reply.onReady());
+					std::cout << "Send " << i << std::endl;
+					req.reply.send(StreamReply{ i });
+				}
+				req.reply.sendError(end_of_stream());
+			}
 		}
 	}
 }
@@ -172,6 +207,18 @@ ACTOR Future<Void> echoClient() {
 	reverseRequest.message = "Hello World";
 	std::string reverseString = wait(server.reverse.getReply(reverseRequest));
 	std::cout << format("Sent %s to reverse, received %s\n", "Hello World", reverseString.c_str());
+
+	state ReplyPromiseStream<StreamReply> stream = server.stream.getReplyStream(StreamRequest{});
+	state int j = 0;
+	try {
+		loop {
+			StreamReply rep = waitNext(stream.getFuture());
+			std::cout << "Rep: " << rep.index << std::endl;
+			ASSERT(rep.index == j++);
+		}
+	} catch (Error& e) {
+		ASSERT(e.code() == error_code_end_of_stream || e.code() == error_code_request_maybe_delivered);
+	}
 	return Void();
 }
 

From ad39cf1d348e0d97152d73300fe3494e3af23510 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 15:24:48 -0800
Subject: [PATCH 047/740] added ack logging

---
 fdbrpc/fdbrpc.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index c56abc54b1a..0180a2bef55 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -248,6 +248,7 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
 
 	void receive(ArenaObjectReader& reader) override {
+		printf("AcknowledgementReceived\n");
 		ErrorOr<EnsureTable<AcknowledgementReply>> message;
 		reader.deserialize(message);
 		ASSERT(!message.isError() && message.get().asUnderlyingType().bytes > bytesAcknowledged);
@@ -286,6 +287,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		} else {
 			if(message.get().asUnderlyingType().acknowledgeEndpoint.present()) {
 				acknowledgements = AcknowledgementReceiver(message.get().asUnderlyingType().acknowledgeEndpoint.get());
+				printf("Acknowledgements create with remote endpoint: %s %s\n", acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 			}
 			this->send(std::move(message.get().asUnderlyingType()));
 		}
@@ -296,7 +298,8 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		T res = this->popImpl();
 		if(acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += res.expectedSize();
-			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), true);
+			printf("Sending acknowledgement to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
+			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 		}
 		return res;
 	}
@@ -317,6 +320,7 @@ class ReplyPromiseStream {
 		if (queue->isRemoteEndpoint()) {
 			if(!queue->acknowledgements.getRawEndpoint().isValid()) {
 				value.acknowledgeEndpoint = queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint);
+				printf("Registered Ack Endpoint: %s\n", queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token.toString().c_str());
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
 			if((!queue->acknowledgements.ready.isValid() || queue->acknowledgements.ready.isSet()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {

From 50a3372155a0371b11a911e1df4fd8022a1290e4 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 15:51:20 -0800
Subject: [PATCH 048/740] use loadedEndpoint for acknowledgement

---
 documentation/tutorial/tutorial.actor.cpp | 2 +-
 fdbclient/StorageServerInterface.h        | 2 +-
 fdbrpc/fdbrpc.h                           | 8 ++++----
 fdbserver/NetworkTest.h                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index df9116e2592..34515dacaf7 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -153,7 +153,7 @@ struct StreamReply : ReplyPromiseStreamReply {
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, ReplyPromiseStreamReply::acknowledgeEndpoint, index);
+		serializer(ar, ReplyPromiseStreamReply::acknowledgeToken, index);
 	}
 };
 
diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index 447013311e1..b285ae6d187 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -278,7 +278,7 @@ struct GetKeyValuesStreamReply : public ReplyPromiseStreamReply {
 
 	template <class Ar>
 	void serialize( Ar& ar ) {
-		serializer(ar, ReplyPromiseStreamReply::acknowledgeEndpoint, data, version, more, cached, arena);
+		serializer(ar, ReplyPromiseStreamReply::acknowledgeToken, data, version, more, cached, arena);
 	}
 };
 
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 0180a2bef55..58a8bf2d760 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -218,7 +218,7 @@ template <class Reply>
 void setReplyPriority(const ReplyPromise<Reply> & p, TaskPriority taskID) { p.getEndpoint(taskID); }
 
 struct ReplyPromiseStreamReply {
-	Optional<Endpoint> acknowledgeEndpoint;
+	Optional<UID> acknowledgeToken;
 	ReplyPromiseStreamReply() {}
 };
 
@@ -285,8 +285,8 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 			}
 			this->sendError(message.getError());
 		} else {
-			if(message.get().asUnderlyingType().acknowledgeEndpoint.present()) {
-				acknowledgements = AcknowledgementReceiver(message.get().asUnderlyingType().acknowledgeEndpoint.get());
+			if(message.get().asUnderlyingType().acknowledgeToken.present()) {
+				acknowledgements = AcknowledgementReceiver(FlowTransport::transport().loadedEndpoint(message.get().asUnderlyingType().acknowledgeToken.get()));
 				printf("Acknowledgements create with remote endpoint: %s %s\n", acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 			}
 			this->send(std::move(message.get().asUnderlyingType()));
@@ -319,7 +319,7 @@ class ReplyPromiseStream {
 	void send(U && value) const {
 		if (queue->isRemoteEndpoint()) {
 			if(!queue->acknowledgements.getRawEndpoint().isValid()) {
-				value.acknowledgeEndpoint = queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint);
+				value.acknowledgeToken = queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token;
 				printf("Registered Ack Endpoint: %s\n", queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token.toString().c_str());
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
diff --git a/fdbserver/NetworkTest.h b/fdbserver/NetworkTest.h
index bf46c8e6d9d..7e5cd30411b 100644
--- a/fdbserver/NetworkTest.h
+++ b/fdbserver/NetworkTest.h
@@ -68,7 +68,7 @@ struct NetworkTestStreamingReply : ReplyPromiseStreamReply {
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, ReplyPromiseStreamReply::acknowledgeEndpoint, index);
+		serializer(ar, ReplyPromiseStreamReply::acknowledgeToken, index);
 	}
 };
 

From 3b618fdd177b8c9df4aa0e1f58c26f35b28a277d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:10:06 -0800
Subject: [PATCH 049/740] more logging

---
 fdbrpc/FlowTransport.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 4221d2f4ccf..81891b66269 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1136,6 +1136,7 @@ ACTOR static Future<Void> connectionReader(
 					}
 				}
 				if (compatible) {
+					printf("Peer Addr: %s\n", peerAddress.toString().c_str());
 					scanPackets( transport, unprocessed_begin, unprocessed_end, arena, peerAddress, peerProtocolVersion );
 				}
 				else if(!expectConnectPacket) {

From 312467bbf8868715149e1cdd369b4fad7513cbd6 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:14:19 -0800
Subject: [PATCH 050/740] more logging

---
 fdbrpc/FlowTransport.actor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 81891b66269..ae1f47a2599 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1009,6 +1009,7 @@ ACTOR static Future<Void> connectionReader(
 	state ProtocolVersion peerProtocolVersion;
 
 	peerAddress = conn->getPeerAddress();
+	printf("Peer Add1: %s\n", peerAddress.toString().c_str());
 	if (!peer) {
 		ASSERT( !peerAddress.isPublic() );
 	}
@@ -1122,6 +1123,7 @@ ACTOR static Future<Void> connectionReader(
 							if (pkt.canonicalRemotePort) {
 								peerAddress = NetworkAddress(pkt.canonicalRemoteIp(), pkt.canonicalRemotePort, true,
 								                             peerAddress.isTLS());
+								printf("Peer Addr2: %s\n", peerAddress.toString().c_str());
 							}
 							peer = transport->getOrOpenPeer(peerAddress, false);
 							peer->compatible = compatible;
@@ -1136,7 +1138,7 @@ ACTOR static Future<Void> connectionReader(
 					}
 				}
 				if (compatible) {
-					printf("Peer Addr: %s\n", peerAddress.toString().c_str());
+					printf("Peer Addr3: %s\n", peerAddress.toString().c_str());
 					scanPackets( transport, unprocessed_begin, unprocessed_end, arena, peerAddress, peerProtocolVersion );
 				}
 				else if(!expectConnectPacket) {

From 9c16acbef00eb90f824ece43e2e679e1339cc77a Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:26:08 -0800
Subject: [PATCH 051/740] more logging

---
 fdbrpc/FlowTransport.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index ae1f47a2599..5d1d8f6e0b2 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1009,7 +1009,7 @@ ACTOR static Future<Void> connectionReader(
 	state ProtocolVersion peerProtocolVersion;
 
 	peerAddress = conn->getPeerAddress();
-	printf("Peer Add1: %s\n", peerAddress.toString().c_str());
+	printf("Peer Add1: %d %s\n", (bool) peer, peerAddress.toString().c_str());
 	if (!peer) {
 		ASSERT( !peerAddress.isPublic() );
 	}

From 117c063fbc9e3d258cd0db60ddad48810ca7507c Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:30:00 -0800
Subject: [PATCH 052/740] more logging

---
 flow/Net2.actor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index 6cf1037908b..17ed6d81b93 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -372,6 +372,7 @@ class Connection : public IConnection, ReferenceCounted<Connection> {
 		state Reference<Connection> self( new Connection(*ios) );
 
 		self->peer_address = addr;
+		printf("Updating peer_addr1: %s\n", addr.toString().c_str());
 		try {
 			auto to = tcpEndpoint(addr);
 			BindPromise p("N2_ConnectError", self->id);
@@ -390,6 +391,7 @@ class Connection : public IConnection, ReferenceCounted<Connection> {
 
 	// This is not part of the IConnection interface, because it is wrapped by IListener::accept()
 	void accept(NetworkAddress peerAddr) {
+		printf("Updating peer_addr2: %s\n", peerAddr.toString().c_str());
 		this->peer_address = peerAddr;
 		init();
 	}

From 197987aa66197d36d2e15a926d049b7c63d59a02 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:36:38 -0800
Subject: [PATCH 053/740] more logging

---
 fdbrpc/FlowTransport.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 5d1d8f6e0b2..3d74eed7208 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -579,7 +579,7 @@ ACTOR Future<Void> connectionKeeper( Reference<Peer> self,
 				                                 ? "OK"
 				                                 : "FAILED");
 				++self->connectOutgoingCount;
-
+				printf("FlowTransport connect: %s\n", self->destination.toString());
 				try {
 					choose {
 						when(Reference<IConnection> _conn =

From 2fbcb7a44981fe8c1ef4377aef06b3decca4d25d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:37:25 -0800
Subject: [PATCH 054/740] fixed logging

---
 fdbrpc/FlowTransport.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 3d74eed7208..8f166592184 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -579,7 +579,7 @@ ACTOR Future<Void> connectionKeeper( Reference<Peer> self,
 				                                 ? "OK"
 				                                 : "FAILED");
 				++self->connectOutgoingCount;
-				printf("FlowTransport connect: %s\n", self->destination.toString());
+				printf("FlowTransport connect: %s\n", self->destination.toString().c_str());
 				try {
 					choose {
 						when(Reference<IConnection> _conn =

From e54aaf8a7763349cc6c3d8c7ffec264cd3d5edee Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:44:13 -0800
Subject: [PATCH 055/740] more debugging

---
 fdbrpc/FlowTransport.actor.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 8f166592184..ce81f4c1780 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1225,6 +1225,10 @@ Reference<Peer> TransportData::getOrOpenPeer( NetworkAddress const& address, boo
 	if(!peer) {
 		peer = makeReference<Peer>(this, address);
 		if(startConnectionKeeper && !isLocalAddress(address)) {
+			fprintf("getOrOpen %s\n", address.toString().c_str());
+			if(!address.ip.isValid()) {
+				crashAndDie();
+			}
 			peer->connect = connectionKeeper(peer);
 		}
 		peers[address] = peer;

From 2354d93030aff7d95d25bd6bd10ff2235645b466 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:44:49 -0800
Subject: [PATCH 056/740] fixed logging

---
 fdbrpc/FlowTransport.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index ce81f4c1780..154a7336a94 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1225,7 +1225,7 @@ Reference<Peer> TransportData::getOrOpenPeer( NetworkAddress const& address, boo
 	if(!peer) {
 		peer = makeReference<Peer>(this, address);
 		if(startConnectionKeeper && !isLocalAddress(address)) {
-			fprintf("getOrOpen %s\n", address.toString().c_str());
+			printf("getOrOpen %s\n", address.toString().c_str());
 			if(!address.ip.isValid()) {
 				crashAndDie();
 			}

From 63d5cead644bd0d894d2efe6f858c9c267dbcf7d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 16:53:51 -0800
Subject: [PATCH 057/740] do not open connections to invalid IP addresses

---
 fdbrpc/FlowTransport.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 154a7336a94..96fc38fd037 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1323,7 +1323,7 @@ Endpoint FlowTransport::loadedEndpoint( const UID& token ) {
 }
 
 void FlowTransport::addPeerReference(const Endpoint& endpoint, bool isStream) {
-	if (!isStream || !endpoint.getPrimaryAddress().isValid())
+	if (!isStream || !endpoint.getPrimaryAddress().ip.isValid())
 		return;
 
 	Reference<Peer> peer = self->getOrOpenPeer(endpoint.getPrimaryAddress());

From 9bc30d85afdd0a109790b9727d9cb80c1d84a411 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 17:06:27 -0800
Subject: [PATCH 058/740] revert changes

---
 fdbrpc/FlowTransport.actor.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 96fc38fd037..9de88a5bfd6 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1226,9 +1226,6 @@ Reference<Peer> TransportData::getOrOpenPeer( NetworkAddress const& address, boo
 		peer = makeReference<Peer>(this, address);
 		if(startConnectionKeeper && !isLocalAddress(address)) {
 			printf("getOrOpen %s\n", address.toString().c_str());
-			if(!address.ip.isValid()) {
-				crashAndDie();
-			}
 			peer->connect = connectionKeeper(peer);
 		}
 		peers[address] = peer;
@@ -1323,7 +1320,7 @@ Endpoint FlowTransport::loadedEndpoint( const UID& token ) {
 }
 
 void FlowTransport::addPeerReference(const Endpoint& endpoint, bool isStream) {
-	if (!isStream || !endpoint.getPrimaryAddress().ip.isValid())
+	if (!isStream || !endpoint.getPrimaryAddress().isValid())
 		return;
 
 	Reference<Peer> peer = self->getOrOpenPeer(endpoint.getPrimaryAddress());

From 4911a66cb1d12cecddfe1bfe430b0406e5b26dae Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 17:27:13 -0800
Subject: [PATCH 059/740] experiment with pop override

---
 fdbrpc/fdbrpc.h |  8 +++-----
 flow/flow.h     | 17 ++++-------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 58a8bf2d760..cee3e8bf8cb 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -294,16 +294,14 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		this->delPromiseRef();
 	}
 
-	T pop() override {
-		T res = this->popImpl();
+	void popAction() override {
 		if(acknowledgements.getRawEndpoint().isValid()) {
-			acknowledgements.bytesAcknowledged += res.expectedSize();
+			acknowledgements.bytesAcknowledged++;
 			printf("Sending acknowledgement to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 		}
-		return res;
 	}
-
+	
 	~NetNotifiedQueueWithErrors() {
 		printf("NetNotifiedQueue destructor %s\n", getRawEndpoint().token.toString().c_str());
 	}
diff --git a/flow/flow.h b/flow/flow.h
index 6c66c03791e..25f2537edbe 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -580,17 +580,19 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	bool isError() const { return queue.empty() && error.isValid(); }  // the *next* thing queued is an error
 	uint32_t size() const { return queue.size(); }
 
-	virtual T pop() {
-		return popImpl();
+	T pop() {
 		if (queue.empty()) {
 			if (error.isValid()) throw error;
 			throw internal_error();
 		}
 		auto copy = std::move(queue.front());
 		queue.pop();
+		popAction();
 		return copy;
 	}
 
+	virtual void popAction() {}
+
 	template <class U>
 	void send(U && value) {
 		if (error.isValid()) return;
@@ -645,17 +647,6 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	virtual void unwait() override { delFutureRef(); }
 	virtual void fire(T const&) override { ASSERT(false); }
 	virtual void fire(T&&) override { ASSERT(false); }
-
-	protected:
-	T popImpl() {
-		if (queue.empty()) {
-			if (error.isValid()) throw error;
-			throw internal_error();
-		}
-		auto copy = std::move(queue.front());
-		queue.pop();
-		return copy;
-	}
 };
 
 

From c03ffd6db4bf76037ce573f95d00cadf42f3a00c Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 17:49:05 -0800
Subject: [PATCH 060/740] send acks when someone is waiting on the stream
 already

---
 fdbrpc/fdbrpc.h | 18 ++++++++++++++----
 flow/flow.h     | 24 +++++++++++++-----------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index cee3e8bf8cb..9277208e477 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -289,19 +289,29 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 				acknowledgements = AcknowledgementReceiver(FlowTransport::transport().loadedEndpoint(message.get().asUnderlyingType().acknowledgeToken.get()));
 				printf("Acknowledgements create with remote endpoint: %s %s\n", acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 			}
+			if(SingleCallback<T>::next != this) {
+				if(acknowledgements.getRawEndpoint().isValid()) {
+					acknowledgements.bytesAcknowledged += res.expectedSize();
+					printf("Sending acknowledgement1 to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
+					FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
+				}
+			}
+
 			this->send(std::move(message.get().asUnderlyingType()));
 		}
 		this->delPromiseRef();
 	}
 
-	void popAction() override {
+	T pop() override {
+		T res = this->popImpl();
 		if(acknowledgements.getRawEndpoint().isValid()) {
-			acknowledgements.bytesAcknowledged++;
-			printf("Sending acknowledgement to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
+			acknowledgements.bytesAcknowledged += res.expectedSize();
+			printf("Sending acknowledgement2 to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 		}
+		return res;
 	}
-	
+
 	~NetNotifiedQueueWithErrors() {
 		printf("NetNotifiedQueue destructor %s\n", getRawEndpoint().token.toString().c_str());
 	}
diff --git a/flow/flow.h b/flow/flow.h
index 25f2537edbe..67593c4115a 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -580,19 +580,10 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	bool isError() const { return queue.empty() && error.isValid(); }  // the *next* thing queued is an error
 	uint32_t size() const { return queue.size(); }
 
-	T pop() {
-		if (queue.empty()) {
-			if (error.isValid()) throw error;
-			throw internal_error();
-		}
-		auto copy = std::move(queue.front());
-		queue.pop();
-		popAction();
-		return copy;
+	virtual T pop() {
+		return popImpl();
 	}
 
-	virtual void popAction() {}
-
 	template <class U>
 	void send(U && value) {
 		if (error.isValid()) return;
@@ -647,6 +638,17 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	virtual void unwait() override { delFutureRef(); }
 	virtual void fire(T const&) override { ASSERT(false); }
 	virtual void fire(T&&) override { ASSERT(false); }
+
+	protected:
+	T popImpl() {
+		if (queue.empty()) {
+			if (error.isValid()) throw error;
+			throw internal_error();
+		}
+		auto copy = std::move(queue.front());
+		queue.pop();
+		return copy;
+	}
 };
 
 

From 5251010f22c619424e7f310ac2a1c8fc24d9400e Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 17:50:57 -0800
Subject: [PATCH 061/740] fixed compiler error

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 9277208e477..d85b31e4179 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -291,7 +291,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 			}
 			if(SingleCallback<T>::next != this) {
 				if(acknowledgements.getRawEndpoint().isValid()) {
-					acknowledgements.bytesAcknowledged += res.expectedSize();
+					acknowledgements.bytesAcknowledged += message.get().asUnderlyingType().expectedSize();
 					printf("Sending acknowledgement1 to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 					FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 				}

From 5fddfb84a023b538006f997f9e42f597e7bb7bbe Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 17:53:31 -0800
Subject: [PATCH 062/740] compile fix

---
 fdbrpc/fdbrpc.h | 2 +-
 flow/flow.h     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index d85b31e4179..5ae105def4e 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -289,7 +289,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 				acknowledgements = AcknowledgementReceiver(FlowTransport::transport().loadedEndpoint(message.get().asUnderlyingType().acknowledgeToken.get()));
 				printf("Acknowledgements create with remote endpoint: %s %s\n", acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 			}
-			if(SingleCallback<T>::next != this) {
+			if(this->shouldFireImmediately()) {
 				if(acknowledgements.getRawEndpoint().isValid()) {
 					acknowledgements.bytesAcknowledged += message.get().asUnderlyingType().expectedSize();
 					printf("Sending acknowledgement1 to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
diff --git a/flow/flow.h b/flow/flow.h
index 67593c4115a..c0a57e1d612 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -600,7 +600,7 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 		if (error.isValid()) return;
 
 		this->error = err;
-		if (SingleCallback<T>::next != this)
+		if (shouldFireImmediately())
 			SingleCallback<T>::next->error(err);
 	}
 
@@ -649,6 +649,10 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 		queue.pop();
 		return copy;
 	}
+
+	bool shouldFireImmediately() {
+		return SingleCallback<T>::next != this;
+	}
 };
 
 

From 94ab2620d5500c7c66be22e1214f1e75efbd44ed Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 14 Dec 2020 18:03:17 -0800
Subject: [PATCH 063/740] update logging for a failed assert

---
 fdbrpc/fdbrpc.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 5ae105def4e..453f62d9559 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -248,10 +248,14 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
 
 	void receive(ArenaObjectReader& reader) override {
-		printf("AcknowledgementReceived\n");
 		ErrorOr<EnsureTable<AcknowledgementReply>> message;
 		reader.deserialize(message);
-		ASSERT(!message.isError() && message.get().asUnderlyingType().bytes > bytesAcknowledged);
+		if(message.isError()) {
+			printf("AcknowledgementReceived Error\n");
+		} else {
+			printf("AcknowledgementReceived %d %d\n", message.get().asUnderlyingType().bytes, bytesAcknowledged);
+		}
+		ASSERT(!message.isError() && message.get().asUnderlyingType().bytes >= bytesAcknowledged);
 		bytesAcknowledged = message.get().asUnderlyingType().bytes;
 		if(bytesSent - bytesAcknowledged < 2e6) {
 			ready.send(Void());

From 7f8465af2c5e3336c5f5f5a4539a518f814b32c3 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Tue, 15 Dec 2020 02:09:11 +0000
Subject: [PATCH 064/740] AcknowledgementReply is not wrapped in ErrorOr

---
 fdbrpc/fdbrpc.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 453f62d9559..94b83111506 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -248,15 +248,11 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
 
 	void receive(ArenaObjectReader& reader) override {
-		ErrorOr<EnsureTable<AcknowledgementReply>> message;
+		printf("AcknowledgementReceived\n");
+		AcknowledgementReply message;
 		reader.deserialize(message);
-		if(message.isError()) {
-			printf("AcknowledgementReceived Error\n");
-		} else {
-			printf("AcknowledgementReceived %d %d\n", message.get().asUnderlyingType().bytes, bytesAcknowledged);
-		}
-		ASSERT(!message.isError() && message.get().asUnderlyingType().bytes >= bytesAcknowledged);
-		bytesAcknowledged = message.get().asUnderlyingType().bytes;
+		ASSERT(message.bytes > bytesAcknowledged);
+		bytesAcknowledged = message.bytes;
 		if(bytesSent - bytesAcknowledged < 2e6) {
 			ready.send(Void());
 		}

From 048782bc7e53a5cb20dddce364854b8f00b4f80e Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Tue, 15 Dec 2020 02:32:26 +0000
Subject: [PATCH 065/740] Fix printf format overflow

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 94b83111506..3428668fac3 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -292,7 +292,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 			if(this->shouldFireImmediately()) {
 				if(acknowledgements.getRawEndpoint().isValid()) {
 					acknowledgements.bytesAcknowledged += message.get().asUnderlyingType().expectedSize();
-					printf("Sending acknowledgement1 to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
+					printf("Sending acknowledgement1 to endpoint: %ld %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 					FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 				}
 			}

From 343e29cd01742a3837dfd7259eb51faacaba14fa Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Tue, 15 Dec 2020 02:39:55 +0000
Subject: [PATCH 066/740] Only set ready promise if it can be set

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 3428668fac3..246a589aa8e 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -253,7 +253,7 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		reader.deserialize(message);
 		ASSERT(message.bytes > bytesAcknowledged);
 		bytesAcknowledged = message.bytes;
-		if(bytesSent - bytesAcknowledged < 2e6) {
+		if (bytesSent - bytesAcknowledged < 2e6 && ready.isValid() && ready.canBeSet()) {
 			ready.send(Void());
 		}
 	}

From aca2e057723ba6d96ad697e46b42be8c2cafb5bb Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 10:50:15 -0800
Subject: [PATCH 067/740] fix: make sure the server does not miss a client
 failure

---
 fdbrpc/fdbrpc.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 246a589aa8e..fbdd9f01261 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -242,6 +242,7 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 	int64_t bytesSent;
 	int64_t bytesAcknowledged;
 	Promise<Void> ready;
+	Future<Void> failures;
 
 	AcknowledgementReceiver() : bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
 	AcknowledgementReceiver(const Endpoint& remoteEndpoint) : FlowReceiver(remoteEndpoint, false),
@@ -269,6 +270,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
 	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, false) {
+		  acknowledgements.failures = tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(remoteEndpoint), request_maybe_delivered());
 		  printf("NetNotified create with remote endpoint: %s\n", remoteEndpoint.token.toString().c_str());
 	  }
 
@@ -395,8 +397,7 @@ class ReplyPromiseStream {
 		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
 			return Void();
 		}
-		return queue->acknowledgements.ready.getFuture() || 
-		       tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint)), request_maybe_delivered());
+		return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
 	}
 
 	void operator=(const ReplyPromiseStream& rhs) {

From 9b327046275a5e5507fbce7fed22c8ce55379bca Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 11:40:44 -0800
Subject: [PATCH 068/740] added error handling for request_maybe_delivered

---
 fdbserver/networktest.actor.cpp | 55 +++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 5fd903741b7..0e79f87f9a2 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -73,32 +73,39 @@ ACTOR Future<Void> networkTestServer() {
 	state LatencyStats latency;
 
 	loop {
-		choose {
-			when(state NetworkTestStreamingRequest req = waitNext(interf.test.getFuture())) {
-				state LatencyStats::sample sample = latency.tick();
-				state int i = 0;
-				for (; i < 100; ++i) {
-					fprintf(stderr, "Wait onReady %d\n", i);
-					wait(req.reply.onReady());
-					fprintf(stderr, "Send reply %d\n", i);
-					req.reply.send(NetworkTestStreamingReply{ i });
+		try {
+			choose {
+				when(state NetworkTestStreamingRequest req = waitNext(interf.test.getFuture())) {
+					state LatencyStats::sample sample = latency.tick();
+					state int i = 0;
+					for (; i < 100; ++i) {
+						fprintf(stderr, "Wait onReady %d\n", i);
+						wait(req.reply.onReady());
+						fprintf(stderr, "Send reply %d\n", i);
+						req.reply.send(NetworkTestStreamingReply{ i });
+					}
+					fprintf(stderr, "Send end_of_stream\n");
+					req.reply.sendError(end_of_stream());
+					latency.tock(sample);
+					sent++;
 				}
-				fprintf(stderr, "Send end_of_stream\n");
-				req.reply.sendError(end_of_stream());
-				latency.tock(sample);
-				sent++;
-			}
-			when( wait( logging ) ) {
-				auto spd = sent / (now() - lastTime);
-				if (FLOW_KNOBS->NETWORK_TEST_SCRIPT_MODE) {
-					fprintf(stderr, "%f\t%.3f\t%.3f\n", spd, latency.mean() * 1e6, latency.stddev() * 1e6);
-				} else {
-					fprintf(stderr, "responses per second: %f (%f us)\n", spd, latency.mean() * 1e6);
+				when( wait( logging ) ) {
+					auto spd = sent / (now() - lastTime);
+					if (FLOW_KNOBS->NETWORK_TEST_SCRIPT_MODE) {
+						fprintf(stderr, "%f\t%.3f\t%.3f\n", spd, latency.mean() * 1e6, latency.stddev() * 1e6);
+					} else {
+						fprintf(stderr, "responses per second: %f (%f us)\n", spd, latency.mean() * 1e6);
+					}
+					latency.reset();
+					lastTime = now();
+					sent = 0;
+					logging = delay( 1.0 );
 				}
-				latency.reset();
-				lastTime = now();
-				sent = 0;
-				logging = delay( 1.0 );
+			}
+		} catch (Error &e) {
+			if(e.code() != error_code_request_maybe_delivered) {
+				fprintf(stderr, "Error: %s\n", e.what());
+				throw e;
 			}
 		}
 	}

From 806af6469b1a2998e57c538ea82949f96326f279 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Tue, 15 Dec 2020 21:22:46 +0000
Subject: [PATCH 069/740] Add client that uses getRangeStream

---
 documentation/tutorial/tutorial.actor.cpp | 34 +++++++++--------------
 fdbclient/NativeAPI.actor.cpp             |  9 ++++--
 fdbrpc/FlowTransport.actor.cpp            |  8 ------
 fdbserver/storageserver.actor.cpp         |  9 +++++-
 flow/Net2.actor.cpp                       |  2 --
 5 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index 34515dacaf7..d7502040d28 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -395,36 +395,28 @@ ACTOR Future<Void> multipleClients() {
 std::string clusterFile = "fdb.cluster";
 
 ACTOR Future<Void> fdbClient() {
-	wait(delay(30));
 	state Database db = Database::createDatabase(clusterFile, 300);
 	state Transaction tx(db);
-	state std::string keyPrefix = "/tut/";
-	state Key startKey;
-	state KeyRef endKey = LiteralStringRef("/tut0");
-	state int beginIdx = 0;
+	state PromiseStream<Standalone<RangeResultRef>> results;
+	state Key next;
 	loop {
 		try {
-			tx.reset();
-			// this workload is stupidly simple:
-			// 1. select a random key between 1
-			//    and 1e8
-			// 2. select this key plus the 100
-			//    next ones
-			// 3. write 10 values in [k, k+100]
-			beginIdx = deterministicRandom()->randomInt(0, 1e8 - 100);
-			startKey = keyPrefix + std::to_string(beginIdx);
-			Standalone<RangeResultRef> range = wait(tx.getRange(KeyRangeRef(startKey, endKey), 100));
-			for (int i = 0; i < 10; ++i) {
-				Key k = Key(keyPrefix + std::to_string(beginIdx + deterministicRandom()->randomInt(0, 100)));
-				tx.set(k, LiteralStringRef("foo"));
+			state Future<Void> stream =
+			    tx.getRangeStream(results, KeySelector(firstGreaterOrEqual(next), next.arena()),
+			                      KeySelector(firstGreaterOrEqual(normalKeys.end)), GetRangeLimits());
+			loop {
+				Standalone<RangeResultRef> range = waitNext(results.getFuture());
+				std::cout << "Got " << range.expectedSize() << std::endl;
+				next = keyAfter(range.back().key);
 			}
-			wait(tx.commit());
-			std::cout << "Committed\n";
-			wait(delay(2.0));
 		} catch (Error& e) {
+			if (e.code() == error_code_end_of_stream) {
+				break;
+			}
 			wait(tx.onError(e));
 		}
 	}
+	return Void();
 }
 
 ACTOR Future<Void> fdbStatusStresser() {
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index ffd13613419..e7c24c12fff 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2705,7 +2705,11 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 			req.end = firstGreaterOrEqual( range.end );
 			req.spanContext = span.context;
 			req.limit = reverse ? -CLIENT_KNOBS->REPLY_BYTE_LIMIT : CLIENT_KNOBS->REPLY_BYTE_LIMIT;
-			req.limitBytes = CLIENT_KNOBS->REPLY_BYTE_LIMIT;
+			if (limits.hasByteLimit()) {
+				req.limitBytes = limits.bytes;
+			} else {
+				req.limitBytes = std::numeric_limits<int>::max();
+			}
 
 			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
 
@@ -2738,6 +2742,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 							when(GetKeyValuesStreamReply _rep = waitNext(replyStream.getFuture())) {
 								rep = _rep;
+								limits.decrement(rep.data);
 							}
 						}
 						++cx->transactionPhysicalReadsCompleted;
@@ -2771,7 +2776,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 							locations[shard].first = KeyRangeRef( keyAfter( output[output.size()-1].key ), locations[shard].first.end );
 					}
 
-					if (!more || locations[shard].first.empty()) {
+					if (!more || locations[shard].first.empty() || limits.isReached()) {
 						TEST(true); // getRangeStream (!more || locations[shard].first.empty())
 						if(shard == locations.size()-1) {
 							const KeyRangeRef& range = locations[shard].first;
diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 9de88a5bfd6..ff9f71b070c 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -89,7 +89,6 @@ void EndpointMap::realloc() {
 }
 
 void EndpointMap::insert( NetworkMessageReceiver* r, Endpoint::Token& token, TaskPriority priority ) {
-	printf("Endpoint Map Insert: %s\n", token.toString().c_str());
 	if (firstFree == uint32_t(-1)) realloc();
 	int index = firstFree;
 	firstFree = data[index].nextFree;
@@ -149,7 +148,6 @@ TaskPriority EndpointMap::getPriority( Endpoint::Token const& token ) {
 }
 
 void EndpointMap::remove( Endpoint::Token const& token, NetworkMessageReceiver* r ) {
-	printf("Endpoint Map Remove: %s\n", token.toString().c_str());
 	uint32_t index = token.second();
 	if ( index < data.size() && data[index].token().first() == token.first() && ((data[index].token().second()&0xffffffff00000000LL)|index)==token.second() && data[index].receiver == r ) {
 		data[index].receiver = 0;
@@ -579,7 +577,6 @@ ACTOR Future<Void> connectionKeeper( Reference<Peer> self,
 				                                 ? "OK"
 				                                 : "FAILED");
 				++self->connectOutgoingCount;
-				printf("FlowTransport connect: %s\n", self->destination.toString().c_str());
 				try {
 					choose {
 						when(Reference<IConnection> _conn =
@@ -1009,7 +1006,6 @@ ACTOR static Future<Void> connectionReader(
 	state ProtocolVersion peerProtocolVersion;
 
 	peerAddress = conn->getPeerAddress();
-	printf("Peer Add1: %d %s\n", (bool) peer, peerAddress.toString().c_str());
 	if (!peer) {
 		ASSERT( !peerAddress.isPublic() );
 	}
@@ -1123,7 +1119,6 @@ ACTOR static Future<Void> connectionReader(
 							if (pkt.canonicalRemotePort) {
 								peerAddress = NetworkAddress(pkt.canonicalRemoteIp(), pkt.canonicalRemotePort, true,
 								                             peerAddress.isTLS());
-								printf("Peer Addr2: %s\n", peerAddress.toString().c_str());
 							}
 							peer = transport->getOrOpenPeer(peerAddress, false);
 							peer->compatible = compatible;
@@ -1138,7 +1133,6 @@ ACTOR static Future<Void> connectionReader(
 					}
 				}
 				if (compatible) {
-					printf("Peer Addr3: %s\n", peerAddress.toString().c_str());
 					scanPackets( transport, unprocessed_begin, unprocessed_end, arena, peerAddress, peerProtocolVersion );
 				}
 				else if(!expectConnectPacket) {
@@ -1225,7 +1219,6 @@ Reference<Peer> TransportData::getOrOpenPeer( NetworkAddress const& address, boo
 	if(!peer) {
 		peer = makeReference<Peer>(this, address);
 		if(startConnectionKeeper && !isLocalAddress(address)) {
-			printf("getOrOpen %s\n", address.toString().c_str());
 			peer->connect = connectionKeeper(peer);
 		}
 		peers[address] = peer;
@@ -1501,7 +1494,6 @@ void FlowTransport::cancelReliable( ReliablePacket* p ) {
 }
 
 Reference<Peer> FlowTransport::sendUnreliable( ISerializeSource const& what, const Endpoint& destination, bool openConnection ) {
-	printf("Send Unreliable: %s %s\n", destination.getPrimaryAddress().toString().c_str(), destination.token.toString().c_str());
 	if (self->isLocalAddress(destination.getPrimaryAddress())) {
 		sendLocal( self, what, destination );
 		return Reference<Peer>();
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 30d7049e845..eac398e6a29 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1722,8 +1722,14 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 			state int remainingLimitBytes = req.limitBytes;
 			loop {
 				wait(req.reply.onReady());
-				GetKeyValuesReply _r = wait( readRange(data, version, KeyRangeRef(begin, end), req.limit, &remainingLimitBytes, span.context) );
+				printf("Issuing getRange for stream impl. begin: %s end: %s limit: %d limitBytes: %d\n",
+				       printable(begin).c_str(), printable(end).c_str(), req.limit, remainingLimitBytes);
+				state int byteLimit = std::min(remainingLimitBytes, CLIENT_KNOBS->REPLY_BYTE_LIMIT);
+				state int byteLimitBefore = byteLimit;
+				GetKeyValuesReply _r = wait( readRange(data, version, KeyRangeRef(begin, end), req.limit, &byteLimit, span.context) );
+				remainingLimitBytes -= byteLimitBefore - byteLimit;
 				GetKeyValuesStreamReply r(_r);
+				printf("Result. size: %d more: %d \n", int(r.data.expectedSize()), int(r.more));
 
 				if( req.debugID.present() )
 					g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");
@@ -1765,6 +1771,7 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 					req.reply.sendError(end_of_stream());
 					break;
 				}
+				ASSERT(r.data.size());
 
 				if(req.limit >= 0) {
 					begin = keyAfter(r.data.back().key);
diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index 17ed6d81b93..6cf1037908b 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -372,7 +372,6 @@ class Connection : public IConnection, ReferenceCounted<Connection> {
 		state Reference<Connection> self( new Connection(*ios) );
 
 		self->peer_address = addr;
-		printf("Updating peer_addr1: %s\n", addr.toString().c_str());
 		try {
 			auto to = tcpEndpoint(addr);
 			BindPromise p("N2_ConnectError", self->id);
@@ -391,7 +390,6 @@ class Connection : public IConnection, ReferenceCounted<Connection> {
 
 	// This is not part of the IConnection interface, because it is wrapped by IListener::accept()
 	void accept(NetworkAddress peerAddr) {
-		printf("Updating peer_addr2: %s\n", peerAddr.toString().c_str());
 		this->peer_address = peerAddr;
 		init();
 	}

From aaf4249b0c52cd19b128376cf079ab870893d9be Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 14:06:38 -0800
Subject: [PATCH 070/740] temporarily allow endpoint_not_found on
 ReplyPromiseStream endpoints. If we know cancel a ReplyPromiseStream before
 consuming the whole stream, send an error to the server

---
 fdbrpc/fdbrpc.h | 33 +++++++++++++++++++++++----------
 flow/flow.h     |  4 ++++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index fbdd9f01261..13c29cc86e5 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -250,12 +250,19 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 
 	void receive(ArenaObjectReader& reader) override {
 		printf("AcknowledgementReceived\n");
-		AcknowledgementReply message;
+		ErrorOr<AcknowledgementReply> message;
 		reader.deserialize(message);
-		ASSERT(message.bytes > bytesAcknowledged);
-		bytesAcknowledged = message.bytes;
-		if (bytesSent - bytesAcknowledged < 2e6 && ready.isValid() && ready.canBeSet()) {
-			ready.send(Void());
+		if(message.isError()) {
+			if(ready.isSet()) {
+				ready = Promise<Void>();
+			}
+			ready.sendError(message.getError());
+		} else {
+			ASSERT(message.get().bytes > bytesAcknowledged);
+			bytesAcknowledged = message.get().bytes;
+			if (bytesSent - bytesAcknowledged < 2e6 && ready.isValid() && ready.canBeSet()) {
+				ready.send(Void());
+			}
 		}
 	}
 };
@@ -269,7 +276,8 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 
 	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
-	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, false) {
+	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
+		  //FIXME: creating the FlowReceiver as a stream will mean that every cancelled read will lead to a permanent endpoint in the failed endpoints map
 		  acknowledgements.failures = tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(remoteEndpoint), request_maybe_delivered());
 		  printf("NetNotified create with remote endpoint: %s\n", remoteEndpoint.token.toString().c_str());
 	  }
@@ -295,7 +303,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 				if(acknowledgements.getRawEndpoint().isValid()) {
 					acknowledgements.bytesAcknowledged += message.get().asUnderlyingType().expectedSize();
 					printf("Sending acknowledgement1 to endpoint: %ld %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
-					FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
+					FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 				}
 			}
 
@@ -309,13 +317,18 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		if(acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += res.expectedSize();
 			printf("Sending acknowledgement2 to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
-			FlowTransport::transport().sendUnreliable(SerializeSource<AcknowledgementReply>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
+			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 		}
 		return res;
 	}
 
 	~NetNotifiedQueueWithErrors() {
-		printf("NetNotifiedQueue destructor %s\n", getRawEndpoint().token.toString().c_str());
+		if(acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
+			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(request_maybe_delivered()), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
+			printf("NetNotifiedQueue destructor with error %s\n", getRawEndpoint().token.toString().c_str());
+		} else {
+			printf("NetNotifiedQueue destructor %s\n", getRawEndpoint().token.toString().c_str());
+		}
 	}
 };
 
@@ -333,7 +346,7 @@ class ReplyPromiseStream {
 				printf("Registered Ack Endpoint: %s\n", queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token.toString().c_str());
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
-			if((!queue->acknowledgements.ready.isValid() || queue->acknowledgements.ready.isSet()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
+			if((queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.isError()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
 				queue->acknowledgements.ready = Promise<Void>();
 			}
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(value), getEndpoint(), false);
diff --git a/flow/flow.h b/flow/flow.h
index c0a57e1d612..a993fa4061a 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -653,6 +653,10 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	bool shouldFireImmediately() {
 		return SingleCallback<T>::next != this;
 	}
+
+	bool hasError() {
+		return error.isValid();
+	}
 };
 
 

From 6da9856ff23ad22a9b1150e7db144dabff8fc0df Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 14:10:22 -0800
Subject: [PATCH 071/740] fix compile error

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 13c29cc86e5..f0fdc5558cd 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -346,7 +346,7 @@ class ReplyPromiseStream {
 				printf("Registered Ack Endpoint: %s\n", queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token.toString().c_str());
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
-			if((queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.isError()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
+			if((queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
 				queue->acknowledgements.ready = Promise<Void>();
 			}
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(value), getEndpoint(), false);

From 5a3d72f36f840b63bcb6092cccf34df74102c835 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 14:28:37 -0800
Subject: [PATCH 072/740] fix: onReady must return errors when possible

---
 fdbrpc/fdbrpc.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index f0fdc5558cd..ada87d3fb13 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -323,11 +323,10 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 	}
 
 	~NetNotifiedQueueWithErrors() {
+		printf("NetNotifiedQueue destructor %s\n", getRawEndpoint().token.toString().c_str());
 		if(acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(request_maybe_delivered()), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 			printf("NetNotifiedQueue destructor with error %s\n", getRawEndpoint().token.toString().c_str());
-		} else {
-			printf("NetNotifiedQueue destructor %s\n", getRawEndpoint().token.toString().c_str());
 		}
 	}
 };
@@ -407,7 +406,13 @@ class ReplyPromiseStream {
 	uint32_t size() const { return queue->size(); }
 
 	Future<Void> onReady() {
+		printf("OnReady Start\n");
+		if(queue->acknowledgements.failures.isError() || (queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError()) {
+			printf("OnReady Error\n");
+			return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
+		}
 		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
+			printf("OnReady Skip\n");
 			return Void();
 		}
 		return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;

From e9d0bc891ac2c83dd3edc44ca0373938d1dc49d8 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 14:29:46 -0800
Subject: [PATCH 073/740] fix compile error

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index ada87d3fb13..a6b71bb9120 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -407,7 +407,7 @@ class ReplyPromiseStream {
 
 	Future<Void> onReady() {
 		printf("OnReady Start\n");
-		if(queue->acknowledgements.failures.isError() || (queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError()) {
+		if(queue->acknowledgements.failures.isError() || (queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError())) {
 			printf("OnReady Error\n");
 			return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
 		}

From 15434cfd0ed70ee0e8a5b3253933f1d83d62eced Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 14:47:09 -0800
Subject: [PATCH 074/740] added checks for ready being invalid

---
 fdbrpc/fdbrpc.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index a6b71bb9120..2d99b3df064 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -253,7 +253,7 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		ErrorOr<AcknowledgementReply> message;
 		reader.deserialize(message);
 		if(message.isError()) {
-			if(ready.isSet()) {
+			if(!ready.isValid() || ready.isSet()) {
 				ready = Promise<Void>();
 			}
 			ready.sendError(message.getError());
@@ -345,7 +345,7 @@ class ReplyPromiseStream {
 				printf("Registered Ack Endpoint: %s\n", queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token.toString().c_str());
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
-			if((queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError()) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
+			if((!queue->acknowledgements.ready.isValid() || (queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError())) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
 				queue->acknowledgements.ready = Promise<Void>();
 			}
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(value), getEndpoint(), false);
@@ -407,7 +407,8 @@ class ReplyPromiseStream {
 
 	Future<Void> onReady() {
 		printf("OnReady Start\n");
-		if(queue->acknowledgements.failures.isError() || (queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError())) {
+		if(queue->acknowledgements.failures.isError() || 
+		  (queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError())) {
 			printf("OnReady Error\n");
 			return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
 		}

From f543188d66b8d32be865e7d587b879d5d54ca55a Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 15:02:50 -0800
Subject: [PATCH 075/740] more logging

---
 fdbrpc/FailureMonitor.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index c9652cb6c0d..4bdb9f83e4d 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -109,6 +109,7 @@ void SimpleFailureMonitor::setStatus(NetworkAddress const& address, FailureStatu
 
 void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 	// SOMEDAY: Expiration (this "leaks" memory)
+	printf("endpointNotFound %s\n", endpoint.token.toString().c_str());
 	if (endpoint.token.first() == -1) {
 		TraceEvent("WellKnownEndpointNotFound")
 		    .suppressFor(1.0)

From 8817ca9faf2069abac457440926ad8cc643a59be Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 15:18:35 -0800
Subject: [PATCH 076/740] fix: do not attempt to use ready when it is invalid

---
 fdbrpc/FlowTransport.actor.cpp |  1 +
 fdbrpc/fdbrpc.h                | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index ff9f71b070c..f8ef9bc335f 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -843,6 +843,7 @@ ACTOR static void deliver(TransportData* self, Endpoint destination, ArenaReader
 	}
 
 	auto receiver = self->endpoints.get(destination.token);
+	printf("Deliver %d %s\n", (bool)receiver, destination.token.toString().c_str());
 	if (receiver) {
 		try {
 			g_currentDeliveryPeerAddress = destination.addresses;
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 2d99b3df064..514702b4cc9 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -407,10 +407,13 @@ class ReplyPromiseStream {
 
 	Future<Void> onReady() {
 		printf("OnReady Start\n");
-		if(queue->acknowledgements.failures.isError() || 
-		  (queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError())) {
-			printf("OnReady Error\n");
-			return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
+		if(queue->acknowledgements.failures.isError()) {
+			printf("OnReady Error1\n");
+			return queue->acknowledgements.failures.getError();
+		}
+		if(queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError())) {
+			printf("OnReady Error2\n");
+			return queue->acknowledgements.ready.getFuture().getError();
 		}
 		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
 			printf("OnReady Skip\n");
@@ -598,6 +601,7 @@ class RequestStream {
 				return p;
 			}
 			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(taskID), true);
+			//FIXME: defer sending the message until we know the connection is established
 			endStreamOnDisconnect(disc, p, peer);
 			return p;
 		}
@@ -616,6 +620,7 @@ class RequestStream {
 				return p;
 			}
 			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);
+			//FIXME: defer sending the message until we know the connection is established
 			endStreamOnDisconnect(disc, p, peer);
 			return p;
 		}

From 9de0c857ea54430765581905c97564f0dc7864a9 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 15:19:25 -0800
Subject: [PATCH 077/740] fix compiler error

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 514702b4cc9..efe4b672023 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -411,7 +411,7 @@ class ReplyPromiseStream {
 			printf("OnReady Error1\n");
 			return queue->acknowledgements.failures.getError();
 		}
-		if(queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError())) {
+		if(queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError()) {
 			printf("OnReady Error2\n");
 			return queue->acknowledgements.ready.getFuture().getError();
 		}

From a674cd01e1ab93e7e1f642ad7c44b4811df15935 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 15:38:24 -0800
Subject: [PATCH 078/740] fix: did not change the endpoint to a stream is all
 places

---
 fdbrpc/fdbrpc.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index efe4b672023..919eaaf923d 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -329,6 +329,9 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 			printf("NetNotifiedQueue destructor with error %s\n", getRawEndpoint().token.toString().c_str());
 		}
 	}
+
+	//FIXME: creating the FlowReceiver as a stream will mean that every cancelled read will lead to a permanent endpoint in the failed endpoints map
+	bool isStream() const override { return true; }
 };
 
 template <class T>

From 061883e5e10e1fa94a7f755f00c24629cee42ea6 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 15:56:26 -0800
Subject: [PATCH 079/740] more logging

---
 fdbrpc/FailureMonitor.actor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index 4bdb9f83e4d..a227e073d23 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -109,7 +109,7 @@ void SimpleFailureMonitor::setStatus(NetworkAddress const& address, FailureStatu
 
 void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 	// SOMEDAY: Expiration (this "leaks" memory)
-	printf("endpointNotFound %s\n", endpoint.token.toString().c_str());
+	printf("endpointNotFound %s %s\n", endpoint.getPrimaryAddress().toString().c_str(), endpoint.token.toString().c_str());
 	if (endpoint.token.first() == -1) {
 		TraceEvent("WellKnownEndpointNotFound")
 		    .suppressFor(1.0)
@@ -142,6 +142,7 @@ Future<Void> SimpleFailureMonitor::onDisconnectOrFailure(Endpoint const& endpoin
 	// Return when the endpoint is triggered, which means that either the endpoint has become known failed, or the
 	//   address has changed state (and since it was previously not failed, it must now be failed), or
 	//   notifyDisconnect() has been called.
+	printf("OnDisconnect %s %s\n", endpoint.getPrimaryAddress().toString().c_str(), endpoint.token.toString().c_str());
 	return endpointKnownFailed.onChange(endpoint);
 }
 

From 4fd9ef9aa315cda6cdbe7e8771b1cacbbed8d0da Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 16:17:08 -0800
Subject: [PATCH 080/740] special handling of endpoint failures for private
 network addresses

---
 fdbrpc/FailureMonitor.actor.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index a227e073d23..ef9e404201e 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -122,7 +122,9 @@ void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 	    .suppressFor(1.0)
 	    .detail("Address", endpoint.getPrimaryAddress())
 	    .detail("Token", endpoint.token);
-	failedEndpoints.insert(endpoint);
+	if(endpoint.getPrimaryAddress().isValid()) {
+		failedEndpoints.insert(endpoint);
+	}
 	endpointKnownFailed.trigger(endpoint);
 }
 
@@ -152,7 +154,13 @@ Future<Void> SimpleFailureMonitor::onDisconnect(Endpoint const& endpoint) {
 		TraceEvent("AlreadyDisconnected").detail("Addr", endpoint.getPrimaryAddress()).detail("Tok", endpoint.token);
 		return Void();
 	}
-	return endpointKnownFailed.onChange(endpoint);
+	if(endpoint.getPrimaryAddress().isPublic()) {
+		return endpointKnownFailed.onChange(endpoint);
+	} else {
+		Endpoint stripped;
+		stripped.token = endpoint.token;
+		return endpointKnownFailed.onChange(endpoint) || endpointKnownFailed.onChange(stripped);
+	}
 }
 
 Future<Void> SimpleFailureMonitor::onStateChanged(Endpoint const& endpoint) {

From d652cac397e880f65ad26a4849cf6ef184d2770b Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 16:18:25 -0800
Subject: [PATCH 081/740] changed to onDisconnect

---
 fdbrpc/fdbrpc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 919eaaf923d..ba55db3b7c4 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -278,7 +278,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
 	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
 		  //FIXME: creating the FlowReceiver as a stream will mean that every cancelled read will lead to a permanent endpoint in the failed endpoints map
-		  acknowledgements.failures = tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(remoteEndpoint), request_maybe_delivered());
+		  acknowledgements.failures = tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), request_maybe_delivered());
 		  printf("NetNotified create with remote endpoint: %s\n", remoteEndpoint.token.toString().c_str());
 	  }
 
@@ -409,7 +409,7 @@ class ReplyPromiseStream {
 	uint32_t size() const { return queue->size(); }
 
 	Future<Void> onReady() {
-		printf("OnReady Start\n");
+		printf("OnReady Start %s\n", getEndpoint().token.toString().c_str());
 		if(queue->acknowledgements.failures.isError()) {
 			printf("OnReady Error1\n");
 			return queue->acknowledgements.failures.getError();

From aec856d00fd9196d280a1f7093313b2007e559b5 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 16:40:33 -0800
Subject: [PATCH 082/740] fix: if an unreliable message is sent in response to
 a disconnect it could prevent the connection from closing

---
 fdbrpc/FlowTransport.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index f8ef9bc335f..ed1677c3ac3 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -645,6 +645,7 @@ ACTOR Future<Void> connectionKeeper( Reference<Peer> self,
 				throw e;
 			}
 		} catch (Error& e) {
+			self->outgoingConnectionIdle = true;
 			delayedHealthUpdateF.cancel();
 			if(now() - self->lastConnectTime > FLOW_KNOBS->RECONNECTION_RESET_TIME) {
 				self->reconnectionDelay = FLOW_KNOBS->INITIAL_RECONNECTION_TIME;

From 54baa9c2f1d3552c25c9ae4fd270e6292ce72525 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 16:43:33 -0800
Subject: [PATCH 083/740] do not add peer references to private network
 addresses

---
 fdbrpc/FlowTransport.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index ed1677c3ac3..da861ef62f9 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1315,7 +1315,7 @@ Endpoint FlowTransport::loadedEndpoint( const UID& token ) {
 }
 
 void FlowTransport::addPeerReference(const Endpoint& endpoint, bool isStream) {
-	if (!isStream || !endpoint.getPrimaryAddress().isValid())
+	if (!isStream || !endpoint.getPrimaryAddress().isValid() || !endpoint.getPrimaryAddress().isPublic())
 		return;
 
 	Reference<Peer> peer = self->getOrOpenPeer(endpoint.getPrimaryAddress());
@@ -1327,7 +1327,7 @@ void FlowTransport::addPeerReference(const Endpoint& endpoint, bool isStream) {
 }
 
 void FlowTransport::removePeerReference(const Endpoint& endpoint, bool isStream) {
-	if (!isStream || !endpoint.getPrimaryAddress().isValid()) return;
+	if (!isStream || !endpoint.getPrimaryAddress().isValid() || !endpoint.getPrimaryAddress().isPublic()) return;
 	Reference<Peer> peer = self->getPeer(endpoint.getPrimaryAddress());
 	if(peer) {
 		peer->peerReferences--;

From e1b44d674c5093a9f24d94d790b01309baeca892 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Tue, 15 Dec 2020 23:49:55 +0000
Subject: [PATCH 084/740] Attempt to fix client bugs

Intercept end_of_stream from storage server
Break out of the second loop
---
 documentation/tutorial/tutorial.actor.cpp | 48 +++++++++++++++++------
 fdbclient/NativeAPI.actor.cpp             | 26 +++++++-----
 fdbserver/storageserver.actor.cpp         | 29 ++------------
 3 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index d7502040d28..ed172fe6e2f 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -394,7 +394,7 @@ ACTOR Future<Void> multipleClients() {
 
 std::string clusterFile = "fdb.cluster";
 
-ACTOR Future<Void> fdbClient() {
+ACTOR Future<Void> fdbClientStream() {
 	state Database db = Database::createDatabase(clusterFile, 300);
 	state Transaction tx(db);
 	state PromiseStream<Standalone<RangeResultRef>> results;
@@ -406,7 +406,7 @@ ACTOR Future<Void> fdbClient() {
 			                      KeySelector(firstGreaterOrEqual(normalKeys.end)), GetRangeLimits());
 			loop {
 				Standalone<RangeResultRef> range = waitNext(results.getFuture());
-				std::cout << "Got " << range.expectedSize() << std::endl;
+				std::cout << "Got " << range.expectedSize() << " next: " << printable(next) << std::endl;
 				next = keyAfter(range.back().key);
 			}
 		} catch (Error& e) {
@@ -419,6 +419,27 @@ ACTOR Future<Void> fdbClient() {
 	return Void();
 }
 
+ACTOR Future<Void> fdbClientGetRange() {
+	state Database db = Database::createDatabase(clusterFile, 300);
+	state Transaction tx(db);
+	state Key next;
+	loop {
+		try {
+			Standalone<RangeResultRef> range = wait(tx.getRange(
+			    KeySelector(firstGreaterOrEqual(next), next.arena()), KeySelector(firstGreaterOrEqual(normalKeys.end)),
+			    GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
+			std::cout << "Got " << range.expectedSize() << " next: " << printable(next) << std::endl;
+			if (!range.more) {
+				break;
+			}
+			next = keyAfter(range.back().key);
+		} catch (Error& e) {
+			wait(tx.onError(e));
+		}
+	}
+	return Void();
+}
+
 ACTOR Future<Void> fdbStatusStresser() {
 	state Database db = Database::createDatabase(clusterFile, 300);
 	state ReadYourWritesTransaction tx(db);
@@ -433,16 +454,19 @@ ACTOR Future<Void> fdbStatusStresser() {
 	}
 }
 
-std::unordered_map<std::string, std::function<Future<Void>()>> actors = { { "timer", &simpleTimer }, // ./tutorial timer
-	                                                                      { "promiseDemo", &promiseDemo }, // ./tutorial promiseDemo
-	                                                                      { "triggerDemo", &triggerDemo }, // ./tutorial triggerDemo
-	                                                                      { "echoServer", &echoServer }, // ./tutorial -p 6666 echoServer
-	                                                                      { "echoClient", &echoClient }, // ./tutorial -s 127.0.0.1:6666 echoClient
-	                                                                      { "kvStoreServer", &kvStoreServer }, // ./tutorial -p 6666 kvStoreServer
-	                                                                      { "kvSimpleClient", &kvSimpleClient }, // ./tutorial -s 127.0.0.1:6666 kvSimpleClient
-	                                                                      { "multipleClients", &multipleClients }, // ./tutorial -s 127.0.0.1:6666 multipleClients
-	                                                                      { "fdbClient", &fdbClient }, // ./tutorial -C $CLUSTER_FILE_PATH fdbClient
-	                                                                      { "fdbStatusStresser", &fdbStatusStresser } }; // ./tutorial -C $CLUSTER_FILE_PATH fdbStatusStresser
+std::unordered_map<std::string, std::function<Future<Void>()>> actors = {
+	{ "timer", &simpleTimer }, // ./tutorial timer
+	{ "promiseDemo", &promiseDemo }, // ./tutorial promiseDemo
+	{ "triggerDemo", &triggerDemo }, // ./tutorial triggerDemo
+	{ "echoServer", &echoServer }, // ./tutorial -p 6666 echoServer
+	{ "echoClient", &echoClient }, // ./tutorial -s 127.0.0.1:6666 echoClient
+	{ "kvStoreServer", &kvStoreServer }, // ./tutorial -p 6666 kvStoreServer
+	{ "kvSimpleClient", &kvSimpleClient }, // ./tutorial -s 127.0.0.1:6666 kvSimpleClient
+	{ "multipleClients", &multipleClients }, // ./tutorial -s 127.0.0.1:6666 multipleClients
+	{ "fdbClientStream", &fdbClientStream }, // ./tutorial -C $CLUSTER_FILE_PATH fdbClientStream
+	{ "fdbClientGetRange", &fdbClientGetRange }, // ./tutorial -C $CLUSTER_FILE_PATH fdbClientGetRange
+	{ "fdbStatusStresser", &fdbStatusStresser }
+}; // ./tutorial -C $CLUSTER_FILE_PATH fdbStatusStresser
 
 int main(int argc, char* argv[]) {
 	bool isServer = false;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index e7c24c12fff..93035a857f8 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2665,6 +2665,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 {
 	//FIXME: better handling to disable row limits
 	ASSERT(!limits.hasRowLimit());
+	ASSERT(!limits.hasByteLimit());
 	state Span span("NAPI:getRangeStream"_loc, info.spanID);
 
 	state Version version = wait( fVersion );
@@ -2693,7 +2694,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 	//or allKeys.begin exists in the database and will be part of the conflict range anyways
 
 	loop {
-		state vector< pair<KeyRange, Reference<LocationInfo>> > locations = wait( getKeyRangeLocations( cx, keys, CLIENT_KNOBS->GET_RANGE_SHARD_LIMIT, reverse, &StorageServerInterface::getKeyValues, info ) );
+		state vector< pair<KeyRange, Reference<LocationInfo>> > locations = wait( getKeyRangeLocations( cx, keys, CLIENT_KNOBS->GET_RANGE_SHARD_LIMIT, reverse, &StorageServerInterface::getKeyValuesStream, info ) );
 		ASSERT( locations.size() );
 		state int shard = 0;
 		loop {
@@ -2705,11 +2706,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 			req.end = firstGreaterOrEqual( range.end );
 			req.spanContext = span.context;
 			req.limit = reverse ? -CLIENT_KNOBS->REPLY_BYTE_LIMIT : CLIENT_KNOBS->REPLY_BYTE_LIMIT;
-			if (limits.hasByteLimit()) {
-				req.limitBytes = limits.bytes;
-			} else {
-				req.limitBytes = std::numeric_limits<int>::max();
-			}
+			req.limitBytes = std::numeric_limits<int>::max();
 
 			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
 
@@ -2732,6 +2729,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 				//FIXME: add load balancing
 				state ReplyPromiseStream<GetKeyValuesStreamReply> replyStream = locations[shard].second->getInterface(0).getKeyValuesStream.getReplyStream(req);
+				state bool breakAgain = false;
 				loop {
 					try {
 						choose {
@@ -2742,13 +2740,16 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 							when(GetKeyValuesStreamReply _rep = waitNext(replyStream.getFuture())) {
 								rep = _rep;
-								limits.decrement(rep.data);
 							}
 						}
 						++cx->transactionPhysicalReadsCompleted;
-					} catch(Error&) {
+					} catch (Error& e) {
 						++cx->transactionPhysicalReadsCompleted;
-						throw;
+						if (e.code() == error_code_end_of_stream) {
+							rep = GetKeyValuesStreamReply();
+						} else {
+							throw;
+						}
 					}
 					if( info.debugID.present() )
 						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
@@ -2776,7 +2777,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 							locations[shard].first = KeyRangeRef( keyAfter( output[output.size()-1].key ), locations[shard].first.end );
 					}
 
-					if (!more || locations[shard].first.empty() || limits.isReached()) {
+					if (!more || locations[shard].first.empty()) {
 						TEST(true); // getRangeStream (!more || locations[shard].first.empty())
 						if(shard == locations.size()-1) {
 							const KeyRangeRef& range = locations[shard].first;
@@ -2810,10 +2811,12 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 							}
 
 							keys = KeyRangeRef(begin, end);
+							breakAgain = true;
 							break;
 						}
 
 						++shard;
+						break;
 					}
 
 					if(output.size() > 0) {
@@ -2839,6 +2842,9 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 						results.send(output);
 					}
 				}
+				if (breakAgain) {
+					break;
+				}
 			} catch (Error& e) {
 				if (e.code() == error_code_actor_cancelled) {
 					throw;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index eac398e6a29..346fa57049b 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1641,9 +1641,9 @@ ACTOR Future<Void> getKeyValuesQ( StorageServer* data, GetKeyValuesRequest req )
 	return Void();
 }
 
-ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStreamRequest req )
-// Throws a wrong_shard_server if the keys in the request or result depend on data outside this server OR if a large selector offset prevents
-// all data from being read in one range read
+ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRequest req)
+// Throws a wrong_shard_server if the keys in the request or result depend on data outside this server OR if a large
+// selector offset prevents all data from being read in one range read
 {
 	state Span span("SS:getKeyValuesStream"_loc, { req.spanContext });
 	state int64_t resultSize = 0;
@@ -1719,17 +1719,11 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 			req.reply.send( none );
 			req.reply.sendError( end_of_stream() );
 		} else {
-			state int remainingLimitBytes = req.limitBytes;
 			loop {
 				wait(req.reply.onReady());
-				printf("Issuing getRange for stream impl. begin: %s end: %s limit: %d limitBytes: %d\n",
-				       printable(begin).c_str(), printable(end).c_str(), req.limit, remainingLimitBytes);
-				state int byteLimit = std::min(remainingLimitBytes, CLIENT_KNOBS->REPLY_BYTE_LIMIT);
-				state int byteLimitBefore = byteLimit;
+				state int byteLimit = CLIENT_KNOBS->REPLY_BYTE_LIMIT;
 				GetKeyValuesReply _r = wait( readRange(data, version, KeyRangeRef(begin, end), req.limit, &byteLimit, span.context) );
-				remainingLimitBytes -= byteLimitBefore - byteLimit;
 				GetKeyValuesStreamReply r(_r);
-				printf("Result. size: %d more: %d \n", int(r.data.expectedSize()), int(r.more));
 
 				if( req.debugID.present() )
 					g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");
@@ -1761,8 +1755,6 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 
 				req.reply.send( r );
 
-				resultSize = req.limitBytes - remainingLimitBytes;
-				data->counters.bytesQueried += resultSize;
 				data->counters.rowsQueried += r.data.size();
 				if(r.data.size() == 0) {
 					++data->counters.emptyQueries;
@@ -1823,19 +1815,6 @@ ACTOR Future<Void> getKeyValuesStreamWork( StorageServer* data, GetKeyValuesStre
 	return Void();
 }
 
-ACTOR Future<Void> getKeyValuesStreamQ( StorageServer* data, GetKeyValuesStreamRequest req )
-{
-	Future<Void> disc = IFailureMonitor::failureMonitor().onDisconnectOrFailure(req.reply.getEndpoint());
-	Future<Void> work = getKeyValuesStreamWork( data, req );
-	choose {
-		when(wait(disc)) {
-			req.reply.sendError(end_of_stream());
-		}
-		when(wait(work)) {}
-	}
-	return Void();
-}
-
 ACTOR Future<Void> getKeyQ( StorageServer* data, GetKeyRequest req ) {
 	state Span span("SS:getKey"_loc, { req.spanContext });
 	state int64_t resultSize = 0;

From 62da2b42bcd6e05eb579a97b30ef4ebd24f3f2f3 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 16 Dec 2020 00:45:37 +0000
Subject: [PATCH 085/740] Log throughput

---
 documentation/tutorial/tutorial.actor.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index ed172fe6e2f..100f09af207 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -394,11 +394,21 @@ ACTOR Future<Void> multipleClients() {
 
 std::string clusterFile = "fdb.cluster";
 
+ACTOR Future<Void> logThroughput(int64_t* v) {
+	loop {
+		state int64_t last = *v;
+		wait(delay(1));
+		printf("throughput: %ld bytes/s\n", *v - last);
+	}
+}
+
 ACTOR Future<Void> fdbClientStream() {
 	state Database db = Database::createDatabase(clusterFile, 300);
 	state Transaction tx(db);
 	state PromiseStream<Standalone<RangeResultRef>> results;
 	state Key next;
+	state int64_t bytes = 0;
+	state Future<Void> logFuture = logThroughput(&bytes);
 	loop {
 		try {
 			state Future<Void> stream =
@@ -406,7 +416,7 @@ ACTOR Future<Void> fdbClientStream() {
 			                      KeySelector(firstGreaterOrEqual(normalKeys.end)), GetRangeLimits());
 			loop {
 				Standalone<RangeResultRef> range = waitNext(results.getFuture());
-				std::cout << "Got " << range.expectedSize() << " next: " << printable(next) << std::endl;
+				bytes += range.expectedSize();
 				next = keyAfter(range.back().key);
 			}
 		} catch (Error& e) {
@@ -423,12 +433,14 @@ ACTOR Future<Void> fdbClientGetRange() {
 	state Database db = Database::createDatabase(clusterFile, 300);
 	state Transaction tx(db);
 	state Key next;
+	state int64_t bytes = 0;
+	state Future<Void> logFuture = logThroughput(&bytes);
 	loop {
 		try {
 			Standalone<RangeResultRef> range = wait(tx.getRange(
 			    KeySelector(firstGreaterOrEqual(next), next.arena()), KeySelector(firstGreaterOrEqual(normalKeys.end)),
 			    GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
-			std::cout << "Got " << range.expectedSize() << " next: " << printable(next) << std::endl;
+			bytes += range.expectedSize();
 			if (!range.more) {
 				break;
 			}

From ac6bf6909fb923952fe26d20098ad098a05fa41d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 16:49:07 -0800
Subject: [PATCH 086/740] it was not required to set this after all

---
 fdbrpc/FlowTransport.actor.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index da861ef62f9..1afa717ce01 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -645,7 +645,6 @@ ACTOR Future<Void> connectionKeeper( Reference<Peer> self,
 				throw e;
 			}
 		} catch (Error& e) {
-			self->outgoingConnectionIdle = true;
 			delayedHealthUpdateF.cancel();
 			if(now() - self->lastConnectTime > FLOW_KNOBS->RECONNECTION_RESET_TIME) {
 				self->reconnectionDelay = FLOW_KNOBS->INITIAL_RECONNECTION_TIME;

From 6b8465355d598fe8fcbe45cef862986e798d2ff2 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 16 Dec 2020 01:31:32 +0000
Subject: [PATCH 087/740] Remove debug printf's

---
 fdbrpc/FailureMonitor.actor.cpp |  2 --
 fdbrpc/FlowTransport.actor.cpp  |  1 -
 fdbrpc/fdbrpc.h                 | 16 ----------------
 3 files changed, 19 deletions(-)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index ef9e404201e..2bb958a8e4d 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -109,7 +109,6 @@ void SimpleFailureMonitor::setStatus(NetworkAddress const& address, FailureStatu
 
 void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 	// SOMEDAY: Expiration (this "leaks" memory)
-	printf("endpointNotFound %s %s\n", endpoint.getPrimaryAddress().toString().c_str(), endpoint.token.toString().c_str());
 	if (endpoint.token.first() == -1) {
 		TraceEvent("WellKnownEndpointNotFound")
 		    .suppressFor(1.0)
@@ -144,7 +143,6 @@ Future<Void> SimpleFailureMonitor::onDisconnectOrFailure(Endpoint const& endpoin
 	// Return when the endpoint is triggered, which means that either the endpoint has become known failed, or the
 	//   address has changed state (and since it was previously not failed, it must now be failed), or
 	//   notifyDisconnect() has been called.
-	printf("OnDisconnect %s %s\n", endpoint.getPrimaryAddress().toString().c_str(), endpoint.token.toString().c_str());
 	return endpointKnownFailed.onChange(endpoint);
 }
 
diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 1afa717ce01..6161d62363e 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -843,7 +843,6 @@ ACTOR static void deliver(TransportData* self, Endpoint destination, ArenaReader
 	}
 
 	auto receiver = self->endpoints.get(destination.token);
-	printf("Deliver %d %s\n", (bool)receiver, destination.token.toString().c_str());
 	if (receiver) {
 		try {
 			g_currentDeliveryPeerAddress = destination.addresses;
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index ba55db3b7c4..901aad33a6b 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -249,7 +249,6 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
 
 	void receive(ArenaObjectReader& reader) override {
-		printf("AcknowledgementReceived\n");
 		ErrorOr<AcknowledgementReply> message;
 		reader.deserialize(message);
 		if(message.isError()) {
@@ -279,12 +278,10 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
 		  //FIXME: creating the FlowReceiver as a stream will mean that every cancelled read will lead to a permanent endpoint in the failed endpoints map
 		  acknowledgements.failures = tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), request_maybe_delivered());
-		  printf("NetNotified create with remote endpoint: %s\n", remoteEndpoint.token.toString().c_str());
 	  }
 
 	void destroy() override { delete this; }
 	void receive(ArenaObjectReader& reader) override {
-		printf("NetNotifiedReceived\n");
 		this->addPromiseRef();
 		ErrorOr<EnsureTable<T>> message;
 		reader.deserialize(message);
@@ -297,12 +294,10 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		} else {
 			if(message.get().asUnderlyingType().acknowledgeToken.present()) {
 				acknowledgements = AcknowledgementReceiver(FlowTransport::transport().loadedEndpoint(message.get().asUnderlyingType().acknowledgeToken.get()));
-				printf("Acknowledgements create with remote endpoint: %s %s\n", acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 			}
 			if(this->shouldFireImmediately()) {
 				if(acknowledgements.getRawEndpoint().isValid()) {
 					acknowledgements.bytesAcknowledged += message.get().asUnderlyingType().expectedSize();
-					printf("Sending acknowledgement1 to endpoint: %ld %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 					FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 				}
 			}
@@ -316,17 +311,14 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		T res = this->popImpl();
 		if(acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += res.expectedSize();
-			printf("Sending acknowledgement2 to endpoint: %d %s %s\n", acknowledgements.bytesAcknowledged, acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).getPrimaryAddress().toString().c_str(), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint).token.toString().c_str());
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 		}
 		return res;
 	}
 
 	~NetNotifiedQueueWithErrors() {
-		printf("NetNotifiedQueue destructor %s\n", getRawEndpoint().token.toString().c_str());
 		if(acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(request_maybe_delivered()), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
-			printf("NetNotifiedQueue destructor with error %s\n", getRawEndpoint().token.toString().c_str());
 		}
 	}
 
@@ -345,7 +337,6 @@ class ReplyPromiseStream {
 		if (queue->isRemoteEndpoint()) {
 			if(!queue->acknowledgements.getRawEndpoint().isValid()) {
 				value.acknowledgeToken = queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token;
-				printf("Registered Ack Endpoint: %s\n", queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token.toString().c_str());
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
 			if((!queue->acknowledgements.ready.isValid() || (queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError())) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
@@ -398,9 +389,6 @@ class ReplyPromiseStream {
 	}
 
 	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const {
-		if(!queue->getRawEndpoint().isValid()) {
-			printf("Registered Endpoint: %s\n", queue->getEndpoint(taskID).token.toString().c_str());
-		}
 		return queue->getEndpoint(taskID); 
 	}
 	
@@ -409,17 +397,13 @@ class ReplyPromiseStream {
 	uint32_t size() const { return queue->size(); }
 
 	Future<Void> onReady() {
-		printf("OnReady Start %s\n", getEndpoint().token.toString().c_str());
 		if(queue->acknowledgements.failures.isError()) {
-			printf("OnReady Error1\n");
 			return queue->acknowledgements.failures.getError();
 		}
 		if(queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError()) {
-			printf("OnReady Error2\n");
 			return queue->acknowledgements.ready.getFuture().getError();
 		}
 		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
-			printf("OnReady Skip\n");
 			return Void();
 		}
 		return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;

From 30089a5d864594a5bccf04e1662df5a858817a5b Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Tue, 15 Dec 2020 20:50:47 -0800
Subject: [PATCH 088/740] Added ResultStream class

---
 fdbclient/FDBTypes.h          |   2 +
 fdbclient/Knobs.cpp           |   2 +
 fdbclient/Knobs.h             |   2 +
 fdbclient/NativeAPI.actor.cpp | 167 ++++++++++++++++++++++++++--------
 4 files changed, 137 insertions(+), 36 deletions(-)

diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index a707675695d..6f1140a9fb8 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -694,6 +694,8 @@ struct RangeResultRef : VectorRef<KeyValueRef> {
 	}
 };
 
+using RangeResult = Standalone<RangeResultRef>;
+
 template<>
 struct Traceable<RangeResultRef> : std::true_type {
 	static std::string toString(const RangeResultRef& value) {
diff --git a/fdbclient/Knobs.cpp b/fdbclient/Knobs.cpp
index e194f8827e9..06efd14c50d 100644
--- a/fdbclient/Knobs.cpp
+++ b/fdbclient/Knobs.cpp
@@ -94,6 +94,8 @@ void ClientKnobs::initialize(bool randomize) {
 	init( DETAILED_HEALTH_METRICS_MAX_STALENESS,   5.0 );
 	init( MID_SHARD_SIZE_MAX_STALENESS,           10.0 );
 	init( TAG_ENCODE_KEY_SERVERS,                false ); if( randomize && BUGGIFY ) TAG_ENCODE_KEY_SERVERS = true;
+	init( RANGESTREAM_FRAGMENT_SIZE,               1e6 );
+	init( RANGESTREAM_CONCURRENT_FRAGMENTS,         10 );
 
 	//KeyRangeMap
 	init( KRM_GET_RANGE_LIMIT,                     1e5 ); if( randomize && BUGGIFY ) KRM_GET_RANGE_LIMIT = 10;
diff --git a/fdbclient/Knobs.h b/fdbclient/Knobs.h
index 11a06d52ccc..f85aeb3a831 100644
--- a/fdbclient/Knobs.h
+++ b/fdbclient/Knobs.h
@@ -88,6 +88,8 @@ class ClientKnobs : public Knobs {
 	double DETAILED_HEALTH_METRICS_MAX_STALENESS;
 	double MID_SHARD_SIZE_MAX_STALENESS;
 	bool TAG_ENCODE_KEY_SERVERS;
+	int64_t RANGESTREAM_FRAGMENT_SIZE;
+	int RANGESTREAM_CONCURRENT_FRAGMENTS;
 
 	//KeyRangeMap
 	int KRM_GET_RANGE_LIMIT;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index ffd13613419..789e5d669f8 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2659,38 +2659,67 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 	}
 }
 
-ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> results, Database cx, Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion,
-	KeySelector begin, KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange, bool snapshot, bool reverse,
-	TransactionInfo info, TagSet tags )
-{
-	//FIXME: better handling to disable row limits
-	ASSERT(!limits.hasRowLimit());
-	state Span span("NAPI:getRangeStream"_loc, info.spanID);
-
-	state Version version = wait( fVersion );
-	cx->validateVersion(version);
+class ResultStream {
+public:
+	class FragmentStream {
+		ResultStream* resultStream;
+		std::deque<RangeResult> buffer;
+		bool completed{ false };
+		friend class ResultStream;
+		FragmentStream(ResultStream* resultStream) : resultStream(resultStream) {}
+
+	public:
+		void send(const RangeResult& rangeResult) { buffer.push_back(rangeResult); }
+		void sendError(Error e) { resultStream->sendError(e); }
+		void finish() {
+			ASSERT(!completed);
+			completed = true;
+			resultStream->flushToClient();
+		}
+	};
 
-	Future<Key> fb = resolveKey(cx, begin, version, info, tags);
-	state Future<Key> fe = resolveKey(cx, end, version, info, tags);
+private:
+	std::vector<FragmentStream> fragments;
+	decltype(fragments)::iterator nextFragment = fragments.begin();
+	PromiseStream<RangeResult> results;
+
+	// TODO: Fix potential slow tasks
+	void flushToClient() {
+		while (nextFragment != fragments.end()) {
+			auto& fragment = *nextFragment;
+			while (!fragment.buffer.empty()) {
+				results.send(std::move(fragment.buffer.front()));
+				fragment.buffer.pop_front();
+			}
+			if (fragment.completed) {
+				++nextFragment;
+			} else {
+				break;
+			}
+		}
+	}
 
-	state Key b = wait(fb);
-	state Key e = wait(fe);
+public:
+	ResultStream(PromiseStream<RangeResult> results) : results(results) {}
 
-	if( !snapshot ) {
-		//FIXME: this conflict range is too large, and should be updated continously as results are returned
-		conflictRange.send(std::make_pair(std::min(b, Key(begin.getKey(),begin.arena())), std::max(e, Key(end.getKey(),end.arena()))));
+	FragmentStream& createFragmentStream() {
+		fragments.push_back(FragmentStream(this));
+		return fragments.back();
 	}
 
-	if (b >= e) {
-		results.sendError(end_of_stream());
-		return Void();
-	}
+	void sendError(Error e) { results.sendError(e); }
+};
 
-	state KeyRangeRef keys(b, e);
+ACTOR Future<Void> getRangeStreamFragment(ResultStream::FragmentStream* results, Database cx,
+                                          Reference<TransactionLogInfo> trLogInfo, Version version, KeyRangeRef keys,
+                                          GetRangeLimits limits, bool snapshot, bool reverse, TransactionInfo info,
+                                          TagSet tags, SpanID spanContext, FlowLock* semaphore) {
+	// if keys.end is allKeys.end, we have read through the end of the database
+	// if keys.begin is allKeys.begin, we have either read through the beginning of the database,
+	// or allKeys.begin exists in the database and will be part of the conflict range anyways
 
-	//if e is allKeys.end, we have read through the end of the database
-	//if b is allKeys.begin, we have either read through the beginning of the database,
-	//or allKeys.begin exists in the database and will be part of the conflict range anyways
+	wait(semaphore->take());
+	state FlowLock::Releaser releaser(*semaphore);
 
 	loop {
 		state vector< pair<KeyRange, Reference<LocationInfo>> > locations = wait( getKeyRangeLocations( cx, keys, CLIENT_KNOBS->GET_RANGE_SHARD_LIMIT, reverse, &StorageServerInterface::getKeyValues, info ) );
@@ -2703,7 +2732,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 			req.version = version;
 			req.begin = firstGreaterOrEqual( range.begin );
 			req.end = firstGreaterOrEqual( range.end );
-			req.spanContext = span.context;
+			req.spanContext = spanContext;
 			req.limit = reverse ? -CLIENT_KNOBS->REPLY_BYTE_LIMIT : CLIENT_KNOBS->REPLY_BYTE_LIMIT;
 			req.limitBytes = CLIENT_KNOBS->REPLY_BYTE_LIMIT;
 
@@ -2722,7 +2751,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 				if( locations[shard].second->size() == 0 ) {
 					wait(cx->connectionFileChanged());
-					results.sendError( transaction_too_old() );
+					results->sendError(transaction_too_old());
 					return Void();
 				}
 
@@ -2732,7 +2761,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 					try {
 						choose {
 							when(wait(cx->connectionFileChanged())) {
-								results.sendError( transaction_too_old() );
+								results->sendError(transaction_too_old());
 								return Void();
 							}
 
@@ -2780,10 +2809,10 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 							if(begin >= end) {
 								output.more = false;
-								if(b == allKeys.begin) {
+								if (range.begin == allKeys.begin) {
 									output.readToBegin = true;
 								}
-								if(e == allKeys.end) {
+								if (range.end == allKeys.end) {
 									output.readThroughEnd = true;
 								}
 								int64_t bytes = 0;
@@ -2799,8 +2828,8 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 								//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
 								//}
 
-								results.send(output);
-								results.sendError(end_of_stream());
+								results->send(std::move(output));
+								results->finish();
 								return Void();
 							}
 
@@ -2813,10 +2842,10 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 
 					if(output.size() > 0) {
 						output.more = true;
-						if(b == allKeys.begin && !reverse) {
+						if (keys.begin == allKeys.begin && !reverse) {
 							output.readToBegin = true;
 						}
-						if(e == allKeys.end && reverse) {
+						if (keys.end == allKeys.end && reverse) {
 							output.readThroughEnd = true;
 						}
 						int64_t bytes = 0;
@@ -2831,7 +2860,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 						//if( trLogInfo ) {
 						//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
 						//}
-						results.send(output);
+						results->send(std::move(output));
 					}
 				}
 			} catch (Error& e) {
@@ -2850,7 +2879,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 					wait( delay(CLIENT_KNOBS->WRONG_SHARD_SERVER_DELAY, info.taskID ));
 					break;
 				} else {
-					results.sendError(e);
+					results->sendError(e);
 					return Void();
 				}
 			}
@@ -2858,6 +2887,72 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 	}
 }
 
+ACTOR Future<Standalone<VectorRef<KeyRef>>> getRangeSplitPoints(Database cx, KeyRange keys, int64_t chunkSize);
+
+ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database cx,
+                                  Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion, KeySelector begin,
+                                  KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange,
+                                  bool snapshot, bool reverse, TransactionInfo info, TagSet tags) {
+
+	state FlowLock semaphore(CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS);
+	state ResultStream results(_results);
+
+	// FIXME: better handling to disable row limits
+	ASSERT(!limits.hasRowLimit());
+	state Span span("NAPI:getRangeStream"_loc, info.spanID);
+
+	state Version version = wait(fVersion);
+	cx->validateVersion(version);
+
+	Future<Key> fb = resolveKey(cx, begin, version, info, tags);
+	state Future<Key> fe = resolveKey(cx, end, version, info, tags);
+
+	state Key b = wait(fb);
+	state Key e = wait(fe);
+
+	if (!snapshot) {
+		// FIXME: this conflict range is too large, and should be updated continously as results are returned
+		conflictRange.send(std::make_pair(std::min(b, Key(begin.getKey(), begin.arena())),
+		                                  std::max(e, Key(end.getKey(), end.arena()))));
+	}
+
+	if (b >= e) {
+		results.sendError(end_of_stream());
+		return Void();
+	}
+
+	state KeyRangeRef keys(b, e);
+
+	state Standalone<VectorRef<KeyRef>> splitPoints =
+	    wait(getRangeSplitPoints(cx, keys, CLIENT_KNOBS->RANGESTREAM_FRAGMENT_SIZE));
+	state std::vector<KeyRangeRef> toSend;
+	// state std::vector<Future<std::list<KeyRangeRef>::iterator>> outstandingRequests;
+	state std::vector<Future<Void>> outstandingRequests;
+
+	if (!splitPoints.empty()) {
+		toSend.emplace_back(splitPoints.front(), b);
+		for (int i = 0; i < splitPoints.size() - 1; ++i) {
+			toSend.emplace_back(splitPoints[i], splitPoints[i + 1]);
+		}
+		toSend.emplace_back(splitPoints.back(), e);
+	} else {
+		toSend.emplace_back(b, e);
+	}
+
+	for (const auto& range : toSend) {
+		auto& fragmentStream = results.createFragmentStream();
+		outstandingRequests.push_back(getRangeStreamFragment(&fragmentStream, cx, trLogInfo, version, range, limits,
+		                                                     snapshot, reverse, info, tags, span.context, &semaphore));
+	}
+
+	try {
+		wait(waitForAll(outstandingRequests));
+	} catch (Error& e) {
+		results.sendError(e);
+	}
+	results.sendError(end_of_stream());
+	return Void();
+}
 
 /*
 ACTOR Future<Void> getRangeStreamSingleShard( PromiseStream<Standalone<RangeResultRef>> results, Database cx, Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion,

From 99aa8abcf56c1708d25194dbb806e388ef4636c5 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 21:27:33 -0800
Subject: [PATCH 089/740] changed endpoint_not_found to use loadedEndpoint
 because it still works with private network addresses

---
 fdbrpc/FailureMonitor.actor.cpp | 15 +++++++--------
 fdbrpc/FlowTransport.actor.cpp  |  9 +++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index 2bb958a8e4d..9d1047182d7 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -121,7 +121,12 @@ void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 	    .suppressFor(1.0)
 	    .detail("Address", endpoint.getPrimaryAddress())
 	    .detail("Token", endpoint.token);
-	if(endpoint.getPrimaryAddress().isValid()) {
+	if(endpoint.getPrimaryAddress().isPublic()) {
+		if(failedEndpoints.size() > 100000) {
+			TraceEvent(SevWarnAlways, "TooManyFailedEndpoints")
+				.suppressFor(1.0);
+			failedEndpoints.clear();
+		}
 		failedEndpoints.insert(endpoint);
 	}
 	endpointKnownFailed.trigger(endpoint);
@@ -152,13 +157,7 @@ Future<Void> SimpleFailureMonitor::onDisconnect(Endpoint const& endpoint) {
 		TraceEvent("AlreadyDisconnected").detail("Addr", endpoint.getPrimaryAddress()).detail("Tok", endpoint.token);
 		return Void();
 	}
-	if(endpoint.getPrimaryAddress().isPublic()) {
-		return endpointKnownFailed.onChange(endpoint);
-	} else {
-		Endpoint stripped;
-		stripped.token = endpoint.token;
-		return endpointKnownFailed.onChange(endpoint) || endpointKnownFailed.onChange(stripped);
-	}
+	return endpointKnownFailed.onChange(endpoint);
 }
 
 Future<Void> SimpleFailureMonitor::onStateChanged(Endpoint const& endpoint) {
diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 6161d62363e..4dcd8c9827e 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -165,8 +165,9 @@ struct EndpointNotFoundReceiver final : NetworkMessageReceiver {
 	}
 	void receive(ArenaObjectReader& reader) override {
 		// Remote machine tells us it doesn't have endpoint e
-		Endpoint e;
-		reader.deserialize(e);
+		UID token;
+		reader.deserialize(token);
+		Endpoint e = FlowTransport::transport().loadedEndpoint(token);
 		IFailureMonitor::failureMonitor().endpointNotFound(e);
 	}
 };
@@ -863,10 +864,10 @@ ACTOR static void deliver(TransportData* self, Endpoint destination, ArenaReader
 		// We don't have the (stream) endpoint 'token', notify the remote machine
 		if (destination.token.first() != -1) {
 			if (self->isLocalAddress(destination.getPrimaryAddress())) {
-				sendLocal(self, SerializeSource<Endpoint>(Endpoint(self->localAddresses, destination.token)), Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND));
+				sendLocal(self, SerializeSource<UID>(destination.token), Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND));
 			} else {
 				Reference<Peer> peer = self->getOrOpenPeer(destination.getPrimaryAddress());
-				sendPacket(self, peer, SerializeSource<Endpoint>(Endpoint(self->localAddresses, destination.token)), Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND), false);
+				sendPacket(self, peer, SerializeSource<UID>(destination.token), Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND), false);
 			}
 		}
 	}

From 6d5a681c29ce81929e3aeebe4aa47a52f85e7081 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Tue, 15 Dec 2020 21:54:58 -0800
Subject: [PATCH 090/740] Encapsulate semaphore in ResultStream

---
 fdbclient/NativeAPI.actor.cpp | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 789e5d669f8..ec3cf2618cf 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2660,13 +2660,16 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 }
 
 class ResultStream {
+	FlowLock semaphore;
+
 public:
 	class FragmentStream {
 		ResultStream* resultStream;
 		std::deque<RangeResult> buffer;
 		bool completed{ false };
 		friend class ResultStream;
-		FragmentStream(ResultStream* resultStream) : resultStream(resultStream) {}
+		FlowLock::Releaser releaser;
+		FragmentStream(ResultStream* resultStream) : resultStream(resultStream), releaser(resultStream->semaphore) {}
 
 	public:
 		void send(const RangeResult& rangeResult) { buffer.push_back(rangeResult); }
@@ -2675,6 +2678,7 @@ class ResultStream {
 			ASSERT(!completed);
 			completed = true;
 			resultStream->flushToClient();
+			releaser.release();
 		}
 	};
 
@@ -2692,6 +2696,7 @@ class ResultStream {
 				fragment.buffer.pop_front();
 			}
 			if (fragment.completed) {
+				fragment.releaser.release();
 				++nextFragment;
 			} else {
 				break;
@@ -2700,27 +2705,26 @@ class ResultStream {
 	}
 
 public:
-	ResultStream(PromiseStream<RangeResult> results) : results(results) {}
+	ResultStream(PromiseStream<RangeResult> results, size_t concurrency) : results(results), semaphore(concurrency) {}
 
-	FragmentStream& createFragmentStream() {
-		fragments.push_back(FragmentStream(this));
-		return fragments.back();
+	ACTOR static Future<FragmentStream*> createFragmentStreamImpl(ResultStream* self) {
+		wait(self->semaphore.take());
+		return &self->fragments.emplace_back(FragmentStream(self));
 	}
 
+	Future<FragmentStream*> createFragmentStream() { return createFragmentStreamImpl(this); }
+
 	void sendError(Error e) { results.sendError(e); }
 };
 
 ACTOR Future<Void> getRangeStreamFragment(ResultStream::FragmentStream* results, Database cx,
                                           Reference<TransactionLogInfo> trLogInfo, Version version, KeyRangeRef keys,
                                           GetRangeLimits limits, bool snapshot, bool reverse, TransactionInfo info,
-                                          TagSet tags, SpanID spanContext, FlowLock* semaphore) {
+                                          TagSet tags, SpanID spanContext) {
 	// if keys.end is allKeys.end, we have read through the end of the database
 	// if keys.begin is allKeys.begin, we have either read through the beginning of the database,
 	// or allKeys.begin exists in the database and will be part of the conflict range anyways
 
-	wait(semaphore->take());
-	state FlowLock::Releaser releaser(*semaphore);
-
 	loop {
 		state vector< pair<KeyRange, Reference<LocationInfo>> > locations = wait( getKeyRangeLocations( cx, keys, CLIENT_KNOBS->GET_RANGE_SHARD_LIMIT, reverse, &StorageServerInterface::getKeyValues, info ) );
 		ASSERT( locations.size() );
@@ -2894,8 +2898,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
                                   KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange,
                                   bool snapshot, bool reverse, TransactionInfo info, TagSet tags) {
 
-	state FlowLock semaphore(CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS);
-	state ResultStream results(_results);
+	state ResultStream results(_results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS);
 
 	// FIXME: better handling to disable row limits
 	ASSERT(!limits.hasRowLimit());
@@ -2939,10 +2942,11 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 		toSend.emplace_back(b, e);
 	}
 
-	for (const auto& range : toSend) {
-		auto& fragmentStream = results.createFragmentStream();
-		outstandingRequests.push_back(getRangeStreamFragment(&fragmentStream, cx, trLogInfo, version, range, limits,
-		                                                     snapshot, reverse, info, tags, span.context, &semaphore));
+	state std::vector<KeyRangeRef>::iterator toSendIt = toSend.begin();
+	for (; toSendIt != toSend.end(); ++toSendIt) {
+		ResultStream::FragmentStream* fragmentStream = wait(results.createFragmentStream());
+		outstandingRequests.push_back(getRangeStreamFragment(fragmentStream, cx, trLogInfo, version, *toSendIt, limits,
+		                                                     snapshot, reverse, info, tags, span.context));
 	}
 
 	try {

From cdf61fe610d180f5e7f4c319bc1c4be5c6cd53f6 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Tue, 15 Dec 2020 22:00:26 -0800
Subject: [PATCH 091/740] Flush to client in ResultStream::FragmentStream::send

---
 fdbclient/NativeAPI.actor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index ec3cf2618cf..1edc30c7e98 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2672,7 +2672,10 @@ class ResultStream {
 		FragmentStream(ResultStream* resultStream) : resultStream(resultStream), releaser(resultStream->semaphore) {}
 
 	public:
-		void send(const RangeResult& rangeResult) { buffer.push_back(rangeResult); }
+		void send(const RangeResult& rangeResult) {
+			buffer.push_back(rangeResult);
+			resultStream->flushToClient();
+		}
 		void sendError(Error e) { resultStream->sendError(e); }
 		void finish() {
 			ASSERT(!completed);

From d30a9cfc27f5adb46911d4b69f62e3a125f2e896 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 15 Dec 2020 22:31:53 -0800
Subject: [PATCH 092/740] changed error codes, and added catches in the correct
 places

---
 documentation/tutorial/tutorial.actor.cpp | 39 +++++++++++++----------
 fdbclient/NativeAPI.actor.cpp             |  2 +-
 fdbrpc/fdbrpc.h                           | 16 ++--------
 fdbrpc/genericactors.actor.h              |  2 +-
 fdbserver/networktest.actor.cpp           |  4 +--
 fdbserver/storageserver.actor.cpp         |  8 +++--
 6 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index 100f09af207..6ec160824b9 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -173,22 +173,29 @@ ACTOR Future<Void> echoServer() {
 	state EchoServerInterface echoServer;
 	echoServer.getInterface.makeWellKnownEndpoint(UID(-1, ++tokenCounter), TaskPriority::DefaultEndpoint);
 	loop {
-		choose {
-			when(GetInterfaceRequest req = waitNext(echoServer.getInterface.getFuture())) {
-				req.reply.send(echoServer);
-			}
-			when(EchoRequest req = waitNext(echoServer.echo.getFuture())) { req.reply.send(req.message); }
-			when(ReverseRequest req = waitNext(echoServer.reverse.getFuture())) {
-				req.reply.send(std::string(req.message.rbegin(), req.message.rend()));
-			}
-			when(state StreamRequest req = waitNext(echoServer.stream.getFuture())) {
-				state int i = 0;
-				for (; i < 100; ++i) {
-					wait(req.reply.onReady());
-					std::cout << "Send " << i << std::endl;
-					req.reply.send(StreamReply{ i });
+		try {
+			choose {
+				when(GetInterfaceRequest req = waitNext(echoServer.getInterface.getFuture())) {
+					req.reply.send(echoServer);
 				}
-				req.reply.sendError(end_of_stream());
+				when(EchoRequest req = waitNext(echoServer.echo.getFuture())) { req.reply.send(req.message); }
+				when(ReverseRequest req = waitNext(echoServer.reverse.getFuture())) {
+					req.reply.send(std::string(req.message.rbegin(), req.message.rend()));
+				}
+				when(state StreamRequest req = waitNext(echoServer.stream.getFuture())) {
+					state int i = 0;
+					for (; i < 100; ++i) {
+						wait(req.reply.onReady());
+						std::cout << "Send " << i << std::endl;
+						req.reply.send(StreamReply{ i });
+					}
+					req.reply.sendError(end_of_stream());
+				}
+			}
+		} catch (Error &e) {
+			if(e.code() != error_code_operation_obsolete) {
+				fprintf(stderr, "Error: %s\n", e.what());
+				throw e;
 			}
 		}
 	}
@@ -217,7 +224,7 @@ ACTOR Future<Void> echoClient() {
 			ASSERT(rep.index == j++);
 		}
 	} catch (Error& e) {
-		ASSERT(e.code() == error_code_end_of_stream || e.code() == error_code_request_maybe_delivered);
+		ASSERT(e.code() == error_code_end_of_stream || e.code() == error_code_connection_failed);
 	}
 	return Void();
 }
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 93035a857f8..8a7a7a566e8 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2849,7 +2849,7 @@ ACTOR Future<Void> getRangeStream( PromiseStream<Standalone<RangeResultRef>> res
 				if (e.code() == error_code_actor_cancelled) {
 					throw;
 				}
-				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed) {
+				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed || e.code() == error_code_connection_failed) {
 					const KeyRangeRef& range = locations[shard].first;
 
 					if( reverse )
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 901aad33a6b..35ee9d94a22 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -223,7 +223,7 @@ struct ReplyPromiseStreamReply {
 };
 
 struct AcknowledgementReply {
-	constexpr static FileIdentifier file_identifier = 1378929;
+	constexpr static FileIdentifier file_identifier = 1389929;
 	int64_t bytes;
 
 	AcknowledgementReply() : bytes(0) {}
@@ -276,8 +276,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
 	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
-		  //FIXME: creating the FlowReceiver as a stream will mean that every cancelled read will lead to a permanent endpoint in the failed endpoints map
-		  acknowledgements.failures = tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), request_maybe_delivered());
+		  acknowledgements.failures = tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), operation_obsolete());
 	  }
 
 	void destroy() override { delete this; }
@@ -318,11 +317,10 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 
 	~NetNotifiedQueueWithErrors() {
 		if(acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
-			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(request_maybe_delivered()), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
+			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(operation_obsolete()), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
 		}
 	}
 
-	//FIXME: creating the FlowReceiver as a stream will mean that every cancelled read will lead to a permanent endpoint in the failed endpoints map
 	bool isStream() const override { return true; }
 };
 
@@ -583,10 +581,6 @@ class RequestStream {
 		if (queue->isRemoteEndpoint()) {
 			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint(taskID));
 			auto& p = getReplyPromiseStream(value);
-			if (disc.isReady()) {
-				p.sendError(request_maybe_delivered());
-				return p;
-			}
 			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(taskID), true);
 			//FIXME: defer sending the message until we know the connection is established
 			endStreamOnDisconnect(disc, p, peer);
@@ -602,10 +596,6 @@ class RequestStream {
 		if (queue->isRemoteEndpoint()) {
 			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint());
 			auto& p = getReplyPromiseStream(value);
-			if (disc.isReady()) {
-				p.sendError(request_maybe_delivered());
-				return p;
-			}
 			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);
 			//FIXME: defer sending the message until we know the connection is established
 			endStreamOnDisconnect(disc, p, peer);
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 3b75d243b10..654c412570c 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -202,7 +202,7 @@ void endStreamOnDisconnect( Future<Void> signal, ReplyPromiseStream<X> stream, R
 	state PeerHolder holder = PeerHolder(peer);
 	choose {
 		when(wait(signal)) {
-			stream.sendError(request_maybe_delivered());
+			stream.sendError(connection_failed());
 		}
 		when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
 	}
diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 0e79f87f9a2..2bc04a8a8ed 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -103,7 +103,7 @@ ACTOR Future<Void> networkTestServer() {
 				}
 			}
 		} catch (Error &e) {
-			if(e.code() != error_code_request_maybe_delivered) {
+			if(e.code() != error_code_operation_obsolete) {
 				fprintf(stderr, "Error: %s\n", e.what());
 				throw e;
 			}
@@ -149,7 +149,7 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 			}
 		} catch (Error& e) {
 			printf("Error: %s\n", e.what());
-			ASSERT(e.code() == error_code_end_of_stream || e.code() == error_code_request_maybe_delivered);
+			ASSERT(e.code() == error_code_end_of_stream || e.code() == error_code_connection_failed);
 		}
 		latency->tock(sample);
 		(*completed)++;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 346fa57049b..5df2c559ce4 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1792,9 +1792,11 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 			}
 		}
 	} catch (Error& e) {
-		if(!canReplyWith(e))
-			throw;
-		req.reply.sendError(e);
+		if(e.code() != error_code_operation_obsolete) {
+			if(!canReplyWith(e))
+				throw;
+			req.reply.sendError(e);
+		}
 	}
 
 	data->transactionTagCounter.addRequest(req.tags, resultSize);

From 7bfb6a6a957fe028fc91a52c74ecedfa2ddff2ed Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Tue, 15 Dec 2020 23:01:52 -0800
Subject: [PATCH 093/740] Put ResultStream into its own files

---
 fdbclient/CMakeLists.txt         |   2 +
 fdbclient/NativeAPI.actor.cpp    |  70 ++-------------------
 fdbclient/ResultStream.actor.cpp |  26 ++++++++
 fdbclient/ResultStream.actor.h   | 101 +++++++++++++++++++++++++++++++
 4 files changed, 134 insertions(+), 65 deletions(-)
 create mode 100644 fdbclient/ResultStream.actor.cpp
 create mode 100644 fdbclient/ResultStream.actor.h

diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index 129f9e7d3ee..b26e1bf869a 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -55,6 +55,8 @@ set(FDBCLIENT_SRCS
   ReadYourWrites.actor.cpp
   ReadYourWrites.h
   RestoreWorkerInterface.actor.h
+  ResultStream.actor.cpp
+  ResultStream.actor.h
   RunTransaction.actor.h
   RYWIterator.cpp
   RYWIterator.h
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 1edc30c7e98..5ffcc85cc75 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -44,6 +44,7 @@
 #include "fdbclient/MonitorLeader.h"
 #include "fdbclient/MutationList.h"
 #include "fdbclient/ReadYourWrites.h"
+#include "fdbclient/ResultStream.actor.h"
 #include "fdbclient/SpecialKeySpace.actor.h"
 #include "fdbclient/StorageServerInterface.h"
 #include "fdbclient/SystemData.h"
@@ -2659,68 +2660,7 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 	}
 }
 
-class ResultStream {
-	FlowLock semaphore;
-
-public:
-	class FragmentStream {
-		ResultStream* resultStream;
-		std::deque<RangeResult> buffer;
-		bool completed{ false };
-		friend class ResultStream;
-		FlowLock::Releaser releaser;
-		FragmentStream(ResultStream* resultStream) : resultStream(resultStream), releaser(resultStream->semaphore) {}
-
-	public:
-		void send(const RangeResult& rangeResult) {
-			buffer.push_back(rangeResult);
-			resultStream->flushToClient();
-		}
-		void sendError(Error e) { resultStream->sendError(e); }
-		void finish() {
-			ASSERT(!completed);
-			completed = true;
-			resultStream->flushToClient();
-			releaser.release();
-		}
-	};
-
-private:
-	std::vector<FragmentStream> fragments;
-	decltype(fragments)::iterator nextFragment = fragments.begin();
-	PromiseStream<RangeResult> results;
-
-	// TODO: Fix potential slow tasks
-	void flushToClient() {
-		while (nextFragment != fragments.end()) {
-			auto& fragment = *nextFragment;
-			while (!fragment.buffer.empty()) {
-				results.send(std::move(fragment.buffer.front()));
-				fragment.buffer.pop_front();
-			}
-			if (fragment.completed) {
-				fragment.releaser.release();
-				++nextFragment;
-			} else {
-				break;
-			}
-		}
-	}
-
-public:
-	ResultStream(PromiseStream<RangeResult> results, size_t concurrency) : results(results), semaphore(concurrency) {}
-
-	ACTOR static Future<FragmentStream*> createFragmentStreamImpl(ResultStream* self) {
-		wait(self->semaphore.take());
-		return &self->fragments.emplace_back(FragmentStream(self));
-	}
-
-	Future<FragmentStream*> createFragmentStream() { return createFragmentStreamImpl(this); }
-
-	void sendError(Error e) { results.sendError(e); }
-};
-
-ACTOR Future<Void> getRangeStreamFragment(ResultStream::FragmentStream* results, Database cx,
+ACTOR Future<Void> getRangeStreamFragment(ResultStream<RangeResult>::FragmentStream* results, Database cx,
                                           Reference<TransactionLogInfo> trLogInfo, Version version, KeyRangeRef keys,
                                           GetRangeLimits limits, bool snapshot, bool reverse, TransactionInfo info,
                                           TagSet tags, SpanID spanContext) {
@@ -2783,7 +2723,7 @@ ACTOR Future<Void> getRangeStreamFragment(ResultStream::FragmentStream* results,
 					}
 					if( info.debugID.present() )
 						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
-					Standalone<RangeResultRef> output( RangeResultRef(rep.data, rep.more), rep.arena );
+					RangeResult output(RangeResultRef(rep.data, rep.more), rep.arena);
 
 					bool more = rep.more;
 					// If the reply says there is more but we know that we finished the shard, then fix rep.more
@@ -2901,7 +2841,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
                                   KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange,
                                   bool snapshot, bool reverse, TransactionInfo info, TagSet tags) {
 
-	state ResultStream results(_results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS);
+	state ResultStream<RangeResult> results(_results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS);
 
 	// FIXME: better handling to disable row limits
 	ASSERT(!limits.hasRowLimit());
@@ -2947,7 +2887,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 
 	state std::vector<KeyRangeRef>::iterator toSendIt = toSend.begin();
 	for (; toSendIt != toSend.end(); ++toSendIt) {
-		ResultStream::FragmentStream* fragmentStream = wait(results.createFragmentStream());
+		ResultStream<RangeResult>::FragmentStream* fragmentStream = wait(results.createFragmentStream());
 		outstandingRequests.push_back(getRangeStreamFragment(fragmentStream, cx, trLogInfo, version, *toSendIt, limits,
 		                                                     snapshot, reverse, info, tags, span.context));
 	}
diff --git a/fdbclient/ResultStream.actor.cpp b/fdbclient/ResultStream.actor.cpp
new file mode 100644
index 00000000000..52345c24ec8
--- /dev/null
+++ b/fdbclient/ResultStream.actor.cpp
@@ -0,0 +1,26 @@
+/*
+ * ResultStream.actor.cpp
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fdbclient/ResultStream.actor.h"
+#include "flow/UnitTest.h"
+
+TEST_CASE("/fdbclient/result_stream") {
+	return Void();
+}
diff --git a/fdbclient/ResultStream.actor.h b/fdbclient/ResultStream.actor.h
new file mode 100644
index 00000000000..bdba304c5eb
--- /dev/null
+++ b/fdbclient/ResultStream.actor.h
@@ -0,0 +1,101 @@
+/*
+ * ResultStream.actor.h
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+// When actually compiled (NO_INTELLISENSE), include the generated version of this file.  In intellisense use the source
+// version.
+#if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_RESULTSTREAM_ACTOR_G_H)
+#define FDBCLIENT_RESULTSTREAM_ACTOR_G_H
+#include "fdbclient/ResultStream.actor.g.h"
+#elif !defined(FDBCLIENT_RESULTSTREAM_ACTOR_H)
+#define FDBCLIENT_RESULTSTREAM_ACTOR_H
+
+#include <deque>
+#include <vector>
+
+#include "flow/genericactors.actor.h"
+#include "flow/actorcompiler.h" // must be last include
+
+template <class T>
+class ResultStream {
+	FlowLock semaphore;
+
+public:
+	class FragmentStream {
+		ResultStream* resultStream;
+		std::deque<T> buffer;
+		bool completed{ false };
+		friend class ResultStream;
+		FlowLock::Releaser releaser;
+		FragmentStream(ResultStream* resultStream) : resultStream(resultStream), releaser(resultStream->semaphore) {}
+
+	public:
+		void send(const T& value) {
+			buffer.push_back(value);
+			resultStream->flushToClient();
+		}
+		void sendError(Error e) { resultStream->sendError(e); }
+		void finish() {
+			ASSERT(!completed);
+			completed = true;
+			resultStream->flushToClient();
+			releaser.release();
+		}
+	};
+
+private:
+	std::vector<FragmentStream> fragments;
+	typename std::vector<FragmentStream>::iterator nextFragment = fragments.begin();
+	PromiseStream<T> results;
+
+	// TODO: Fix potential slow task
+	void flushToClient() {
+		while (nextFragment != fragments.end()) {
+			auto& fragment = *nextFragment;
+			while (!fragment.buffer.empty()) {
+				results.send(std::move(fragment.buffer.front()));
+				fragment.buffer.pop_front();
+			}
+			if (fragment.completed) {
+				fragment.releaser.release();
+				++nextFragment;
+			} else {
+				break;
+			}
+		}
+	}
+
+public:
+	ResultStream(PromiseStream<T> results, size_t concurrency) : results(results), semaphore(concurrency) {}
+
+	ACTOR static Future<FragmentStream*> createFragmentStreamImpl(ResultStream<T>* self) {
+		wait(self->semaphore.take());
+		return &self->fragments.emplace_back(FragmentStream(self));
+	}
+
+	Future<FragmentStream*> createFragmentStream() { return createFragmentStreamImpl(this); }
+
+	void sendError(Error e) { results.sendError(e); }
+};
+
+#include "flow/unactorcompiler.h"
+
+#endif

From 3e8e4fd7d95dfc9445019a4b6bbe55b8d2a163f4 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Tue, 15 Dec 2020 23:13:32 -0800
Subject: [PATCH 094/740] Rename ResultStream to ParallelStream

---
 fdbclient/CMakeLists.txt                      | 10 ++---
 fdbclient/NativeAPI.actor.cpp                 | 10 ++---
 ...eam.actor.cpp => ParallelStream.actor.cpp} |  6 +--
 ...tStream.actor.h => ParallelStream.actor.h} | 41 ++++++++++---------
 4 files changed, 34 insertions(+), 33 deletions(-)
 rename fdbclient/{ResultStream.actor.cpp => ParallelStream.actor.cpp} (86%)
 rename fdbclient/{ResultStream.actor.h => ParallelStream.actor.h} (63%)

diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index b26e1bf869a..4029567e757 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -18,6 +18,7 @@ set(FDBCLIENT_SRCS
   ClientLogEvents.h
   ClientWorkerInterface.h
   ClusterInterface.h
+  CommitProxyInterface.h
   CommitTransaction.h
   CoordinationInterface.h
   DatabaseBackupAgent.actor.cpp
@@ -40,7 +41,6 @@ set(FDBCLIENT_SRCS
   Knobs.h
   ManagementAPI.actor.cpp
   ManagementAPI.actor.h
-  CommitProxyInterface.h
   MonitorLeader.actor.cpp
   MonitorLeader.h
   MultiVersionAssignmentVars.h
@@ -50,13 +50,11 @@ set(FDBCLIENT_SRCS
   NativeAPI.actor.cpp
   NativeAPI.actor.h
   Notified.h
-  SpecialKeySpace.actor.cpp
-  SpecialKeySpace.actor.h
+  ParallelStream.actor.cpp
+  ParallelStream.actor.h
   ReadYourWrites.actor.cpp
   ReadYourWrites.h
   RestoreWorkerInterface.actor.h
-  ResultStream.actor.cpp
-  ResultStream.actor.h
   RunTransaction.actor.h
   RYWIterator.cpp
   RYWIterator.h
@@ -64,6 +62,8 @@ set(FDBCLIENT_SRCS
   Schemas.cpp
   Schemas.h
   SnapshotCache.h
+  SpecialKeySpace.actor.cpp
+  SpecialKeySpace.actor.h
   Status.h
   StatusClient.actor.cpp
   StatusClient.h
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 5ffcc85cc75..4235010d06a 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -44,7 +44,7 @@
 #include "fdbclient/MonitorLeader.h"
 #include "fdbclient/MutationList.h"
 #include "fdbclient/ReadYourWrites.h"
-#include "fdbclient/ResultStream.actor.h"
+#include "fdbclient/ParallelStream.actor.h"
 #include "fdbclient/SpecialKeySpace.actor.h"
 #include "fdbclient/StorageServerInterface.h"
 #include "fdbclient/SystemData.h"
@@ -2660,7 +2660,7 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 	}
 }
 
-ACTOR Future<Void> getRangeStreamFragment(ResultStream<RangeResult>::FragmentStream* results, Database cx,
+ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment* results, Database cx,
                                           Reference<TransactionLogInfo> trLogInfo, Version version, KeyRangeRef keys,
                                           GetRangeLimits limits, bool snapshot, bool reverse, TransactionInfo info,
                                           TagSet tags, SpanID spanContext) {
@@ -2841,7 +2841,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
                                   KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange,
                                   bool snapshot, bool reverse, TransactionInfo info, TagSet tags) {
 
-	state ResultStream<RangeResult> results(_results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS);
+	state ParallelStream<RangeResult> results(_results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS);
 
 	// FIXME: better handling to disable row limits
 	ASSERT(!limits.hasRowLimit());
@@ -2887,8 +2887,8 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 
 	state std::vector<KeyRangeRef>::iterator toSendIt = toSend.begin();
 	for (; toSendIt != toSend.end(); ++toSendIt) {
-		ResultStream<RangeResult>::FragmentStream* fragmentStream = wait(results.createFragmentStream());
-		outstandingRequests.push_back(getRangeStreamFragment(fragmentStream, cx, trLogInfo, version, *toSendIt, limits,
+		ParallelStream<RangeResult>::Fragment* fragment = wait(results.createFragment());
+		outstandingRequests.push_back(getRangeStreamFragment(fragment, cx, trLogInfo, version, *toSendIt, limits,
 		                                                     snapshot, reverse, info, tags, span.context));
 	}
 
diff --git a/fdbclient/ResultStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
similarity index 86%
rename from fdbclient/ResultStream.actor.cpp
rename to fdbclient/ParallelStream.actor.cpp
index 52345c24ec8..38b76718356 100644
--- a/fdbclient/ResultStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -1,5 +1,5 @@
 /*
- * ResultStream.actor.cpp
+ * ParallelStream.actor.cpp
  *
  * This source file is part of the FoundationDB open source project
  *
@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 
-#include "fdbclient/ResultStream.actor.h"
+#include "fdbclient/ParallelStream.actor.h"
 #include "flow/UnitTest.h"
 
-TEST_CASE("/fdbclient/result_stream") {
+TEST_CASE("/fdbclient/parallel_stream") {
 	return Void();
 }
diff --git a/fdbclient/ResultStream.actor.h b/fdbclient/ParallelStream.actor.h
similarity index 63%
rename from fdbclient/ResultStream.actor.h
rename to fdbclient/ParallelStream.actor.h
index bdba304c5eb..f03e6c5339c 100644
--- a/fdbclient/ResultStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -1,5 +1,5 @@
 /*
- * ResultStream.actor.h
+ * ParallelStream.actor.h
  *
  * This source file is part of the FoundationDB open source project
  *
@@ -22,11 +22,11 @@
 
 // When actually compiled (NO_INTELLISENSE), include the generated version of this file.  In intellisense use the source
 // version.
-#if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_RESULTSTREAM_ACTOR_G_H)
-#define FDBCLIENT_RESULTSTREAM_ACTOR_G_H
-#include "fdbclient/ResultStream.actor.g.h"
-#elif !defined(FDBCLIENT_RESULTSTREAM_ACTOR_H)
-#define FDBCLIENT_RESULTSTREAM_ACTOR_H
+#if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_PARALLEL_STREAM_ACTOR_G_H)
+#define FDBCLIENT_PARALLEL_STREAM_ACTOR_G_H
+#include "fdbclient/ParallelStream.actor.g.h"
+#elif !defined(FDBCLIENT_PARALLEL_STREAM_ACTOR_H)
+#define FDBCLIENT_PARALLEL_STREAM_ACTOR_H
 
 #include <deque>
 #include <vector>
@@ -35,35 +35,36 @@
 #include "flow/actorcompiler.h" // must be last include
 
 template <class T>
-class ResultStream {
+class ParallelStream {
 	FlowLock semaphore;
 
 public:
-	class FragmentStream {
-		ResultStream* resultStream;
+	class Fragment {
+		ParallelStream* parallelStream;
 		std::deque<T> buffer;
 		bool completed{ false };
-		friend class ResultStream;
+		friend class ParallelStream;
 		FlowLock::Releaser releaser;
-		FragmentStream(ResultStream* resultStream) : resultStream(resultStream), releaser(resultStream->semaphore) {}
+		Fragment(ParallelStream* parallelStream)
+		  : parallelStream(parallelStream), releaser(parallelStream->semaphore) {}
 
 	public:
 		void send(const T& value) {
 			buffer.push_back(value);
-			resultStream->flushToClient();
+			parallelStream->flushToClient();
 		}
-		void sendError(Error e) { resultStream->sendError(e); }
+		void sendError(Error e) { parallelStream->sendError(e); }
 		void finish() {
 			ASSERT(!completed);
 			completed = true;
-			resultStream->flushToClient();
+			parallelStream->flushToClient();
 			releaser.release();
 		}
 	};
 
 private:
-	std::vector<FragmentStream> fragments;
-	typename std::vector<FragmentStream>::iterator nextFragment = fragments.begin();
+	std::vector<Fragment> fragments;
+	typename std::vector<Fragment>::iterator nextFragment = fragments.begin();
 	PromiseStream<T> results;
 
 	// TODO: Fix potential slow task
@@ -84,14 +85,14 @@ class ResultStream {
 	}
 
 public:
-	ResultStream(PromiseStream<T> results, size_t concurrency) : results(results), semaphore(concurrency) {}
+	ParallelStream(PromiseStream<T> results, size_t concurrency) : results(results), semaphore(concurrency) {}
 
-	ACTOR static Future<FragmentStream*> createFragmentStreamImpl(ResultStream<T>* self) {
+	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
 		wait(self->semaphore.take());
-		return &self->fragments.emplace_back(FragmentStream(self));
+		return &self->fragments.emplace_back(Fragment(self));
 	}
 
-	Future<FragmentStream*> createFragmentStream() { return createFragmentStreamImpl(this); }
+	Future<Fragment*> createFragment() { return createFragmentImpl(this); }
 
 	void sendError(Error e) { results.sendError(e); }
 };

From 688e297dfc875afab0b049a88816d0babbcd8d75 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Tue, 15 Dec 2020 23:44:03 -0800
Subject: [PATCH 095/740] Added parallel_stream unit test

---
 fdbclient/ParallelStream.actor.cpp | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index 38b76718356..c26d63781cc 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -18,9 +18,45 @@
  * limitations under the License.
  */
 
+#include <vector>
+
 #include "fdbclient/ParallelStream.actor.h"
 #include "flow/UnitTest.h"
+#include "flow/actorcompiler.h" // This must be the last #include.
+
+ACTOR static Future<Void> produce(ParallelStream<int>::Fragment* fragment, int i) {
+	wait(delay(deterministicRandom()->random01()));
+	fragment->send(i);
+	wait(delay(deterministicRandom()->random01()));
+	fragment->finish();
+	return Void();
+}
+
+ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
+	state int next;
+	try {
+		loop {
+			int i = waitNext(stream);
+			ASSERT(i == next++);
+		}
+	} catch (Error& e) {
+		ASSERT(e.code() == error_code_end_of_stream);
+		ASSERT(next == expected);
+		return Void();
+	}
+}
 
 TEST_CASE("/fdbclient/parallel_stream") {
+	state PromiseStream<int> results;
+	state ParallelStream<int> parallelStream(results, 10);
+	state Future<Void> consumer = consume(results.getFuture(), 100);
+	state std::vector<Future<Void>> producers;
+	state int i = 0;
+	for (; i < 100; ++i) {
+		ParallelStream<int>::Fragment* fragment = wait(parallelStream.createFragment());
+		producers.push_back(produce(fragment, i));
+	}
+	wait(waitForAll(producers));
+	results.sendError(end_of_stream());
 	return Void();
 }

From 693d101d00e3ef7f504f2919d09a5b22363b7322 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 00:08:52 -0800
Subject: [PATCH 096/740] Added ParallelStreamTest namespace

---
 fdbclient/ParallelStream.actor.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index c26d63781cc..1c67812d6b6 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -24,6 +24,8 @@
 #include "flow/UnitTest.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
+namespace ParallelStreamTest {
+
 ACTOR static Future<Void> produce(ParallelStream<int>::Fragment* fragment, int i) {
 	wait(delay(deterministicRandom()->random01()));
 	fragment->send(i);
@@ -46,17 +48,20 @@ ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
 	}
 }
 
-TEST_CASE("/fdbclient/parallel_stream") {
+} // namespace ParallelStreamTest
+
+TEST_CASE("/parallel_stream") {
 	state PromiseStream<int> results;
 	state ParallelStream<int> parallelStream(results, 10);
-	state Future<Void> consumer = consume(results.getFuture(), 100);
+	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), 100);
 	state std::vector<Future<Void>> producers;
 	state int i = 0;
 	for (; i < 100; ++i) {
 		ParallelStream<int>::Fragment* fragment = wait(parallelStream.createFragment());
-		producers.push_back(produce(fragment, i));
+		producers.push_back(ParallelStreamTest::produce(fragment, i));
 	}
 	wait(waitForAll(producers));
 	results.sendError(end_of_stream());
+	wait(consumer);
 	return Void();
 }

From 19d0800356ec83113b727b3c6546584d0f1f9e4d Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 09:05:45 -0800
Subject: [PATCH 097/740] Move ParallelStreamCorrectness into fdbserver

Apparently this is required to register the unit test
---
 fdbclient/CMakeLists.txt                                      | 1 -
 fdbserver/CMakeLists.txt                                      | 1 +
 .../workloads/ParallelStreamCorrectness.actor.cpp             | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename fdbclient/ParallelStream.actor.cpp => fdbserver/workloads/ParallelStreamCorrectness.actor.cpp (96%)

diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index 4029567e757..3df3422ccf3 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -50,7 +50,6 @@ set(FDBCLIENT_SRCS
   NativeAPI.actor.cpp
   NativeAPI.actor.h
   Notified.h
-  ParallelStream.actor.cpp
   ParallelStream.actor.h
   ReadYourWrites.actor.cpp
   ReadYourWrites.h
diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index bf266069cbd..1469bf8af0a 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -175,6 +175,7 @@ set(FDBSERVER_SRCS
   workloads/MemoryKeyValueStore.h
   workloads/MemoryLifetime.actor.cpp
   workloads/MetricLogging.actor.cpp
+  workloads/ParallelStreamCorrectness.actor.cpp
   workloads/Performance.actor.cpp
   workloads/Ping.actor.cpp
   workloads/PopulateTPCC.actor.cpp
diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbserver/workloads/ParallelStreamCorrectness.actor.cpp
similarity index 96%
rename from fdbclient/ParallelStream.actor.cpp
rename to fdbserver/workloads/ParallelStreamCorrectness.actor.cpp
index 1c67812d6b6..5975f3eff85 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbserver/workloads/ParallelStreamCorrectness.actor.cpp
@@ -1,5 +1,5 @@
 /*
- * ParallelStream.actor.cpp
+ * ParallelStreamCorrectness.actor.cpp
  *
  * This source file is part of the FoundationDB open source project
  *
@@ -50,7 +50,7 @@ ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
 
 } // namespace ParallelStreamTest
 
-TEST_CASE("/parallel_stream") {
+TEST_CASE("/fdbclient/ParallelStream") {
 	state PromiseStream<int> results;
 	state ParallelStream<int> parallelStream(results, 10);
 	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), 100);

From d89c591ef7b50584614876fd9dfebba58d824389 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 10:20:08 -0800
Subject: [PATCH 098/740] Use unique_ptrs to store parallel stream fragments

---
 fdbclient/ParallelStream.actor.h | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index f03e6c5339c..7d1a3beda1e 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -45,10 +45,9 @@ class ParallelStream {
 		bool completed{ false };
 		friend class ParallelStream;
 		FlowLock::Releaser releaser;
+	public:
 		Fragment(ParallelStream* parallelStream)
 		  : parallelStream(parallelStream), releaser(parallelStream->semaphore) {}
-
-	public:
 		void send(const T& value) {
 			buffer.push_back(value);
 			parallelStream->flushToClient();
@@ -63,20 +62,24 @@ class ParallelStream {
 	};
 
 private:
-	std::vector<Fragment> fragments;
-	typename std::vector<Fragment>::iterator nextFragment = fragments.begin();
+	std::vector<std::unique_ptr<Fragment>> fragments;
+	typename std::vector<std::unique_ptr<Fragment>>::iterator nextFragment;
 	PromiseStream<T> results;
 
 	// TODO: Fix potential slow task
 	void flushToClient() {
 		while (nextFragment != fragments.end()) {
-			auto& fragment = *nextFragment;
-			while (!fragment.buffer.empty()) {
-				results.send(std::move(fragment.buffer.front()));
-				fragment.buffer.pop_front();
+			if (!*nextFragment) {
+				++nextFragment;
+				continue;
+			}
+			auto fragment = nextFragment->get();
+			while (!fragment->buffer.empty()) {
+				results.send(fragment->buffer.front());
+				fragment->buffer.pop_front();
 			}
-			if (fragment.completed) {
-				fragment.releaser.release();
+			if (fragment->completed) {
+				nextFragment->reset();
 				++nextFragment;
 			} else {
 				break;
@@ -89,7 +92,12 @@ class ParallelStream {
 
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
 		wait(self->semaphore.take());
-		return &self->fragments.emplace_back(Fragment(self));
+		self->fragments.push_back(std::make_unique<Fragment>(self));
+		if (self->fragments.size() == 1) {
+			self->nextFragment = self->fragments.begin();
+		}
+		ASSERT(*self->nextFragment);
+		return self->fragments.back().get();
 	}
 
 	Future<Fragment*> createFragment() { return createFragmentImpl(this); }

From 27ce55af0c5f9719dc8e4bfc5dd4fb160f98e115 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 10:21:00 -0800
Subject: [PATCH 099/740] Fix range order in getRangeStream

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 4235010d06a..4a9148033b0 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2876,7 +2876,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 	state std::vector<Future<Void>> outstandingRequests;
 
 	if (!splitPoints.empty()) {
-		toSend.emplace_back(splitPoints.front(), b);
+		toSend.emplace_back(b, splitPoints.front());
 		for (int i = 0; i < splitPoints.size() - 1; ++i) {
 			toSend.emplace_back(splitPoints[i], splitPoints[i + 1]);
 		}

From 4b71ebd875173c2c0d3814fe8b0e52bad97f7212 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 10:21:08 -0800
Subject: [PATCH 100/740] Update flow/flow.h

Co-authored-by: Trevor Clinkenbeard <65554662+sfc-gh-tclinkenbeard@users.noreply.github.com>
---
 flow/flow.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flow/flow.h b/flow/flow.h
index a993fa4061a..509e8caf207 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -898,7 +898,7 @@ decltype(std::declval<Request>().reply) const& getReplyPromise(Request const& r)
 }
 
 template <class Request>
-decltype(std::declval<Request>().reply) const& getReplyPromiseStream(Request const& r) {
+auto const& getReplyPromiseStream(Request const& r) {
 	return r.reply;
 }
 

From ef16dec03688c653c52c6c34493b861c626cff9d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 10:26:26 -0800
Subject: [PATCH 101/740] added a knob for acknowledge limit bytes

---
 fdbrpc/FailureMonitor.actor.cpp | 2 +-
 fdbrpc/fdbrpc.h                 | 6 +++---
 flow/Knobs.cpp                  | 1 +
 flow/Knobs.h                    | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index 9d1047182d7..70304cb3c77 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -133,7 +133,7 @@ void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 }
 
 void SimpleFailureMonitor::notifyDisconnect(NetworkAddress const& address) {
-	TraceEvent("NotifyDisconnect").detail("Address", address);
+	//TraceEvent("NotifyDisconnect").detail("Address", address);
 	endpointKnownFailed.triggerRange(Endpoint({ address }, UID()), Endpoint({ address }, UID(-1, -1)));
 }
 
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 35ee9d94a22..5b1c1b776ff 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -259,7 +259,7 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		} else {
 			ASSERT(message.get().bytes > bytesAcknowledged);
 			bytesAcknowledged = message.get().bytes;
-			if (bytesSent - bytesAcknowledged < 2e6 && ready.isValid() && ready.canBeSet()) {
+			if (bytesSent - bytesAcknowledged < FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES && ready.isValid() && ready.canBeSet()) {
 				ready.send(Void());
 			}
 		}
@@ -337,7 +337,7 @@ class ReplyPromiseStream {
 				value.acknowledgeToken = queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token;
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
-			if((!queue->acknowledgements.ready.isValid() || (queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError())) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= 2e6) {
+			if((!queue->acknowledgements.ready.isValid() || (queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError())) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES) {
 				queue->acknowledgements.ready = Promise<Void>();
 			}
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(value), getEndpoint(), false);
@@ -401,7 +401,7 @@ class ReplyPromiseStream {
 		if(queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError()) {
 			return queue->acknowledgements.ready.getFuture().getError();
 		}
-		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < 2e6) {
+		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES) {
 			return Void();
 		}
 		return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index 606ccb24e6f..4f19a56955c 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -62,6 +62,7 @@ void FlowKnobs::initialize(bool randomize, bool isSimulated) {
 	init( HUGE_ARENA_LOGGING_INTERVAL,                         5.0 );
 
 	init( WRITE_TRACING_ENABLED,                              true ); if( randomize && BUGGIFY ) WRITE_TRACING_ENABLED = false;
+	init( ACKNOWLEDGE_LIMIT_BYTES,                             2e6 ); if( randomize && BUGGIFY ) ACKNOWLEDGE_LIMIT_BYTES = 1;
 
 	//connectionMonitor
 	init( CONNECTION_MONITOR_LOOP_TIME,   isSimulated ? 0.75 : 1.0 ); if( randomize && BUGGIFY ) CONNECTION_MONITOR_LOOP_TIME = 6.0;
diff --git a/flow/Knobs.h b/flow/Knobs.h
index 656cb8eff5a..fe89d85c28d 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -70,6 +70,7 @@ class FlowKnobs : public Knobs {
 	double HUGE_ARENA_LOGGING_INTERVAL;
 
 	bool WRITE_TRACING_ENABLED;
+	int64_t ACKNOWLEDGE_LIMIT_BYTES;
 
 	//run loop profiling
 	double RUN_LOOP_PROFILING_INTERVAL;

From 7514bd0e878b5fffc4f7de2e9b75edada982a88f Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 11:05:30 -0800
Subject: [PATCH 102/740] Use index instead of iterator for tracking next
 fragment

---
 fdbclient/ParallelStream.actor.h | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 7d1a3beda1e..a204010c1a5 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -63,24 +63,24 @@ class ParallelStream {
 
 private:
 	std::vector<std::unique_ptr<Fragment>> fragments;
-	typename std::vector<std::unique_ptr<Fragment>>::iterator nextFragment;
+	size_t fragmentsProcessed { 0 };
 	PromiseStream<T> results;
 
 	// TODO: Fix potential slow task
 	void flushToClient() {
-		while (nextFragment != fragments.end()) {
-			if (!*nextFragment) {
-				++nextFragment;
+		while (fragmentsProcessed < fragments.size()) {
+			auto &fragment = fragments[fragmentsProcessed];
+			if (!fragment) {
+				++fragmentsProcessed;
 				continue;
 			}
-			auto fragment = nextFragment->get();
 			while (!fragment->buffer.empty()) {
 				results.send(fragment->buffer.front());
 				fragment->buffer.pop_front();
 			}
 			if (fragment->completed) {
-				nextFragment->reset();
-				++nextFragment;
+				fragment.reset();
+				++fragmentsProcessed;
 			} else {
 				break;
 			}
@@ -93,10 +93,7 @@ class ParallelStream {
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
 		wait(self->semaphore.take());
 		self->fragments.push_back(std::make_unique<Fragment>(self));
-		if (self->fragments.size() == 1) {
-			self->nextFragment = self->fragments.begin();
-		}
-		ASSERT(*self->nextFragment);
+		ASSERT(self->fragments[self->fragmentsProcessed]);
 		return self->fragments.back().get();
 	}
 

From 91eb0c6f9eadb6c52347176224afe3860af0ab9b Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 11:28:56 -0800
Subject: [PATCH 103/740] Use perfect forwarding in
 ParallelStream::Fragment::send

---
 fdbclient/ParallelStream.actor.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index a204010c1a5..4d2d2d16938 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -48,8 +48,9 @@ class ParallelStream {
 	public:
 		Fragment(ParallelStream* parallelStream)
 		  : parallelStream(parallelStream), releaser(parallelStream->semaphore) {}
-		void send(const T& value) {
-			buffer.push_back(value);
+		template<class U>
+		void send(U &&value) {
+			buffer.push_back(std::forward<U>(value));
 			parallelStream->flushToClient();
 		}
 		void sendError(Error e) { parallelStream->sendError(e); }

From cb588135c7229cc9d374a71224fc4f3de6642381 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 11:34:27 -0800
Subject: [PATCH 104/740] Avoid calling ParallelStream::releaser::release()
 after destruction

---
 fdbclient/ParallelStream.actor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 4d2d2d16938..7449c63dfa8 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -57,8 +57,8 @@ class ParallelStream {
 		void finish() {
 			ASSERT(!completed);
 			completed = true;
+			releaser.release(); // Release before destruction to free up pending fragments
 			parallelStream->flushToClient();
-			releaser.release();
 		}
 	};
 

From 241b38b54f1d7e546ec7a23a3cdcaf0237f638a4 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 16 Dec 2020 20:01:07 +0000
Subject: [PATCH 105/740] Fix fdbClientStream bug

---
 documentation/tutorial/tutorial.actor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index 6ec160824b9..5393c0c3e40 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -401,22 +401,22 @@ ACTOR Future<Void> multipleClients() {
 
 std::string clusterFile = "fdb.cluster";
 
-ACTOR Future<Void> logThroughput(int64_t* v) {
+ACTOR Future<Void> logThroughput(int64_t* v, Key* next) {
 	loop {
 		state int64_t last = *v;
 		wait(delay(1));
-		printf("throughput: %ld bytes/s\n", *v - last);
+		printf("throughput: %ld bytes/s, next: %s\n", *v - last, printable(*next).c_str());
 	}
 }
 
 ACTOR Future<Void> fdbClientStream() {
 	state Database db = Database::createDatabase(clusterFile, 300);
 	state Transaction tx(db);
-	state PromiseStream<Standalone<RangeResultRef>> results;
 	state Key next;
 	state int64_t bytes = 0;
-	state Future<Void> logFuture = logThroughput(&bytes);
+	state Future<Void> logFuture = logThroughput(&bytes, &next);
 	loop {
+		state PromiseStream<Standalone<RangeResultRef>> results;
 		try {
 			state Future<Void> stream =
 			    tx.getRangeStream(results, KeySelector(firstGreaterOrEqual(next), next.arena()),
@@ -441,7 +441,7 @@ ACTOR Future<Void> fdbClientGetRange() {
 	state Transaction tx(db);
 	state Key next;
 	state int64_t bytes = 0;
-	state Future<Void> logFuture = logThroughput(&bytes);
+	state Future<Void> logFuture = logThroughput(&bytes, &next);
 	loop {
 		try {
 			Standalone<RangeResultRef> range = wait(tx.getRange(

From fc859996832e83f04657a33d9021885e7054c249 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 16 Dec 2020 20:01:30 +0000
Subject: [PATCH 106/740] Naive load balancing

---
 fdbclient/NativeAPI.actor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index d6e12563b21..046bc2e99e3 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2699,7 +2699,10 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 				}
 
 				//FIXME: add load balancing
-				state ReplyPromiseStream<GetKeyValuesStreamReply> replyStream = locations[shard].second->getInterface(0).getKeyValuesStream.getReplyStream(req);
+				state ReplyPromiseStream<GetKeyValuesStreamReply> replyStream =
+				    locations[shard]
+				        .second->getInterface(deterministicRandom()->randomInt(0, locations[shard].second->size()))
+				        .getKeyValuesStream.getReplyStream(req);
 				state bool breakAgain = false;
 				loop {
 					try {

From 18205a9e20fa4616c700359bf49217c2b903e495 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 16 Dec 2020 20:02:12 +0000
Subject: [PATCH 107/740] Remove broken assert

---
 fdbrpc/genericactors.actor.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 654c412570c..4f21b2441e8 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -229,7 +229,6 @@ Future<ErrorOr<X>> waitValueOrSignal( Future<X> value, Future<Void> signal, Endp
 			if( e.code() == error_code_actor_cancelled )
 				throw e;
 
-			ASSERT(e.code() != error_code_broken_promise);
 			return ErrorOr<X>(e);
 		}
 	}

From 3bf9dcac4bb52dca6dc5cf893d6021fb3c07a611 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 13:00:17 -0800
Subject: [PATCH 108/740] updated fetchKeys to properly use getRangeStream

---
 fdbserver/Knobs.cpp               |   1 +
 fdbserver/Knobs.h                 |   1 +
 fdbserver/storageserver.actor.cpp | 208 ++++++++++--------------------
 3 files changed, 67 insertions(+), 143 deletions(-)

diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index c7165d326a5..158bbd60ed5 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -553,6 +553,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( BUGGIFY_LIMIT_BYTES,                                  1000 );
 	init( FETCH_BLOCK_BYTES,                                     2e6 );
 	init( FETCH_KEYS_PARALLELISM_BYTES,                          4e6 ); if( randomize && BUGGIFY ) FETCH_KEYS_PARALLELISM_BYTES = 3e6;
+	init( FETCH_KEYS_PARALLELISM,                                  1 );
 	init( FETCH_KEYS_LOWER_PRIORITY,                               0 );
 	init( BUGGIFY_BLOCK_BYTES,                                 10000 );
 	init( STORAGE_COMMIT_BYTES,                             10000000 ); if( randomize && BUGGIFY ) STORAGE_COMMIT_BYTES = 2000000;
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 16160381297..2095bf4e485 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -480,6 +480,7 @@ class ServerKnobs : public Knobs {
 	int BUGGIFY_LIMIT_BYTES;
 	int FETCH_BLOCK_BYTES;
 	int FETCH_KEYS_PARALLELISM_BYTES;
+	int FETCH_KESY_PARALLELISM;
 	int FETCH_KEYS_LOWER_PRIORITY;
 	int BUGGIFY_BLOCK_BYTES;
 	int64_t STORAGE_HARD_LIMIT_BYTES;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 5df2c559ce4..d07d61d1d68 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -614,7 +614,7 @@ struct StorageServer {
 			versionLag(0), primaryLocality(tagLocalityInvalid),
 			updateEagerReads(0),
 			shardChangeCounter(0),
-			fetchKeysParallelismLock(SERVER_KNOBS->FETCH_KEYS_PARALLELISM_BYTES),
+			fetchKeysParallelismLock(SERVER_KNOBS->FETCH_KEYS_PARALLELISM),
 			shuttingDown(false), debug_inApplyUpdate(false), debug_lastValidateTime(0), watchBytes(0), numWatches(0),
 			logProtocol(0), counters(this), tag(invalidTag), maxQueryQueue(0), thisServerID(ssi.id()),
 			readQueueSizeMetric(LiteralStringRef("StorageServer.ReadQueueSize")),
@@ -2218,70 +2218,6 @@ void coalesceShards(StorageServer *data, KeyRangeRef keys) {
 	}
 }
 
-ACTOR Future<Standalone<RangeResultRef>> tryGetRange( Database cx, Version version, KeyRangeRef keys, GetRangeLimits limits, bool* isTooOld ) {
-	state Transaction tr( cx );
-	state Standalone<RangeResultRef> output;
-	state KeySelectorRef begin = firstGreaterOrEqual( keys.begin );
-	state KeySelectorRef end = firstGreaterOrEqual( keys.end );
-
-	if( *isTooOld )
-		throw transaction_too_old();
-
-	ASSERT(!cx->switchable);
-	tr.setVersion( version );
-	tr.info.taskID = TaskPriority::FetchKeys;
-	limits.minRows = 0;
-
-	try {
-		loop {
-			state PromiseStream<Standalone<RangeResultRef>> results;
-			state Future<Void> hold = tr.getRangeStream(results, begin, end, limits, true);
-			loop {
-				Standalone<RangeResultRef> rep = waitNext( results.getFuture() );
-				limits.decrement( rep );
-				//FIXME: this is only returning the first result from the stream and then cancelling the stream
-				if( limits.isReached() || !rep.more ) {
-					if( output.size() ) {
-						output.arena().dependsOn( rep.arena() );
-						output.append( output.arena(), rep.begin(), rep.size() );
-						if( limits.isReached() && rep.readThrough.present() )
-							output.readThrough = rep.readThrough.get();
-					} else {
-						output = rep;
-					}
-
-					output.more = limits.isReached();
-
-					return output;
-				} else if( rep.readThrough.present() ) {
-					output.arena().dependsOn( rep.arena() );
-					if( rep.size() ) {
-						output.append( output.arena(), rep.begin(), rep.size() );
-						ASSERT( rep.readThrough.get() > rep.end()[-1].key );
-					} else {
-						ASSERT( rep.readThrough.get() > keys.begin );
-					}
-					begin = firstGreaterOrEqual( rep.readThrough.get() );
-				} else {
-					output.arena().dependsOn( rep.arena() );
-					output.append( output.arena(), rep.begin(), rep.size() );
-					begin = firstGreaterThan( output.end()[-1].key );
-				}
-			}
-		}
-	} catch( Error &e ) {
-		if( begin.getKey() != keys.begin && ( e.code() == error_code_transaction_too_old || e.code() == error_code_future_version || e.code() == error_code_process_behind ) ) {
-			if( e.code() == error_code_transaction_too_old )
-				*isTooOld = true;
-			output.more = true;
-			if( begin.isFirstGreaterOrEqual() )
-				output.readThrough = begin.getKey();
-			return output;
-		}
-		throw;
-	}
-}
-
 template <class T>
 void addMutation( T& target, Version version, MutationRef const& mutation ) {
 	target.addMutation( version, mutation );
@@ -2332,8 +2268,7 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 	state KeyRange keys = shard->keys;
 	state Future<Void> warningLogger = logFetchKeysWarning(shard);
 	state double startt = now();
-	state int fetchBlockBytes = BUGGIFY ? SERVER_KNOBS->BUGGIFY_BLOCK_BYTES : SERVER_KNOBS->FETCH_BLOCK_BYTES;
-
+	
 	// delay(0) to force a return to the run loop before the work of fetchKeys is started.
 	//  This allows adding->start() to be called inline with CSK.
 	wait( data->coreStarted.getFuture() && delay( 0 ) );
@@ -2365,8 +2300,8 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 
 		TraceEvent(SevDebug, "FetchKeysVersionSatisfied", data->thisServerID).detail("FKID", interval.pairID);
 
-		wait( data->fetchKeysParallelismLock.take( TaskPriority::DefaultYield, fetchBlockBytes ) );
-		state FlowLock::Releaser holdingFKPL( data->fetchKeysParallelismLock, fetchBlockBytes );
+		wait( data->fetchKeysParallelismLock.take( TaskPriority::DefaultYield ) );
+		state FlowLock::Releaser holdingFKPL( data->fetchKeysParallelismLock );
 
 		state double executeStart = now();
 		++data->counters.fetchWaitingCount;
@@ -2378,8 +2313,7 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 		wait( data->durableVersionLock.take() );
 
 		shard->phase = AddingShard::Fetching;
-		state Version fetchVersion = data->version.get();
-
+		
 		data->durableVersionLock.release();
 
 		wait(delay(0));
@@ -2395,49 +2329,69 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 		data->cx->invalidateCache(keys);
 
 		loop {
-			try {
-				TEST(true);		// Fetching keys for transferred shard
-
-				//FIXME: this is inefficient because we are restarting the getRangeStreaming for every block
-				state Standalone<RangeResultRef> this_block =
-				    wait(tryGetRange(data->cx, fetchVersion, keys,
-				                     GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, fetchBlockBytes), &isTooOld));
-
-				int expectedSize = (int)this_block.expectedSize() + (8-(int)sizeof(KeyValueRef))*this_block.size();
-
-				TraceEvent(SevDebug, "FetchKeysBlock", data->thisServerID).detail("FKID", interval.pairID)
-					.detail("BlockRows", this_block.size()).detail("BlockBytes", expectedSize)
-					.detail("KeyBegin", keys.begin).detail("KeyEnd", keys.end)
-					.detail("Last", this_block.size() ? this_block.end()[-1].key : std::string())
-					.detail("Version", fetchVersion).detail("More", this_block.more);
-				DEBUG_KEY_RANGE("fetchRange", fetchVersion, keys);
-				for(auto k = this_block.begin(); k != this_block.end(); ++k) DEBUG_MUTATION("fetch", fetchVersion, MutationRef(MutationRef::SetValue, k->key, k->value));
-
-				data->counters.bytesFetched += expectedSize;
-				if( fetchBlockBytes > expectedSize ) {
-					holdingFKPL.release( fetchBlockBytes - expectedSize );
-				}
+			state Transaction tr( data->cx );
+			state Version fetchVersion = data->version.get();
+			while (!shard->updates.empty() && shard->updates[0].version <= fetchVersion) shard->updates.pop_front();
+			tr.setVersion( fetchVersion );
+			tr.info.taskID = TaskPriority::FetchKeys;
+			state PromiseStream<Standalone<RangeResultRef>> results;
+			state Future<Void> hold = tr.getRangeStream(results, keys, GetRangeLimits(), true);
+			state Key nfk = keys.begin;
 
-				// Wait for permission to proceed
-				//wait( data->fetchKeysStorageWriteLock.take() );
-				//state FlowLock::Releaser holdingFKSWL( data->fetchKeysStorageWriteLock );
+			loop {
+				try {
+					TEST(true);		// Fetching keys for transferred shard
+					state Standalone<RangeResultRef> this_block = waitNext( results.getFuture() );
+
+					int expectedSize = (int)this_block.expectedSize() + (8-(int)sizeof(KeyValueRef))*this_block.size();
+
+					TraceEvent(SevDebug, "FetchKeysBlock", data->thisServerID).detail("FKID", interval.pairID)
+						.detail("BlockRows", this_block.size()).detail("BlockBytes", expectedSize)
+						.detail("KeyBegin", keys.begin).detail("KeyEnd", keys.end)
+						.detail("Last", this_block.size() ? this_block.end()[-1].key : std::string())
+						.detail("Version", fetchVersion).detail("More", this_block.more);
+					DEBUG_KEY_RANGE("fetchRange", fetchVersion, keys);
+					for(auto k = this_block.begin(); k != this_block.end(); ++k) DEBUG_MUTATION("fetch", fetchVersion, MutationRef(MutationRef::SetValue, k->key, k->value));
+
+					data->counters.bytesFetched += expectedSize;
+
+					// Write this_block to storage
+					state KeyValueRef *kvItr = this_block.begin();
+					for(; kvItr != this_block.end(); ++kvItr) {
+						data->storage.writeKeyValue( *kvItr );
+						wait(yield());
+					}
 
-				// Write this_block to storage
-				state KeyValueRef *kvItr = this_block.begin();
-				for(; kvItr != this_block.end(); ++kvItr) {
-					data->storage.writeKeyValue( *kvItr );
-					wait(yield());
-				}
+					kvItr = this_block.begin();
+					for(; kvItr != this_block.end(); ++kvItr) {
+						data->byteSampleApplySet( *kvItr, invalidVersion );
+						wait(yield());
+					}
 
-				kvItr = this_block.begin();
-				for(; kvItr != this_block.end(); ++kvItr) {
-					data->byteSampleApplySet( *kvItr, invalidVersion );
-					wait(yield());
-				}
+					nfk = this_block.readThrough.present() ? this_block.readThrough.get() : keyAfter( this_block.end()[-1].key );
+					this_block = Standalone<RangeResultRef>();
+				} catch( Error &e ) {
+					if(e.code() != error_code_end_of_stream || e.code() != error_code_connection_failed || e.code() != error_code_transaction_too_old ||
+					   e.code() != error_code_future_version || e.code() != error_code_process_behind) {
+						throw;
+					}
+					if(nfk == keys.begin) {
+						TraceEvent("FKBlockFail", data->thisServerID).error(e,true).suppressFor(1.0).detail("FKID", interval.pairID);
+
+						//FIXME: remove when we no longer support upgrades from 5.X
+						if(debug_getRangeRetries >= 100) {
+							data->cx->enableLocalityLoadBalance = false;
+						}
 
-				if (this_block.more) {
-					Key nfk = this_block.readThrough.present() ? this_block.readThrough.get() : keyAfter( this_block.end()[-1].key );
-					if (nfk != keys.end) {
+						debug_getRangeRetries++;
+						if (debug_nextRetryToLog==debug_getRangeRetries){
+							debug_nextRetryToLog += std::min(debug_nextRetryToLog, 1024);
+							TraceEvent(SevWarn, "FetchPast", data->thisServerID).detail("TotalAttempts", debug_getRangeRetries).detail("FKID", interval.pairID).detail("V", lastFV).detail("N", fetchVersion).detail("E", data->version.get());
+						}
+						wait( delayJittered( FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY ) );
+						continue;
+					}
+					if(nfk < keys.end) {
 						std::deque< Standalone<VerUpdateRef> > updatesToSplit = std::move( shard->updates );
 
 						// This actor finishes committing the keys [keys.begin,nfk) that we already fetched.
@@ -2461,40 +2415,8 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 						TEST( shard->updates.size() ); // Shard has updates
 						ASSERT( otherShard->updates.empty() );
 					}
+					break;
 				}
-
-				this_block = Standalone<RangeResultRef>();
-
-				if (BUGGIFY) wait( delay( 1 ) );
-
-				break;
-			} catch (Error& e) {
-				TraceEvent("FKBlockFail", data->thisServerID).error(e,true).suppressFor(1.0).detail("FKID", interval.pairID);
-				if (e.code() == error_code_transaction_too_old){
-					TEST(true); // A storage server has forgotten the history data we are fetching
-					Version lastFV = fetchVersion;
-					fetchVersion = data->version.get();
-					isTooOld = false;
-
-					// Throw away deferred updates from before fetchVersion, since we don't need them to use blocks fetched at that version
-					while (!shard->updates.empty() && shard->updates[0].version <= fetchVersion) shard->updates.pop_front();
-
-					//FIXME: remove when we no longer support upgrades from 5.X
-					if(debug_getRangeRetries >= 100) {
-						data->cx->enableLocalityLoadBalance = false;
-					}
-
-					debug_getRangeRetries++;
-					if (debug_nextRetryToLog==debug_getRangeRetries){
-						debug_nextRetryToLog += std::min(debug_nextRetryToLog, 1024);
-						TraceEvent(SevWarn, "FetchPast", data->thisServerID).detail("TotalAttempts", debug_getRangeRetries).detail("FKID", interval.pairID).detail("V", lastFV).detail("N", fetchVersion).detail("E", data->version.get());
-					}
-				} else if (e.code() == error_code_future_version || e.code() == error_code_process_behind) {
-					TEST(true); // fetchKeys got future_version or process_behind, so there must be a huge storage lag somewhere.  Keep trying.
-				} else {
-					throw;
-				}
-				wait( delayJittered( FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY ) );
 			}
 		}
 

From bebddcbc450f6433ebdb0fcd1157978639f5dece Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 13:03:11 -0800
Subject: [PATCH 109/740] reordered the loop and try

---
 fdbserver/storageserver.actor.cpp | 88 +++++++++++++++----------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index d07d61d1d68..0d4cee5b373 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2338,8 +2338,8 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 			state Future<Void> hold = tr.getRangeStream(results, keys, GetRangeLimits(), true);
 			state Key nfk = keys.begin;
 
-			loop {
-				try {
+			try {
+				loop {
 					TEST(true);		// Fetching keys for transferred shard
 					state Standalone<RangeResultRef> this_block = waitNext( results.getFuture() );
 
@@ -2370,53 +2370,53 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 
 					nfk = this_block.readThrough.present() ? this_block.readThrough.get() : keyAfter( this_block.end()[-1].key );
 					this_block = Standalone<RangeResultRef>();
-				} catch( Error &e ) {
-					if(e.code() != error_code_end_of_stream || e.code() != error_code_connection_failed || e.code() != error_code_transaction_too_old ||
-					   e.code() != error_code_future_version || e.code() != error_code_process_behind) {
-						throw;
-					}
-					if(nfk == keys.begin) {
-						TraceEvent("FKBlockFail", data->thisServerID).error(e,true).suppressFor(1.0).detail("FKID", interval.pairID);
-
-						//FIXME: remove when we no longer support upgrades from 5.X
-						if(debug_getRangeRetries >= 100) {
-							data->cx->enableLocalityLoadBalance = false;
-						}
+				}
+			} catch( Error &e ) {
+				if(e.code() != error_code_end_of_stream || e.code() != error_code_connection_failed || e.code() != error_code_transaction_too_old ||
+					e.code() != error_code_future_version || e.code() != error_code_process_behind) {
+					throw;
+				}
+				if(nfk == keys.begin) {
+					TraceEvent("FKBlockFail", data->thisServerID).error(e,true).suppressFor(1.0).detail("FKID", interval.pairID);
 
-						debug_getRangeRetries++;
-						if (debug_nextRetryToLog==debug_getRangeRetries){
-							debug_nextRetryToLog += std::min(debug_nextRetryToLog, 1024);
-							TraceEvent(SevWarn, "FetchPast", data->thisServerID).detail("TotalAttempts", debug_getRangeRetries).detail("FKID", interval.pairID).detail("V", lastFV).detail("N", fetchVersion).detail("E", data->version.get());
-						}
-						wait( delayJittered( FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY ) );
-						continue;
+					//FIXME: remove when we no longer support upgrades from 5.X
+					if(debug_getRangeRetries >= 100) {
+						data->cx->enableLocalityLoadBalance = false;
 					}
-					if(nfk < keys.end) {
-						std::deque< Standalone<VerUpdateRef> > updatesToSplit = std::move( shard->updates );
-
-						// This actor finishes committing the keys [keys.begin,nfk) that we already fetched.
-						// The remaining unfetched keys [nfk,keys.end) will become a separate AddingShard with its own fetchKeys.
-						shard->server->addShard( ShardInfo::addingSplitLeft( KeyRangeRef(keys.begin, nfk), shard ) );
-						shard->server->addShard( ShardInfo::newAdding( data, KeyRangeRef(nfk, keys.end) ) );
-						shard = data->shards.rangeContaining( keys.begin ).value()->adding;
-						warningLogger = logFetchKeysWarning(shard);
-						AddingShard* otherShard = data->shards.rangeContaining( nfk ).value()->adding;
-						keys = shard->keys;
-
-						// Split our prior updates.  The ones that apply to our new, restricted key range will go back into shard->updates,
-						// and the ones delivered to the new shard will be discarded because it is in WaitPrevious phase (hasn't chosen a fetchVersion yet).
-						// What we are doing here is expensive and could get more expensive if we started having many more blocks per shard. May need optimization in the future.
-						std::deque< Standalone<VerUpdateRef> >::iterator u = updatesToSplit.begin();
-						for(; u != updatesToSplit.end(); ++u) {
-							splitMutations(data, data->shards, *u);
-						}
 
-						TEST( true );  // fetchkeys has more
-						TEST( shard->updates.size() ); // Shard has updates
-						ASSERT( otherShard->updates.empty() );
+					debug_getRangeRetries++;
+					if (debug_nextRetryToLog==debug_getRangeRetries){
+						debug_nextRetryToLog += std::min(debug_nextRetryToLog, 1024);
+						TraceEvent(SevWarn, "FetchPast", data->thisServerID).detail("TotalAttempts", debug_getRangeRetries).detail("FKID", interval.pairID).detail("V", lastFV).detail("N", fetchVersion).detail("E", data->version.get());
 					}
-					break;
+					wait( delayJittered( FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY ) );
+					continue;
 				}
+				if(nfk < keys.end) {
+					std::deque< Standalone<VerUpdateRef> > updatesToSplit = std::move( shard->updates );
+
+					// This actor finishes committing the keys [keys.begin,nfk) that we already fetched.
+					// The remaining unfetched keys [nfk,keys.end) will become a separate AddingShard with its own fetchKeys.
+					shard->server->addShard( ShardInfo::addingSplitLeft( KeyRangeRef(keys.begin, nfk), shard ) );
+					shard->server->addShard( ShardInfo::newAdding( data, KeyRangeRef(nfk, keys.end) ) );
+					shard = data->shards.rangeContaining( keys.begin ).value()->adding;
+					warningLogger = logFetchKeysWarning(shard);
+					AddingShard* otherShard = data->shards.rangeContaining( nfk ).value()->adding;
+					keys = shard->keys;
+
+					// Split our prior updates.  The ones that apply to our new, restricted key range will go back into shard->updates,
+					// and the ones delivered to the new shard will be discarded because it is in WaitPrevious phase (hasn't chosen a fetchVersion yet).
+					// What we are doing here is expensive and could get more expensive if we started having many more blocks per shard. May need optimization in the future.
+					std::deque< Standalone<VerUpdateRef> >::iterator u = updatesToSplit.begin();
+					for(; u != updatesToSplit.end(); ++u) {
+						splitMutations(data, data->shards, *u);
+					}
+
+					TEST( true );  // fetchkeys has more
+					TEST( shard->updates.size() ); // Shard has updates
+					ASSERT( otherShard->updates.empty() );
+				}
+				break;
 			}
 		}
 

From c063a7d98e37d1ad48a22491005ab798f06502be Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 13:04:33 -0800
Subject: [PATCH 110/740] fixed typo

---
 fdbserver/Knobs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 2095bf4e485..edb426533af 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -480,7 +480,7 @@ class ServerKnobs : public Knobs {
 	int BUGGIFY_LIMIT_BYTES;
 	int FETCH_BLOCK_BYTES;
 	int FETCH_KEYS_PARALLELISM_BYTES;
-	int FETCH_KESY_PARALLELISM;
+	int FETCH_KEYS_PARALLELISM;
 	int FETCH_KEYS_LOWER_PRIORITY;
 	int BUGGIFY_BLOCK_BYTES;
 	int64_t STORAGE_HARD_LIMIT_BYTES;

From 0cebd5e29fc18bbc7cd4208c8bad0e8afc1a7f8a Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 12:11:08 -0800
Subject: [PATCH 111/740] Take advantage of move sematings in
 ParallelStream::flushToClient

---
 fdbclient/ParallelStream.actor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 7449c63dfa8..f26dd1a62ea 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -76,7 +76,7 @@ class ParallelStream {
 				continue;
 			}
 			while (!fragment->buffer.empty()) {
-				results.send(fragment->buffer.front());
+				results.send(std::move(fragment->buffer.front()));
 				fragment->buffer.pop_front();
 			}
 			if (fragment->completed) {

From 15579299fcdabe0c43957eca22fe98662db5693f Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 12:42:25 -0800
Subject: [PATCH 112/740] Encapsulate ParallelStream::Fragment construction

---
 fdbclient/ParallelStream.actor.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index f26dd1a62ea..73aa3a65d2a 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -37,16 +37,20 @@
 template <class T>
 class ParallelStream {
 	FlowLock semaphore;
+	struct FragmentConstructorTag {
+		explicit FragmentConstructorTag() = default;
+	};
 
 public:
 	class Fragment {
 		ParallelStream* parallelStream;
 		std::deque<T> buffer;
 		bool completed{ false };
-		friend class ParallelStream;
 		FlowLock::Releaser releaser;
+		friend class ParallelStream;
+
 	public:
-		Fragment(ParallelStream* parallelStream)
+		Fragment(ParallelStream* parallelStream, FragmentConstructorTag)
 		  : parallelStream(parallelStream), releaser(parallelStream->semaphore) {}
 		template<class U>
 		void send(U &&value) {
@@ -93,7 +97,7 @@ class ParallelStream {
 
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
 		wait(self->semaphore.take());
-		self->fragments.push_back(std::make_unique<Fragment>(self));
+		self->fragments.push_back(std::make_unique<Fragment>(self, FragmentConstructorTag()));
 		ASSERT(self->fragments[self->fragmentsProcessed]);
 		return self->fragments.back().get();
 	}

From 2bfb178bb11dc61fcb1697f673606ae191c93955 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 13:41:54 -0800
Subject: [PATCH 113/740] Move ParallelStream.actor.cpp to fdbclient

---
 fdbclient/CMakeLists.txt                                        | 1 +
 .../ParallelStream.actor.cpp                                    | 2 ++
 fdbserver/CMakeLists.txt                                        | 1 -
 fdbserver/workloads/UnitTests.actor.cpp                         | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)
 rename fdbserver/workloads/ParallelStreamCorrectness.actor.cpp => fdbclient/ParallelStream.actor.cpp (98%)

diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index 3df3422ccf3..4029567e757 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -50,6 +50,7 @@ set(FDBCLIENT_SRCS
   NativeAPI.actor.cpp
   NativeAPI.actor.h
   Notified.h
+  ParallelStream.actor.cpp
   ParallelStream.actor.h
   ReadYourWrites.actor.cpp
   ReadYourWrites.h
diff --git a/fdbserver/workloads/ParallelStreamCorrectness.actor.cpp b/fdbclient/ParallelStream.actor.cpp
similarity index 98%
rename from fdbserver/workloads/ParallelStreamCorrectness.actor.cpp
rename to fdbclient/ParallelStream.actor.cpp
index 5975f3eff85..a9a6c5ca849 100644
--- a/fdbserver/workloads/ParallelStreamCorrectness.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -65,3 +65,5 @@ TEST_CASE("/fdbclient/ParallelStream") {
 	wait(consumer);
 	return Void();
 }
+
+void forceLinkParallelStreamTests() {}
diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index 1469bf8af0a..bf266069cbd 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -175,7 +175,6 @@ set(FDBSERVER_SRCS
   workloads/MemoryKeyValueStore.h
   workloads/MemoryLifetime.actor.cpp
   workloads/MetricLogging.actor.cpp
-  workloads/ParallelStreamCorrectness.actor.cpp
   workloads/Performance.actor.cpp
   workloads/Ping.actor.cpp
   workloads/PopulateTPCC.actor.cpp
diff --git a/fdbserver/workloads/UnitTests.actor.cpp b/fdbserver/workloads/UnitTests.actor.cpp
index 10fa0283546..bf0a885d299 100644
--- a/fdbserver/workloads/UnitTests.actor.cpp
+++ b/fdbserver/workloads/UnitTests.actor.cpp
@@ -28,6 +28,7 @@ void forceLinkFlowTests();
 void forceLinkVersionedMapTests();
 void forceLinkMemcpyTests();
 void forceLinkMemcpyPerfTests();
+void forceLinkParallelStreamTests();
 
 struct UnitTestWorkload : TestWorkload {
 	bool enabled;
@@ -49,6 +50,7 @@ struct UnitTestWorkload : TestWorkload {
 		forceLinkVersionedMapTests();
 		forceLinkMemcpyTests();
 		forceLinkMemcpyPerfTests();
+		forceLinkParallelStreamTests();
 	}
 
 	std::string description() const override { return "UnitTests"; }

From dcd9a392401415fb1d57f9583b59ac33082f73aa Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 16 Dec 2020 22:00:22 +0000
Subject: [PATCH 114/740] Add some missing result->send's, work around
 getRangeSplitPoints bug

---
 fdbclient/NativeAPI.actor.cpp | 57 ++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 046bc2e99e3..4c9c7baed76 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2779,42 +2779,48 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 								//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
 								//}
 
-								results->send(std::move(output));
+								if (output.size()) {
+									results->send(std::move(output));
+								}
 								results->finish();
 								return Void();
 							}
 
+							ASSERT(output.size());
+							results->send(std::move(output));
 							keys = KeyRangeRef(begin, end);
 							breakAgain = true;
 							break;
 						}
 
+						ASSERT(output.size());
+						results->send(std::move(output));
 						++shard;
 						break;
 					}
 
-					if(output.size() > 0) {
-						output.more = true;
-						if (keys.begin == allKeys.begin && !reverse) {
-							output.readToBegin = true;
-						}
-						if (keys.end == allKeys.end && reverse) {
-							output.readThroughEnd = true;
-						}
-						int64_t bytes = 0;
-						for(const KeyValueRef &kv : output) {
-							bytes += kv.key.size() + kv.value.size();
-						}
+					ASSERT(output.size());
+					output.more = true;
+					if (keys.begin == allKeys.begin && !reverse) {
+						output.readToBegin = true;
+					}
+					if (keys.end == allKeys.end && reverse) {
+						output.readThroughEnd = true;
+					}
+					int64_t bytes = 0;
+					for (const KeyValueRef& kv : output) {
+						bytes += kv.key.size() + kv.value.size();
+					}
 
-						cx->transactionBytesRead += bytes;
-						cx->transactionKeysRead += output.size();
+					cx->transactionBytesRead += bytes;
+					cx->transactionKeysRead += output.size();
 
-						//FIXME: figure out appropriate metrics for the client event log
-						//if( trLogInfo ) {
-						//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
-						//}
-						results->send(std::move(output));
-					}
+					// FIXME: figure out appropriate metrics for the client event log
+					// if( trLogInfo ) {
+					//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(),
+					//now()-startTime, bytes, begin.getKey(), end.getKey()));
+					//}
+					results->send(std::move(output));
 				}
 				if (breakAgain) {
 					break;
@@ -2900,6 +2906,9 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 
 	state std::vector<KeyRangeRef>::iterator toSendIt = toSend.begin();
 	for (; toSendIt != toSend.end(); ++toSendIt) {
+		if (toSendIt->empty()) {
+			continue;
+		}
 		ParallelStream<RangeResult>::Fragment* fragment = wait(results.createFragment());
 		outstandingRequests.push_back(getRangeStreamFragment(fragment, cx, trLogInfo, version, *toSendIt, limits,
 		                                                     snapshot, reverse, info, tags, span.context));
@@ -4996,9 +5005,9 @@ Future<Standalone<VectorRef<ReadHotRangeWithMetrics>>> Transaction::getReadHotRa
 ACTOR Future<Standalone<VectorRef<KeyRef>>> getRangeSplitPoints(Database cx, KeyRange keys, int64_t chunkSize) {
 	state Span span("NAPI:GetRangeSplitPoints"_loc);
 	loop {
-		state vector<pair<KeyRange, Reference<LocationInfo>>> locations =
-		    wait(getKeyRangeLocations(cx, keys, 100, false, &StorageServerInterface::getRangeSplitPoints,
-		                              TransactionInfo(TaskPriority::DataDistribution, span.context)));
+		state vector<pair<KeyRange, Reference<LocationInfo>>> locations = wait(
+		    getKeyRangeLocations(cx, keys, CLIENT_KNOBS->TOO_MANY, false, &StorageServerInterface::getRangeSplitPoints,
+		                         TransactionInfo(TaskPriority::DataDistribution, span.context)));
 		try {
 			state int nLocs = locations.size();
 			state vector<Future<SplitRangeReply>> fReplies(nLocs);

From 2c030658e901d8baee8d2e2f2b2979131914d26f Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 16 Dec 2020 22:41:30 +0000
Subject: [PATCH 115/740] Handle empty range from client

---
 documentation/tutorial/tutorial.actor.cpp | 6 ++++--
 fdbclient/NativeAPI.actor.cpp             | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index 5393c0c3e40..8f69716177f 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -423,8 +423,10 @@ ACTOR Future<Void> fdbClientStream() {
 			                      KeySelector(firstGreaterOrEqual(normalKeys.end)), GetRangeLimits());
 			loop {
 				Standalone<RangeResultRef> range = waitNext(results.getFuture());
-				bytes += range.expectedSize();
-				next = keyAfter(range.back().key);
+				if (range.size()) {
+					bytes += range.expectedSize();
+					next = keyAfter(range.back().key);
+				}
 			}
 		} catch (Error& e) {
 			if (e.code() == error_code_end_of_stream) {
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 4c9c7baed76..533dfa77403 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2779,9 +2779,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 								//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
 								//}
 
-								if (output.size()) {
-									results->send(std::move(output));
-								}
+								results->send(std::move(output));
 								results->finish();
 								return Void();
 							}

From 702a882a5c9f74e88b22c368b947f177458d2bdc Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 14:47:48 -0800
Subject: [PATCH 116/740] get split points one shard at a time

---
 fdbclient/NativeAPI.actor.cpp | 62 +++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 533dfa77403..c8724b8964d 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2789,6 +2789,11 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 							keys = KeyRangeRef(begin, end);
 							breakAgain = true;
 							break;
+						} else {
+							output.more = true;
+							output.arena().dependsOn( locations[shard].first.arena() );
+							output.readThrough = reverse ? locations[shard].first.begin : locations[shard].first.end;
+							results->send(std::move(output));
 						}
 
 						ASSERT(output.size());
@@ -2880,38 +2885,47 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 		return Void();
 	}
 
-	state KeyRangeRef keys(b, e);
-
 	//if e is allKeys.end, we have read through the end of the database
 	//if b is allKeys.begin, we have either read through the beginning of the database,
 	//or allKeys.begin exists in the database and will be part of the conflict range anyways
 
-	state Standalone<VectorRef<KeyRef>> splitPoints =
-	    wait(getRangeSplitPoints(cx, keys, CLIENT_KNOBS->RANGESTREAM_FRAGMENT_SIZE));
-	state std::vector<KeyRangeRef> toSend;
-	// state std::vector<Future<std::list<KeyRangeRef>::iterator>> outstandingRequests;
-	state std::vector<Future<Void>> outstandingRequests;
-
-	if (!splitPoints.empty()) {
-		toSend.emplace_back(b, splitPoints.front());
-		for (int i = 0; i < splitPoints.size() - 1; ++i) {
-			toSend.emplace_back(splitPoints[i], splitPoints[i + 1]);
+	loop {
+		state pair<KeyRange, Reference<LocationInfo>> ssi = 
+			wait(getKeyLocation(cx, reverse ? e : b, &StorageServerInterface::getKeyValuesStream, info, reverse));
+		state Standalone<VectorRef<KeyRef>> splitPoints =
+			wait(getRangeSplitPoints(cx, ssi.first, CLIENT_KNOBS->RANGESTREAM_FRAGMENT_SIZE));
+		state std::vector<KeyRangeRef> toSend;
+		// state std::vector<Future<std::list<KeyRangeRef>::iterator>> outstandingRequests;
+		state std::vector<Future<Void>> outstandingRequests;
+
+		if (!splitPoints.empty()) {
+			toSend.emplace_back(b, splitPoints.front());
+			for (int i = 0; i < splitPoints.size() - 1; ++i) {
+				toSend.emplace_back(splitPoints[i], splitPoints[i + 1]);
+			}
+			toSend.emplace_back(splitPoints.back(), e);
+		} else {
+			toSend.emplace_back(b, e);
 		}
-		toSend.emplace_back(splitPoints.back(), e);
-	} else {
-		toSend.emplace_back(b, e);
-	}
 
-	state std::vector<KeyRangeRef>::iterator toSendIt = toSend.begin();
-	for (; toSendIt != toSend.end(); ++toSendIt) {
-		if (toSendIt->empty()) {
-			continue;
+		state std::vector<KeyRangeRef>::iterator toSendIt = toSend.begin();
+		for (; toSendIt != toSend.end(); ++toSendIt) {
+			if (toSendIt->empty()) {
+				continue;
+			}
+			ParallelStream<RangeResult>::Fragment* fragment = wait(results.createFragment());
+			outstandingRequests.push_back(getRangeStreamFragment(fragment, cx, trLogInfo, version, *toSendIt, limits,
+																snapshot, reverse, info, tags, span.context));
+		}
+		if(reverse) {
+			e = ssi.first.begin;
+		} else {
+			b = ssi.first.end;
+		}
+		if(b >= e) {
+			break;
 		}
-		ParallelStream<RangeResult>::Fragment* fragment = wait(results.createFragment());
-		outstandingRequests.push_back(getRangeStreamFragment(fragment, cx, trLogInfo, version, *toSendIt, limits,
-		                                                     snapshot, reverse, info, tags, span.context));
 	}
-
 	try {
 		wait(waitForAll(outstandingRequests));
 	} catch (Error& e) {

From c7ac1622cc1d590065a84958f4566248982455d1 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 14:51:41 -0800
Subject: [PATCH 117/740] removed missing variable

---
 fdbserver/storageserver.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 0d4cee5b373..d04ab9a1c00 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2387,7 +2387,7 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 					debug_getRangeRetries++;
 					if (debug_nextRetryToLog==debug_getRangeRetries){
 						debug_nextRetryToLog += std::min(debug_nextRetryToLog, 1024);
-						TraceEvent(SevWarn, "FetchPast", data->thisServerID).detail("TotalAttempts", debug_getRangeRetries).detail("FKID", interval.pairID).detail("V", lastFV).detail("N", fetchVersion).detail("E", data->version.get());
+						TraceEvent(SevWarn, "FetchPast", data->thisServerID).detail("TotalAttempts", debug_getRangeRetries).detail("FKID", interval.pairID).detail("N", fetchVersion).detail("E", data->version.get());
 					}
 					wait( delayJittered( FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY ) );
 					continue;

From 4237bd93eccca08b92dd1bd205102885b7bdf06d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 15:09:20 -0800
Subject: [PATCH 118/740] fixed a bug with reverse range reads

---
 fdbclient/NativeAPI.actor.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index c8724b8964d..4554f39e90e 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2908,13 +2908,15 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 			toSend.emplace_back(b, e);
 		}
 
-		state std::vector<KeyRangeRef>::iterator toSendIt = toSend.begin();
-		for (; toSendIt != toSend.end(); ++toSendIt) {
-			if (toSendIt->empty()) {
+		state int idx = 0;
+		state int useIdx = 0;
+		for (; idx < toSend.size(); ++idx) {
+			useIdx = reverse ? toSend.size() - idx - 1 : idx;
+			if (toSend[useIdx].empty()) {
 				continue;
 			}
 			ParallelStream<RangeResult>::Fragment* fragment = wait(results.createFragment());
-			outstandingRequests.push_back(getRangeStreamFragment(fragment, cx, trLogInfo, version, *toSendIt, limits,
+			outstandingRequests.push_back(getRangeStreamFragment(fragment, cx, trLogInfo, version, toSend[useIdx], limits,
 																snapshot, reverse, info, tags, span.context));
 		}
 		if(reverse) {

From f4e9a9ac40c69587ea9c712fd17db1458cd82345 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 15:36:18 -0800
Subject: [PATCH 119/740] Use PromiseStreams for ParallelStream implementation

---
 fdbclient/ParallelStream.actor.h | 58 +++++++++++++++-----------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 73aa3a65d2a..78690ad69b5 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -28,9 +28,6 @@
 #elif !defined(FDBCLIENT_PARALLEL_STREAM_ACTOR_H)
 #define FDBCLIENT_PARALLEL_STREAM_ACTOR_H
 
-#include <deque>
-#include <vector>
-
 #include "flow/genericactors.actor.h"
 #include "flow/actorcompiler.h" // must be last include
 
@@ -42,9 +39,9 @@ class ParallelStream {
 	};
 
 public:
-	class Fragment {
+	class Fragment : public ReferenceCounted<Fragment> {
 		ParallelStream* parallelStream;
-		std::deque<T> buffer;
+		PromiseStream<T> stream;
 		bool completed{ false };
 		FlowLock::Releaser releaser;
 		friend class ParallelStream;
@@ -54,52 +51,53 @@ class ParallelStream {
 		  : parallelStream(parallelStream), releaser(parallelStream->semaphore) {}
 		template<class U>
 		void send(U &&value) {
-			buffer.push_back(std::forward<U>(value));
-			parallelStream->flushToClient();
+			stream.send(std::forward<U>(value));
 		}
 		void sendError(Error e) { parallelStream->sendError(e); }
 		void finish() {
 			ASSERT(!completed);
 			completed = true;
 			releaser.release(); // Release before destruction to free up pending fragments
-			parallelStream->flushToClient();
 		}
 	};
 
 private:
-	std::vector<std::unique_ptr<Fragment>> fragments;
+	PromiseStream<Reference<Fragment>> fragments;
 	size_t fragmentsProcessed { 0 };
 	PromiseStream<T> results;
+	Future<Void> flusher;
+
+public:
 
 	// TODO: Fix potential slow task
-	void flushToClient() {
-		while (fragmentsProcessed < fragments.size()) {
-			auto &fragment = fragments[fragmentsProcessed];
-			if (!fragment) {
-				++fragmentsProcessed;
-				continue;
-			}
-			while (!fragment->buffer.empty()) {
-				results.send(std::move(fragment->buffer.front()));
-				fragment->buffer.pop_front();
-			}
-			if (fragment->completed) {
-				fragment.reset();
-				++fragmentsProcessed;
-			} else {
-				break;
+	ACTOR static Future<Void> flushToClient(ParallelStream<T> *self) {
+		loop {
+			state Reference<Fragment> fragment = waitNext(self->fragments.getFuture());
+			loop {
+				try {
+					T value = waitNext(fragment->stream.getFuture());
+					self->results.send(value);
+				} catch (Error &e) {
+					if (e.code() == error_code_end_of_stream) {
+						fragment.clear();
+						break;
+					} else {
+						throw e;
+					}
+				}
 			}
 		}
 	}
 
-public:
-	ParallelStream(PromiseStream<T> results, size_t concurrency) : results(results), semaphore(concurrency) {}
+	ParallelStream(PromiseStream<T> results, size_t concurrency) : results(results), semaphore(concurrency) {
+		flusher = flushToClient(this);
+	}
 
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
 		wait(self->semaphore.take());
-		self->fragments.push_back(std::make_unique<Fragment>(self, FragmentConstructorTag()));
-		ASSERT(self->fragments[self->fragmentsProcessed]);
-		return self->fragments.back().get();
+		auto fragment = makeReference<Fragment>(self, FragmentConstructorTag());
+		self->fragments.send(fragment);
+		return fragment.getPtr();
 	}
 
 	Future<Fragment*> createFragment() { return createFragmentImpl(this); }

From f056fddb4d2fc6031a17986cfd133ab6a02469b1 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 16:18:09 -0800
Subject: [PATCH 120/740] fix: readThrough was not being set in all cases

---
 fdbclient/NativeAPI.actor.cpp     | 17 +++++++++++------
 fdbserver/storageserver.actor.cpp |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 4554f39e90e..b60bfc72866 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2661,7 +2661,7 @@ ACTOR Future<Standalone<RangeResultRef>> getRange( Database cx, Reference<Transa
 }
 
 ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment* results, Database cx,
-                                          Reference<TransactionLogInfo> trLogInfo, Version version, KeyRangeRef keys,
+                                          Reference<TransactionLogInfo> trLogInfo, Version version, KeyRange keys,
                                           GetRangeLimits limits, bool snapshot, bool reverse, TransactionInfo info,
                                           TagSet tags, SpanID spanContext) {
 	loop {
@@ -2766,6 +2766,11 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 								if (range.end == allKeys.end) {
 									output.readThroughEnd = true;
 								}
+								if(!output.size()) {
+									output.arena().dependsOn( keys.arena() );
+									output.readThrough = reverse ? keys.begin : keys.end;
+								}
+
 								int64_t bytes = 0;
 								for(const KeyValueRef &kv : output) {
 									bytes += kv.key.size() + kv.value.size();
@@ -2894,18 +2899,18 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 			wait(getKeyLocation(cx, reverse ? e : b, &StorageServerInterface::getKeyValuesStream, info, reverse));
 		state Standalone<VectorRef<KeyRef>> splitPoints =
 			wait(getRangeSplitPoints(cx, ssi.first, CLIENT_KNOBS->RANGESTREAM_FRAGMENT_SIZE));
-		state std::vector<KeyRangeRef> toSend;
+		state std::vector<KeyRange> toSend;
 		// state std::vector<Future<std::list<KeyRangeRef>::iterator>> outstandingRequests;
 		state std::vector<Future<Void>> outstandingRequests;
 
 		if (!splitPoints.empty()) {
-			toSend.emplace_back(b, splitPoints.front());
+			toSend.push_back(KeyRange(KeyRangeRef(b, splitPoints.front()), splitPoints.arena()));
 			for (int i = 0; i < splitPoints.size() - 1; ++i) {
-				toSend.emplace_back(splitPoints[i], splitPoints[i + 1]);
+				toSend.push_back(KeyRange(KeyRangeRef(splitPoints[i], splitPoints[i + 1]), splitPoints.arena()));
 			}
-			toSend.emplace_back(splitPoints.back(), e);
+			toSend.push_back(KeyRange(KeyRangeRef(splitPoints.back(), e), splitPoints.arena()));
 		} else {
-			toSend.emplace_back(b, e);
+			toSend.push_back(KeyRange(KeyRangeRef(b, e), splitPoints.arena()));
 		}
 
 		state int idx = 0;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index d04ab9a1c00..76b83d1e980 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2368,6 +2368,7 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 						wait(yield());
 					}
 
+					ASSERT(this_block.readThrough.present() || this_block.size());
 					nfk = this_block.readThrough.present() ? this_block.readThrough.get() : keyAfter( this_block.end()[-1].key );
 					this_block = Standalone<RangeResultRef>();
 				}

From 9edf3c2e1acf5934a7ccee98a79158fb8c846843 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 16:42:31 -0800
Subject: [PATCH 121/740] for streaming the more flag is always true

---
 fdbclient/NativeAPI.actor.cpp     | 15 +++++----------
 fdbserver/storageserver.actor.cpp |  4 ++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index b60bfc72866..4750a111d3e 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2727,7 +2727,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					}
 					if( info.debugID.present() )
 						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
-					RangeResult output(RangeResultRef(rep.data, rep.more), rep.arena);
+					RangeResult output(RangeResultRef(rep.data, true), rep.arena);
 
 					bool more = rep.more;
 					// If the reply says there is more but we know that we finished the shard, then fix rep.more
@@ -2759,17 +2759,14 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 							KeyRef end = reverse ? range.begin : keys.end;
 
 							if(begin >= end) {
-								output.more = false;
 								if (range.begin == allKeys.begin) {
 									output.readToBegin = true;
 								}
 								if (range.end == allKeys.end) {
 									output.readThroughEnd = true;
 								}
-								if(!output.size()) {
-									output.arena().dependsOn( keys.arena() );
-									output.readThrough = reverse ? keys.begin : keys.end;
-								}
+								output.arena().dependsOn( keys.arena() );
+								output.readThrough = reverse ? keys.begin : keys.end;
 
 								int64_t bytes = 0;
 								for(const KeyValueRef &kv : output) {
@@ -2795,9 +2792,8 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 							breakAgain = true;
 							break;
 						} else {
-							output.more = true;
-							output.arena().dependsOn( locations[shard].first.arena() );
-							output.readThrough = reverse ? locations[shard].first.begin : locations[shard].first.end;
+							output.arena().dependsOn( range.arena() );
+							output.readThrough = reverse ? range.begin : range.end;
 							results->send(std::move(output));
 						}
 
@@ -2808,7 +2804,6 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					}
 
 					ASSERT(output.size());
-					output.more = true;
 					if (keys.begin == allKeys.begin && !reverse) {
 						output.readToBegin = true;
 					}
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 76b83d1e980..3a58272045c 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2373,8 +2373,8 @@ ACTOR Future<Void> fetchKeys( StorageServer *data, AddingShard* shard ) {
 					this_block = Standalone<RangeResultRef>();
 				}
 			} catch( Error &e ) {
-				if(e.code() != error_code_end_of_stream || e.code() != error_code_connection_failed || e.code() != error_code_transaction_too_old ||
-					e.code() != error_code_future_version || e.code() != error_code_process_behind) {
+				if(e.code() != error_code_end_of_stream && e.code() != error_code_connection_failed && e.code() != error_code_transaction_too_old &&
+					e.code() != error_code_future_version && e.code() != error_code_process_behind) {
 					throw;
 				}
 				if(nfk == keys.begin) {

From a4c5867657f2a79c03e2d59a54b1b94b6aed34c5 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 16:45:00 -0800
Subject: [PATCH 122/740] compile error

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 4750a111d3e..0c6b299421a 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2753,8 +2753,8 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 
 					if (!more || locations[shard].first.empty()) {
 						TEST(true); // getRangeStream (!more || locations[shard].first.empty())
+						const KeyRangeRef& range = locations[shard].first;
 						if(shard == locations.size()-1) {
-							const KeyRangeRef& range = locations[shard].first;
 							KeyRef begin = reverse ? keys.begin : range.end;
 							KeyRef end = reverse ? range.begin : keys.end;
 

From 6216d2f84ef53e14f1e48258795987588df5f855 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 16:46:10 -0800
Subject: [PATCH 123/740] another fix

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 0c6b299421a..38b1997b681 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2753,7 +2753,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 
 					if (!more || locations[shard].first.empty()) {
 						TEST(true); // getRangeStream (!more || locations[shard].first.empty())
-						const KeyRangeRef& range = locations[shard].first;
+						const KeyRange& range = locations[shard].first;
 						if(shard == locations.size()-1) {
 							KeyRef begin = reverse ? keys.begin : range.end;
 							KeyRef end = reverse ? range.begin : keys.end;

From 97686fd181d1d4c95d498970778a11cf40377b38 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 17:07:48 -0800
Subject: [PATCH 124/740] fix: the wrong range was being used

---
 fdbclient/NativeAPI.actor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 38b1997b681..f8031ff05ec 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2899,13 +2899,13 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 		state std::vector<Future<Void>> outstandingRequests;
 
 		if (!splitPoints.empty()) {
-			toSend.push_back(KeyRange(KeyRangeRef(b, splitPoints.front()), splitPoints.arena()));
+			toSend.push_back(KeyRange(KeyRangeRef(ssi.first.begin, splitPoints.front()), splitPoints.arena()));
 			for (int i = 0; i < splitPoints.size() - 1; ++i) {
 				toSend.push_back(KeyRange(KeyRangeRef(splitPoints[i], splitPoints[i + 1]), splitPoints.arena()));
 			}
-			toSend.push_back(KeyRange(KeyRangeRef(splitPoints.back(), e), splitPoints.arena()));
+			toSend.push_back(KeyRange(KeyRangeRef(splitPoints.back(), ssi.first.end), splitPoints.arena()));
 		} else {
-			toSend.push_back(KeyRange(KeyRangeRef(b, e), splitPoints.arena()));
+			toSend.push_back(KeyRange(KeyRangeRef(ssi.first.begin, ssi.first.end), splitPoints.arena()));
 		}
 
 		state int idx = 0;

From e4ec9634f5109732e156442d1dab11050236ee21 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 17 Dec 2020 01:12:14 +0000
Subject: [PATCH 125/740] Attempt to fix broken_promise issue

---
 fdbrpc/genericactors.actor.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 4f21b2441e8..0c3c4f70375 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -229,7 +229,11 @@ Future<ErrorOr<X>> waitValueOrSignal( Future<X> value, Future<Void> signal, Endp
 			if( e.code() == error_code_actor_cancelled )
 				throw e;
 
-			return ErrorOr<X>(e);
+			// broken_promise error normally means an endpoint failure, which in tryGetReply has the same semantics as receiving the failure signal
+			if (e.code() != error_code_broken_promise || signal.isError())
+				return ErrorOr<X>(e);
+
+			value = Never();
 		}
 	}
 }

From c6f079443b458d7c678c1ebbf9ad42d625a0f00e Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 17:54:53 -0800
Subject: [PATCH 126/740] Fix some ParallelStream bugs

---
 fdbclient/ParallelStream.actor.cpp | 8 ++++----
 fdbclient/ParallelStream.actor.h   | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index a9a6c5ca849..3e383f24bc7 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -26,9 +26,9 @@
 
 namespace ParallelStreamTest {
 
-ACTOR static Future<Void> produce(ParallelStream<int>::Fragment* fragment, int i) {
+ACTOR static Future<Void> produce(ParallelStream<int>::Fragment* fragment, int value) {
 	wait(delay(deterministicRandom()->random01()));
-	fragment->send(i);
+	fragment->send(value);
 	wait(delay(deterministicRandom()->random01()));
 	fragment->finish();
 	return Void();
@@ -38,8 +38,8 @@ ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
 	state int next;
 	try {
 		loop {
-			int i = waitNext(stream);
-			ASSERT(i == next++);
+			int value = waitNext(stream);
+			ASSERT(value == next++);
 		}
 	} catch (Error& e) {
 		ASSERT(e.code() == error_code_end_of_stream);
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 78690ad69b5..cf9a3150af0 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -42,7 +42,6 @@ class ParallelStream {
 	class Fragment : public ReferenceCounted<Fragment> {
 		ParallelStream* parallelStream;
 		PromiseStream<T> stream;
-		bool completed{ false };
 		FlowLock::Releaser releaser;
 		friend class ParallelStream;
 
@@ -55,9 +54,8 @@ class ParallelStream {
 		}
 		void sendError(Error e) { parallelStream->sendError(e); }
 		void finish() {
-			ASSERT(!completed);
-			completed = true;
 			releaser.release(); // Release before destruction to free up pending fragments
+			stream.sendError(end_of_stream());
 		}
 	};
 

From 5ec3481366dd8c43d7306af3dd935c3593288dc1 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 21:03:08 -0800
Subject: [PATCH 127/740] code cleanup

---
 fdbclient/NativeAPI.actor.cpp   | 202 +-------------------------------
 fdbrpc/fdbrpc.h                 |   6 +-
 fdbserver/NetworkTest.h         |   4 +-
 fdbserver/networktest.actor.cpp |  59 ++++++++--
 4 files changed, 58 insertions(+), 213 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index f8031ff05ec..e39fbc9f55e 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2669,7 +2669,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 		ASSERT( locations.size() );
 		state int shard = 0;
 		loop {
-			const KeyRangeRef& range = locations[shard].first;
+			const KeyRange& range = locations[shard].first;
 
 			state GetKeyValuesStreamRequest req;
 			req.version = version;
@@ -2937,206 +2937,6 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 	return Void();
 }
 
-/*
-ACTOR Future<Void> getRangeStreamSingleShard( PromiseStream<Standalone<RangeResultRef>> results, Database cx, Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion,
-	KeySelector begin, KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange, bool snapshot, bool reverse,
-	TransactionInfo info, TagSet tags )
-{
-	state GetRangeLimits originalLimits( limits );
-	state KeySelector originalBegin = begin;
-	state KeySelector originalEnd = end;
-	state Standalone<RangeResultRef> output;
-	state Span span("NAPI:getRangeStream"_loc, info.spanID);
-
-	try {
-		state Version version = wait( fVersion );
-		cx->validateVersion(version);
-
-		state double startTime = now();
-		state Version readVersion = version; // Needed for latestVersion requests; if more, make future requests at the version that the first one completed
-											 // FIXME: Is this really right?  Weaken this and see if there is a problem; if so maybe there is a much subtler problem even with this.
-
-		if( begin.getKey() == allKeys.begin && begin.offset < 1 ) {
-			output.readToBegin = true;
-			begin = KeySelector(firstGreaterOrEqual( begin.getKey() ), begin.arena());
-		}
-
-		ASSERT( !limits.isReached() );
-		ASSERT( (!limits.hasRowLimit() || limits.rows >= limits.minRows) && limits.minRows >= 0 );
-
-		loop {
-			if( end.getKey() == allKeys.begin && (end.offset < 1 || end.isFirstGreaterOrEqual()) ) {
-				getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
-				results.send(output);
-				results.sendError(end_of_stream());
-				return Void();
-			}
-
-			Key locationKey = reverse ? Key(end.getKey(), end.arena()) : Key(begin.getKey(), begin.arena());
-			bool locationBackward = reverse ? (end-1).isBackward() : begin.isBackward();
-			state pair<KeyRange, Reference<LocationInfo>> beginServer = wait( getKeyLocation( cx, locationKey, &StorageServerInterface::getKeyValues, info, locationBackward ) );
-			state KeyRange shard = beginServer.first;
-			state bool modifiedSelectors = false;
-			state GetKeyValuesRequest req;
-
-			req.isFetchKeys = (info.taskID == TaskPriority::FetchKeys);
-			req.version = readVersion;
-
-			if( reverse && (begin-1).isDefinitelyLess(shard.begin) &&
-				( !begin.isFirstGreaterOrEqual() || begin.getKey() != shard.begin ) ) { //In this case we would be setting modifiedSelectors to true, but not modifying anything
-
-				req.begin = firstGreaterOrEqual( shard.begin );
-				modifiedSelectors = true;
-			}
-			else req.begin = begin;
-
-			if( !reverse && end.isDefinitelyGreater(shard.end) ) {
-				req.end = firstGreaterOrEqual( shard.end );
-				modifiedSelectors = true;
-			}
-			else req.end = end;
-
-			transformRangeLimits(limits, reverse, req);
-			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
-
-			req.tags = cx->sampleReadTags() ? tags : Optional<TagSet>();
-			req.debugID = info.debugID;
-			req.spanContext = span.context;
-			try {
-				if( info.debugID.present() ) {
-					g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.Before");
-				}
-
-				++cx->transactionPhysicalReads;
-				state GetKeyValuesReply rep;
-				if (CLIENT_BUGGIFY) {
-					throw deterministicRandom()->randomChoice(std::vector<Error>{
-							transaction_too_old(), future_version()
-								});
-				}
-				//FIXME: load balance requests
-				if(beginServer.second->size() == 0) {
-					wait(Future<Void>(Never()));
-				}
-				state ReplyPromiseStream<GetKeyValuesStreamReply> repStream = beginServer.second->getInterface(0).getKeyValuesStream.getReplyStream(req);
-				loop {
-					GetKeyValuesStreamReply rep = waitNext(repStream.getFuture());
-
-					if( info.debugID.present() ) {
-						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.After");//.detail("SizeOf", rep.data.size());
-					}
-
-					ASSERT( !rep.more || rep.data.size() );
-					ASSERT( !limits.hasRowLimit() || rep.data.size() <= limits.rows );
-
-					limits.decrement( rep.data );
-
-					if(reverse && begin.isLastLessOrEqual() && rep.data.size() && rep.data.end()[-1].key == begin.getKey()) {
-						modifiedSelectors = false;
-					}
-
-					bool finished = limits.isReached() || ( !modifiedSelectors && !rep.more ) || limits.hasSatisfiedMinRows();
-					bool readThrough = modifiedSelectors && !rep.more;
-
-					// optimization: first request got all data--just return it
-					if( finished && !output.size() ) {
-						bool readToBegin = output.readToBegin;
-						bool readThroughEnd = output.readThroughEnd;
-
-						output = Standalone<RangeResultRef>( RangeResultRef( rep.data, modifiedSelectors || limits.isReached() || rep.more ), rep.arena );
-						output.readToBegin = readToBegin;
-						output.readThroughEnd = readThroughEnd;
-
-						if( BUGGIFY && limits.hasByteLimit() && output.size() > std::max(1, originalLimits.minRows) ) {
-							output.more = true;
-							output.resize(output.arena(), deterministicRandom()->randomInt(std::max(1,originalLimits.minRows),output.size()));
-							getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
-							return output;
-						}
-
-						if( readThrough ) {
-							output.arena().dependsOn( shard.arena() );
-							output.readThrough = reverse ? shard.begin : shard.end;
-						}
-
-						getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
-						return output;
-					}
-
-					output.arena().dependsOn( rep.arena );
-					output.append(output.arena(), rep.data.begin(), rep.data.size());
-
-					if( finished ) {
-						if( readThrough ) {
-							output.arena().dependsOn( shard.arena() );
-							output.readThrough = reverse ? shard.begin : shard.end;
-						}
-						output.more = modifiedSelectors || limits.isReached() || rep.more;
-
-						getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, output);
-						return output;
-					}
-
-					readVersion = rep.version; // see above comment
-
-					if( !rep.more ) {
-						ASSERT( modifiedSelectors );
-						TEST(true);  // !GetKeyValuesReply.more and modifiedSelectors in getRangeStream
-
-						if( !rep.data.size() ) {
-							Standalone<RangeResultRef> result = wait( getRangeFallback(cx, version, originalBegin, originalEnd, originalLimits, reverse, info, tags ) );
-							getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, result);
-							return result;
-						}
-
-						if( reverse )
-							end = firstGreaterOrEqual( shard.begin );
-						else
-							begin = firstGreaterOrEqual( shard.end );
-					} else {
-						TEST(true);  // GetKeyValuesReply.more in getRangeStream
-						if( reverse )
-							end = firstGreaterOrEqual( output[output.size()-1].key );
-						else
-							begin = firstGreaterThan( output[output.size()-1].key );
-					}
-				}
-
-			} catch ( Error& e ) {
-				if( info.debugID.present() ) {
-					g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getRange.Error");
-					TraceEvent("TransactionDebugError", info.debugID.get()).error(e);
-				}
-				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed ||
-					(e.code() == error_code_transaction_too_old && readVersion == latestVersion))
-				{
-					cx->invalidateCache( reverse ? end.getKey() : begin.getKey(), reverse ? (end-1).isBackward() : begin.isBackward() );
-
-					if (e.code() == error_code_wrong_shard_server) {
-						Standalone<RangeResultRef> result = wait( getRangeFallback(cx, version, originalBegin, originalEnd, originalLimits, reverse, info, tags ) );
-						getRangeFinished(cx, trLogInfo, startTime, originalBegin, originalEnd, snapshot, conflictRange, reverse, result);
-						return result;
-					}
-
-					wait(delay(CLIENT_KNOBS->WRONG_SHARD_SERVER_DELAY, info.taskID));
-				} else {
-					if (trLogInfo)
-						trLogInfo->addLog(FdbClientLogEvents::EventGetRangeError(startTime, cx->clientLocality.dcId(), static_cast<int>(e.code()), begin.getKey(), end.getKey()));
-
-					throw e;
-				}
-			}
-		}
-	}
-	catch(Error &e) {
-		if(conflictRange.canBeSet()) {
-			conflictRange.send(std::make_pair(Key(), Key()));
-		}
-
-		throw;
-	}
-}*/
-
 Future<Standalone<RangeResultRef>> getRange( Database const& cx, Future<Version> const& fVersion, KeySelector const& begin, KeySelector const& end,
 	GetRangeLimits const& limits, bool const& reverse, TransactionInfo const& info, TagSet const& tags )
 {
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 5b1c1b776ff..04e485cacc9 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -573,7 +573,11 @@ class RequestStream {
 		}
 	}
 
-	//FIXME comment
+	// stream.getReplyStream( request )
+	//   Unreliable at most once delivery. 
+	//   Registers the request with the remote endpoint which sends back a stream of replies, followed by an end_of_stream error.
+	//   If the connection is ever broken the remote endpoint will stop attempting to send replies.
+    //   The caller sends acknowledgements to the remote endpoint so that at most 2MB of replies is ever inflight.
 
 	template <class X>
 	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value, TaskPriority taskID) const {
diff --git a/fdbserver/NetworkTest.h b/fdbserver/NetworkTest.h
index 7e5cd30411b..7d6fa946302 100644
--- a/fdbserver/NetworkTest.h
+++ b/fdbserver/NetworkTest.h
@@ -27,8 +27,8 @@
 #include "flow/FileIdentifier.h"
 
 struct NetworkTestInterface {
-	// RequestStream< struct NetworkTestRequest > test;
-	RequestStream<struct NetworkTestStreamingRequest> test;
+	RequestStream< struct NetworkTestRequest > test;
+	RequestStream<struct NetworkTestStreamingRequest> testStream;
 	NetworkTestInterface() {}
 	NetworkTestInterface( NetworkAddress remote );
 	NetworkTestInterface( INetwork* local );
diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 2bc04a8a8ed..2c78ca545c0 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -72,6 +72,37 @@ ACTOR Future<Void> networkTestServer() {
 	state int sent = 0;
 	state LatencyStats latency;
 
+	loop {
+		choose {
+			when( NetworkTestRequest req = waitNext( interf.test.getFuture() ) ) {
+				LatencyStats::sample sample = latency.tick();
+				req.reply.send( NetworkTestReply( Value( std::string( req.replySize, '.' ) ) ) );
+				latency.tock(sample);
+				sent++;
+			}
+			when( wait( logging ) ) {
+				auto spd = sent / (now() - lastTime);
+				if (FLOW_KNOBS->NETWORK_TEST_SCRIPT_MODE) {
+					fprintf(stderr, "%f\t%.3f\t%.3f\n", spd, latency.mean() * 1e6, latency.stddev() * 1e6);
+				} else {
+					fprintf(stderr, "responses per second: %f (%f us)\n", spd, latency.mean() * 1e6);
+				}
+				latency.reset();
+				lastTime = now();
+				sent = 0;
+				logging = delay( 1.0 );
+			}
+		}
+	}
+}
+
+ACTOR Future<Void> networkTestStreamingServer() {
+	state NetworkTestInterface interf( g_network );
+	state Future<Void> logging = delay( 1.0 );
+	state double lastTime = now();
+	state int sent = 0;
+	state LatencyStats latency;
+
 	loop {
 		try {
 			choose {
@@ -79,12 +110,9 @@ ACTOR Future<Void> networkTestServer() {
 					state LatencyStats::sample sample = latency.tick();
 					state int i = 0;
 					for (; i < 100; ++i) {
-						fprintf(stderr, "Wait onReady %d\n", i);
 						wait(req.reply.onReady());
-						fprintf(stderr, "Send reply %d\n", i);
 						req.reply.send(NetworkTestStreamingReply{ i });
 					}
-					fprintf(stderr, "Send end_of_stream\n");
 					req.reply.sendError(end_of_stream());
 					latency.tock(sample);
 					sent++;
@@ -104,7 +132,6 @@ ACTOR Future<Void> networkTestServer() {
 			}
 		} catch (Error &e) {
 			if(e.code() != error_code_operation_obsolete) {
-				fprintf(stderr, "Error: %s\n", e.what());
 				throw e;
 			}
 		}
@@ -133,22 +160,36 @@ ACTOR Future<Void> testClient(std::vector<NetworkTestInterface> interfs, int* se
 	state std::string request_payload(FLOW_KNOBS->NETWORK_TEST_REQUEST_SIZE, '.');
 	state LatencyStats::sample sample;
 
+	while (moreRequestsPending(*sent)) {
+		(*sent)++;
+		sample = latency->tick();
+		NetworkTestReply rep = wait(
+		    retryBrokenPromise(interfs[deterministicRandom()->randomInt(0, interfs.size())].test,
+		                       NetworkTestRequest(StringRef(request_payload), FLOW_KNOBS->NETWORK_TEST_REPLY_SIZE)));
+		latency->tock(sample);
+		(*completed)++;
+	}
+	return Void();
+}
+
+ACTOR Future<Void> testClientStream(std::vector<NetworkTestInterface> interfs, int* sent, int* completed,
+                              LatencyStats* latency) {
+	state std::string request_payload(FLOW_KNOBS->NETWORK_TEST_REQUEST_SIZE, '.');
+	state LatencyStats::sample sample;
+
 	while (moreRequestsPending(*sent)) {
 		(*sent)++;
 		sample = latency->tick();
 		state ReplyPromiseStream<NetworkTestStreamingReply> stream =
-		    interfs[deterministicRandom()->randomInt(0, interfs.size())].test.getReplyStream(
+		    interfs[deterministicRandom()->randomInt(0, interfs.size())].testStream.getReplyStream(
 		        NetworkTestStreamingRequest{});
 		state int j = 0;
 		try {
 			loop {
-				printf("Wait for result\n");
 				NetworkTestStreamingReply rep = waitNext(stream.getFuture());
 				ASSERT(rep.index == j++);
-				printf("Result: %d\n", rep.index);
 			}
 		} catch (Error& e) {
-			printf("Error: %s\n", e.what());
 			ASSERT(e.code() == error_code_end_of_stream || e.code() == error_code_connection_failed);
 		}
 		latency->tock(sample);
@@ -255,7 +296,7 @@ ACTOR Future<Void> networkTestClient( std:: string testServers ) {
 	}
 
 	state std::vector<Future<Void>> clients;
-	for (int i = 0; i < 1; i++) {
+	for (int i = 0; i < FLOW_KNOBS->NETWORK_TEST_CLIENT_COUNT; i++) {
 		clients.push_back(testClient(interfs, &sent, &completed, &latency));
 	}
 	clients.push_back(logger(&sent, &completed, &latency));

From 4fd01c8511a6e326984986442e3f0338fb4d6c18 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 21:04:57 -0800
Subject: [PATCH 128/740] compile error

---
 fdbserver/networktest.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/networktest.actor.cpp b/fdbserver/networktest.actor.cpp
index 2c78ca545c0..825dafab652 100644
--- a/fdbserver/networktest.actor.cpp
+++ b/fdbserver/networktest.actor.cpp
@@ -106,7 +106,7 @@ ACTOR Future<Void> networkTestStreamingServer() {
 	loop {
 		try {
 			choose {
-				when(state NetworkTestStreamingRequest req = waitNext(interf.test.getFuture())) {
+				when(state NetworkTestStreamingRequest req = waitNext(interf.testStream.getFuture())) {
 					state LatencyStats::sample sample = latency.tick();
 					state int i = 0;
 					for (; i < 100; ++i) {

From 7e88adf0c11716c6f42c727f59acd09360346395 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Dec 2020 21:12:46 -0800
Subject: [PATCH 129/740] added a yield to avoid slow tasks

---
 fdbclient/ParallelStream.actor.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index cf9a3150af0..fb019e258b6 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -75,6 +75,7 @@ class ParallelStream {
 				try {
 					T value = waitNext(fragment->stream.getFuture());
 					self->results.send(value);
+					wait(yield());
 				} catch (Error &e) {
 					if (e.code() == error_code_end_of_stream) {
 						fragment.clear();

From c6e01aa6e4c004113c108c08f7bbe3f80f40933b Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 20:03:20 -0800
Subject: [PATCH 130/740] Yield to prevent slow tasks in
 ParallelStream::flushToClient

---
 fdbclient/ParallelStream.actor.cpp | 27 +++++++++++++++++----------
 fdbclient/ParallelStream.actor.h   | 16 +++++++++++++++-
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index 3e383f24bc7..6aaee058e76 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -26,20 +26,25 @@
 
 namespace ParallelStreamTest {
 
-ACTOR static Future<Void> produce(ParallelStream<int>::Fragment* fragment, int value) {
+struct Data {
+	static constexpr size_t expectedSize() { return sizeof(Data); }
+	int v;
+};
+
+ACTOR static Future<Void> produce(ParallelStream<Data>::Fragment* fragment, int value) {
 	wait(delay(deterministicRandom()->random01()));
-	fragment->send(value);
+	fragment->send(Data{value});
 	wait(delay(deterministicRandom()->random01()));
 	fragment->finish();
 	return Void();
 }
 
-ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
+ACTOR static Future<Void> consume(FutureStream<Data> stream, int expected) {
 	state int next;
 	try {
 		loop {
-			int value = waitNext(stream);
-			ASSERT(value == next++);
+			Data data = waitNext(stream);
+			ASSERT(data.v == next++);
 		}
 	} catch (Error& e) {
 		ASSERT(e.code() == error_code_end_of_stream);
@@ -51,13 +56,15 @@ ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
 } // namespace ParallelStreamTest
 
 TEST_CASE("/fdbclient/ParallelStream") {
-	state PromiseStream<int> results;
-	state ParallelStream<int> parallelStream(results, 10);
-	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), 100);
+	state PromiseStream<ParallelStreamTest::Data> results;
+	state size_t concurrency = deterministicRandom()->randomInt(1,11);
+	state size_t numProducers = deterministicRandom()->randomInt(1,1001);
+	state ParallelStream<ParallelStreamTest::Data> parallelStream(results, concurrency);
+	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), numProducers);
 	state std::vector<Future<Void>> producers;
 	state int i = 0;
-	for (; i < 100; ++i) {
-		ParallelStream<int>::Fragment* fragment = wait(parallelStream.createFragment());
+	for (; i < numProducers; ++i) {
+		ParallelStream<ParallelStreamTest::Data>::Fragment* fragment = wait(parallelStream.createFragment());
 		producers.push_back(ParallelStreamTest::produce(fragment, i));
 	}
 	wait(waitForAll(producers));
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index fb019e258b6..8283edb204f 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -67,13 +67,27 @@ class ParallelStream {
 
 public:
 
-	// TODO: Fix potential slow task
 	ACTOR static Future<Void> flushToClient(ParallelStream<T> *self) {
+		state const int bytesPerTaskLimit = 1e6; // TODO: buggify
+		state int bytesFlushedInTask = 0;
 		loop {
+			if (!self->fragments.getFuture().isReady()) {
+				bytesFlushedInTask = 0;
+			}
+			if (bytesFlushedInTask > bytesPerTaskLimit) {
+				wait(yield());
+			}
 			state Reference<Fragment> fragment = waitNext(self->fragments.getFuture());
 			loop {
 				try {
+					if (!fragment->stream.getFuture().isReady()) {
+						bytesFlushedInTask = 0;
+					}
+					if (bytesFlushedInTask > bytesPerTaskLimit) {
+						wait(yield());
+					}
 					T value = waitNext(fragment->stream.getFuture());
+					bytesFlushedInTask += value.expectedSize();
 					self->results.send(value);
 					wait(yield());
 				} catch (Error &e) {

From 7e529fb2e20b76d7ba7184a1cb73602a1528d7e3 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 20:36:19 -0800
Subject: [PATCH 131/740] Buggify bytesPerTaskLimit in
 ResultStream::flushToClient

---
 fdbclient/ParallelStream.actor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 8283edb204f..dc8170a77ac 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -68,7 +68,7 @@ class ParallelStream {
 public:
 
 	ACTOR static Future<Void> flushToClient(ParallelStream<T> *self) {
-		state const int bytesPerTaskLimit = 1e6; // TODO: buggify
+		state const int bytesPerTaskLimit = BUGGIFY ? 1 : 1e6;
 		state int bytesFlushedInTask = 0;
 		loop {
 			if (!self->fragments.getFuture().isReady()) {

From df5c381f928f3de6472d55ed04ccdbd58eb4b2e2 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 16 Dec 2020 22:27:17 -0800
Subject: [PATCH 132/740] Use BoundedFlowLock in ParallelStream

---
 fdbclient/Knobs.cpp                |  1 +
 fdbclient/Knobs.h                  |  1 +
 fdbclient/NativeAPI.actor.cpp      |  3 ++-
 fdbclient/ParallelStream.actor.cpp |  7 ++++++-
 fdbclient/ParallelStream.actor.h   | 16 ++++++++--------
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/fdbclient/Knobs.cpp b/fdbclient/Knobs.cpp
index 06efd14c50d..7d50c738d51 100644
--- a/fdbclient/Knobs.cpp
+++ b/fdbclient/Knobs.cpp
@@ -96,6 +96,7 @@ void ClientKnobs::initialize(bool randomize) {
 	init( TAG_ENCODE_KEY_SERVERS,                false ); if( randomize && BUGGIFY ) TAG_ENCODE_KEY_SERVERS = true;
 	init( RANGESTREAM_FRAGMENT_SIZE,               1e6 );
 	init( RANGESTREAM_CONCURRENT_FRAGMENTS,         10 );
+	init( RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT,     2*RANGESTREAM_CONCURRENT_FRAGMENTS );
 
 	//KeyRangeMap
 	init( KRM_GET_RANGE_LIMIT,                     1e5 ); if( randomize && BUGGIFY ) KRM_GET_RANGE_LIMIT = 10;
diff --git a/fdbclient/Knobs.h b/fdbclient/Knobs.h
index f85aeb3a831..0dd02a7f49d 100644
--- a/fdbclient/Knobs.h
+++ b/fdbclient/Knobs.h
@@ -90,6 +90,7 @@ class ClientKnobs : public Knobs {
 	bool TAG_ENCODE_KEY_SERVERS;
 	int64_t RANGESTREAM_FRAGMENT_SIZE;
 	int RANGESTREAM_CONCURRENT_FRAGMENTS;
+	int RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT;
 
 	//KeyRangeMap
 	int KRM_GET_RANGE_LIMIT;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index e39fbc9f55e..12e519d2475 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2859,7 +2859,8 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
                                   KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange,
                                   bool snapshot, bool reverse, TransactionInfo info, TagSet tags) {
 
-	state ParallelStream<RangeResult> results(_results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS);
+	state ParallelStream<RangeResult> results(_results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS,
+	                                          CLIENT_KNOBS->RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT);
 
 	// FIXME: better handling to disable row limits
 	ASSERT(!limits.hasRowLimit());
diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index 6aaee058e76..536e366e4ed 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -58,10 +58,15 @@ ACTOR static Future<Void> consume(FutureStream<Data> stream, int expected) {
 TEST_CASE("/fdbclient/ParallelStream") {
 	state PromiseStream<ParallelStreamTest::Data> results;
 	state size_t concurrency = deterministicRandom()->randomInt(1,11);
+	state size_t bufferLimit = concurrency + deterministicRandom()->randomInt(0, 11);
 	state size_t numProducers = deterministicRandom()->randomInt(1,1001);
-	state ParallelStream<ParallelStreamTest::Data> parallelStream(results, concurrency);
+	state ParallelStream<ParallelStreamTest::Data> parallelStream(results, concurrency, bufferLimit);
 	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), numProducers);
 	state std::vector<Future<Void>> producers;
+	TraceEvent("StartingParallelStreamTest")
+	    .detail("Concurrency", concurrency)
+	    .detail("BufferLimit", bufferLimit)
+	    .detail("NumProducers", numProducers);
 	state int i = 0;
 	for (; i < numProducers; ++i) {
 		ParallelStream<ParallelStreamTest::Data>::Fragment* fragment = wait(parallelStream.createFragment());
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index dc8170a77ac..176b5fb98f2 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -33,7 +33,7 @@
 
 template <class T>
 class ParallelStream {
-	FlowLock semaphore;
+	BoundedFlowLock semaphore;
 	struct FragmentConstructorTag {
 		explicit FragmentConstructorTag() = default;
 	};
@@ -42,12 +42,11 @@ class ParallelStream {
 	class Fragment : public ReferenceCounted<Fragment> {
 		ParallelStream* parallelStream;
 		PromiseStream<T> stream;
-		FlowLock::Releaser releaser;
+		BoundedFlowLock::Releaser releaser;
 		friend class ParallelStream;
-
 	public:
-		Fragment(ParallelStream* parallelStream, FragmentConstructorTag)
-		  : parallelStream(parallelStream), releaser(parallelStream->semaphore) {}
+		Fragment(ParallelStream* parallelStream, int64_t permitNumber, FragmentConstructorTag)
+		  : parallelStream(parallelStream), releaser(&parallelStream->semaphore, permitNumber) {}
 		template<class U>
 		void send(U &&value) {
 			stream.send(std::forward<U>(value));
@@ -102,13 +101,14 @@ class ParallelStream {
 		}
 	}
 
-	ParallelStream(PromiseStream<T> results, size_t concurrency) : results(results), semaphore(concurrency) {
+	ParallelStream(PromiseStream<T> results, size_t concurrency, size_t bufferLimit)
+	  : results(results), semaphore(concurrency, bufferLimit) {
 		flusher = flushToClient(this);
 	}
 
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
-		wait(self->semaphore.take());
-		auto fragment = makeReference<Fragment>(self, FragmentConstructorTag());
+		int64_t permitNumber = wait(self->semaphore.take());
+		auto fragment = makeReference<Fragment>(self, permitNumber, FragmentConstructorTag());
 		self->fragments.send(fragment);
 		return fragment.getPtr();
 	}

From 2813cc0aa4200d5a2d42ee16f38f1706bdff5d22 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 17 Dec 2020 19:21:00 +0000
Subject: [PATCH 133/740] Add GetRangeStream.actor.cpp

---
 fdbserver/CMakeLists.txt                     |   1 +
 fdbserver/workloads/GetRangeStream.actor.cpp | 110 +++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 fdbserver/workloads/GetRangeStream.actor.cpp

diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index bf266069cbd..abe3efeaf8d 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -157,6 +157,7 @@ set(FDBSERVER_SRCS
   workloads/FileSystem.actor.cpp
   workloads/Fuzz.cpp
   workloads/FuzzApiCorrectness.actor.cpp
+  workloads/GetRangeStream.actor.cpp
   workloads/HealthMetricsApi.actor.cpp
   workloads/IncrementalBackup.actor.cpp
   workloads/Increment.actor.cpp
diff --git a/fdbserver/workloads/GetRangeStream.actor.cpp b/fdbserver/workloads/GetRangeStream.actor.cpp
new file mode 100644
index 00000000000..eb35b3389a9
--- /dev/null
+++ b/fdbserver/workloads/GetRangeStream.actor.cpp
@@ -0,0 +1,110 @@
+/*
+ * GetRangeStream.actor.cpp
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2020 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fdbclient/NativeAPI.actor.h"
+#include "fdbserver/TesterInterface.actor.h"
+#include "fdbserver/workloads/workloads.actor.h"
+#include "fdbserver/workloads/BulkSetup.actor.h"
+#include "flow/actorcompiler.h" // This must be the last #include.
+
+struct GetRangeStream : TestWorkload {
+	PerfIntCounter bytesRead;
+	bool useGetRange;
+
+	GetRangeStream(WorkloadContext const& wcx) : TestWorkload(wcx), bytesRead("BytesRead") {
+		useGetRange = getOption(options, LiteralStringRef("useGetRange"), false);
+	}
+
+	std::string description() const override { return "GetRangeStreamWorkload"; }
+
+	Future<Void> setup(Database const& cx) override { return Void(); }
+
+	Future<Void> start(Database const& cx) override {
+		return clientId != 0 ? Void() : useGetRange ? fdbClientGetRange(cx, this) : fdbClientStream(cx, this);
+	}
+
+	Future<bool> check(Database const& cx) override { return true; }
+
+	void getMetrics(vector<PerfMetric>& m) override { m.push_back(bytesRead.getMetric()); }
+
+	ACTOR static Future<Void> logThroughput(GetRangeStream* self, Key* next) {
+		loop {
+			state int64_t last = self->bytesRead.getValue();
+			state double before = g_network->now();
+			wait(delay(1));
+			state double after = g_network->now();
+			if (after > before) {
+				printf("throughput: %g bytes/s, next: %s\n", (self->bytesRead.getValue() - last) / (after - before),
+				       printable(*next).c_str());
+			}
+		}
+	}
+
+	ACTOR static Future<Void> fdbClientGetRange(Database db, GetRangeStream* self) {
+		state Transaction tx(db);
+		state Key next;
+		state Future<Void> logFuture = logThroughput(self, &next);
+		loop {
+			try {
+				Standalone<RangeResultRef> range = wait(
+				    tx.getRange(KeySelector(firstGreaterOrEqual(next), next.arena()),
+				                KeySelector(firstGreaterOrEqual(normalKeys.end)),
+				                GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
+				self->bytesRead += range.expectedSize();
+				if (!range.more) {
+					break;
+				}
+				next = keyAfter(range.back().key);
+			} catch (Error& e) {
+				wait(tx.onError(e));
+			}
+		}
+		return Void();
+	}
+
+	ACTOR static Future<Void> fdbClientStream(Database db, GetRangeStream* self) {
+		state Transaction tx(db);
+		state Key next;
+		state Future<Void> logFuture = logThroughput(self, &next);
+		loop {
+			state PromiseStream<Standalone<RangeResultRef>> results;
+			try {
+				state Future<Void> stream =
+				    tx.getRangeStream(results, KeySelector(firstGreaterOrEqual(next), next.arena()),
+				                      KeySelector(firstGreaterOrEqual(normalKeys.end)), GetRangeLimits());
+				loop {
+					Standalone<RangeResultRef> range = waitNext(results.getFuture());
+					if (range.size()) {
+						self->bytesRead += range.expectedSize();
+						next = keyAfter(range.back().key);
+					}
+				}
+			} catch (Error& e) {
+				if (e.code() == error_code_end_of_stream) {
+					break;
+				}
+				wait(tx.onError(e));
+			}
+		}
+		return Void();
+	}
+};
+
+WorkloadFactory<GetRangeStream> GetRangeStreamWorkloadFactory("GetRangeStream");

From d1d822d4809e6809004b618bfce4074393f6691f Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 17 Dec 2020 19:53:42 +0000
Subject: [PATCH 134/740] Fix bug where stream would hang

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 12e519d2475..0fc8736b343 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2890,6 +2890,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 	//if b is allKeys.begin, we have either read through the beginning of the database,
 	//or allKeys.begin exists in the database and will be part of the conflict range anyways
 
+	state std::vector<Future<Void>> outstandingRequests;
 	loop {
 		state pair<KeyRange, Reference<LocationInfo>> ssi = 
 			wait(getKeyLocation(cx, reverse ? e : b, &StorageServerInterface::getKeyValuesStream, info, reverse));
@@ -2897,7 +2898,6 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 			wait(getRangeSplitPoints(cx, ssi.first, CLIENT_KNOBS->RANGESTREAM_FRAGMENT_SIZE));
 		state std::vector<KeyRange> toSend;
 		// state std::vector<Future<std::list<KeyRangeRef>::iterator>> outstandingRequests;
-		state std::vector<Future<Void>> outstandingRequests;
 
 		if (!splitPoints.empty()) {
 			toSend.push_back(KeyRange(KeyRangeRef(ssi.first.begin, splitPoints.front()), splitPoints.arena()));

From 9ba408ae8f4f0c630cea503e49ffa014785e1f16 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 17 Dec 2020 19:53:51 +0000
Subject: [PATCH 135/740] Add begin, end, printKVPairs

---
 fdbserver/workloads/GetRangeStream.actor.cpp | 29 +++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/fdbserver/workloads/GetRangeStream.actor.cpp b/fdbserver/workloads/GetRangeStream.actor.cpp
index eb35b3389a9..77be4135ca6 100644
--- a/fdbserver/workloads/GetRangeStream.actor.cpp
+++ b/fdbserver/workloads/GetRangeStream.actor.cpp
@@ -27,9 +27,15 @@
 struct GetRangeStream : TestWorkload {
 	PerfIntCounter bytesRead;
 	bool useGetRange;
+	Key begin;
+	Key end;
+	bool printKVPairs;
 
 	GetRangeStream(WorkloadContext const& wcx) : TestWorkload(wcx), bytesRead("BytesRead") {
 		useGetRange = getOption(options, LiteralStringRef("useGetRange"), false);
+		begin = getOption(options, LiteralStringRef("begin"), normalKeys.begin);
+		end = getOption(options, LiteralStringRef("end"), normalKeys.end);
+		printKVPairs = getOption(options, LiteralStringRef("printKVPairs"), false);
 	}
 
 	std::string description() const override { return "GetRangeStreamWorkload"; }
@@ -59,15 +65,19 @@ struct GetRangeStream : TestWorkload {
 
 	ACTOR static Future<Void> fdbClientGetRange(Database db, GetRangeStream* self) {
 		state Transaction tx(db);
-		state Key next;
+		state Key next = self->begin;
 		state Future<Void> logFuture = logThroughput(self, &next);
 		loop {
 			try {
-				Standalone<RangeResultRef> range = wait(
-				    tx.getRange(KeySelector(firstGreaterOrEqual(next), next.arena()),
-				                KeySelector(firstGreaterOrEqual(normalKeys.end)),
-				                GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
+				Standalone<RangeResultRef> range = wait(tx.getRange(
+				    KeySelector(firstGreaterOrEqual(next), next.arena()), KeySelector(firstGreaterOrEqual(self->end)),
+				    GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
 				self->bytesRead += range.expectedSize();
+				if (self->printKVPairs) {
+					for (const auto & [ k, v ] : range) {
+						printf("%s -> %s\n", printable(k).c_str(), printable(v).c_str());
+					}
+				}
 				if (!range.more) {
 					break;
 				}
@@ -81,16 +91,21 @@ struct GetRangeStream : TestWorkload {
 
 	ACTOR static Future<Void> fdbClientStream(Database db, GetRangeStream* self) {
 		state Transaction tx(db);
-		state Key next;
+		state Key next = self->begin;
 		state Future<Void> logFuture = logThroughput(self, &next);
 		loop {
 			state PromiseStream<Standalone<RangeResultRef>> results;
 			try {
 				state Future<Void> stream =
 				    tx.getRangeStream(results, KeySelector(firstGreaterOrEqual(next), next.arena()),
-				                      KeySelector(firstGreaterOrEqual(normalKeys.end)), GetRangeLimits());
+				                      KeySelector(firstGreaterOrEqual(self->end)), GetRangeLimits());
 				loop {
 					Standalone<RangeResultRef> range = waitNext(results.getFuture());
+					if (self->printKVPairs) {
+						for (const auto & [ k, v ] : range) {
+							printf("%s -> %s\n", printable(k).c_str(), printable(v).c_str());
+						}
+					}
 					if (range.size()) {
 						self->bytesRead += range.expectedSize();
 						next = keyAfter(range.back().key);

From 46d39584f57cc3a8440479cbfc6b3a26422fce0f Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 17 Dec 2020 21:25:44 +0000
Subject: [PATCH 136/740] Clamp shard to requested keyrange

---
 fdbclient/NativeAPI.actor.cpp                | 17 +++++++++++------
 fdbserver/workloads/GetRangeStream.actor.cpp | 12 ++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 0fc8736b343..8fca5220ef0 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2854,6 +2854,10 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 
 ACTOR Future<Standalone<VectorRef<KeyRef>>> getRangeSplitPoints(Database cx, KeyRange keys, int64_t chunkSize);
 
+static KeyRange intersect(KeyRangeRef lhs, KeyRangeRef rhs) {
+	return KeyRange(KeyRangeRef(std::max(lhs.begin, rhs.begin), std::min(lhs.end, rhs.end)));
+}
+
 ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database cx,
                                   Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion, KeySelector begin,
                                   KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange,
@@ -2894,19 +2898,20 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 	loop {
 		state pair<KeyRange, Reference<LocationInfo>> ssi = 
 			wait(getKeyLocation(cx, reverse ? e : b, &StorageServerInterface::getKeyValuesStream, info, reverse));
+		state KeyRange shardIntersection = intersect(ssi.first, KeyRangeRef(b, e));
 		state Standalone<VectorRef<KeyRef>> splitPoints =
-			wait(getRangeSplitPoints(cx, ssi.first, CLIENT_KNOBS->RANGESTREAM_FRAGMENT_SIZE));
+		    wait(getRangeSplitPoints(cx, shardIntersection, CLIENT_KNOBS->RANGESTREAM_FRAGMENT_SIZE));
 		state std::vector<KeyRange> toSend;
 		// state std::vector<Future<std::list<KeyRangeRef>::iterator>> outstandingRequests;
 
 		if (!splitPoints.empty()) {
-			toSend.push_back(KeyRange(KeyRangeRef(ssi.first.begin, splitPoints.front()), splitPoints.arena()));
+			toSend.push_back(KeyRange(KeyRangeRef(shardIntersection.begin, splitPoints.front()), splitPoints.arena()));
 			for (int i = 0; i < splitPoints.size() - 1; ++i) {
 				toSend.push_back(KeyRange(KeyRangeRef(splitPoints[i], splitPoints[i + 1]), splitPoints.arena()));
 			}
-			toSend.push_back(KeyRange(KeyRangeRef(splitPoints.back(), ssi.first.end), splitPoints.arena()));
+			toSend.push_back(KeyRange(KeyRangeRef(splitPoints.back(), shardIntersection.end), splitPoints.arena()));
 		} else {
-			toSend.push_back(KeyRange(KeyRangeRef(ssi.first.begin, ssi.first.end), splitPoints.arena()));
+			toSend.push_back(KeyRange(KeyRangeRef(shardIntersection.begin, shardIntersection.end)));
 		}
 
 		state int idx = 0;
@@ -2921,9 +2926,9 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 																snapshot, reverse, info, tags, span.context));
 		}
 		if(reverse) {
-			e = ssi.first.begin;
+			e = shardIntersection.begin;
 		} else {
-			b = ssi.first.end;
+			b = shardIntersection.end;
 		}
 		if(b >= e) {
 			break;
diff --git a/fdbserver/workloads/GetRangeStream.actor.cpp b/fdbserver/workloads/GetRangeStream.actor.cpp
index 77be4135ca6..0159204f120 100644
--- a/fdbserver/workloads/GetRangeStream.actor.cpp
+++ b/fdbserver/workloads/GetRangeStream.actor.cpp
@@ -72,11 +72,11 @@ struct GetRangeStream : TestWorkload {
 				Standalone<RangeResultRef> range = wait(tx.getRange(
 				    KeySelector(firstGreaterOrEqual(next), next.arena()), KeySelector(firstGreaterOrEqual(self->end)),
 				    GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
-				self->bytesRead += range.expectedSize();
-				if (self->printKVPairs) {
-					for (const auto & [ k, v ] : range) {
+				for (const auto & [ k, v ] : range) {
+					if (self->printKVPairs) {
 						printf("%s -> %s\n", printable(k).c_str(), printable(v).c_str());
 					}
+					self->bytesRead += k.size() + v.size();
 				}
 				if (!range.more) {
 					break;
@@ -101,13 +101,13 @@ struct GetRangeStream : TestWorkload {
 				                      KeySelector(firstGreaterOrEqual(self->end)), GetRangeLimits());
 				loop {
 					Standalone<RangeResultRef> range = waitNext(results.getFuture());
-					if (self->printKVPairs) {
-						for (const auto & [ k, v ] : range) {
+					for (const auto & [ k, v ] : range) {
+						if (self->printKVPairs) {
 							printf("%s -> %s\n", printable(k).c_str(), printable(v).c_str());
 						}
+						self->bytesRead += k.size() + v.size();
 					}
 					if (range.size()) {
-						self->bytesRead += range.expectedSize();
 						next = keyAfter(range.back().key);
 					}
 				}

From 2c2b6ed8a0fc6c804dda986d81133a5345316a31 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 17 Dec 2020 22:30:10 +0000
Subject: [PATCH 137/740] Avoid double sending results

---
 fdbclient/NativeAPI.actor.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 8fca5220ef0..e4a1d37b427 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2792,15 +2792,13 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 							breakAgain = true;
 							break;
 						} else {
+							ASSERT(output.size());
 							output.arena().dependsOn( range.arena() );
 							output.readThrough = reverse ? range.begin : range.end;
-							results->send(std::move(output));
+							results.send(std::move(output));
+							++shard;
+							break;
 						}
-
-						ASSERT(output.size());
-						results->send(std::move(output));
-						++shard;
-						break;
 					}
 
 					ASSERT(output.size());

From 92425ade0af4e19b7d29a0bf596217960cd03af3 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 17 Dec 2020 22:42:14 +0000
Subject: [PATCH 138/740] Remove potentially bogus asserts

---
 fdbclient/NativeAPI.actor.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index e4a1d37b427..6a365e07912 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2786,13 +2786,11 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 								return Void();
 							}
 
-							ASSERT(output.size());
 							results->send(std::move(output));
 							keys = KeyRangeRef(begin, end);
 							breakAgain = true;
 							break;
 						} else {
-							ASSERT(output.size());
 							output.arena().dependsOn( range.arena() );
 							output.readThrough = reverse ? range.begin : range.end;
 							results.send(std::move(output));

From 4d32bc24c3343ebeacaf3d2dd65caa12e06b1da7 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 17 Dec 2020 22:56:55 +0000
Subject: [PATCH 139/740] Change ParallelStream::sendError to finish

---
 fdbclient/NativeAPI.actor.cpp    | 11 ++----
 fdbclient/ParallelStream.actor.h | 68 ++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 6a365e07912..efb237dbc49 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2793,7 +2793,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 						} else {
 							output.arena().dependsOn( range.arena() );
 							output.readThrough = reverse ? range.begin : range.end;
-							results.send(std::move(output));
+							results->send(std::move(output));
 							++shard;
 							break;
 						}
@@ -2882,7 +2882,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 	}
 
 	if (b >= e) {
-		results.sendError(end_of_stream());
+		wait(results.finish());
 		return Void();
 	}
 
@@ -2930,12 +2930,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 			break;
 		}
 	}
-	try {
-		wait(waitForAll(outstandingRequests));
-	} catch (Error& e) {
-		results.sendError(e);
-	}
-	results.sendError(end_of_stream());
+	wait(waitForAll(outstandingRequests) && results.finish());
 	return Void();
 }
 
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 176b5fb98f2..139c9acc370 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -51,7 +51,7 @@ class ParallelStream {
 		void send(U &&value) {
 			stream.send(std::forward<U>(value));
 		}
-		void sendError(Error e) { parallelStream->sendError(e); }
+		void sendError(Error e) { stream.sendError(e); }
 		void finish() {
 			releaser.release(); // Release before destruction to free up pending fragments
 			stream.sendError(end_of_stream());
@@ -65,39 +65,46 @@ class ParallelStream {
 	Future<Void> flusher;
 
 public:
-
-	ACTOR static Future<Void> flushToClient(ParallelStream<T> *self) {
+	ACTOR static Future<Void> flushToClient(ParallelStream<T>* self) {
 		state const int bytesPerTaskLimit = BUGGIFY ? 1 : 1e6;
-		state int bytesFlushedInTask = 0;
-		loop {
-			if (!self->fragments.getFuture().isReady()) {
-				bytesFlushedInTask = 0;
-			}
-			if (bytesFlushedInTask > bytesPerTaskLimit) {
-				wait(yield());
-			}
-			state Reference<Fragment> fragment = waitNext(self->fragments.getFuture());
+		try {
+			state int bytesFlushedInTask = 0;
 			loop {
-				try {
-					if (!fragment->stream.getFuture().isReady()) {
-						bytesFlushedInTask = 0;
-					}
-					if (bytesFlushedInTask > bytesPerTaskLimit) {
-						wait(yield());
-					}
-					T value = waitNext(fragment->stream.getFuture());
-					bytesFlushedInTask += value.expectedSize();
-					self->results.send(value);
+				if (!self->fragments.getFuture().isReady()) {
+					bytesFlushedInTask = 0;
+				}
+				if (bytesFlushedInTask > bytesPerTaskLimit) {
 					wait(yield());
-				} catch (Error &e) {
-					if (e.code() == error_code_end_of_stream) {
-						fragment.clear();
-						break;
-					} else {
-						throw e;
+				}
+				state Reference<Fragment> fragment = waitNext(self->fragments.getFuture());
+				loop {
+					try {
+						if (!fragment->stream.getFuture().isReady()) {
+							bytesFlushedInTask = 0;
+						}
+						if (bytesFlushedInTask > bytesPerTaskLimit) {
+							wait(yield());
+						}
+						T value = waitNext(fragment->stream.getFuture());
+						bytesFlushedInTask += value.expectedSize();
+						self->results.send(value);
+						wait(yield());
+					} catch (Error& e) {
+						if (e.code() == error_code_end_of_stream) {
+							fragment.clear();
+							break;
+						} else {
+							throw e;
+						}
 					}
 				}
 			}
+		} catch (Error& e) {
+			if (e.code() == error_code_actor_cancelled) {
+				throw;
+			}
+			self->results.sendError(e);
+			return Void();
 		}
 	}
 
@@ -115,7 +122,10 @@ class ParallelStream {
 
 	Future<Fragment*> createFragment() { return createFragmentImpl(this); }
 
-	void sendError(Error e) { results.sendError(e); }
+	Future<Void> finish() {
+		fragments.sendError(end_of_stream());
+		return flusher;
+	}
 };
 
 #include "flow/unactorcompiler.h"

From 650e79302628c24d3c2b3a9bd6d726d9ac50c766 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Thu, 17 Dec 2020 15:46:54 -0800
Subject: [PATCH 140/740] Simplify yielding logic in
 ParallelStream::flushToClient

---
 fdbclient/ParallelStream.actor.cpp | 24 +++++++++---------------
 fdbclient/ParallelStream.actor.h   | 22 ++++++----------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index 536e366e4ed..beb7f42dc75 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -26,25 +26,20 @@
 
 namespace ParallelStreamTest {
 
-struct Data {
-	static constexpr size_t expectedSize() { return sizeof(Data); }
-	int v;
-};
-
-ACTOR static Future<Void> produce(ParallelStream<Data>::Fragment* fragment, int value) {
+ACTOR static Future<Void> produce(ParallelStream<int>::Fragment* fragment, int value) {
 	wait(delay(deterministicRandom()->random01()));
-	fragment->send(Data{value});
+	fragment->send(value);
 	wait(delay(deterministicRandom()->random01()));
 	fragment->finish();
 	return Void();
 }
 
-ACTOR static Future<Void> consume(FutureStream<Data> stream, int expected) {
+ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
 	state int next;
 	try {
 		loop {
-			Data data = waitNext(stream);
-			ASSERT(data.v == next++);
+			int value = waitNext(stream);
+			ASSERT(value == next++);
 		}
 	} catch (Error& e) {
 		ASSERT(e.code() == error_code_end_of_stream);
@@ -56,11 +51,11 @@ ACTOR static Future<Void> consume(FutureStream<Data> stream, int expected) {
 } // namespace ParallelStreamTest
 
 TEST_CASE("/fdbclient/ParallelStream") {
-	state PromiseStream<ParallelStreamTest::Data> results;
+	state PromiseStream<int> results;
 	state size_t concurrency = deterministicRandom()->randomInt(1,11);
 	state size_t bufferLimit = concurrency + deterministicRandom()->randomInt(0, 11);
 	state size_t numProducers = deterministicRandom()->randomInt(1,1001);
-	state ParallelStream<ParallelStreamTest::Data> parallelStream(results, concurrency, bufferLimit);
+	state ParallelStream<int> parallelStream(results, concurrency, bufferLimit);
 	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), numProducers);
 	state std::vector<Future<Void>> producers;
 	TraceEvent("StartingParallelStreamTest")
@@ -69,11 +64,10 @@ TEST_CASE("/fdbclient/ParallelStream") {
 	    .detail("NumProducers", numProducers);
 	state int i = 0;
 	for (; i < numProducers; ++i) {
-		ParallelStream<ParallelStreamTest::Data>::Fragment* fragment = wait(parallelStream.createFragment());
+		ParallelStream<int>::Fragment* fragment = wait(parallelStream.createFragment());
 		producers.push_back(ParallelStreamTest::produce(fragment, i));
 	}
-	wait(waitForAll(producers));
-	results.sendError(end_of_stream());
+	wait(parallelStream.finish());
 	wait(consumer);
 	return Void();
 }
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 139c9acc370..0357f17d70b 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -66,29 +66,19 @@ class ParallelStream {
 
 public:
 	ACTOR static Future<Void> flushToClient(ParallelStream<T>* self) {
-		state const int bytesPerTaskLimit = BUGGIFY ? 1 : 1e6;
+		state const int messagesBetweenYields = 1000;
+		state int messagesSinceYield = 0;
 		try {
-			state int bytesFlushedInTask = 0;
 			loop {
-				if (!self->fragments.getFuture().isReady()) {
-					bytesFlushedInTask = 0;
-				}
-				if (bytesFlushedInTask > bytesPerTaskLimit) {
-					wait(yield());
-				}
 				state Reference<Fragment> fragment = waitNext(self->fragments.getFuture());
 				loop {
 					try {
-						if (!fragment->stream.getFuture().isReady()) {
-							bytesFlushedInTask = 0;
-						}
-						if (bytesFlushedInTask > bytesPerTaskLimit) {
-							wait(yield());
-						}
 						T value = waitNext(fragment->stream.getFuture());
-						bytesFlushedInTask += value.expectedSize();
 						self->results.send(value);
-						wait(yield());
+						if (++messagesSinceYield == messagesBetweenYields) {
+							wait(yield());
+							messagesSinceYield = 0;
+						}
 					} catch (Error& e) {
 						if (e.code() == error_code_end_of_stream) {
 							fragment.clear();

From e0d6376de927febfb8bbeed7fdae16f174ea870a Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sat, 1 May 2021 14:34:52 -0700
Subject: [PATCH 141/740] clang format code

---
 documentation/tutorial/tutorial.actor.cpp    |  56 ++--
 fdbclient/FDBTypes.h                         |   2 +-
 fdbclient/NativeAPI.actor.cpp                | 221 +++++++++------
 fdbclient/NativeAPI.actor.h                  |  47 +++-
 fdbclient/ParallelStream.actor.cpp           |   4 +-
 fdbclient/ParallelStream.actor.h             |   7 +-
 fdbclient/StorageServerInterface.h           |  12 +-
 fdbrpc/FailureMonitor.actor.cpp              |   7 +-
 fdbrpc/FlowTransport.actor.cpp               |  15 +-
 fdbrpc/FlowTransport.h                       |   2 +-
 fdbrpc/fdbrpc.h                              | 161 ++++++-----
 fdbrpc/genericactors.actor.h                 |  19 +-
 fdbserver/NetworkTest.h                      |   4 +-
 fdbserver/storageserver.actor.cpp            | 280 +++++++++++--------
 fdbserver/workloads/GetRangeStream.actor.cpp |  21 +-
 flow/flow.h                                  |  24 +-
 flow/genericactors.actor.h                   |   3 +-
 17 files changed, 514 insertions(+), 371 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index 841f7481662..f5eed7ab394 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -1,23 +1,23 @@
 /*
- * tutorial.actor.cpp
-
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* tutorial.actor.cpp
+
+*
+* This source file is part of the FoundationDB open source project
+*
+* Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 #include "flow/flow.h"
 #include "flow/Platform.h"
@@ -192,8 +192,8 @@ ACTOR Future<Void> echoServer() {
 					req.reply.sendError(end_of_stream());
 				}
 			}
-		} catch (Error &e) {
-			if(e.code() != error_code_operation_obsolete) {
+		} catch (Error& e) {
+			if (e.code() != error_code_operation_obsolete) {
 				fprintf(stderr, "Error: %s\n", e.what());
 				throw e;
 			}
@@ -418,9 +418,10 @@ ACTOR Future<Void> fdbClientStream() {
 	loop {
 		state PromiseStream<Standalone<RangeResultRef>> results;
 		try {
-			state Future<Void> stream =
-			    tx.getRangeStream(results, KeySelector(firstGreaterOrEqual(next), next.arena()),
-			                      KeySelector(firstGreaterOrEqual(normalKeys.end)), GetRangeLimits());
+			state Future<Void> stream = tx.getRangeStream(results,
+			                                              KeySelector(firstGreaterOrEqual(next), next.arena()),
+			                                              KeySelector(firstGreaterOrEqual(normalKeys.end)),
+			                                              GetRangeLimits());
 			loop {
 				Standalone<RangeResultRef> range = waitNext(results.getFuture());
 				if (range.size()) {
@@ -446,9 +447,10 @@ ACTOR Future<Void> fdbClientGetRange() {
 	state Future<Void> logFuture = logThroughput(&bytes, &next);
 	loop {
 		try {
-			Standalone<RangeResultRef> range = wait(tx.getRange(
-			    KeySelector(firstGreaterOrEqual(next), next.arena()), KeySelector(firstGreaterOrEqual(normalKeys.end)),
-			    GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
+			Standalone<RangeResultRef> range =
+			    wait(tx.getRange(KeySelector(firstGreaterOrEqual(next), next.arena()),
+			                     KeySelector(firstGreaterOrEqual(normalKeys.end)),
+			                     GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
 			bytes += range.expectedSize();
 			if (!range.more) {
 				break;
diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index 6af364fbd68..76ad36416c4 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -709,7 +709,7 @@ struct RangeResultRef : VectorRef<KeyValueRef> {
 
 using RangeResult = Standalone<RangeResultRef>;
 
-template<>
+template <>
 struct Traceable<RangeResultRef> : std::true_type {
 	static std::string toString(const RangeResultRef& value) {
 		return Traceable<VectorRef<KeyValueRef>>::toString(value);
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 65bebc29eef..d783e073bb6 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -927,7 +927,7 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
     transactionPhysicalReadsCompleted("PhysicalReadRequestsCompleted", cc),
     transactionGetKeyRequests("GetKeyRequests", cc), transactionGetValueRequests("GetValueRequests", cc),
     transactionGetRangeRequests("GetRangeRequests", cc),
-	transactionGetRangeStreamRequests("GetRangeStreamRequests", cc), transactionWatchRequests("WatchRequests", cc),
+    transactionGetRangeStreamRequests("GetRangeStreamRequests", cc), transactionWatchRequests("WatchRequests", cc),
     transactionGetAddressesForKeyRequests("GetAddressesForKeyRequests", cc), transactionBytesRead("BytesRead", cc),
     transactionKeysRead("KeysRead", cc), transactionMetadataVersionReads("MetadataVersionReads", cc),
     transactionCommittedMutations("CommittedMutations", cc),
@@ -1056,14 +1056,16 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
 		    std::make_unique<ClientProfilingImpl>(
 		        KeyRangeRef(LiteralStringRef("profiling/"), LiteralStringRef("profiling0"))
-				.withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
+		            .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
 		registerSpecialKeySpaceModule(
-		    SpecialKeySpace::MODULE::MANAGEMENT, SpecialKeySpace::IMPLTYPE::READWRITE,
+		    SpecialKeySpace::MODULE::MANAGEMENT,
+		    SpecialKeySpace::IMPLTYPE::READWRITE,
 		    std::make_unique<MaintenanceImpl>(
 		        KeyRangeRef(LiteralStringRef("maintenance/"), LiteralStringRef("maintenance0"))
 		            .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
 		registerSpecialKeySpaceModule(
-		    SpecialKeySpace::MODULE::MANAGEMENT, SpecialKeySpace::IMPLTYPE::READWRITE,
+		    SpecialKeySpace::MODULE::MANAGEMENT,
+		    SpecialKeySpace::IMPLTYPE::READWRITE,
 		    std::make_unique<DataDistributionImpl>(
 		        KeyRangeRef(LiteralStringRef("data_distribution/"), LiteralStringRef("data_distribution0"))
 		            .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
@@ -1161,7 +1163,7 @@ DatabaseContext::DatabaseContext(const Error& err)
     transactionPhysicalReadsCompleted("PhysicalReadRequestsCompleted", cc),
     transactionGetKeyRequests("GetKeyRequests", cc), transactionGetValueRequests("GetValueRequests", cc),
     transactionGetRangeRequests("GetRangeRequests", cc),
-	transactionGetRangeStreamRequests("GetRangeStreamRequests", cc), transactionWatchRequests("WatchRequests", cc),
+    transactionGetRangeStreamRequests("GetRangeStreamRequests", cc), transactionWatchRequests("WatchRequests", cc),
     transactionGetAddressesForKeyRequests("GetAddressesForKeyRequests", cc), transactionBytesRead("BytesRead", cc),
     transactionKeysRead("KeysRead", cc), transactionMetadataVersionReads("MetadataVersionReads", cc),
     transactionCommittedMutations("CommittedMutations", cc),
@@ -3260,45 +3262,54 @@ ACTOR Future<Standalone<RangeResultRef>> getRange(Database cx,
 	}
 }
 
-ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment* results, Database cx,
-                                          Reference<TransactionLogInfo> trLogInfo, Version version, KeyRange keys,
-                                          GetRangeLimits limits, bool snapshot, bool reverse, TransactionInfo info,
-                                          TagSet tags, SpanID spanContext) {
+ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment* results,
+                                          Database cx,
+                                          Reference<TransactionLogInfo> trLogInfo,
+                                          Version version,
+                                          KeyRange keys,
+                                          GetRangeLimits limits,
+                                          bool snapshot,
+                                          bool reverse,
+                                          TransactionInfo info,
+                                          TagSet tags,
+                                          SpanID spanContext) {
 	loop {
-		state vector< pair<KeyRange, Reference<LocationInfo>> > locations = wait( getKeyRangeLocations( cx, keys, CLIENT_KNOBS->GET_RANGE_SHARD_LIMIT, reverse, &StorageServerInterface::getKeyValuesStream, info ) );
-		ASSERT( locations.size() );
+		state vector<pair<KeyRange, Reference<LocationInfo>>> locations = wait(getKeyRangeLocations(
+		    cx, keys, CLIENT_KNOBS->GET_RANGE_SHARD_LIMIT, reverse, &StorageServerInterface::getKeyValuesStream, info));
+		ASSERT(locations.size());
 		state int shard = 0;
 		loop {
 			const KeyRange& range = locations[shard].first;
 
 			state GetKeyValuesStreamRequest req;
 			req.version = version;
-			req.begin = firstGreaterOrEqual( range.begin );
-			req.end = firstGreaterOrEqual( range.end );
+			req.begin = firstGreaterOrEqual(range.begin);
+			req.end = firstGreaterOrEqual(range.end);
 			req.spanContext = spanContext;
 			req.limit = reverse ? -CLIENT_KNOBS->REPLY_BYTE_LIMIT : CLIENT_KNOBS->REPLY_BYTE_LIMIT;
 			req.limitBytes = std::numeric_limits<int>::max();
 
 			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
 
-			//FIXME: buggify byte limits on internal functions that use them, instead of globally
+			// FIXME: buggify byte limits on internal functions that use them, instead of globally
 			req.tags = cx->sampleReadTags() ? tags : Optional<TagSet>();
 			req.debugID = info.debugID;
 
 			try {
-				if( info.debugID.present() ) {
-					g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.RangeStream.Before");
+				if (info.debugID.present()) {
+					g_traceBatch.addEvent(
+					    "TransactionDebug", info.debugID.get().first(), "NativeAPI.RangeStream.Before");
 				}
 				++cx->transactionPhysicalReads;
 				state GetKeyValuesStreamReply rep;
 
-				if( locations[shard].second->size() == 0 ) {
+				if (locations[shard].second->size() == 0) {
 					wait(cx->connectionFileChanged());
 					results->sendError(transaction_too_old());
 					return Void();
 				}
 
-				//FIXME: add load balancing
+				// FIXME: add load balancing
 				state ReplyPromiseStream<GetKeyValuesStreamReply> replyStream =
 				    locations[shard]
 				        .second->getInterface(deterministicRandom()->randomInt(0, locations[shard].second->size()))
@@ -3312,9 +3323,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 								return Void();
 							}
 
-							when(GetKeyValuesStreamReply _rep = waitNext(replyStream.getFuture())) {
-								rep = _rep;
-							}
+							when(GetKeyValuesStreamReply _rep = waitNext(replyStream.getFuture())) { rep = _rep; }
 						}
 						++cx->transactionPhysicalReadsCompleted;
 					} catch (Error& e) {
@@ -3325,60 +3334,69 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 							throw;
 						}
 					}
-					if( info.debugID.present() )
-						g_traceBatch.addEvent("TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
+					if (info.debugID.present())
+						g_traceBatch.addEvent(
+						    "TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
 					RangeResult output(RangeResultRef(rep.data, true), rep.arena);
 
 					bool more = rep.more;
 					// If the reply says there is more but we know that we finished the shard, then fix rep.more
-					if( reverse && more && rep.data.size() > 0 && output[output.size()-1].key == locations[shard].first.begin ) {
+					if (reverse && more && rep.data.size() > 0 &&
+					    output[output.size() - 1].key == locations[shard].first.begin) {
 						more = false;
 					}
 
 					if (more) {
-						if( !rep.data.size() ) {
-							TraceEvent(SevError, "GetRangeStreamError").detail("Reason", "More data indicated but no rows present")
-								.detail("LimitBytes", limits.bytes).detail("LimitRows", limits.rows)
-								.detail("OutputSize", output.size()).detail("OutputBytes", output.expectedSize())
-								.detail("BlockSize", rep.data.size()).detail("BlockBytes", rep.data.expectedSize());
-							ASSERT( false );
+						if (!rep.data.size()) {
+							TraceEvent(SevError, "GetRangeStreamError")
+							    .detail("Reason", "More data indicated but no rows present")
+							    .detail("LimitBytes", limits.bytes)
+							    .detail("LimitRows", limits.rows)
+							    .detail("OutputSize", output.size())
+							    .detail("OutputBytes", output.expectedSize())
+							    .detail("BlockSize", rep.data.size())
+							    .detail("BlockBytes", rep.data.expectedSize());
+							ASSERT(false);
 						}
-						TEST(true);   // GetKeyValuesStreamReply.more in getRangeStream
+						TEST(true); // GetKeyValuesStreamReply.more in getRangeStream
 						// Make next request to the same shard with a beginning key just after the last key returned
-						if( reverse )
-							locations[shard].first = KeyRangeRef( locations[shard].first.begin, output[output.size()-1].key );
+						if (reverse)
+							locations[shard].first =
+							    KeyRangeRef(locations[shard].first.begin, output[output.size() - 1].key);
 						else
-							locations[shard].first = KeyRangeRef( keyAfter( output[output.size()-1].key ), locations[shard].first.end );
+							locations[shard].first =
+							    KeyRangeRef(keyAfter(output[output.size() - 1].key), locations[shard].first.end);
 					}
 
 					if (!more || locations[shard].first.empty()) {
 						TEST(true); // getRangeStream (!more || locations[shard].first.empty())
 						const KeyRange& range = locations[shard].first;
-						if(shard == locations.size()-1) {
+						if (shard == locations.size() - 1) {
 							KeyRef begin = reverse ? keys.begin : range.end;
 							KeyRef end = reverse ? range.begin : keys.end;
 
-							if(begin >= end) {
+							if (begin >= end) {
 								if (range.begin == allKeys.begin) {
 									output.readToBegin = true;
 								}
 								if (range.end == allKeys.end) {
 									output.readThroughEnd = true;
 								}
-								output.arena().dependsOn( keys.arena() );
+								output.arena().dependsOn(keys.arena());
 								output.readThrough = reverse ? keys.begin : keys.end;
 
 								int64_t bytes = 0;
-								for(const KeyValueRef &kv : output) {
+								for (const KeyValueRef& kv : output) {
 									bytes += kv.key.size() + kv.value.size();
 								}
 
 								cx->transactionBytesRead += bytes;
 								cx->transactionKeysRead += output.size();
 
-								//FIXME: figure out appropriate metrics for the client event log
-								//if( trLogInfo ) {
-								//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
+								// FIXME: figure out appropriate metrics for the client event log
+								// if( trLogInfo ) {
+								//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime,
+								//cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
 								//}
 
 								results->send(std::move(output));
@@ -3391,7 +3409,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 							breakAgain = true;
 							break;
 						} else {
-							output.arena().dependsOn( range.arena() );
+							output.arena().dependsOn(range.arena());
 							output.readThrough = reverse ? range.begin : range.end;
 							results->send(std::move(output));
 							++shard;
@@ -3417,7 +3435,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					// FIXME: figure out appropriate metrics for the client event log
 					// if( trLogInfo ) {
 					//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(),
-					//now()-startTime, bytes, begin.getKey(), end.getKey()));
+					// now()-startTime, bytes, begin.getKey(), end.getKey()));
 					//}
 					results->send(std::move(output));
 				}
@@ -3428,16 +3446,17 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 				if (e.code() == error_code_actor_cancelled) {
 					throw;
 				}
-				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed || e.code() == error_code_connection_failed) {
+				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed ||
+				    e.code() == error_code_connection_failed) {
 					const KeyRangeRef& range = locations[shard].first;
 
-					if( reverse )
-						keys = KeyRangeRef( keys.begin, range.end );
+					if (reverse)
+						keys = KeyRangeRef(keys.begin, range.end);
 					else
-						keys = KeyRangeRef( range.begin, keys.end );
+						keys = KeyRangeRef(range.begin, keys.end);
 
-					cx->invalidateCache( keys );
-					wait( delay(CLIENT_KNOBS->WRONG_SHARD_SERVER_DELAY, info.taskID ));
+					cx->invalidateCache(keys);
+					wait(delay(CLIENT_KNOBS->WRONG_SHARD_SERVER_DELAY, info.taskID));
 					break;
 				} else {
 					results->sendError(e);
@@ -3454,13 +3473,21 @@ static KeyRange intersect(KeyRangeRef lhs, KeyRangeRef rhs) {
 	return KeyRange(KeyRangeRef(std::max(lhs.begin, rhs.begin), std::min(lhs.end, rhs.end)));
 }
 
-ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database cx,
-                                  Reference<TransactionLogInfo> trLogInfo, Future<Version> fVersion, KeySelector begin,
-                                  KeySelector end, GetRangeLimits limits, Promise<std::pair<Key, Key>> conflictRange,
-                                  bool snapshot, bool reverse, TransactionInfo info, TagSet tags) {
+ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results,
+                                  Database cx,
+                                  Reference<TransactionLogInfo> trLogInfo,
+                                  Future<Version> fVersion,
+                                  KeySelector begin,
+                                  KeySelector end,
+                                  GetRangeLimits limits,
+                                  Promise<std::pair<Key, Key>> conflictRange,
+                                  bool snapshot,
+                                  bool reverse,
+                                  TransactionInfo info,
+                                  TagSet tags) {
 
-	state ParallelStream<RangeResult> results(_results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS,
-	                                          CLIENT_KNOBS->RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT);
+	state ParallelStream<RangeResult> results(
+	    _results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS, CLIENT_KNOBS->RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT);
 
 	// FIXME: better handling to disable row limits
 	ASSERT(!limits.hasRowLimit());
@@ -3486,14 +3513,14 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 		return Void();
 	}
 
-	//if e is allKeys.end, we have read through the end of the database
-	//if b is allKeys.begin, we have either read through the beginning of the database,
-	//or allKeys.begin exists in the database and will be part of the conflict range anyways
+	// if e is allKeys.end, we have read through the end of the database
+	// if b is allKeys.begin, we have either read through the beginning of the database,
+	// or allKeys.begin exists in the database and will be part of the conflict range anyways
 
 	state std::vector<Future<Void>> outstandingRequests;
 	loop {
-		state pair<KeyRange, Reference<LocationInfo>> ssi = 
-			wait(getKeyLocation(cx, reverse ? e : b, &StorageServerInterface::getKeyValuesStream, info, reverse));
+		state pair<KeyRange, Reference<LocationInfo>> ssi =
+		    wait(getKeyLocation(cx, reverse ? e : b, &StorageServerInterface::getKeyValuesStream, info, reverse));
 		state KeyRange shardIntersection = intersect(ssi.first, KeyRangeRef(b, e));
 		state Standalone<VectorRef<KeyRef>> splitPoints =
 		    wait(getRangeSplitPoints(cx, shardIntersection, CLIENT_KNOBS->RANGESTREAM_FRAGMENT_SIZE));
@@ -3518,15 +3545,15 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results, Database
 				continue;
 			}
 			ParallelStream<RangeResult>::Fragment* fragment = wait(results.createFragment());
-			outstandingRequests.push_back(getRangeStreamFragment(fragment, cx, trLogInfo, version, toSend[useIdx], limits,
-																snapshot, reverse, info, tags, span.context));
+			outstandingRequests.push_back(getRangeStreamFragment(
+			    fragment, cx, trLogInfo, version, toSend[useIdx], limits, snapshot, reverse, info, tags, span.context));
 		}
-		if(reverse) {
+		if (reverse) {
 			e = shardIntersection.begin;
 		} else {
 			b = shardIntersection.end;
 		}
-		if(b >= e) {
+		if (b >= e) {
 			break;
 		}
 	}
@@ -3889,23 +3916,21 @@ Future<Standalone<RangeResultRef>> Transaction::getRange(const KeySelector& begi
 	return getRange(begin, end, GetRangeLimits(limit), snapshot, reverse);
 }
 
-Future<Void> Transaction::getRangeStream(
-	const PromiseStream<Standalone<RangeResultRef>>& results,
-	const KeySelector& begin,
-	const KeySelector& end,
-	GetRangeLimits limits,
-	bool snapshot,
-	bool reverse )
-{
+Future<Void> Transaction::getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+                                         const KeySelector& begin,
+                                         const KeySelector& end,
+                                         GetRangeLimits limits,
+                                         bool snapshot,
+                                         bool reverse) {
 	++cx->transactionLogicalReads;
 	++cx->transactionGetRangeStreamRequests;
 
-	if( limits.isReached() ) {
+	if (limits.isReached()) {
 		results.sendError(end_of_stream());
 		return Void();
 	}
 
-	if( !limits.isValid() ) {
+	if (!limits.isValid()) {
 		results.sendError(range_limits_invalid());
 		return Void();
 	}
@@ -3913,44 +3938,54 @@ Future<Void> Transaction::getRangeStream(
 	ASSERT(limits.rows != 0);
 
 	KeySelector b = begin;
-	if( b.orEqual ) {
+	if (b.orEqual) {
 		TEST(true); // Native stream begin orEqual==true
 		b.removeOrEqual(b.arena());
 	}
 
 	KeySelector e = end;
-	if( e.orEqual ) {
+	if (e.orEqual) {
 		TEST(true); // Native stream end orEqual==true
 		e.removeOrEqual(e.arena());
 	}
 
-	if( b.offset >= e.offset && b.getKey() >= e.getKey() ) {
+	if (b.offset >= e.offset && b.getKey() >= e.getKey()) {
 		TEST(true); // Native stream range inverted
 		results.sendError(end_of_stream());
 		return Void();
 	}
 
 	Promise<std::pair<Key, Key>> conflictRange;
-	if(!snapshot) {
-		extraConflictRanges.push_back( conflictRange.getFuture() );
+	if (!snapshot) {
+		extraConflictRanges.push_back(conflictRange.getFuture());
 	}
 
-	return forwardErrors(::getRangeStream(results, cx, trLogInfo, getReadVersion(), b, e, limits, conflictRange, snapshot, reverse, info, options.readTags), results);
-}
-
-Future<Void> Transaction::getRangeStream(
-	const PromiseStream<Standalone<RangeResultRef>>& results,
-	const KeySelector& begin,
-	const KeySelector& end,
-	int limit,
-	bool snapshot,
-	bool reverse )
-{
-	return getRangeStream( results, begin, end, GetRangeLimits( limit ), snapshot, reverse );
+	return forwardErrors(::getRangeStream(results,
+	                                      cx,
+	                                      trLogInfo,
+	                                      getReadVersion(),
+	                                      b,
+	                                      e,
+	                                      limits,
+	                                      conflictRange,
+	                                      snapshot,
+	                                      reverse,
+	                                      info,
+	                                      options.readTags),
+	                     results);
+}
+
+Future<Void> Transaction::getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+                                         const KeySelector& begin,
+                                         const KeySelector& end,
+                                         int limit,
+                                         bool snapshot,
+                                         bool reverse) {
+	return getRangeStream(results, begin, end, GetRangeLimits(limit), snapshot, reverse);
 }
 
-void Transaction::addReadConflictRange( KeyRangeRef const& keys ) {
-	ASSERT( !keys.empty() );
+void Transaction::addReadConflictRange(KeyRangeRef const& keys) {
+	ASSERT(!keys.empty());
 
 	// There aren't any keys in the database with size larger than KEY_SIZE_LIMIT, so if range contains large keys
 	// we can translate it to an equivalent one with smaller keys
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 99e18a6b421..c6b537a3650 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -283,20 +283,41 @@ class Transaction : NonCopyable {
 		                reverse);
 	}
 
-	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results, const KeySelector& begin, const KeySelector& end,
-	                                                          int limit, bool snapshot = false, bool reverse = false);
-	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results, const KeySelector& begin, const KeySelector& end,
-	                                                          GetRangeLimits limits, bool snapshot = false,
-	                                                          bool reverse = false);
-	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results, const KeyRange& keys, int limit, bool snapshot = false,
-	                                                          bool reverse = false) {
-		return getRangeStream(results, KeySelector(firstGreaterOrEqual(keys.begin), keys.arena()),
-		                KeySelector(firstGreaterOrEqual(keys.end), keys.arena()), limit, snapshot, reverse);
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+	                                          const KeySelector& begin,
+	                                          const KeySelector& end,
+	                                          int limit,
+	                                          bool snapshot = false,
+	                                          bool reverse = false);
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+	                                          const KeySelector& begin,
+	                                          const KeySelector& end,
+	                                          GetRangeLimits limits,
+	                                          bool snapshot = false,
+	                                          bool reverse = false);
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+	                                          const KeyRange& keys,
+	                                          int limit,
+	                                          bool snapshot = false,
+	                                          bool reverse = false) {
+		return getRangeStream(results,
+		                      KeySelector(firstGreaterOrEqual(keys.begin), keys.arena()),
+		                      KeySelector(firstGreaterOrEqual(keys.end), keys.arena()),
+		                      limit,
+		                      snapshot,
+		                      reverse);
 	}
-	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results, const KeyRange& keys, GetRangeLimits limits,
-	                                                          bool snapshot = false, bool reverse = false) {
-		return getRangeStream(results, KeySelector(firstGreaterOrEqual(keys.begin), keys.arena()),
-		                KeySelector(firstGreaterOrEqual(keys.end), keys.arena()), limits, snapshot, reverse);
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+	                                          const KeyRange& keys,
+	                                          GetRangeLimits limits,
+	                                          bool snapshot = false,
+	                                          bool reverse = false) {
+		return getRangeStream(results,
+		                      KeySelector(firstGreaterOrEqual(keys.begin), keys.arena()),
+		                      KeySelector(firstGreaterOrEqual(keys.end), keys.arena()),
+		                      limits,
+		                      snapshot,
+		                      reverse);
 	}
 
 	[[nodiscard]] Future<Standalone<VectorRef<const char*>>> getAddressesForKey(const Key& key);
diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index beb7f42dc75..e8372b39fa2 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -52,9 +52,9 @@ ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
 
 TEST_CASE("/fdbclient/ParallelStream") {
 	state PromiseStream<int> results;
-	state size_t concurrency = deterministicRandom()->randomInt(1,11);
+	state size_t concurrency = deterministicRandom()->randomInt(1, 11);
 	state size_t bufferLimit = concurrency + deterministicRandom()->randomInt(0, 11);
-	state size_t numProducers = deterministicRandom()->randomInt(1,1001);
+	state size_t numProducers = deterministicRandom()->randomInt(1, 1001);
 	state ParallelStream<int> parallelStream(results, concurrency, bufferLimit);
 	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), numProducers);
 	state std::vector<Future<Void>> producers;
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 0357f17d70b..d4562749da9 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -44,11 +44,12 @@ class ParallelStream {
 		PromiseStream<T> stream;
 		BoundedFlowLock::Releaser releaser;
 		friend class ParallelStream;
+
 	public:
 		Fragment(ParallelStream* parallelStream, int64_t permitNumber, FragmentConstructorTag)
 		  : parallelStream(parallelStream), releaser(&parallelStream->semaphore, permitNumber) {}
-		template<class U>
-		void send(U &&value) {
+		template <class U>
+		void send(U&& value) {
 			stream.send(std::forward<U>(value));
 		}
 		void sendError(Error e) { stream.sendError(e); }
@@ -60,7 +61,7 @@ class ParallelStream {
 
 private:
 	PromiseStream<Reference<Fragment>> fragments;
-	size_t fragmentsProcessed { 0 };
+	size_t fragmentsProcessed{ 0 };
 	PromiseStream<T> results;
 	Future<Void> flusher;
 
diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index f6040cbe5df..5548107e433 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -109,7 +109,8 @@ struct StorageServerInterface {
 				    RequestStream<struct ReadHotSubRangeRequest>(getValue.getEndpoint().getAdjustedEndpoint(11));
 				getRangeSplitPoints =
 				    RequestStream<struct SplitRangeRequest>(getValue.getEndpoint().getAdjustedEndpoint(12));
-				getKeyValuesStream = RequestStream<struct GetKeyValuesStreamRequest>(getValue.getEndpoint().getAdjustedEndpoint(13));
+				getKeyValuesStream =
+				    RequestStream<struct GetKeyValuesStreamRequest>(getValue.getEndpoint().getAdjustedEndpoint(13));
 			}
 		} else {
 			ASSERT(Ar::isDeserializing);
@@ -296,12 +297,13 @@ struct GetKeyValuesStreamReply : public ReplyPromiseStreamReply {
 	bool cached = false;
 
 	GetKeyValuesStreamReply() : version(invalidVersion), more(false), cached(false) {}
-	GetKeyValuesStreamReply(GetKeyValuesReply r) : arena(r.arena), data(r.data), version(r.version), more(r.more), cached(r.cached) {}
+	GetKeyValuesStreamReply(GetKeyValuesReply r)
+	  : arena(r.arena), data(r.data), version(r.version), more(r.more), cached(r.cached) {}
 
 	int expectedSize() const { return sizeof(GetKeyValuesStreamReply) + data.expectedSize(); }
 
 	template <class Ar>
-	void serialize( Ar& ar ) {
+	void serialize(Ar& ar) {
 		serializer(ar, ReplyPromiseStreamReply::acknowledgeToken, data, version, more, cached, arena);
 	}
 };
@@ -311,7 +313,7 @@ struct GetKeyValuesStreamRequest {
 	SpanID spanContext;
 	Arena arena;
 	KeySelectorRef begin, end;
-	Version version;		// or latestVersion
+	Version version; // or latestVersion
 	int limit, limitBytes;
 	bool isFetchKeys;
 	Optional<TagSet> tags;
@@ -320,7 +322,7 @@ struct GetKeyValuesStreamRequest {
 
 	GetKeyValuesStreamRequest() : isFetchKeys(false) {}
 	template <class Ar>
-	void serialize( Ar& ar ) {
+	void serialize(Ar& ar) {
 		serializer(ar, begin, end, version, limit, limitBytes, isFetchKeys, tags, debugID, reply, spanContext, arena);
 	}
 };
diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index 438a891a27a..58980d1f085 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -126,10 +126,9 @@ void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 	    .suppressFor(1.0)
 	    .detail("Address", endpoint.getPrimaryAddress())
 	    .detail("Token", endpoint.token);
-	if(endpoint.getPrimaryAddress().isPublic()) {
-		if(failedEndpoints.size() > 100000) {
-			TraceEvent(SevWarnAlways, "TooManyFailedEndpoints")
-				.suppressFor(1.0);
+	if (endpoint.getPrimaryAddress().isPublic()) {
+		if (failedEndpoints.size() > 100000) {
+			TraceEvent(SevWarnAlways, "TooManyFailedEndpoints").suppressFor(1.0);
 			failedEndpoints.clear();
 		}
 		failedEndpoints.insert(endpoint);
diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 3a753008f8c..83a9f00c6c7 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -950,10 +950,16 @@ ACTOR static void deliver(TransportData* self,
 		// We don't have the (stream) endpoint 'token', notify the remote machine
 		if (destination.token.first() != -1) {
 			if (self->isLocalAddress(destination.getPrimaryAddress())) {
-				sendLocal(self, SerializeSource<UID>(destination.token), Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND));
+				sendLocal(self,
+				          SerializeSource<UID>(destination.token),
+				          Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND));
 			} else {
 				Reference<Peer> peer = self->getOrOpenPeer(destination.getPrimaryAddress());
-				sendPacket(self, peer, SerializeSource<UID>(destination.token), Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND), false);
+				sendPacket(self,
+				           peer,
+				           SerializeSource<UID>(destination.token),
+				           Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND),
+				           false);
 			}
 		}
 	}
@@ -1209,7 +1215,7 @@ ACTOR static Future<Void> connectionReader(TransportData* transport,
 							}
 							compatible = false;
 							if (!protocolVersion.hasInexpensiveMultiVersionClient()) {
-								if(peer) {
+								if (peer) {
 									peer->protocolVersion->set(protocolVersion);
 								}
 
@@ -1472,7 +1478,8 @@ void FlowTransport::addPeerReference(const Endpoint& endpoint, bool isStream) {
 }
 
 void FlowTransport::removePeerReference(const Endpoint& endpoint, bool isStream) {
-	if (!isStream || !endpoint.getPrimaryAddress().isValid() || !endpoint.getPrimaryAddress().isPublic()) return;
+	if (!isStream || !endpoint.getPrimaryAddress().isValid() || !endpoint.getPrimaryAddress().isPublic())
+		return;
 	Reference<Peer> peer = self->getPeer(endpoint.getPrimaryAddress());
 	if (peer) {
 		peer->peerReferences--;
diff --git a/fdbrpc/FlowTransport.h b/fdbrpc/FlowTransport.h
index 7387281e324..e7078288034 100644
--- a/fdbrpc/FlowTransport.h
+++ b/fdbrpc/FlowTransport.h
@@ -64,7 +64,7 @@ class Endpoint {
 
 	NetworkAddress getStableAddress() const { return addresses.getTLSAddress(); }
 
-	Endpoint getAdjustedEndpoint( uint32_t index ) const {
+	Endpoint getAdjustedEndpoint(uint32_t index) const {
 		uint32_t newIndex = token.second();
 		newIndex += index;
 		return Endpoint(
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 4e40b6206ee..cdef40ce129 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -79,9 +79,7 @@ struct FlowReceiver : public NetworkMessageReceiver {
 		FlowTransport::transport().addWellKnownEndpoint(endpoint, this, taskID);
 	}
 
-	const Endpoint& getRawEndpoint() {
-		return endpoint;
-	}
+	const Endpoint& getRawEndpoint() { return endpoint; }
 
 private:
 	Optional<PeerCompatibilityPolicy> peerCompatibilityPolicy_;
@@ -107,8 +105,8 @@ struct NetSAV final : SAV<T>, FlowReceiver, FastAllocated<NetSAV<T>> {
 		ErrorOr<EnsureTable<T>> message;
 		reader.deserialize(message);
 		if (message.isError()) {
-			if(message.getError().code() == error_code_broken_promise) {
-				IFailureMonitor::failureMonitor().endpointNotFound( getRawEndpoint() );
+			if (message.getError().code() == error_code_broken_promise) {
+				IFailureMonitor::failureMonitor().endpointNotFound(getRawEndpoint());
 			}
 			SAV<T>::sendErrorAndDelPromiseRef(message.getError());
 		} else {
@@ -271,7 +269,7 @@ struct AcknowledgementReply {
 	explicit AcknowledgementReply(int64_t bytes) : bytes(bytes) {}
 
 	template <class Ar>
-	void serialize( Ar& ar ) {
+	void serialize(Ar& ar) {
 		serializer(ar, bytes);
 	}
 };
@@ -286,21 +284,22 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 	Future<Void> failures;
 
 	AcknowledgementReceiver() : bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
-	AcknowledgementReceiver(const Endpoint& remoteEndpoint) : FlowReceiver(remoteEndpoint, false),
-		bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
+	AcknowledgementReceiver(const Endpoint& remoteEndpoint)
+	  : FlowReceiver(remoteEndpoint, false), bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
 
 	void receive(ArenaObjectReader& reader) override {
 		ErrorOr<AcknowledgementReply> message;
 		reader.deserialize(message);
-		if(message.isError()) {
-			if(!ready.isValid() || ready.isSet()) {
+		if (message.isError()) {
+			if (!ready.isValid() || ready.isSet()) {
 				ready = Promise<Void>();
 			}
 			ready.sendError(message.getError());
 		} else {
 			ASSERT(message.get().bytes > bytesAcknowledged);
 			bytesAcknowledged = message.get().bytes;
-			if (bytesSent - bytesAcknowledged < FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES && ready.isValid() && ready.canBeSet()) {
+			if (bytesSent - bytesAcknowledged < FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES && ready.isValid() &&
+			    ready.canBeSet()) {
 				ready.send(Void());
 			}
 		}
@@ -316,9 +315,10 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 
 	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
-	  :  NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
-		  acknowledgements.failures = tagError<Void>(makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), operation_obsolete());
-	  }
+	  : NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
+		acknowledgements.failures = tagError<Void>(
+		    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), operation_obsolete());
+	}
 
 	void destroy() override { delete this; }
 	void receive(ArenaObjectReader& reader) override {
@@ -327,18 +327,23 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		reader.deserialize(message);
 
 		if (message.isError()) {
-			if(message.getError().code() == error_code_broken_promise) {
-				IFailureMonitor::failureMonitor().endpointNotFound( getRawEndpoint() );
+			if (message.getError().code() == error_code_broken_promise) {
+				IFailureMonitor::failureMonitor().endpointNotFound(getRawEndpoint());
 			}
 			this->sendError(message.getError());
 		} else {
-			if(message.get().asUnderlyingType().acknowledgeToken.present()) {
-				acknowledgements = AcknowledgementReceiver(FlowTransport::transport().loadedEndpoint(message.get().asUnderlyingType().acknowledgeToken.get()));
+			if (message.get().asUnderlyingType().acknowledgeToken.present()) {
+				acknowledgements = AcknowledgementReceiver(
+				    FlowTransport::transport().loadedEndpoint(message.get().asUnderlyingType().acknowledgeToken.get()));
 			}
-			if(this->shouldFireImmediately()) {
-				if(acknowledgements.getRawEndpoint().isValid()) {
+			if (this->shouldFireImmediately()) {
+				if (acknowledgements.getRawEndpoint().isValid()) {
 					acknowledgements.bytesAcknowledged += message.get().asUnderlyingType().expectedSize();
-					FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
+					FlowTransport::transport().sendUnreliable(
+					    SerializeSource<ErrorOr<AcknowledgementReply>>(
+					        AcknowledgementReply(acknowledgements.bytesAcknowledged)),
+					    acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint),
+					    false);
 				}
 			}
 
@@ -349,16 +354,23 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 
 	T pop() override {
 		T res = this->popImpl();
-		if(acknowledgements.getRawEndpoint().isValid()) {
+		if (acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += res.expectedSize();
-			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(AcknowledgementReply(acknowledgements.bytesAcknowledged)), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
+			FlowTransport::transport().sendUnreliable(
+			    SerializeSource<ErrorOr<AcknowledgementReply>>(
+			        AcknowledgementReply(acknowledgements.bytesAcknowledged)),
+			    acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint),
+			    false);
 		}
 		return res;
 	}
 
 	~NetNotifiedQueueWithErrors() {
-		if(acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
-			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(operation_obsolete()), acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint), false);
+		if (acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
+			FlowTransport::transport().sendUnreliable(
+			    SerializeSource<ErrorOr<AcknowledgementReply>>(operation_obsolete()),
+			    acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint),
+			    false);
 		}
 	}
 
@@ -371,45 +383,56 @@ class ReplyPromiseStream {
 	// stream.send( request )
 	//   Unreliable at most once delivery: Delivers request unless there is a connection failure (zero or one times)
 
-	template<class U>
-	void send(U && value) const {
+	template <class U>
+	void send(U&& value) const {
 		if (queue->isRemoteEndpoint()) {
-			if(!queue->acknowledgements.getRawEndpoint().isValid()) {
+			if (!queue->acknowledgements.getRawEndpoint().isValid()) {
 				value.acknowledgeToken = queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token;
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
-			if((!queue->acknowledgements.ready.isValid() || (queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError())) && queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >= FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES) {
+			if ((!queue->acknowledgements.ready.isValid() ||
+			     (queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError())) &&
+			    queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >=
+			        FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES) {
 				queue->acknowledgements.ready = Promise<Void>();
 			}
-			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(value), getEndpoint(), false);
-		}
-		else {
+			FlowTransport::transport().sendUnreliable(
+			    SerializeSource<ErrorOr<EnsureTable<T>>>(value), getEndpoint(), false);
+		} else {
 			queue->send(std::forward<U>(value));
 		}
 	}
 
 	template <class E>
-	void sendError(const E& exc) const { 
+	void sendError(const E& exc) const {
 		if (queue->isRemoteEndpoint()) {
-			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(exc), getEndpoint(), false);
+			FlowTransport::transport().sendUnreliable(
+			    SerializeSource<ErrorOr<EnsureTable<T>>>(exc), getEndpoint(), false);
 		} else {
 			queue->sendError(exc);
-			if(errors && errors->canBeSet()) {
+			if (errors && errors->canBeSet()) {
 				errors->sendError(exc);
 			}
 		}
 	}
 
-	FutureStream<T> getFuture() const { queue->addFutureRef(); return FutureStream<T>(queue); }
+	FutureStream<T> getFuture() const {
+		queue->addFutureRef();
+		return FutureStream<T>(queue);
+	}
 	ReplyPromiseStream() : queue(new NetNotifiedQueueWithErrors<T>(0, 1)), errors(new SAV<Void>(0, 1)) {}
-	ReplyPromiseStream(const ReplyPromiseStream& rhs) : queue(rhs.queue), errors(rhs.errors) { 
+	ReplyPromiseStream(const ReplyPromiseStream& rhs) : queue(rhs.queue), errors(rhs.errors) {
 		queue->addPromiseRef();
-		if(errors) {
+		if (errors) {
 			errors->addPromiseRef();
 		}
 	}
-	ReplyPromiseStream(ReplyPromiseStream&& rhs) noexcept : queue(rhs.queue), errors(rhs.errors) { rhs.queue = nullptr; rhs.errors = nullptr; }
-	explicit ReplyPromiseStream(const Endpoint& endpoint) : queue(new NetNotifiedQueueWithErrors<T>(0, 1, endpoint)), errors(nullptr) {}
+	ReplyPromiseStream(ReplyPromiseStream&& rhs) noexcept : queue(rhs.queue), errors(rhs.errors) {
+		rhs.queue = nullptr;
+		rhs.errors = nullptr;
+	}
+	explicit ReplyPromiseStream(const Endpoint& endpoint)
+	  : queue(new NetNotifiedQueueWithErrors<T>(0, 1, endpoint)), errors(nullptr) {}
 
 	Future<Void> getErrorFutureAndDelPromiseRef() {
 		ASSERT(errors && errors->getPromiseReferenceCount() > 1);
@@ -419,7 +442,7 @@ class ReplyPromiseStream {
 		errors = nullptr;
 		return res;
 	}
-	
+
 	~ReplyPromiseStream() {
 		if (queue)
 			queue->delPromiseRef();
@@ -428,21 +451,23 @@ class ReplyPromiseStream {
 	}
 
 	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const {
-		return queue->getEndpoint(taskID); 
+		return queue->getEndpoint(taskID);
 	}
-	
-	bool operator == (const ReplyPromiseStream<T>& rhs) const { return queue == rhs.queue; }
+
+	bool operator==(const ReplyPromiseStream<T>& rhs) const { return queue == rhs.queue; }
 	bool isEmpty() const { return !queue->isReady(); }
 	uint32_t size() const { return queue->size(); }
 
 	Future<Void> onReady() {
-		if(queue->acknowledgements.failures.isError()) {
+		if (queue->acknowledgements.failures.isError()) {
 			return queue->acknowledgements.failures.getError();
 		}
-		if(queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() && queue->acknowledgements.ready.getFuture().isError()) {
+		if (queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() &&
+		    queue->acknowledgements.ready.getFuture().isError()) {
 			return queue->acknowledgements.ready.getFuture().getError();
 		}
-		if(queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged < FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES) {
+		if (queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged <
+		    FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES) {
 			return Void();
 		}
 		return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
@@ -450,20 +475,25 @@ class ReplyPromiseStream {
 
 	void operator=(const ReplyPromiseStream& rhs) {
 		rhs.queue->addPromiseRef();
-		if (queue) queue->delPromiseRef();
+		if (queue)
+			queue->delPromiseRef();
 		queue = rhs.queue;
-		if(rhs.errors) rhs.errors->addPromiseRef();
-		if (errors) errors->delPromiseRef();
+		if (rhs.errors)
+			rhs.errors->addPromiseRef();
+		if (errors)
+			errors->delPromiseRef();
 		errors = rhs.errors;
 	}
 	void operator=(ReplyPromiseStream&& rhs) noexcept {
 		if (queue != rhs.queue) {
-			if (queue) queue->delPromiseRef();
+			if (queue)
+				queue->delPromiseRef();
 			queue = rhs.queue;
 			rhs.queue = 0;
 		}
 		if (errors != rhs.errors) {
-			if (errors) errors->delPromiseRef();
+			if (errors)
+				errors->delPromiseRef();
 			errors = rhs.errors;
 			rhs.errors = 0;
 		}
@@ -490,7 +520,7 @@ void load(Ar& ar, ReplyPromiseStream<T>& value) {
 
 template <class T>
 struct serializable_traits<ReplyPromiseStream<T>> : std::true_type {
-	template<class Archiver>
+	template <class Archiver>
 	static void serialize(Archiver& ar, ReplyPromiseStream<T>& p) {
 		if constexpr (Archiver::isDeserializing) {
 			UID token;
@@ -620,10 +650,10 @@ class RequestStream {
 	}
 
 	// stream.getReplyStream( request )
-	//   Unreliable at most once delivery. 
-	//   Registers the request with the remote endpoint which sends back a stream of replies, followed by an end_of_stream error.
-	//   If the connection is ever broken the remote endpoint will stop attempting to send replies.
-    //   The caller sends acknowledgements to the remote endpoint so that at most 2MB of replies is ever inflight.
+	//   Unreliable at most once delivery.
+	//   Registers the request with the remote endpoint which sends back a stream of replies, followed by an
+	//   end_of_stream error. If the connection is ever broken the remote endpoint will stop attempting to send replies.
+	//   The caller sends acknowledgements to the remote endpoint so that at most 2MB of replies is ever inflight.
 
 	template <class X>
 	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value, TaskPriority taskID) const {
@@ -631,8 +661,9 @@ class RequestStream {
 		if (queue->isRemoteEndpoint()) {
 			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint(taskID));
 			auto& p = getReplyPromiseStream(value);
-			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(taskID), true);
-			//FIXME: defer sending the message until we know the connection is established
+			Reference<Peer> peer =
+			    FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(taskID), true);
+			// FIXME: defer sending the message until we know the connection is established
 			endStreamOnDisconnect(disc, p, peer);
 			return p;
 		}
@@ -646,12 +677,12 @@ class RequestStream {
 		if (queue->isRemoteEndpoint()) {
 			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint());
 			auto& p = getReplyPromiseStream(value);
-			Reference<Peer> peer = FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);
-			//FIXME: defer sending the message until we know the connection is established
+			Reference<Peer> peer =
+			    FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);
+			// FIXME: defer sending the message until we know the connection is established
 			endStreamOnDisconnect(disc, p, peer);
 			return p;
-		}
-		else {
+		} else {
 			send(value);
 			auto& p = getReplyPromiseStream(value);
 			return p;
@@ -727,7 +758,9 @@ class RequestStream {
 		// queue = (NetNotifiedQueue<T>*)0xdeadbeef;
 	}
 
-	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const { return queue->getEndpoint(taskID); }
+	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const {
+		return queue->getEndpoint(taskID);
+	}
 	void makeWellKnownEndpoint(Endpoint::Token token, TaskPriority taskID) {
 		queue->makeWellKnownEndpoint(token, taskID);
 	}
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index b5cfdeaea0e..ef0283ad235 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -198,23 +198,22 @@ struct PeerHolder {
 };
 
 // Implements getRepyStream, this a void actor with the same lifetime as the input ReplyPromiseStream.
-// Because this actor holds a reference to the stream, normally it would be impossible to know when there are no other references.
-// To get around this, there is a SAV inside the stream that has one less promise reference than
-// it should (caused by getErrorFutureAndDelPromiseRef()). When that SAV gets a broken promise because no one besides this void actor
-// is referencing it, this void actor will get a broken_promise dropping the final reference to the full ReplyPromiseStream
+// Because this actor holds a reference to the stream, normally it would be impossible to know when there are no other
+// references. To get around this, there is a SAV inside the stream that has one less promise reference than it should
+// (caused by getErrorFutureAndDelPromiseRef()). When that SAV gets a broken promise because no one besides this void
+// actor is referencing it, this void actor will get a broken_promise dropping the final reference to the full
+// ReplyPromiseStream
 ACTOR template <class X>
-void endStreamOnDisconnect( Future<Void> signal, ReplyPromiseStream<X> stream, Reference<Peer> peer = Reference<Peer>() ) {
+void endStreamOnDisconnect(Future<Void> signal,
+                           ReplyPromiseStream<X> stream,
+                           Reference<Peer> peer = Reference<Peer>()) {
 	state PeerHolder holder = PeerHolder(peer);
 	choose {
-		when(wait(signal)) {
-			stream.sendError(connection_failed());
-		}
+		when(wait(signal)) { stream.sendError(connection_failed()); }
 		when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
 	}
 }
 
-
-
 // Implements tryGetReply, getReplyUnlessFailedFor
 ACTOR template <class X>
 Future<ErrorOr<X>> waitValueOrSignal(Future<X> value,
diff --git a/fdbserver/NetworkTest.h b/fdbserver/NetworkTest.h
index 307c0f02825..a6aa60708b9 100644
--- a/fdbserver/NetworkTest.h
+++ b/fdbserver/NetworkTest.h
@@ -27,7 +27,7 @@
 #include "flow/FileIdentifier.h"
 
 struct NetworkTestInterface {
-	RequestStream< struct NetworkTestRequest > test;
+	RequestStream<struct NetworkTestRequest> test;
 	RequestStream<struct NetworkTestStreamingRequest> testStream;
 	NetworkTestInterface() {}
 	NetworkTestInterface(NetworkAddress remote);
@@ -64,7 +64,7 @@ struct NetworkTestStreamingReply : ReplyPromiseStreamReply {
 	int index = 0;
 	NetworkTestStreamingReply() = default;
 	explicit NetworkTestStreamingReply(int index) : index(index) {}
-	size_t expectedSize() const { return 4e6;/*sizeof(*this);*/ }
+	size_t expectedSize() const { return 4e6; /*sizeof(*this);*/ }
 
 	template <class Ar>
 	void serialize(Ar& ar) {
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 648938dc218..a01fe668196 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -667,7 +667,8 @@ struct StorageServer {
 
 	struct Counters {
 		CounterCollection cc;
-		Counter allQueries, getKeyQueries, getValueQueries, getRangeQueries, getRangeStreamQueries, finishedQueries, lowPriorityQueries, rowsQueried, bytesQueried, watchQueries, emptyQueries;
+		Counter allQueries, getKeyQueries, getValueQueries, getRangeQueries, getRangeStreamQueries, finishedQueries,
+		    lowPriorityQueries, rowsQueried, bytesQueried, watchQueries, emptyQueries;
 		Counter bytesInput, bytesDurable, bytesFetched,
 		    mutationBytes; // Like bytesInput but without MVCC accounting
 		Counter sampledBytesCleared;
@@ -682,21 +683,22 @@ struct StorageServer {
 
 		Counters(StorageServer* self)
 		  : cc("StorageServer", self->thisServerID.toString()), getKeyQueries("GetKeyQueries", cc),
-		    getValueQueries("GetValueQueries", cc), getRangeQueries("GetRangeQueries", cc), getRangeStreamQueries("GetRangeStreamQueries", cc),
-		    allQueries("QueryQueue", cc), finishedQueries("FinishedQueries", cc),
-		    lowPriorityQueries("LowPriorityQueries", cc), rowsQueried("RowsQueried", cc),
-		    bytesQueried("BytesQueried", cc), watchQueries("WatchQueries", cc), emptyQueries("EmptyQueries", cc),
-		    bytesInput("BytesInput", cc), bytesDurable("BytesDurable", cc), bytesFetched("BytesFetched", cc),
-		    mutationBytes("MutationBytes", cc), sampledBytesCleared("SampledBytesCleared", cc),
-		    mutations("Mutations", cc), setMutations("SetMutations", cc),
-		    clearRangeMutations("ClearRangeMutations", cc), atomicMutations("AtomicMutations", cc),
-		    updateBatches("UpdateBatches", cc), updateVersions("UpdateVersions", cc), loops("Loops", cc),
-		    fetchWaitingMS("FetchWaitingMS", cc), fetchWaitingCount("FetchWaitingCount", cc),
-		    fetchExecutingMS("FetchExecutingMS", cc), fetchExecutingCount("FetchExecutingCount", cc),
-		    readsRejected("ReadsRejected", cc), readLatencySample("ReadLatencyMetrics",
-		                                                          self->thisServerID,
-		                                                          SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-		                                                          SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    getValueQueries("GetValueQueries", cc), getRangeQueries("GetRangeQueries", cc),
+		    getRangeStreamQueries("GetRangeStreamQueries", cc), allQueries("QueryQueue", cc),
+		    finishedQueries("FinishedQueries", cc), lowPriorityQueries("LowPriorityQueries", cc),
+		    rowsQueried("RowsQueried", cc), bytesQueried("BytesQueried", cc), watchQueries("WatchQueries", cc),
+		    emptyQueries("EmptyQueries", cc), bytesInput("BytesInput", cc), bytesDurable("BytesDurable", cc),
+		    bytesFetched("BytesFetched", cc), mutationBytes("MutationBytes", cc),
+		    sampledBytesCleared("SampledBytesCleared", cc), mutations("Mutations", cc),
+		    setMutations("SetMutations", cc), clearRangeMutations("ClearRangeMutations", cc),
+		    atomicMutations("AtomicMutations", cc), updateBatches("UpdateBatches", cc),
+		    updateVersions("UpdateVersions", cc), loops("Loops", cc), fetchWaitingMS("FetchWaitingMS", cc),
+		    fetchWaitingCount("FetchWaitingCount", cc), fetchExecutingMS("FetchExecutingMS", cc),
+		    fetchExecutingCount("FetchExecutingCount", cc), readsRejected("ReadsRejected", cc),
+		    readLatencySample("ReadLatencyMetrics",
+		                      self->thisServerID,
+		                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
 			specialCounter(cc, "LastTLogVersion", [self]() { return self->lastTLogVersion; });
 			specialCounter(cc, "Version", [self]() { return self->version.get(); });
@@ -1965,32 +1967,38 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 	++data->counters.getRangeStreamQueries;
 	++data->counters.allQueries;
 	++data->readQueueSizeMetric;
-	data->maxQueryQueue = std::max<int>( data->maxQueryQueue, data->counters.allQueries.getValue() - data->counters.finishedQueries.getValue());
+	data->maxQueryQueue = std::max<int>(
+	    data->maxQueryQueue, data->counters.allQueries.getValue() - data->counters.finishedQueries.getValue());
 
 	// Active load balancing runs at a very high priority (to obtain accurate queue lengths)
 	// so we need to downgrade here
 	if (SERVER_KNOBS->FETCH_KEYS_LOWER_PRIORITY && req.isFetchKeys) {
-		wait( delay(0, TaskPriority::FetchKeys) );
+		wait(delay(0, TaskPriority::FetchKeys));
 	} else {
-		wait( delay(0, TaskPriority::DefaultEndpoint) );
+		wait(delay(0, TaskPriority::DefaultEndpoint));
 	}
-	
+
 	try {
-		if( req.debugID.present() )
+		if (req.debugID.present())
 			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Before");
-		state Version version = wait( waitForVersion( data, req.version, span.context ) );
+		state Version version = wait(waitForVersion(data, req.version, span.context));
 
 		state uint64_t changeCounter = data->shardChangeCounter;
-//		try {
-		state KeyRange shard = getShardKeyRange( data, req.begin );
+		//		try {
+		state KeyRange shard = getShardKeyRange(data, req.begin);
 
-		if( req.debugID.present() )
-			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterVersion");
+		if (req.debugID.present())
+			g_traceBatch.addEvent(
+			    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterVersion");
 		//.detail("ShardBegin", shard.begin).detail("ShardEnd", shard.end);
-		//} catch (Error& e) { TraceEvent("WrongShardServer", data->thisServerID).detail("Begin", req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("Shard", "None").detail("In", "getKeyValues>getShardKeyRange"); throw e; }
+		//} catch (Error& e) { TraceEvent("WrongShardServer", data->thisServerID).detail("Begin",
+		//req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("Shard",
+		//"None").detail("In", "getKeyValues>getShardKeyRange"); throw e; }
 
-		if ( !selectorInRange(req.end, shard) && !(req.end.isFirstGreaterOrEqual() && req.end.getKey() == shard.end) ) {
-//			TraceEvent("WrongShardServer1", data->thisServerID).detail("Begin", req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("ShardBegin", shard.begin).detail("ShardEnd", shard.end).detail("In", "getKeyValues>checkShardExtents");
+		if (!selectorInRange(req.end, shard) && !(req.end.isFirstGreaterOrEqual() && req.end.getKey() == shard.end)) {
+			//			TraceEvent("WrongShardServer1", data->thisServerID).detail("Begin",
+			//req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("ShardBegin",
+			//shard.begin).detail("ShardEnd", shard.end).detail("In", "getKeyValues>checkShardExtents");
 			throw wrong_shard_server();
 		}
 
@@ -2004,24 +2012,27 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 		                             : findKey(data, req.end, version, shard, &offset2, span.context);
 		state Key begin = wait(fBegin);
 		state Key end = wait(fEnd);
-		if( req.debugID.present() )
-			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterKeys");
+		if (req.debugID.present())
+			g_traceBatch.addEvent(
+			    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterKeys");
 		//.detail("Off1",offset1).detail("Off2",offset2).detail("ReqBegin",req.begin.getKey()).detail("ReqEnd",req.end.getKey());
 
 		// Offsets of zero indicate begin/end keys in this shard, which obviously means we can answer the query
-		// An end offset of 1 is also OK because the end key is exclusive, so if the first key of the next shard is the end the last actual key returned must be from this shard.
-		// A begin offset of 1 is also OK because then either begin is past end or equal to end (so the result is definitely empty)
-		if ((offset1 && offset1!=1) || (offset2 && offset2!=1)) {
-			TEST(true);  // wrong_shard_server due to offset in rangeStream
-			// We could detect when offset1 takes us off the beginning of the database or offset2 takes us off the end, and return a clipped range rather
-			// than an error (since that is what the NativeAPI.getRange will do anyway via its "slow path"), but we would have to add some flags to the response
-			// to encode whether we went off the beginning and the end, since it needs that information.
+		// An end offset of 1 is also OK because the end key is exclusive, so if the first key of the next shard is the
+		// end the last actual key returned must be from this shard. A begin offset of 1 is also OK because then either
+		// begin is past end or equal to end (so the result is definitely empty)
+		if ((offset1 && offset1 != 1) || (offset2 && offset2 != 1)) {
+			TEST(true); // wrong_shard_server due to offset in rangeStream
+			// We could detect when offset1 takes us off the beginning of the database or offset2 takes us off the end,
+			// and return a clipped range rather than an error (since that is what the NativeAPI.getRange will do anyway
+			// via its "slow path"), but we would have to add some flags to the response to encode whether we went off
+			// the beginning and the end, since it needs that information.
 			//TraceEvent("WrongShardServer2", data->thisServerID).detail("Begin", req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("ShardBegin", shard.begin).detail("ShardEnd", shard.end).detail("In", "getKeyValues>checkOffsets").detail("BeginKey", begin).detail("EndKey", end).detail("BeginOffset", offset1).detail("EndOffset", offset2);
 			throw wrong_shard_server();
 		}
 
 		if (begin >= end) {
-			if( req.debugID.present() )
+			if (req.debugID.present())
 				g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Send");
 			//.detail("Begin",begin).detail("End",end);
 
@@ -2029,20 +2040,27 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 			none.version = version;
 			none.more = false;
 
-			data->checkChangeCounter( changeCounter, KeyRangeRef( std::min<KeyRef>(req.begin.getKey(), req.end.getKey()), std::max<KeyRef>(req.begin.getKey(), req.end.getKey()) ) );
-			req.reply.send( none );
-			req.reply.sendError( end_of_stream() );
+			data->checkChangeCounter(changeCounter,
+			                         KeyRangeRef(std::min<KeyRef>(req.begin.getKey(), req.end.getKey()),
+			                                     std::max<KeyRef>(req.begin.getKey(), req.end.getKey())));
+			req.reply.send(none);
+			req.reply.sendError(end_of_stream());
 		} else {
 			loop {
 				wait(req.reply.onReady());
 				state int byteLimit = CLIENT_KNOBS->REPLY_BYTE_LIMIT;
-				GetKeyValuesReply _r = wait( readRange(data, version, KeyRangeRef(begin, end), req.limit, &byteLimit, span.context) );
+				GetKeyValuesReply _r =
+				    wait(readRange(data, version, KeyRangeRef(begin, end), req.limit, &byteLimit, span.context));
 				GetKeyValuesStreamReply r(_r);
 
-				if( req.debugID.present() )
-					g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");
+				if (req.debugID.present())
+					g_traceBatch.addEvent(
+					    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");
 				//.detail("Begin",begin).detail("End",end).detail("SizeOf",r.data.size());
-				data->checkChangeCounter( changeCounter, KeyRangeRef( std::min<KeyRef>(begin, std::min<KeyRef>(req.begin.getKey(), req.end.getKey())), std::max<KeyRef>(end, std::max<KeyRef>(req.begin.getKey(), req.end.getKey())) ) );
+				data->checkChangeCounter(
+				    changeCounter,
+				    KeyRangeRef(std::min<KeyRef>(begin, std::min<KeyRef>(req.begin.getKey(), req.end.getKey())),
+				                std::max<KeyRef>(end, std::max<KeyRef>(req.begin.getKey(), req.end.getKey()))));
 				if (EXPENSIVE_VALIDATION) {
 					for (int i = 0; i < r.data.size(); i++)
 						ASSERT(r.data[i].key >= begin && r.data[i].key < end);
@@ -2056,7 +2074,8 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 					data->metrics.notify(r.data[i].key, m);
 				}*/
 
-				// For performance concerns, the cost of a range read is billed to the start key and end key of the range.
+				// For performance concerns, the cost of a range read is billed to the start key and end key of the
+				// range.
 				int64_t totalByteSize = 0;
 				for (int i = 0; i < r.data.size(); i++) {
 					totalByteSize += r.data[i].expectedSize();
@@ -2067,38 +2086,40 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 					data->metrics.notifyBytesReadPerKSecond(r.data[r.data.size() - 1].key, bytesReadPerKSecond);
 				}
 
-				req.reply.send( r );
+				req.reply.send(r);
 
 				data->counters.rowsQueried += r.data.size();
-				if(r.data.size() == 0) {
+				if (r.data.size() == 0) {
 					++data->counters.emptyQueries;
 				}
-				if(!r.more) {
+				if (!r.more) {
 					req.reply.sendError(end_of_stream());
 					break;
 				}
 				ASSERT(r.data.size());
 
-				if(req.limit >= 0) {
+				if (req.limit >= 0) {
 					begin = keyAfter(r.data.back().key);
 				} else {
 					end = r.data.back().key;
 				}
 
 				if (SERVER_KNOBS->FETCH_KEYS_LOWER_PRIORITY && req.isFetchKeys) {
-					wait( delay(0, TaskPriority::FetchKeys) );
+					wait(delay(0, TaskPriority::FetchKeys));
 				} else {
-					wait( delay(0, TaskPriority::DefaultEndpoint) );
+					wait(delay(0, TaskPriority::DefaultEndpoint));
 				}
-				
+
 				data->transactionTagCounter.addRequest(req.tags, resultSize);
 
-				//FIXME: figure out what to do with latency measurements
-				//double duration = g_network->timer() - req.requestTime();
-				//data->counters.readLatencySample.addMeasurement(duration);
-				//if(data->latencyBandConfig.present()) {
-				//	int maxReadBytes = data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());
-				//	int maxSelectorOffset = data->latencyBandConfig.get().readConfig.maxKeySelectorOffset.orDefault(std::numeric_limits<int>::max());
+				// FIXME: figure out what to do with latency measurements
+				// double duration = g_network->timer() - req.requestTime();
+				// data->counters.readLatencySample.addMeasurement(duration);
+				// if(data->latencyBandConfig.present()) {
+				//	int maxReadBytes =
+				//data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max()); 	int
+				//maxSelectorOffset =
+				//data->latencyBandConfig.get().readConfig.maxKeySelectorOffset.orDefault(std::numeric_limits<int>::max());
 				//	data->counters.readLatencyBands.addMeasurement(
 				//		duration, resultSize > maxReadBytes || abs(req.begin.offset) > maxSelectorOffset ||
 				//										abs(req.end.offset) > maxSelectorOffset);
@@ -2106,8 +2127,8 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 			}
 		}
 	} catch (Error& e) {
-		if(e.code() != error_code_operation_obsolete) {
-			if(!canReplyWith(e))
+		if (e.code() != error_code_operation_obsolete) {
+			if (!canReplyWith(e))
 				throw;
 			req.reply.sendError(e);
 		}
@@ -2117,12 +2138,14 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 	++data->counters.finishedQueries;
 	--data->readQueueSizeMetric;
 
-	//FIXME: figure out what to do with latency measurements
-	//double duration = g_network->timer() - req.requestTime();
-	//data->counters.readLatencySample.addMeasurement(duration);
-	//if(data->latencyBandConfig.present()) {
-	//	int maxReadBytes = data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());
-	//	int maxSelectorOffset = data->latencyBandConfig.get().readConfig.maxKeySelectorOffset.orDefault(std::numeric_limits<int>::max());
+	// FIXME: figure out what to do with latency measurements
+	// double duration = g_network->timer() - req.requestTime();
+	// data->counters.readLatencySample.addMeasurement(duration);
+	// if(data->latencyBandConfig.present()) {
+	//	int maxReadBytes =
+	//data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max()); 	int
+	//maxSelectorOffset =
+	//data->latencyBandConfig.get().readConfig.maxKeySelectorOffset.orDefault(std::numeric_limits<int>::max());
 	//	data->counters.readLatencyBands.addMeasurement(
 	//		duration, resultSize > maxReadBytes || abs(req.begin.offset) > maxSelectorOffset ||
 	//										abs(req.end.offset) > maxSelectorOffset);
@@ -2131,7 +2154,7 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 	return Void();
 }
 
-ACTOR Future<Void> getKeyQ( StorageServer* data, GetKeyRequest req ) {
+ACTOR Future<Void> getKeyQ(StorageServer* data, GetKeyRequest req) {
 	state Span span("SS:getKey"_loc, { req.spanContext });
 	state int64_t resultSize = 0;
 
@@ -2687,8 +2710,8 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 
 		TraceEvent(SevDebug, "FetchKeysVersionSatisfied", data->thisServerID).detail("FKID", interval.pairID);
 
-		wait( data->fetchKeysParallelismLock.take( TaskPriority::DefaultYield ) );
-		state FlowLock::Releaser holdingFKPL( data->fetchKeysParallelismLock );
+		wait(data->fetchKeysParallelismLock.take(TaskPriority::DefaultYield));
+		state FlowLock::Releaser holdingFKPL(data->fetchKeysParallelismLock);
 
 		state double executeStart = now();
 		++data->counters.fetchWaitingCount;
@@ -2700,7 +2723,7 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 		wait(data->durableVersionLock.take());
 
 		shard->phase = AddingShard::Fetching;
-		
+
 		data->durableVersionLock.release();
 
 		wait(delay(0));
@@ -2719,10 +2742,11 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 		data->cx->invalidateCache(keys);
 
 		loop {
-			state Transaction tr( data->cx );
+			state Transaction tr(data->cx);
 			state Version fetchVersion = data->version.get();
-			while (!shard->updates.empty() && shard->updates[0].version <= fetchVersion) shard->updates.pop_front();
-			tr.setVersion( fetchVersion );
+			while (!shard->updates.empty() && shard->updates[0].version <= fetchVersion)
+				shard->updates.pop_front();
+			tr.setVersion(fetchVersion);
 			tr.info.taskID = TaskPriority::FetchKeys;
 			state PromiseStream<Standalone<RangeResultRef>> results;
 			state Future<Void> hold = tr.getRangeStream(results, keys, GetRangeLimits(), true);
@@ -2730,46 +2754,57 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 
 			try {
 				loop {
-					TEST(true);		// Fetching keys for transferred shard
-					state Standalone<RangeResultRef> this_block = waitNext( results.getFuture() );
-
-					int expectedSize = (int)this_block.expectedSize() + (8-(int)sizeof(KeyValueRef))*this_block.size();
-
-					TraceEvent(SevDebug, "FetchKeysBlock", data->thisServerID).detail("FKID", interval.pairID)
-						.detail("BlockRows", this_block.size()).detail("BlockBytes", expectedSize)
-						.detail("KeyBegin", keys.begin).detail("KeyEnd", keys.end)
-						.detail("Last", this_block.size() ? this_block.end()[-1].key : std::string())
-						.detail("Version", fetchVersion).detail("More", this_block.more);
+					TEST(true); // Fetching keys for transferred shard
+					state Standalone<RangeResultRef> this_block = waitNext(results.getFuture());
+
+					int expectedSize =
+					    (int)this_block.expectedSize() + (8 - (int)sizeof(KeyValueRef)) * this_block.size();
+
+					TraceEvent(SevDebug, "FetchKeysBlock", data->thisServerID)
+					    .detail("FKID", interval.pairID)
+					    .detail("BlockRows", this_block.size())
+					    .detail("BlockBytes", expectedSize)
+					    .detail("KeyBegin", keys.begin)
+					    .detail("KeyEnd", keys.end)
+					    .detail("Last", this_block.size() ? this_block.end()[-1].key : std::string())
+					    .detail("Version", fetchVersion)
+					    .detail("More", this_block.more);
 					DEBUG_KEY_RANGE("fetchRange", fetchVersion, keys);
-					for(auto k = this_block.begin(); k != this_block.end(); ++k) DEBUG_MUTATION("fetch", fetchVersion, MutationRef(MutationRef::SetValue, k->key, k->value));
+					for (auto k = this_block.begin(); k != this_block.end(); ++k)
+						DEBUG_MUTATION("fetch", fetchVersion, MutationRef(MutationRef::SetValue, k->key, k->value));
 
 					metricReporter.addFetchedBytes(expectedSize);
 					data->counters.bytesFetched += expectedSize;
 
 					// Write this_block to storage
-					state KeyValueRef *kvItr = this_block.begin();
-					for(; kvItr != this_block.end(); ++kvItr) {
-						data->storage.writeKeyValue( *kvItr );
+					state KeyValueRef* kvItr = this_block.begin();
+					for (; kvItr != this_block.end(); ++kvItr) {
+						data->storage.writeKeyValue(*kvItr);
 						wait(yield());
 					}
 
 					kvItr = this_block.begin();
-					for(; kvItr != this_block.end(); ++kvItr) {
-						data->byteSampleApplySet( *kvItr, invalidVersion );
+					for (; kvItr != this_block.end(); ++kvItr) {
+						data->byteSampleApplySet(*kvItr, invalidVersion);
 						wait(yield());
 					}
 
 					ASSERT(this_block.readThrough.present() || this_block.size());
-					nfk = this_block.readThrough.present() ? this_block.readThrough.get() : keyAfter( this_block.end()[-1].key );
+					nfk = this_block.readThrough.present() ? this_block.readThrough.get()
+					                                       : keyAfter(this_block.end()[-1].key);
 					this_block = Standalone<RangeResultRef>();
 				}
-			} catch( Error &e ) {
-				if(e.code() != error_code_end_of_stream && e.code() != error_code_connection_failed && e.code() != error_code_transaction_too_old &&
-					e.code() != error_code_future_version && e.code() != error_code_process_behind) {
+			} catch (Error& e) {
+				if (e.code() != error_code_end_of_stream && e.code() != error_code_connection_failed &&
+				    e.code() != error_code_transaction_too_old && e.code() != error_code_future_version &&
+				    e.code() != error_code_process_behind) {
 					throw;
 				}
-				if(nfk == keys.begin) {
-					TraceEvent("FKBlockFail", data->thisServerID).error(e,true).suppressFor(1.0).detail("FKID", interval.pairID);
+				if (nfk == keys.begin) {
+					TraceEvent("FKBlockFail", data->thisServerID)
+					    .error(e, true)
+					    .suppressFor(1.0)
+					    .detail("FKID", interval.pairID);
 
 					// FIXME: remove when we no longer support upgrades from 5.X
 					if (debug_getRangeRetries >= 100) {
@@ -2780,34 +2815,41 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 					debug_getRangeRetries++;
 					if (debug_nextRetryToLog == debug_getRangeRetries) {
 						debug_nextRetryToLog += std::min(debug_nextRetryToLog, 1024);
-						TraceEvent(SevWarn, "FetchPast", data->thisServerID).detail("TotalAttempts", debug_getRangeRetries).detail("FKID", interval.pairID).detail("N", fetchVersion).detail("E", data->version.get());
+						TraceEvent(SevWarn, "FetchPast", data->thisServerID)
+						    .detail("TotalAttempts", debug_getRangeRetries)
+						    .detail("FKID", interval.pairID)
+						    .detail("N", fetchVersion)
+						    .detail("E", data->version.get());
 					}
-					wait( delayJittered( FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY ) );
+					wait(delayJittered(FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY));
 					continue;
 				}
-				if(nfk < keys.end) {
-					std::deque< Standalone<VerUpdateRef> > updatesToSplit = std::move( shard->updates );
+				if (nfk < keys.end) {
+					std::deque<Standalone<VerUpdateRef>> updatesToSplit = std::move(shard->updates);
 
 					// This actor finishes committing the keys [keys.begin,nfk) that we already fetched.
-					// The remaining unfetched keys [nfk,keys.end) will become a separate AddingShard with its own fetchKeys.
-					shard->server->addShard( ShardInfo::addingSplitLeft( KeyRangeRef(keys.begin, nfk), shard ) );
-					shard->server->addShard( ShardInfo::newAdding( data, KeyRangeRef(nfk, keys.end) ) );
-					shard = data->shards.rangeContaining( keys.begin ).value()->adding;
+					// The remaining unfetched keys [nfk,keys.end) will become a separate AddingShard with its own
+					// fetchKeys.
+					shard->server->addShard(ShardInfo::addingSplitLeft(KeyRangeRef(keys.begin, nfk), shard));
+					shard->server->addShard(ShardInfo::newAdding(data, KeyRangeRef(nfk, keys.end)));
+					shard = data->shards.rangeContaining(keys.begin).value()->adding;
 					warningLogger = logFetchKeysWarning(shard);
-					AddingShard* otherShard = data->shards.rangeContaining( nfk ).value()->adding;
+					AddingShard* otherShard = data->shards.rangeContaining(nfk).value()->adding;
 					keys = shard->keys;
 
-					// Split our prior updates.  The ones that apply to our new, restricted key range will go back into shard->updates,
-					// and the ones delivered to the new shard will be discarded because it is in WaitPrevious phase (hasn't chosen a fetchVersion yet).
-					// What we are doing here is expensive and could get more expensive if we started having many more blocks per shard. May need optimization in the future.
-					std::deque< Standalone<VerUpdateRef> >::iterator u = updatesToSplit.begin();
-					for(; u != updatesToSplit.end(); ++u) {
+					// Split our prior updates.  The ones that apply to our new, restricted key range will go back into
+					// shard->updates, and the ones delivered to the new shard will be discarded because it is in
+					// WaitPrevious phase (hasn't chosen a fetchVersion yet). What we are doing here is expensive and
+					// could get more expensive if we started having many more blocks per shard. May need optimization
+					// in the future.
+					std::deque<Standalone<VerUpdateRef>>::iterator u = updatesToSplit.begin();
+					for (; u != updatesToSplit.end(); ++u) {
 						splitMutations(data, data->shards, *u);
 					}
 
-					TEST( true );  // fetchkeys has more
-					TEST( shard->updates.size() ); // Shard has updates
-					ASSERT( otherShard->updates.empty() );
+					TEST(true); // fetchkeys has more
+					TEST(shard->updates.size()); // Shard has updates
+					ASSERT(otherShard->updates.empty());
 				}
 				break;
 			}
@@ -4422,16 +4464,18 @@ ACTOR Future<Void> serveGetKeyValuesRequests(StorageServer* self, FutureStream<G
 	}
 }
 
-ACTOR Future<Void> serveGetKeyValuesStreamRequests( StorageServer* self, FutureStream<GetKeyValuesStreamRequest> getKeyValuesStream ) {
+ACTOR Future<Void> serveGetKeyValuesStreamRequests(StorageServer* self,
+                                                   FutureStream<GetKeyValuesStreamRequest> getKeyValuesStream) {
 	loop {
 		GetKeyValuesStreamRequest req = waitNext(getKeyValuesStream);
-		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade before doing real work
-		//FIXME: add readGuard again
+		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
+		// before doing real work
+		// FIXME: add readGuard again
 		self->actors.add(getKeyValuesStreamQ(self, req));
 	}
 }
 
-ACTOR Future<Void> serveGetKeyRequests( StorageServer* self, FutureStream<GetKeyRequest> getKey ) {
+ACTOR Future<Void> serveGetKeyRequests(StorageServer* self, FutureStream<GetKeyRequest> getKey) {
 	loop {
 		GetKeyRequest req = waitNext(getKey);
 		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
diff --git a/fdbserver/workloads/GetRangeStream.actor.cpp b/fdbserver/workloads/GetRangeStream.actor.cpp
index 0159204f120..b63e2129799 100644
--- a/fdbserver/workloads/GetRangeStream.actor.cpp
+++ b/fdbserver/workloads/GetRangeStream.actor.cpp
@@ -57,7 +57,8 @@ struct GetRangeStream : TestWorkload {
 			wait(delay(1));
 			state double after = g_network->now();
 			if (after > before) {
-				printf("throughput: %g bytes/s, next: %s\n", (self->bytesRead.getValue() - last) / (after - before),
+				printf("throughput: %g bytes/s, next: %s\n",
+				       (self->bytesRead.getValue() - last) / (after - before),
 				       printable(*next).c_str());
 			}
 		}
@@ -69,10 +70,11 @@ struct GetRangeStream : TestWorkload {
 		state Future<Void> logFuture = logThroughput(self, &next);
 		loop {
 			try {
-				Standalone<RangeResultRef> range = wait(tx.getRange(
-				    KeySelector(firstGreaterOrEqual(next), next.arena()), KeySelector(firstGreaterOrEqual(self->end)),
-				    GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
-				for (const auto & [ k, v ] : range) {
+				Standalone<RangeResultRef> range = wait(
+				    tx.getRange(KeySelector(firstGreaterOrEqual(next), next.arena()),
+				                KeySelector(firstGreaterOrEqual(self->end)),
+				                GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED, CLIENT_KNOBS->REPLY_BYTE_LIMIT)));
+				for (const auto& [k, v] : range) {
 					if (self->printKVPairs) {
 						printf("%s -> %s\n", printable(k).c_str(), printable(v).c_str());
 					}
@@ -96,12 +98,13 @@ struct GetRangeStream : TestWorkload {
 		loop {
 			state PromiseStream<Standalone<RangeResultRef>> results;
 			try {
-				state Future<Void> stream =
-				    tx.getRangeStream(results, KeySelector(firstGreaterOrEqual(next), next.arena()),
-				                      KeySelector(firstGreaterOrEqual(self->end)), GetRangeLimits());
+				state Future<Void> stream = tx.getRangeStream(results,
+				                                              KeySelector(firstGreaterOrEqual(next), next.arena()),
+				                                              KeySelector(firstGreaterOrEqual(self->end)),
+				                                              GetRangeLimits());
 				loop {
 					Standalone<RangeResultRef> range = waitNext(results.getFuture());
-					for (const auto & [ k, v ] : range) {
+					for (const auto& [k, v] : range) {
 						if (self->printKVPairs) {
 							printf("%s -> %s\n", printable(k).c_str(), printable(v).c_str());
 						}
diff --git a/flow/flow.h b/flow/flow.h
index 27319a081e6..c6a8f8b224a 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #pragma warning(disable : 4244 4267) // SOMEDAY: Carefully check for integer overflow issues (e.g. size_t to int
-                                     // conversions like this suppresses)
+// conversions like this suppresses)
 #pragma warning(disable : 4345)
 #pragma warning(error : 4239)
 
@@ -595,9 +595,7 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	bool isError() const { return queue.empty() && error.isValid(); } // the *next* thing queued is an error
 	uint32_t size() const { return queue.size(); }
 
-	virtual T pop() {
-		return popImpl();
-	}
+	virtual T pop() { return popImpl(); }
 
 	template <class U>
 	void send(U&& value) {
@@ -654,10 +652,11 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	virtual void fire(T const&) override { ASSERT(false); }
 	virtual void fire(T&&) override { ASSERT(false); }
 
-	protected:
+protected:
 	T popImpl() {
 		if (queue.empty()) {
-			if (error.isValid()) throw error;
+			if (error.isValid())
+				throw error;
 			throw internal_error();
 		}
 		auto copy = std::move(queue.front());
@@ -665,13 +664,9 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 		return copy;
 	}
 
-	bool shouldFireImmediately() {
-		return SingleCallback<T>::next != this;
-	}
+	bool shouldFireImmediately() { return SingleCallback<T>::next != this; }
 
-	bool hasError() {
-		return error.isValid();
-	}
+	bool hasError() { return error.isValid(); }
 };
 
 template <class T>
@@ -1010,7 +1005,8 @@ struct ReplyStreamType {
 	//   breaks IntelliSense in VS2010; this is a workaround.
 	typedef decltype(std::declval<T>().reply.getFuture().pop()) Type;
 };
-template <class T> class ReplyPromiseStream;
+template <class T>
+class ReplyPromiseStream;
 template <class T>
 struct ReplyStreamType<ReplyPromiseStream<T>> {
 	typedef T Type;
@@ -1018,7 +1014,7 @@ struct ReplyStreamType<ReplyPromiseStream<T>> {
 #define REPLYSTREAM_TYPE(RequestType) typename ReplyStreamType<RequestType>::Type
 #endif
 
-//extern int actorCount;
+// extern int actorCount;
 
 template <class T>
 static inline void destruct(T& t) {
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 608611059ac..b977d4c4ae6 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1261,7 +1261,8 @@ Future<T> waitOrError(Future<T> f, Future<Void> errorSignal) {
 	}
 }
 
-ACTOR template <class T, class V> Future<T> forwardErrors(Future<T> f, PromiseStream<V> output) {
+ACTOR template <class T, class V>
+Future<T> forwardErrors(Future<T> f, PromiseStream<V> output) {
 	try {
 		T val = wait(f);
 		return val;

From ccb39a6c1c484d4281f939b8b0f0ed296ba33791 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 2 May 2021 12:00:13 -0700
Subject: [PATCH 142/740] fixed merge errors

---
 documentation/tutorial/tutorial.actor.cpp | 1 -
 fdbserver/storageserver.actor.cpp         | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index f5eed7ab394..bcee4e7cc59 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -488,7 +488,6 @@ std::unordered_map<std::string, std::function<Future<Void>()>> actors = {
 	{ "multipleClients", &multipleClients }, // ./tutorial -s 127.0.0.1:6666 multipleClients
 	{ "fdbClientStream", &fdbClientStream }, // ./tutorial -C $CLUSTER_FILE_PATH fdbClientStream
 	{ "fdbClientGetRange", &fdbClientGetRange }, // ./tutorial -C $CLUSTER_FILE_PATH fdbClientGetRange
-	{ "fdbClient", &fdbClient }, // ./tutorial -C $CLUSTER_FILE_PATH fdbClient
 	{ "fdbStatusStresser", &fdbStatusStresser }
 }; // ./tutorial -C $CLUSTER_FILE_PATH fdbStatusStresser
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index a01fe668196..5ea3b1fa6dd 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2832,9 +2832,9 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 					// fetchKeys.
 					shard->server->addShard(ShardInfo::addingSplitLeft(KeyRangeRef(keys.begin, nfk), shard));
 					shard->server->addShard(ShardInfo::newAdding(data, KeyRangeRef(nfk, keys.end)));
-					shard = data->shards.rangeContaining(keys.begin).value()->adding;
+					shard = data->shards.rangeContaining(keys.begin).value()->adding.get();
 					warningLogger = logFetchKeysWarning(shard);
-					AddingShard* otherShard = data->shards.rangeContaining(nfk).value()->adding;
+					AddingShard* otherShard = data->shards.rangeContaining(nfk).value()->adding.get();
 					keys = shard->keys;
 
 					// Split our prior updates.  The ones that apply to our new, restricted key range will go back into

From b44fa2f05c1be20ca11dd04818fa4e611bc686dc Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 4 May 2021 20:53:02 -0700
Subject: [PATCH 143/740] fix: replyPromiseStream must be at ReadSocket
 priority so it gets in-order delivery to they reply stream

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index cdef40ce129..93dc290b1bd 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -506,7 +506,7 @@ class ReplyPromiseStream {
 
 template <class Ar, class T>
 void save(Ar& ar, const ReplyPromiseStream<T>& value) {
-	auto const& ep = value.getEndpoint().token;
+	auto const& ep = value.getEndpoint(TaskPriority::ReadSocket).token;
 	ar << ep;
 }
 

From 542a266e83538ad2873ccd6b3826122f5d978a52 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 4 May 2021 22:44:20 -0700
Subject: [PATCH 144/740] changed all task priorities for both the
 ReplyPromiseStream and the acknowledgements to be at ReadSocket

---
 fdbrpc/fdbrpc.h | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 93dc290b1bd..508ca0352ab 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -342,7 +342,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 					FlowTransport::transport().sendUnreliable(
 					    SerializeSource<ErrorOr<AcknowledgementReply>>(
 					        AcknowledgementReply(acknowledgements.bytesAcknowledged)),
-					    acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint),
+					    acknowledgements.getEndpoint(TaskPriority::ReadSocket),
 					    false);
 				}
 			}
@@ -356,11 +356,10 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		T res = this->popImpl();
 		if (acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += res.expectedSize();
-			FlowTransport::transport().sendUnreliable(
-			    SerializeSource<ErrorOr<AcknowledgementReply>>(
-			        AcknowledgementReply(acknowledgements.bytesAcknowledged)),
-			    acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint),
-			    false);
+			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(
+			                                              AcknowledgementReply(acknowledgements.bytesAcknowledged)),
+			                                          acknowledgements.getEndpoint(TaskPriority::ReadSocket),
+			                                          false);
 		}
 		return res;
 	}
@@ -369,7 +368,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		if (acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
 			FlowTransport::transport().sendUnreliable(
 			    SerializeSource<ErrorOr<AcknowledgementReply>>(operation_obsolete()),
-			    acknowledgements.getEndpoint(TaskPriority::DefaultPromiseEndpoint),
+			    acknowledgements.getEndpoint(TaskPriority::ReadSocket),
 			    false);
 		}
 	}
@@ -387,7 +386,7 @@ class ReplyPromiseStream {
 	void send(U&& value) const {
 		if (queue->isRemoteEndpoint()) {
 			if (!queue->acknowledgements.getRawEndpoint().isValid()) {
-				value.acknowledgeToken = queue->acknowledgements.getEndpoint(TaskPriority::DefaultEndpoint).token;
+				value.acknowledgeToken = queue->acknowledgements.getEndpoint(TaskPriority::ReadSocket).token;
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
 			if ((!queue->acknowledgements.ready.isValid() ||
@@ -450,9 +449,7 @@ class ReplyPromiseStream {
 			errors->delPromiseRef();
 	}
 
-	const Endpoint& getEndpoint(TaskPriority taskID = TaskPriority::DefaultEndpoint) const {
-		return queue->getEndpoint(taskID);
-	}
+	const Endpoint& getEndpoint() const { return queue->getEndpoint(TaskPriority::ReadSocket); }
 
 	bool operator==(const ReplyPromiseStream<T>& rhs) const { return queue == rhs.queue; }
 	bool isEmpty() const { return !queue->isReady(); }
@@ -506,7 +503,7 @@ class ReplyPromiseStream {
 
 template <class Ar, class T>
 void save(Ar& ar, const ReplyPromiseStream<T>& value) {
-	auto const& ep = value.getEndpoint(TaskPriority::ReadSocket).token;
+	auto const& ep = value.getEndpoint().token;
 	ar << ep;
 }
 

From f60fbeb1ab7d71ace4428e5d0d478378a226e05c Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 4 May 2021 23:11:15 -0700
Subject: [PATCH 145/740] formatting

---
 fdbclient/NativeAPI.actor.cpp     | 14 +++++++-------
 fdbserver/storageserver.actor.cpp |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index d160a7aa28e..6e9aeacdc16 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3577,13 +3577,13 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results,
 }
 
 Future<RangeResult> getRange(Database const& cx,
-                                            Future<Version> const& fVersion,
-                                            KeySelector const& begin,
-                                            KeySelector const& end,
-                                            GetRangeLimits const& limits,
-                                            bool const& reverse,
-                                            TransactionInfo const& info,
-                                            TagSet const& tags) {
+                             Future<Version> const& fVersion,
+                             KeySelector const& begin,
+                             KeySelector const& end,
+                             GetRangeLimits const& limits,
+                             bool const& reverse,
+                             TransactionInfo const& info,
+                             TagSet const& tags) {
 	return getRange(cx,
 	                Reference<TransactionLogInfo>(),
 	                fVersion,
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index ddabfe2d5b0..aa90f7f315c 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -4355,7 +4355,7 @@ ACTOR Future<Void> metricsCore(StorageServer* self, StorageServerInterface ssi)
 	                               SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                               &self->counters.cc,
 	                               self->thisServerID.toString() + "/StorageMetrics",
-	                               [tag, self=self](TraceEvent& te) {
+	                               [tag, self = self](TraceEvent& te) {
 		                               te.detail("Tag", tag.toString());
 		                               StorageBytes sb = self->storage.getStorageBytes();
 		                               te.detail("KvstoreBytesUsed", sb.used);

From cc72789661d8b6a50fc40187f901a35d4961e547 Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Tue, 4 May 2021 19:54:33 -0400
Subject: [PATCH 146/740] Merge pull request #4763 from sfc-gh-jfu/jfu-fix-docs

Fix documentation build
---
 documentation/sphinx/source/administration.rst                  | 2 +-
 documentation/sphinx/source/release-notes/release-notes-620.rst | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/administration.rst b/documentation/sphinx/source/administration.rst
index c71d26ee41e..7053a78ca08 100644
--- a/documentation/sphinx/source/administration.rst
+++ b/documentation/sphinx/source/administration.rst
@@ -801,7 +801,7 @@ Upgrading from Older Versions
 Upgrades from versions older than 5.0.0 are no longer supported.
 
 Version-specific notes on downgrading
-===================================
+=====================================
 
 In general, downgrades between non-patch releases (i.e. 6.2.x - 6.1.x) are not supported.
 
diff --git a/documentation/sphinx/source/release-notes/release-notes-620.rst b/documentation/sphinx/source/release-notes/release-notes-620.rst
index b61b33e4451..3e388a81299 100644
--- a/documentation/sphinx/source/release-notes/release-notes-620.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-620.rst
@@ -9,6 +9,7 @@ Release Notes
 * Backup agent no longer uses 4k block caching layer on local output files so that write operations are larger. `(PR #4428) <https://github.com/apple/foundationdb/pull/4428>`_
 * Fix accounting error that could cause commits to incorrectly fail with ``proxy_memory_limit_exceeded``. `(PR #4529) <https://github.com/apple/foundationdb/pull/4529>`_
 * Added support for downgrades from FDB version 6.3. For more details, see the :ref:`administration notes <downgrade-specific-version>`. `(PR #4673) <https://github.com/apple/foundationdb/pull/4673>`_ `(PR #4469) <https://github.com/apple/foundationdb/pull/4469>`_
+
 6.2.32
 ======
 * Fix an issue where symbolic links in cmake-built RPMs are broken if you unpack the RPM to a custom directory. `(PR #4380) <https://github.com/apple/foundationdb/pull/4380>`_

From 5bff9cd1964da862416210b9b1848b7c215da3d6 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Tue, 4 May 2021 18:07:48 -0700
Subject: [PATCH 147/740] Merge pull request #4756 from
 apple/revert-4562-bugfixes/simulator-close-files

Revert "Actually close files in simulation"
---
 fdbrpc/AsyncFileNonDurable.actor.h | 14 --------------
 fdbrpc/sim2.actor.cpp              | 16 ++++++++--------
 flow/flow.h                        |  2 --
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index 28b3506d6e0..00c0f7441d7 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -276,20 +276,6 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 			Future<Void> deleteFuture = deleteFile(this);
 			if (!deleteFuture.isReady())
 				filesBeingDeleted[filename] = deleteFuture;
-		} else if (isSoleOwner()) {
-			// isSoleOwner is a bit confusing here. What we mean is that the openFiles map is the sole owner. If we
-			// remove the file from the map to make sure it gets closed.
-			auto& openFiles = g_simulator.getCurrentProcess()->machine->openFiles;
-			auto iter = openFiles.find(filename);
-			// the file could've been renamed (DiskQueue does that for example). In that case the file won't be in the
-			// map anymore.
-			if (iter != openFiles.end()) {
-				// even if the filename exists, it doesn't mean that it references the same file. It could be that the
-				// file was renamed and later a file with the same name was opened.
-				if (iter->second.canGet() && iter->second.get().getPtr() == this) {
-					openFiles.erase(filename);
-				}
-			}
 		}
 	}
 
diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index d72dcc62b8d..5cf65da0a5e 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -537,10 +537,7 @@ class SimpleFile : public IAsyncFile, public ReferenceCounted<SimpleFile> {
 
 	std::string getFilename() const override { return actualFilename; }
 
-	~SimpleFile() override {
-		_close(h);
-		--openCount;
-	}
+	~SimpleFile() override { _close(h); }
 
 private:
 	int h;
@@ -1941,7 +1938,10 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 		TraceEvent("ClogInterface")
 		    .detail("IP", ip.toString())
 		    .detail("Delay", seconds)
-		    .detail("Queue", mode == ClogSend ? "Send" : mode == ClogReceive ? "Receive" : "All");
+		    .detail("Queue",
+		            mode == ClogSend      ? "Send"
+		            : mode == ClogReceive ? "Receive"
+		                                  : "All");
 
 		if (mode == ClogSend || mode == ClogAll)
 			g_clogging.clogSendFor(ip, seconds);
@@ -2415,9 +2415,9 @@ int sf_open(const char* filename, int flags, int convFlags, int mode) {
 	                       GENERIC_READ | ((flags & IAsyncFile::OPEN_READWRITE) ? GENERIC_WRITE : 0),
 	                       FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
 	                       nullptr,
-	                       (flags & IAsyncFile::OPEN_EXCLUSIVE)
-	                           ? CREATE_NEW
-	                           : (flags & IAsyncFile::OPEN_CREATE) ? OPEN_ALWAYS : OPEN_EXISTING,
+	                       (flags & IAsyncFile::OPEN_EXCLUSIVE) ? CREATE_NEW
+	                       : (flags & IAsyncFile::OPEN_CREATE)  ? OPEN_ALWAYS
+	                                                            : OPEN_EXISTING,
 	                       FILE_ATTRIBUTE_NORMAL,
 	                       nullptr);
 	int h = -1;
diff --git a/flow/flow.h b/flow/flow.h
index 86d5ce05298..8388113253b 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -805,8 +805,6 @@ class Future {
 	bool isValid() const { return sav != 0; }
 	bool isReady() const { return sav->isSet(); }
 	bool isError() const { return sav->isError(); }
-	// returns true if get can be called on this future (counterpart of canBeSet on Promises)
-	bool canGet() const { return isValid() && isReady() && !isError(); }
 	Error& getError() const {
 		ASSERT(isError());
 		return sav->error_state;

From eaefd03bb0a3748e606a74b0ec46ea92c7861336 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 5 May 2021 10:03:29 -0700
Subject: [PATCH 148/740] Merge pull request #4747 from
 sfc-gh-anoyes/anoyes/fix-clang-unseed-mismatch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use a deterministic iteration order for committing in the special key…
---
 fdbclient/SpecialKeySpace.actor.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 9eb8e3aacb9..5d24fa4c985 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -572,16 +572,20 @@ ACTOR Future<Void> commitActor(SpecialKeySpace* sks, ReadYourWritesTransaction*
 	state RangeMap<Key, std::pair<bool, Optional<Value>>, KeyRangeRef>::Ranges ranges =
 	    ryw->getSpecialKeySpaceWriteMap().containedRanges(specialKeys);
 	state RangeMap<Key, std::pair<bool, Optional<Value>>, KeyRangeRef>::iterator iter = ranges.begin();
-	state std::set<SpecialKeyRangeRWImpl*> writeModulePtrs;
+	state std::vector<SpecialKeyRangeRWImpl*> writeModulePtrs;
+	std::unordered_set<SpecialKeyRangeRWImpl*> deduplicate;
 	while (iter != ranges.end()) {
 		std::pair<bool, Optional<Value>> entry = iter->value();
 		if (entry.first) {
 			auto modulePtr = sks->getRWImpls().rangeContaining(iter->begin())->value();
-			writeModulePtrs.insert(modulePtr);
+			auto [_, inserted] = deduplicate.insert(modulePtr);
+			if (inserted) {
+				writeModulePtrs.push_back(modulePtr);
+			}
 		}
 		++iter;
 	}
-	state std::set<SpecialKeyRangeRWImpl*>::const_iterator it;
+	state std::vector<SpecialKeyRangeRWImpl*>::const_iterator it;
 	for (it = writeModulePtrs.begin(); it != writeModulePtrs.end(); ++it) {
 		Optional<std::string> msg = wait((*it)->commit(ryw));
 		if (msg.present()) {

From e25d2ed489a693bc336a61110650da4da91d105a Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 5 May 2021 14:18:06 -0700
Subject: [PATCH 149/740] Use default initializer for TraceEvent::errorKind

---
 flow/Trace.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flow/Trace.h b/flow/Trace.h
index ef86671cc17..4c2eadb215b 100644
--- a/flow/Trace.h
+++ b/flow/Trace.h
@@ -483,7 +483,7 @@ struct TraceEvent {
 	std::string trackingKey;
 	TraceEventFields fields;
 	Severity severity;
-	ErrorKind errorKind;
+	ErrorKind errorKind{ ErrorKind::Unset };
 	const char* type;
 	UID id;
 	Error err;

From 40169600adbfa92ae41d47496c69dd26afa2f0fe Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 5 May 2021 16:05:34 -0700
Subject: [PATCH 150/740] Merge pull request #4746 from
 sfc-gh-ljoswiak/fixes/boost

Fix boost download links
---
 README.md                             | 2 +-
 build/cmake/Dockerfile                | 2 +-
 build/docker/centos6/build/Dockerfile | 4 ++--
 build/docker/centos7/build/Dockerfile | 4 ++--
 cmake/CompileBoost.cmake              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 44b451c1355..cd28c798f0f 100755
--- a/README.md
+++ b/README.md
@@ -171,7 +171,7 @@ that Visual Studio is used to compile.
 
 1. Install Visual Studio 2017 (Community Edition is tested)
 1. Install cmake Version 3.12 or higher [CMake](https://cmake.org/)
-1. Download version 1.72 of [Boost](https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2)
+1. Download version 1.72 of [Boost](https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2)
 1. Unpack boost (you don't need to compile it)
 1. Install [Mono](http://www.mono-project.com/download/stable/)
 1. (Optional) Install a [JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html). FoundationDB currently builds with Java 8
diff --git a/build/cmake/Dockerfile b/build/cmake/Dockerfile
index 3f9d51a29a4..0452606a1fe 100644
--- a/build/cmake/Dockerfile
+++ b/build/cmake/Dockerfile
@@ -13,7 +13,7 @@ RUN curl -L https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.1
     cd /tmp && tar xf cmake.tar.gz && cp -r cmake-3.13.4-Linux-x86_64/* /usr/local/
 
 # install boost
-RUN curl -L https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_72_0.tar.bz2 > /tmp/boost.tar.bz2 &&\
+RUN curl -L https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.bz2 > /tmp/boost.tar.bz2 &&\
     cd /tmp && echo "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba  boost.tar.bz2" > boost-sha.txt &&\
     sha256sum -c boost-sha.txt && tar xf boost.tar.bz2 && cp -r boost_1_72_0/boost /usr/local/include/ &&\
     rm -rf boost.tar.bz2 boost_1_72_0
diff --git a/build/docker/centos6/build/Dockerfile b/build/docker/centos6/build/Dockerfile
index c0076266438..08ad28256ba 100644
--- a/build/docker/centos6/build/Dockerfile
+++ b/build/docker/centos6/build/Dockerfile
@@ -156,7 +156,7 @@ RUN curl -Ls https://github.com/facebook/rocksdb/archive/v6.10.1.tar.gz -o rocks
     rm -rf /tmp/*
 
 # install boost 1.67 to /opt
-RUN curl -Ls https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2 -o boost_1_67_0.tar.bz2 && \
+RUN curl -Ls https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.bz2 -o boost_1_67_0.tar.bz2 && \
     echo "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba  boost_1_67_0.tar.bz2" > boost-sha-67.txt && \
     sha256sum -c boost-sha-67.txt && \
     tar --no-same-owner --directory /opt -xjf boost_1_67_0.tar.bz2 && \
@@ -165,7 +165,7 @@ RUN curl -Ls https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.
 
 # install boost 1.72 to /opt
 RUN source /opt/rh/devtoolset-8/enable && \
-    curl -Ls https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 -o boost_1_72_0.tar.bz2 && \
+    curl -Ls https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 -o boost_1_72_0.tar.bz2 && \
     echo "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722  boost_1_72_0.tar.bz2" > boost-sha-72.txt && \
     sha256sum -c boost-sha-72.txt && \
     tar --no-same-owner --directory /opt -xjf boost_1_72_0.tar.bz2 && \
diff --git a/build/docker/centos7/build/Dockerfile b/build/docker/centos7/build/Dockerfile
index 18773c041a8..3492fc15f49 100644
--- a/build/docker/centos7/build/Dockerfile
+++ b/build/docker/centos7/build/Dockerfile
@@ -139,7 +139,7 @@ RUN curl -Ls https://github.com/facebook/rocksdb/archive/v6.10.1.tar.gz -o rocks
     rm -rf /tmp/*
 
 # install boost 1.67 to /opt
-RUN curl -Ls https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2 -o boost_1_67_0.tar.bz2 && \
+RUN curl -Ls https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.bz2 -o boost_1_67_0.tar.bz2 && \
     echo "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba  boost_1_67_0.tar.bz2" > boost-sha-67.txt && \
     sha256sum -c boost-sha-67.txt && \
     tar --no-same-owner --directory /opt -xjf boost_1_67_0.tar.bz2 && \
@@ -148,7 +148,7 @@ RUN curl -Ls https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.
 
 # install boost 1.72 to /opt
 RUN source /opt/rh/devtoolset-8/enable && \
-    curl -Ls https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 -o boost_1_72_0.tar.bz2 && \
+    curl -Ls https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 -o boost_1_72_0.tar.bz2 && \
     echo "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722  boost_1_72_0.tar.bz2" > boost-sha-72.txt && \
     sha256sum -c boost-sha-72.txt && \
     tar --no-same-owner --directory /opt -xjf boost_1_72_0.tar.bz2 && \
diff --git a/cmake/CompileBoost.cmake b/cmake/CompileBoost.cmake
index 0b1cc68502d..687c266f0b7 100644
--- a/cmake/CompileBoost.cmake
+++ b/cmake/CompileBoost.cmake
@@ -38,7 +38,7 @@ function(compile_boost)
   include(ExternalProject)
   set(BOOST_INSTALL_DIR "${CMAKE_BINARY_DIR}/boost_install")
   ExternalProject_add("${MY_TARGET}Project"
-    URL "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2"
+    URL "https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2"
     URL_HASH SHA256=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
     CONFIGURE_COMMAND ./bootstrap.sh ${BOOTSTRAP_ARGS}
     BUILD_COMMAND ${B2_COMMAND} link=static ${MY_BUILD_ARGS} --prefix=${BOOST_INSTALL_DIR} ${USER_CONFIG_FLAG} install

From b68051fd2d7a45fbe5f58cece170254841f91250 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Thu, 6 May 2021 15:46:49 -0700
Subject: [PATCH 151/740] fix: endpointNotFound needs to be called on the
 endpoint of the RequestStream, not the endpoint of the reply

---
 fdbrpc/fdbrpc.h              | 10 ++--------
 fdbrpc/genericactors.actor.h | 15 +++++++++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 508ca0352ab..d987456db2f 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -105,9 +105,6 @@ struct NetSAV final : SAV<T>, FlowReceiver, FastAllocated<NetSAV<T>> {
 		ErrorOr<EnsureTable<T>> message;
 		reader.deserialize(message);
 		if (message.isError()) {
-			if (message.getError().code() == error_code_broken_promise) {
-				IFailureMonitor::failureMonitor().endpointNotFound(getRawEndpoint());
-			}
 			SAV<T>::sendErrorAndDelPromiseRef(message.getError());
 		} else {
 			SAV<T>::sendAndDelPromiseRef(message.get().asUnderlyingType());
@@ -327,9 +324,6 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		reader.deserialize(message);
 
 		if (message.isError()) {
-			if (message.getError().code() == error_code_broken_promise) {
-				IFailureMonitor::failureMonitor().endpointNotFound(getRawEndpoint());
-			}
 			this->sendError(message.getError());
 		} else {
 			if (message.get().asUnderlyingType().acknowledgeToken.present()) {
@@ -661,7 +655,7 @@ class RequestStream {
 			Reference<Peer> peer =
 			    FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(taskID), true);
 			// FIXME: defer sending the message until we know the connection is established
-			endStreamOnDisconnect(disc, p, peer);
+			endStreamOnDisconnect(disc, p, getEndpoint(taskID), peer);
 			return p;
 		}
 		send(value);
@@ -677,7 +671,7 @@ class RequestStream {
 			Reference<Peer> peer =
 			    FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);
 			// FIXME: defer sending the message until we know the connection is established
-			endStreamOnDisconnect(disc, p, peer);
+			endStreamOnDisconnect(disc, p, getEndpoint(), peer);
 			return p;
 		} else {
 			send(value);
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index ef0283ad235..f00182b5778 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -206,11 +206,18 @@ struct PeerHolder {
 ACTOR template <class X>
 void endStreamOnDisconnect(Future<Void> signal,
                            ReplyPromiseStream<X> stream,
+                           Endpoint endpoint,
                            Reference<Peer> peer = Reference<Peer>()) {
 	state PeerHolder holder = PeerHolder(peer);
-	choose {
-		when(wait(signal)) { stream.sendError(connection_failed()); }
-		when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
+	try {
+		choose {
+			when(wait(signal)) { stream.sendError(connection_failed()); }
+			when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
+		}
+	} catch (Error& e) {
+		if (e.code() == error_code_broken_promise) {
+			IFailureMonitor::failureMonitor().endpointNotFound(endpoint);
+		}
 	}
 }
 
@@ -241,7 +248,7 @@ Future<ErrorOr<X>> waitValueOrSignal(Future<X> value,
 			// receiving the failure signal
 			if (e.code() != error_code_broken_promise || signal.isError())
 				return ErrorOr<X>(e);
-
+			IFailureMonitor::failureMonitor().endpointNotFound(endpoint);
 			value = Never();
 		}
 	}

From d918f080360fb52d41a3312f1618b79bfe86b5b3 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Thu, 6 May 2021 23:15:14 -0700
Subject: [PATCH 152/740] fix: handle a streaming read lasting long enough that
 the version is gone

---
 fdbserver/storageserver.actor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index aa90f7f315c..74000e4223f 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2047,6 +2047,11 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 		} else {
 			loop {
 				wait(req.reply.onReady());
+
+				if (version < data->oldestVersion.get()) {
+					throw transaction_too_old();
+				}
+
 				state int byteLimit = CLIENT_KNOBS->REPLY_BYTE_LIMIT;
 				GetKeyValuesReply _r =
 				    wait(readRange(data, version, KeyRangeRef(begin, end), req.limit, &byteLimit, span.context));

From def877382f3f06978119f2d96674e945b1cdf565 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Thu, 6 May 2021 23:16:02 -0700
Subject: [PATCH 153/740] hold a reference to the promise because the second
 could cause it to be replaced by a new promise which will crash

---
 fdbrpc/fdbrpc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index d987456db2f..819425f52ff 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -297,6 +297,7 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 			bytesAcknowledged = message.get().bytes;
 			if (bytesSent - bytesAcknowledged < FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES && ready.isValid() &&
 			    ready.canBeSet()) {
+				Promise<Void> hold = ready;
 				ready.send(Void());
 			}
 		}

From 3e74686c2a420ff8a6122ba3608eb3021869563e Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 9 May 2021 22:34:43 -0700
Subject: [PATCH 154/740] fix: endStreamOnDisconnect gets broken promises when
 dropping references to the ReplyPromise, so it cannot be used for
 endpointNotFound

---
 fdbrpc/fdbrpc.h              |  7 +++++++
 fdbrpc/genericactors.actor.h | 13 ++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 819425f52ff..5d5ee2f83b1 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -310,6 +310,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator delete;
 
 	AcknowledgementReceiver acknowledgements;
+	Endpoint requestStreamEndpoint;
 
 	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
@@ -325,6 +326,10 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		reader.deserialize(message);
 
 		if (message.isError()) {
+			if (message.getError().code() == error_code_broken_promise) {
+				ASSERT(requestStreamEndpoint.isValid());
+				IFailureMonitor::failureMonitor().endpointNotFound(requestStreamEndpoint);
+			}
 			this->sendError(message.getError());
 		} else {
 			if (message.get().asUnderlyingType().acknowledgeToken.present()) {
@@ -437,6 +442,8 @@ class ReplyPromiseStream {
 		return res;
 	}
 
+	void setRequestStreamEndpoint(const Endpoint& endpoint) { queue->requestStreamEndpoint = endpoint; }
+
 	~ReplyPromiseStream() {
 		if (queue)
 			queue->delPromiseRef();
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index f00182b5778..23bd3e97c25 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -209,15 +209,10 @@ void endStreamOnDisconnect(Future<Void> signal,
                            Endpoint endpoint,
                            Reference<Peer> peer = Reference<Peer>()) {
 	state PeerHolder holder = PeerHolder(peer);
-	try {
-		choose {
-			when(wait(signal)) { stream.sendError(connection_failed()); }
-			when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
-		}
-	} catch (Error& e) {
-		if (e.code() == error_code_broken_promise) {
-			IFailureMonitor::failureMonitor().endpointNotFound(endpoint);
-		}
+	stream.setRequestStreamEndpoint(endpoint);
+	choose {
+		when(wait(signal)) { stream.sendError(connection_failed()); }
+		when(wait(stream.getErrorFutureAndDelPromiseRef())) {}
 	}
 }
 

From f84e9c6b72d6725116f373d0708adc34d053706e Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 10 May 2021 20:36:35 -0700
Subject: [PATCH 155/740] Revert "Merge pull request #4136 from
 sfc-gh-mpilman/features/actor-lineage"

This reverts commit da41534618a2a1edbf6b0b760635175372a66294, reversing
changes made to e6300905d6f294c52ebd166f4714541b084f37b4.
---
 CMakeLists.txt                          |   1 -
 cmake/GetMsgpack.cmake                  |  20 --
 fdbclient/ActorLineageProfiler.cpp      | 381 ------------------------
 fdbclient/ActorLineageProfiler.h        | 192 ------------
 fdbclient/AnnotateActor.cpp             |  23 --
 fdbclient/AnnotateActor.h               |  85 ------
 fdbclient/CMakeLists.txt                |   9 +-
 fdbclient/FluentDSampleIngestor.cpp     | 257 ----------------
 fdbclient/GlobalConfig.actor.cpp        |  46 +--
 fdbclient/GlobalConfig.actor.h          |  29 +-
 fdbclient/NativeAPI.actor.cpp           |  20 +-
 fdbclient/ProcessInterface.h            |  81 -----
 fdbclient/SpecialKeySpace.actor.cpp     | 293 +-----------------
 fdbclient/SpecialKeySpace.actor.h       |  29 --
 fdbclient/TransactionLineage.cpp        |  25 --
 fdbclient/TransactionLineage.h          | 128 --------
 fdbclient/Tuple.cpp                     |  29 --
 fdbclient/Tuple.h                       |   4 +-
 fdbrpc/AsyncFileKAIO.actor.h            |   7 +-
 fdbrpc/FlowTests.actor.cpp              |   4 -
 fdbrpc/FlowTransport.actor.cpp          |   2 +-
 fdbrpc/IAsyncFile.h                     |   4 -
 fdbrpc/Locality.h                       |   1 -
 fdbrpc/Net2FileSystem.cpp               |   4 -
 fdbrpc/Net2FileSystem.h                 |   3 -
 fdbrpc/sim2.actor.cpp                   |  11 -
 fdbrpc/simulator.h                      |   4 -
 fdbserver/CMakeLists.txt                |   3 -
 fdbserver/ClusterController.actor.cpp   |   4 +-
 fdbserver/CommitProxyServer.actor.cpp   |   6 +-
 fdbserver/GrvProxyServer.actor.cpp      |   5 -
 fdbserver/RoleLineage.actor.cpp         |  25 --
 fdbserver/RoleLineage.actor.h           |  67 -----
 fdbserver/SigStack.cpp                  |  23 --
 fdbserver/WorkerInterface.actor.h       |  35 ---
 fdbserver/fdbserver.actor.cpp           |  38 +--
 fdbserver/storageserver.actor.cpp       |  11 -
 fdbserver/worker.actor.cpp              |  70 -----
 flow/CMakeLists.txt                     |   1 -
 flow/Net2.actor.cpp                     |  12 +-
 flow/Platform.actor.cpp                 |   4 -
 flow/Platform.h                         |   6 +-
 flow/Profiler.actor.cpp                 |   3 -
 flow/WriteOnlySet.actor.cpp             | 273 -----------------
 flow/WriteOnlySet.h                     | 162 ----------
 flow/actorcompiler/ActorCompiler.cs     |   2 -
 flow/actorcompiler/actorcompiler.csproj | 108 ++++++-
 flow/actorcompiler/actorcompiler.sln    |  34 ---
 flow/flow.cpp                           |  21 --
 flow/flow.h                             | 188 +-----------
 flow/genericactors.actor.h              |   4 -
 flow/network.h                          |   4 -
 flow/singleton.h                        | 237 ---------------
 tests/TestRunner/local_cluster.py       |   2 +-
 54 files changed, 142 insertions(+), 2898 deletions(-)
 delete mode 100644 cmake/GetMsgpack.cmake
 delete mode 100644 fdbclient/ActorLineageProfiler.cpp
 delete mode 100644 fdbclient/ActorLineageProfiler.h
 delete mode 100644 fdbclient/AnnotateActor.cpp
 delete mode 100644 fdbclient/AnnotateActor.h
 delete mode 100644 fdbclient/FluentDSampleIngestor.cpp
 delete mode 100644 fdbclient/ProcessInterface.h
 delete mode 100644 fdbclient/TransactionLineage.cpp
 delete mode 100644 fdbclient/TransactionLineage.h
 delete mode 100644 fdbserver/RoleLineage.actor.cpp
 delete mode 100644 fdbserver/RoleLineage.actor.h
 delete mode 100644 fdbserver/SigStack.cpp
 delete mode 100644 flow/WriteOnlySet.actor.cpp
 delete mode 100644 flow/WriteOnlySet.h
 delete mode 100644 flow/actorcompiler/actorcompiler.sln
 delete mode 100644 flow/singleton.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e48d954476..f6e85984f16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 endif()
 
 include(CompileBoost)
-include(GetMsgpack)
 add_subdirectory(flow)
 add_subdirectory(fdbrpc)
 add_subdirectory(fdbclient)
diff --git a/cmake/GetMsgpack.cmake b/cmake/GetMsgpack.cmake
deleted file mode 100644
index b3313f336e9..00000000000
--- a/cmake/GetMsgpack.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-find_package(msgpack 3.3.0 EXACT QUIET CONFIG)
-
-add_library(msgpack INTERFACE)
-
-if(msgpack_FOUND)
-  target_link_libraries(msgpack INTERFACE msgpackc-cxx)
-else()
-  include(ExternalProject)
-  ExternalProject_add(msgpackProject
-    URL "https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz"
-    URL_HASH SHA256=6e114d12a5ddb8cb11f669f83f32246e484a8addd0ce93f274996f1941c1f07b
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-  )
-
-  ExternalProject_Get_property(msgpackProject SOURCE_DIR)
-  target_include_directories(msgpack SYSTEM INTERFACE "${SOURCE_DIR}/include")
-  add_dependencies(msgpack msgpackProject)
-endif()
diff --git a/fdbclient/ActorLineageProfiler.cpp b/fdbclient/ActorLineageProfiler.cpp
deleted file mode 100644
index 9be7a60704b..00000000000
--- a/fdbclient/ActorLineageProfiler.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * ActorLineageProfiler.cpp
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "flow/flow.h"
-#include "flow/singleton.h"
-#include "fdbrpc/IAsyncFile.h"
-#include "fdbclient/ActorLineageProfiler.h"
-#include <msgpack.hpp>
-#include <memory>
-#include <boost/endian/conversion.hpp>
-#include <boost/asio.hpp>
-
-using namespace std::literals;
-
-class Packer : public msgpack::packer<msgpack::sbuffer> {
-	struct visitor_t {
-		using VisitorMap = std::unordered_map<std::type_index, std::function<void(std::any const&, Packer& packer)>>;
-		VisitorMap visitorMap;
-
-		template <class T>
-		static void any_visitor(std::any const& val, Packer& packer) {
-			const T& v = std::any_cast<const T&>(val);
-			packer.pack(v);
-		}
-
-		template <class... Args>
-		struct populate_visitor_map;
-		template <class Head, class... Tail>
-		struct populate_visitor_map<Head, Tail...> {
-			static void populate(VisitorMap& map) {
-				map.emplace(std::type_index(typeid(Head)), any_visitor<Head>);
-				populate_visitor_map<Tail...>::populate(map);
-			}
-		};
-		template <class Head>
-		struct populate_visitor_map<Head> {
-			static void populate(VisitorMap&) {}
-		};
-
-		visitor_t() {
-			populate_visitor_map<int64_t,
-			                     uint64_t,
-			                     bool,
-			                     float,
-			                     double,
-			                     std::string,
-			                     std::string_view,
-			                     std::vector<std::any>,
-			                     std::map<std::string, std::any>,
-			                     std::map<std::string_view, std::any>,
-			                     std::vector<std::map<std::string_view, std::any>>>::populate(visitorMap);
-		}
-
-		void visit(const std::any& val, Packer& packer) {
-			auto iter = visitorMap.find(val.type());
-			if (iter == visitorMap.end()) {
-				TraceEvent(SevError, "PackerTypeNotFound").detail("Type", val.type().name());
-			} else {
-				iter->second(val, packer);
-			}
-		}
-	};
-	msgpack::sbuffer sbuffer;
-	// Initializing visitor_t involves building a type-map. As this is a relatively expensive operation, we don't want
-	// to do this each time we create a Packer object. So visitor_t is a stateless class and we only use it as a
-	// visitor.
-	crossbow::singleton<visitor_t> visitor;
-
-public:
-	Packer() : msgpack::packer<msgpack::sbuffer>(sbuffer) {}
-
-	void pack(std::any const& val) { visitor->visit(val, *this); }
-
-	void pack(bool val) {
-		if (val) {
-			pack_true();
-		} else {
-			pack_false();
-		}
-	}
-
-	void pack(uint64_t val) {
-		if (val <= std::numeric_limits<uint8_t>::max()) {
-			pack_uint8(uint8_t(val));
-		} else if (val <= std::numeric_limits<uint16_t>::max()) {
-			pack_uint16(uint16_t(val));
-		} else if (val <= std::numeric_limits<uint32_t>::max()) {
-			pack_uint32(uint32_t(val));
-		} else {
-			pack_uint64(val);
-		}
-	}
-
-	void pack(int64_t val) {
-		if (val >= 0) {
-			this->pack(uint64_t(val));
-		} else if (val >= std::numeric_limits<uint8_t>::min()) {
-			pack_int8(int8_t(val));
-		} else if (val >= std::numeric_limits<int16_t>::min()) {
-			pack_int16(int16_t(val));
-		} else if (val >= std::numeric_limits<int32_t>::min()) {
-			pack_int32(int32_t(val));
-		} else if (val >= std::numeric_limits<int64_t>::min()) {
-			pack_int64(int64_t(val));
-		}
-	}
-
-	void pack(float val) { pack_float(val); }
-	void pack(double val) { pack_double(val); }
-	void pack(std::string const& str) {
-		pack_str(str.size());
-		pack_str_body(str.data(), str.size());
-	}
-
-	void pack(std::string_view val) {
-		pack_str(val.size());
-		pack_str_body(val.data(), val.size());
-	}
-
-	template <class K, class V>
-	void pack(std::map<K, V> const& map) {
-		pack_map(map.size());
-		for (const auto& p : map) {
-			pack(p.first);
-			pack(p.second);
-		}
-	}
-
-	template <class T>
-	void pack(std::vector<T> const& val) {
-		pack_array(val.size());
-		for (const auto& v : val) {
-			pack(v);
-		}
-	}
-
-	std::pair<char*, unsigned> getbuf() {
-		unsigned size = sbuffer.size();
-		return std::make_pair(sbuffer.release(), size);
-	}
-};
-
-IALPCollectorBase::IALPCollectorBase() {
-	SampleCollector::instance().addCollector(this);
-}
-
-std::map<std::string_view, std::any> SampleCollectorT::collect(ActorLineage* lineage) {
-	std::map<std::string_view, std::any> out;
-	for (auto& collector : collectors) {
-		auto val = collector->collect(lineage);
-		if (val.has_value()) {
-			out[collector->name()] = val.value();
-		}
-	}
-	return out;
-}
-
-std::shared_ptr<Sample> SampleCollectorT::collect() {
-	auto sample = std::make_shared<Sample>();
-	double time = g_network->now();
-	sample->time = time;
-	for (auto& p : getSamples) {
-		Packer packer;
-		std::vector<std::map<std::string_view, std::any>> samples;
-		auto sampleVec = p.second();
-		for (auto& val : sampleVec) {
-			auto m = collect(val.getPtr());
-			if (!m.empty()) {
-				samples.emplace_back(std::move(m));
-			}
-		}
-		if (!samples.empty()) {
-			packer.pack(samples);
-			sample->data[p.first] = packer.getbuf();
-		}
-	}
-	return sample;
-}
-
-void SampleCollection_t::refresh() {
-	auto sample = _collector->collect();
-	auto min = std::min(sample->time - windowSize, sample->time);
-	{
-		Lock _{ mutex };
-		data.emplace_back(std::move(sample));
-	}
-	double oldest = data.front()->time;
-	// we don't need to check for data.empty() in this loop (or the inner loop) as we know that we will end
-	// up with at least one entry which is the most recent sample
-	while (oldest < min) {
-		Lock _{ mutex };
-		// we remove at most 10 elements at a time. This is so we don't block the main thread for too long.
-		for (int i = 0; i < 10 && oldest < min; ++i) {
-			data.pop_front();
-			oldest = data.front()->time;
-		}
-	}
-	//config->ingest(sample);
-}
-
-std::vector<std::shared_ptr<Sample>> SampleCollection_t::get(double from /*= 0.0*/,
-                                                             double to /*= std::numeric_limits<double>::max()*/) const {
-	Lock _{ mutex };
-	std::vector<std::shared_ptr<Sample>> res;
-	for (const auto& sample : data) {
-		if (sample->time > to) {
-			break;
-		} else if (sample->time >= from) {
-			res.push_back(sample);
-		}
-	}
-	return res;
-}
-
-struct ProfilerImpl {
-	boost::asio::io_context context;
-	boost::asio::executor_work_guard<decltype(context.get_executor())> workGuard;
-	boost::asio::steady_timer timer;
-	std::thread mainThread;
-	unsigned frequency;
-
-	SampleCollection collection;
-
-	ProfilerImpl() : workGuard(context.get_executor()), timer(context) {
-		mainThread = std::thread([this]() { context.run(); });
-	}
-	~ProfilerImpl() {
-		setFrequency(0);
-		workGuard.reset();
-		mainThread.join();
-	}
-
-	void profileHandler(boost::system::error_code const& ec) {
-		if (ec) {
-			return;
-		}
-		collection->refresh();
-		timer = boost::asio::steady_timer(context, std::chrono::microseconds(1000000 / frequency));
-		timer.async_wait([this](auto const& ec) { profileHandler(ec); });
-	}
-
-	void setFrequency(unsigned frequency) {
-		boost::asio::post(context, [this, frequency]() {
-			this->frequency = frequency;
-			timer.cancel();
-			if (frequency > 0) {
-				profileHandler(boost::system::error_code{});
-			}
-		});
-	}
-};
-
-ActorLineageProfilerT::ActorLineageProfilerT() : impl(new ProfilerImpl()) {
-	collection->collector()->addGetter(WaitState::Network,
-	                                   std::bind(&ActorLineageSet::copy, std::ref(g_network->getActorLineageSet())));
-	collection->collector()->addGetter(
-	    WaitState::Disk,
-	    std::bind(&ActorLineageSet::copy, std::ref(IAsyncFileSystem::filesystem()->getActorLineageSet())));
-	collection->collector()->addGetter(WaitState::Running, []() {
-		auto res = currentLineageThreadSafe.get();
-		if (res.isValid()) {
-			return std::vector<Reference<ActorLineage>>({ res });
-		}
-		return std::vector<Reference<ActorLineage>>();
-	});
-}
-
-ActorLineageProfilerT::~ActorLineageProfilerT() {
-	delete impl;
-}
-
-void ActorLineageProfilerT::setFrequency(unsigned frequency) {
-	impl->setFrequency(frequency);
-}
-
-boost::asio::io_context& ActorLineageProfilerT::context() {
-	return impl->context;
-}
-
-SampleIngestor::~SampleIngestor() {}
-
-// Callback used to update the sampling profilers run frequency whenever the
-// frequency changes.
-void samplingProfilerUpdateFrequency(std::optional<std::any> freq) {
-	double frequency = 0;
-	if (freq.has_value()) {
-		frequency = std::any_cast<double>(freq.value());
-	}
-	TraceEvent(SevInfo, "SamplingProfilerUpdateFrequency").detail("Frequency", frequency);
-	ActorLineageProfiler::instance().setFrequency(frequency);
-}
-
-void ProfilerConfigT::reset(std::map<std::string, std::string> const& config) {
-	bool expectNoMore = false, useFluentD = false, useTCP = false;
-	std::string endpoint;
-	ConfigError err;
-	for (auto& kv : config) {
-		if (expectNoMore) {
-			err.description = format("Unexpected option %s", kv.first.c_str());
-			throw err;
-		}
-		if (kv.first == "collector") {
-			std::string val = kv.second;
-			std::for_each(val.begin(), val.end(), [](auto c) { return std::tolower(c); });
-			if (val == "none") {
-				setBackend(std::make_shared<NoneIngestor>());
-			} else if (val == "fluentd") {
-				useFluentD = true;
-			} else {
-				err.description = format("Unsupported collector: %s", val.c_str());
-				throw err;
-			}
-		} else if (kv.first == "collector_endpoint") {
-			endpoint = kv.second;
-		} else if (kv.first == "collector_protocol") {
-			auto val = kv.second;
-			std::for_each(val.begin(), val.end(), [](auto c) { return std::tolower(c); });
-			if (val == "tcp") {
-				useTCP = true;
-			} else if (val == "udp") {
-				useTCP = false;
-			} else {
-				err.description = format("Unsupported protocol for fluentd: %s", kv.second.c_str());
-				throw err;
-			}
-		} else {
-			err.description = format("Unknown option %s", kv.first.c_str());
-			throw err;
-		}
-	}
-	if (useFluentD) {
-		if (endpoint.empty()) {
-			err.description = "Endpoint is required for fluentd ingestor";
-			throw err;
-		}
-		NetworkAddress address;
-		try {
-			address = NetworkAddress::parse(endpoint);
-		} catch (Error& e) {
-			err.description = format("Can't parse address %s", endpoint.c_str());
-			throw err;
-		}
-		setBackend(std::make_shared<FluentDIngestor>(
-		    useTCP ? FluentDIngestor::Protocol::TCP : FluentDIngestor::Protocol::TCP, address));
-	}
-}
-
-std::map<std::string, std::string> ProfilerConfigT::getConfig() const {
-	std::map<std::string, std::string> res;
-	if (ingestor) {
-		ingestor->getConfig(res);
-	}
-	return res;
-}
-
-// Callback used to update the sample collector window size.
-void samplingProfilerUpdateWindow(std::optional<std::any> window) {
-	double duration = 0;
-	if (window.has_value()) {
-		duration = std::any_cast<double>(window.value());
-	}
-	TraceEvent(SevInfo, "SamplingProfilerUpdateWindow").detail("Duration", duration);
-	SampleCollection::instance().setWindowSize(duration);
-}
diff --git a/fdbclient/ActorLineageProfiler.h b/fdbclient/ActorLineageProfiler.h
deleted file mode 100644
index 30a3eec3e7b..00000000000
--- a/fdbclient/ActorLineageProfiler.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * ActorLineageProfiler.h
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "fdbclient/AnnotateActor.h"
-
-#include <optional>
-#include <string>
-#include <any>
-#include <vector>
-#include <mutex>
-#include <condition_variable>
-#include "flow/singleton.h"
-#include "flow/flow.h"
-
-void samplingProfilerUpdateFrequency(std::optional<std::any> freq);
-void samplingProfilerUpdateWindow(std::optional<std::any> window);
-
-struct IALPCollectorBase {
-	virtual std::optional<std::any> collect(ActorLineage*) = 0;
-	virtual const std::string_view& name() = 0;
-	IALPCollectorBase();
-};
-
-template <class T>
-struct IALPCollector : IALPCollectorBase {
-	const std::string_view& name() override { return T::name; }
-};
-
-struct Sample : std::enable_shared_from_this<Sample> {
-	double time = 0.0;
-	Sample() {}
-	Sample(Sample const&) = delete;
-	Sample& operator=(Sample const&) = delete;
-	std::unordered_map<WaitState, std::pair<char*, unsigned>> data;
-	~Sample() {
-		std::for_each(data.begin(), data.end(), [](std::pair<WaitState, std::pair<char*, unsigned>> entry) {
-			::free(entry.second.first);
-		});
-	}
-};
-
-class SampleIngestor : std::enable_shared_from_this<SampleIngestor> {
-public:
-	virtual ~SampleIngestor();
-	virtual void ingest(std::shared_ptr<Sample> const& sample) = 0;
-	virtual void getConfig(std::map<std::string, std::string>&) const = 0;
-};
-
-class NoneIngestor : public SampleIngestor {
-public:
-	void ingest(std::shared_ptr<Sample> const& sample) override {}
-	void getConfig(std::map<std::string, std::string>& res) const override { res["ingestor"] = "none"; }
-};
-
-// The FluentD ingestor uses the pimpl idiom. This is to make compilation less heavy weight as this implementation has
-// dependencies to boost::asio
-struct FluentDIngestorImpl;
-
-class FluentDIngestor : public SampleIngestor {
-public: // Public Types
-	enum class Protocol { TCP, UDP };
-
-private: // members
-	FluentDIngestorImpl* impl;
-
-public: // interface
-	void ingest(std::shared_ptr<Sample> const& sample) override;
-	FluentDIngestor(Protocol protocol, NetworkAddress& endpoint);
-	void getConfig(std::map<std::string, std::string>& res) const override;
-	~FluentDIngestor();
-};
-
-struct ConfigError {
-	std::string description;
-};
-
-class ProfilerConfigT {
-private: // private types
-	using Lock = std::unique_lock<std::mutex>;
-	friend class crossbow::create_static<ProfilerConfigT>;
-
-private: // members
-	std::shared_ptr<SampleIngestor> ingestor = std::make_shared<NoneIngestor>();
-
-private: // construction
-	ProfilerConfigT() {}
-	ProfilerConfigT(ProfilerConfigT const&) = delete;
-	ProfilerConfigT& operator=(ProfilerConfigT const&) = delete;
-	void setBackend(std::shared_ptr<SampleIngestor> ingestor) { this->ingestor = ingestor; }
-
-public:
-	void reset(std::map<std::string, std::string> const& config);
-	std::map<std::string, std::string> getConfig() const;
-};
-
-using ProfilerConfig = crossbow::singleton<ProfilerConfigT>;
-
-class SampleCollectorT {
-public: // Types
-	friend struct crossbow::create_static<SampleCollectorT>;
-	using Getter = std::function<std::vector<Reference<ActorLineage>>()>;
-
-private:
-	std::vector<IALPCollectorBase*> collectors;
-	std::map<WaitState, Getter> getSamples;
-	SampleCollectorT() {}
-	std::map<std::string_view, std::any> collect(ActorLineage* lineage);
-
-public:
-	void addCollector(IALPCollectorBase* collector) { collectors.push_back(collector); }
-	std::shared_ptr<Sample> collect();
-	void addGetter(WaitState waitState, Getter const& getter) { getSamples[waitState] = getter; };
-};
-
-using SampleCollector = crossbow::singleton<SampleCollectorT>;
-
-class SampleCollection_t {
-	friend struct crossbow::create_static<SampleCollection_t>;
-	using Lock = std::unique_lock<std::mutex>;
-	SampleCollection_t() {}
-
-	SampleCollector _collector;
-	mutable std::mutex mutex;
-	std::atomic<double> windowSize = 0.0;
-	std::deque<std::shared_ptr<Sample>> data;
-	ProfilerConfig config;
-
-public:
-	/**
-	 * Define how many samples the collection shoul keep. The window size is defined by time dimension.
-	 *
-	 * \param duration How long a sample should be kept in the collection.
-	 */
-	void setWindowSize(double duration) { windowSize.store(duration); }
-	/**
-	 * By default returns reference counted pointers of all samples. A window can be defined in terms of absolute time.
-	 *
-	 * \param from The minimal age of all returned samples.
-	 * \param to The max age of all returned samples.
-	 */
-	std::vector<std::shared_ptr<Sample>> get(double from = 0.0, double to = std::numeric_limits<double>::max()) const;
-	/**
-	 * Collects all new samples from the sample collector and stores them in the collection.
-	 */
-	void refresh();
-	const SampleCollector& collector() const { return _collector; }
-	SampleCollector& collector() { return _collector; }
-};
-
-using SampleCollection = crossbow::singleton<SampleCollection_t>;
-
-struct ProfilerImpl;
-
-namespace boost {
-namespace asio {
-// forward declare io_context because including boost asio is super expensive
-class io_context;
-} // namespace asio
-} // namespace boost
-
-class ActorLineageProfilerT {
-	friend struct crossbow::create_static<ActorLineageProfilerT>;
-	ProfilerImpl* impl;
-	SampleCollection collection;
-	ActorLineageProfilerT();
-
-public:
-	~ActorLineageProfilerT();
-	void setFrequency(unsigned frequency);
-	boost::asio::io_context& context();
-};
-
-using ActorLineageProfiler = crossbow::singleton<ActorLineageProfilerT>;
diff --git a/fdbclient/AnnotateActor.cpp b/fdbclient/AnnotateActor.cpp
deleted file mode 100644
index 80b9a8cec4a..00000000000
--- a/fdbclient/AnnotateActor.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * AnnotateActor.cpp
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fdbclient/AnnotateActor.h"
-
-std::map<WaitState, std::function<std::vector<Reference<ActorLineage>>()>> samples;
diff --git a/fdbclient/AnnotateActor.h b/fdbclient/AnnotateActor.h
deleted file mode 100644
index dfc944fd024..00000000000
--- a/fdbclient/AnnotateActor.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * AnnotateActor.h
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "flow/flow.h"
-#include "flow/network.h"
-
-#include <string_view>
-
-// Used to manually instrument waiting actors to collect samples for the
-// sampling profiler.
-struct AnnotateActor {
-	unsigned index;
-	bool set;
-
-	AnnotateActor() : set(false) {}
-
-	AnnotateActor(Reference<ActorLineage> lineage) : set(true) {
-		index = g_network->getActorLineageSet().insert(lineage);
-		if (index == ActorLineageSet::npos) {
-			set = false;
-		}
-	}
-
-	AnnotateActor(const AnnotateActor& other) = delete;
-	AnnotateActor(AnnotateActor&& other) = delete;
-	AnnotateActor& operator=(const AnnotateActor& other) = delete;
-
-	AnnotateActor& operator=(AnnotateActor&& other) {
-		if (this == &other) {
-			return *this;
-		}
-
-		this->index = other.index;
-		this->set = other.set;
-
-		other.set = false;
-
-		return *this;
-	}
-
-	~AnnotateActor() {
-		if (set) {
-			g_network->getActorLineageSet().erase(index);
-		}
-	}
-};
-
-enum class WaitState { Disk, Network, Running };
-// usually we shouldn't use `using namespace` in a header file, but literals should be safe as user defined literals
-// need to be prefixed with `_`
-using namespace std::literals;
-
-constexpr std::string_view to_string(WaitState st) {
-	switch (st) {
-	case WaitState::Disk:
-		return "Disk"sv;
-	case WaitState::Network:
-		return "Network"sv;
-	case WaitState::Running:
-		return "Running"sv;
-	default:
-		return ""sv;
-	}
-}
-
-extern std::map<WaitState, std::function<std::vector<Reference<ActorLineage>>()>> samples;
diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index e9d3d3716b5..bd14ef7b528 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -1,7 +1,4 @@
 set(FDBCLIENT_SRCS
-  ActorLineageProfiler.h
-  ActorLineageProfiler.cpp
-  AnnotateActor.cpp
   AsyncFileS3BlobStore.actor.cpp
   AsyncFileS3BlobStore.actor.h
   AsyncTaskThread.actor.cpp
@@ -30,7 +27,6 @@ set(FDBCLIENT_SRCS
   EventTypes.actor.h
   FDBOptions.h
   FDBTypes.h
-  FluentDSampleIngestor.cpp
   FileBackupAgent.actor.cpp
   GlobalConfig.h
   GlobalConfig.actor.h
@@ -144,7 +140,8 @@ endif()
 
 add_flow_target(STATIC_LIBRARY NAME fdbclient SRCS ${FDBCLIENT_SRCS} ADDL_SRCS ${options_srcs})
 add_dependencies(fdbclient fdboptions)
-target_link_libraries(fdbclient PUBLIC fdbrpc msgpack)
 if(BUILD_AZURE_BACKUP)
-  target_link_libraries(fdbclient PRIVATE curl uuid azure-storage-lite)
+  target_link_libraries(fdbclient PUBLIC fdbrpc PRIVATE curl uuid azure-storage-lite)
+else()
+  target_link_libraries(fdbclient PUBLIC fdbrpc)
 endif()
diff --git a/fdbclient/FluentDSampleIngestor.cpp b/fdbclient/FluentDSampleIngestor.cpp
deleted file mode 100644
index 08d5bfe55fb..00000000000
--- a/fdbclient/FluentDSampleIngestor.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * FluentDSampleIngestor.cpp
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fdbclient/ActorLineageProfiler.h"
-#include <boost/asio.hpp>
-#include <boost/asio/co_spawn.hpp>
-#include <msgpack.hpp>
-
-namespace {
-
-boost::asio::ip::address ipAddress(IPAddress const& n) {
-	if (n.isV6()) {
-		return boost::asio::ip::address_v6(n.toV6());
-	} else {
-		return boost::asio::ip::address_v4(n.toV4());
-	}
-}
-
-template <class Protocol>
-boost::asio::ip::basic_endpoint<Protocol> toEndpoint(NetworkAddress const n) {
-	return boost::asio::ip::basic_endpoint<Protocol>(ipAddress(n.ip), n.port);
-}
-
-struct FluentDSocket {
-	virtual ~FluentDSocket() {}
-	virtual void connect(NetworkAddress const& endpoint) = 0;
-	virtual void send(std::shared_ptr<Sample> const& sample) = 0;
-	virtual const boost::system::error_code& failed() const = 0;
-};
-
-template <class Protocol, class Callback>
-class SampleSender : public std::enable_shared_from_this<SampleSender<Protocol, Callback>> {
-	using Socket = typename Protocol::socket;
-	using Iter = typename decltype(Sample::data)::iterator;
-	Socket& socket;
-	Callback callback;
-	Iter iter, end;
-
-	struct Buf {
-		const char* data;
-		const unsigned size;
-		Buf(const char* data, unsigned size) : data(data), size(size) {}
-		Buf(Buf const&) = delete;
-		Buf& operator=(Buf const&) = delete;
-		~Buf() { delete[] data; }
-	};
-
-	void sendCompletionHandler(boost::system::error_code const& ec) {
-		if (ec) {
-			callback(ec);
-		} else {
-			++iter;
-			sendNext();
-		}
-	}
-
-	void send(boost::asio::ip::tcp::socket& socket, std::shared_ptr<Buf> const& buf) {
-		boost::asio::async_write(
-		    socket,
-		    boost::asio::const_buffer(buf->data, buf->size),
-		    [buf, self = this->shared_from_this()](auto const& ec, size_t) { self->sendCompletionHandler(ec); });
-	}
-	void send(boost::asio::ip::udp::socket& socket, std::shared_ptr<Buf> const& buf) {
-		socket.async_send(
-		    boost::asio::const_buffer(buf->data, buf->size),
-		    [buf, self = this->shared_from_this()](auto const& ec, size_t) { self->sendCompletionHandler(ec); });
-	}
-
-	void sendNext() {
-		if (iter == end) {
-			callback(boost::system::error_code());
-		}
-		// 1. calculate size of buffer
-		unsigned size = 1; // 1 for fixmap identifier byte
-		auto waitState = to_string(iter->first);
-		if (waitState.size() < 32) {
-			size = waitState.size() + 1;
-		} else {
-			size = waitState.size() + 2;
-		}
-		size += iter->second.second;
-		// 2. allocate the buffer
-		std::unique_ptr<char[]> buf(new char[size]);
-		unsigned off = 0;
-		// 3. serialize fixmap
-		buf[off++] = 0x81; // map of size 1
-		// 3.1 serialize key
-		if (waitState.size() < 32) {
-			buf[off++] = 0xa0 + waitState.size(); // fixstr
-		} else {
-			buf[off++] = 0xd9;
-			buf[off++] = char(waitState.size());
-		}
-		memcpy(buf.get() + off, waitState.data(), waitState.size());
-		off += waitState.size();
-		// 3.2 append serialized value
-		memcpy(buf.get() + off, iter->second.first, iter->second.second);
-		// 4. send the result to fluentd
-		send(socket, std::make_shared<Buf>(buf.release(), size));
-	}
-
-public:
-	SampleSender(Socket& socket, Callback const& callback, std::shared_ptr<Sample> const& sample)
-	  : socket(socket), callback(callback), iter(sample->data.begin()), end(sample->data.end()) {
-			sendNext();
-		}
-};
-
-// Sample function to make instanciation of SampleSender easier
-template <class Protocol, class Callback>
-std::shared_ptr<SampleSender<Protocol, Callback>> makeSampleSender(typename Protocol::socket& socket, Callback const& callback, std::shared_ptr<Sample> const& sample) {
-	return std::make_shared<SampleSender<Protocol, Callback>>(socket, callback, sample);
-}
-
-template <class Protocol>
-struct FluentDSocketImpl : FluentDSocket, std::enable_shared_from_this<FluentDSocketImpl<Protocol>> {
-	static constexpr unsigned MAX_QUEUE_SIZE = 100;
-	boost::asio::io_context& context;
-	typename Protocol::socket socket;
-	FluentDSocketImpl(boost::asio::io_context& context) : context(context), socket(context) {}
-	bool ready = false;
-	std::deque<std::shared_ptr<Sample>> queue;
-	boost::system::error_code _failed;
-
-	const boost::system::error_code& failed() const override { return _failed; }
-
-	void sendCompletionHandler(boost::system::error_code const& ec) {
-		if (ec) {
-			// TODO: trace error
-			_failed = ec;
-			return;
-		}
-		if (queue.empty()) {
-			ready = true;
-		} else {
-			auto sample = queue.front();
-			queue.pop_front();
-			sendImpl(sample);
-		}
-	}
-
-
-	void sendImpl(std::shared_ptr<Sample> const& sample) {
-		makeSampleSender<Protocol>(socket, [self = this->shared_from_this()](boost::system::error_code const& ec){
-			self->sendCompletionHandler(ec);
-		}, sample);
-	}
-
-	void send(std::shared_ptr<Sample> const& sample) override {
-		if (_failed) {
-			return;
-		}
-		if (ready) {
-			ready = false;
-			sendImpl(sample);
-		} else {
-			if (queue.size() < MAX_QUEUE_SIZE) {
-				queue.push_back(sample);
-			} // TODO: else trace a warning
-		}
-	}
-
-	void connect(NetworkAddress const& endpoint) override {
-		auto to = toEndpoint<Protocol>(endpoint);
-		socket.async_connect(to, [self = this->shared_from_this()](boost::system::error_code const& ec) {
-			if (ec) {
-				// TODO: error handling
-				self->_failed = ec;
-				return;
-			}
-			self->ready = true;
-		});
-	}
-};
-
-} // namespace
-
-struct FluentDIngestorImpl {
-	using Protocol = FluentDIngestor::Protocol;
-	Protocol protocol;
-	NetworkAddress endpoint;
-	boost::asio::io_context& io_context;
-	std::unique_ptr<FluentDSocket> socket;
-	boost::asio::steady_timer retryTimer;
-	FluentDIngestorImpl(Protocol protocol, NetworkAddress const& endpoint)
-	  : protocol(protocol), endpoint(endpoint), io_context(ActorLineageProfiler::instance().context()),
-	    retryTimer(io_context) {
-		connect();
-	}
-
-	~FluentDIngestorImpl() { retryTimer.cancel(); }
-
-	void connect() {
-		switch (protocol) {
-		case Protocol::TCP:
-			socket.reset(new FluentDSocketImpl<boost::asio::ip::tcp>(io_context));
-			break;
-		case Protocol::UDP:
-			socket.reset(new FluentDSocketImpl<boost::asio::ip::udp>(io_context));
-			break;
-		}
-		socket->connect(endpoint);
-	}
-
-	void retry() {
-		retryTimer = boost::asio::steady_timer(io_context, std::chrono::seconds(1));
-		retryTimer.async_wait([this](auto const& ec) {
-			if (ec) {
-				return;
-			}
-			connect();
-		});
-		socket.reset();
-	}
-};
-
-FluentDIngestor::~FluentDIngestor() {
-	delete impl;
-}
-
-FluentDIngestor::FluentDIngestor(Protocol protocol, NetworkAddress& endpoint)
-  : impl(new FluentDIngestorImpl(protocol, endpoint)) {}
-
-void FluentDIngestor::ingest(const std::shared_ptr<Sample>& sample) {
-	if (!impl->socket) {
-		// the connection failed in the past and we wait for a timeout before we retry
-		return;
-	} else if (impl->socket->failed()) {
-		impl->retry();
-		return;
-	} else {
-		impl->socket->send(sample);
-	}
-}
-
-void FluentDIngestor::getConfig(std::map<std::string, std::string>& res) const {
-	res["ingestor"] = "fluentd";
-	res["collector_endpoint"] = impl->endpoint.toString();
-	res["collector_protocol"] = impl->protocol == Protocol::TCP ? "tcp" : "udp";
-}
diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index e4f07914317..5fa901df0e8 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -34,18 +34,14 @@ const KeyRef fdbClientInfoTxnSizeLimit = LiteralStringRef("config/fdb_client_inf
 const KeyRef transactionTagSampleRate = LiteralStringRef("config/transaction_tag_sample_rate");
 const KeyRef transactionTagSampleCost = LiteralStringRef("config/transaction_tag_sample_cost");
 
-const KeyRef samplingFrequency = LiteralStringRef("visibility/sampling/frequency");
-const KeyRef samplingWindow = LiteralStringRef("visibility/sampling/window");
-
 GlobalConfig::GlobalConfig() : lastUpdate(0) {}
 
 void GlobalConfig::create(DatabaseContext* cx, Reference<AsyncVar<ClientDBInfo>> dbInfo) {
 	if (g_network->global(INetwork::enGlobalConfig) == nullptr) {
 		auto config = new GlobalConfig{};
 		config->cx = Database(cx);
-		config->dbInfo = dbInfo;
 		g_network->setGlobal(INetwork::enGlobalConfig, config);
-		config->_updater = updater(config);
+		config->_updater = updater(config, dbInfo);
 	}
 }
 
@@ -55,10 +51,6 @@ GlobalConfig& GlobalConfig::globalConfig() {
 	return *reinterpret_cast<GlobalConfig*>(res);
 }
 
-void GlobalConfig::updateDBInfo(Reference<AsyncVar<ClientDBInfo>> dbInfo) {
-	// this->dbInfo = dbInfo;
-}
-
 Key GlobalConfig::prefixedKey(KeyRef key) {
 	return key.withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG).begin);
 }
@@ -85,14 +77,6 @@ Future<Void> GlobalConfig::onInitialized() {
 	return initialized.getFuture();
 }
 
-Future<Void> GlobalConfig::onChange() {
-	return configChanged.onTrigger();
-}
-
-void GlobalConfig::trigger(KeyRef key, std::function<void(std::optional<std::any>)> fn) {
-	callbacks.emplace(key, std::move(fn));
-}
-
 void GlobalConfig::insert(KeyRef key, ValueRef value) {
 	data.erase(key);
 
@@ -105,8 +89,6 @@ void GlobalConfig::insert(KeyRef key, ValueRef value) {
 			any = StringRef(arena, t.getString(0).contents());
 		} else if (t.getType(0) == Tuple::ElementType::INT) {
 			any = t.getInt(0);
-		} else if (t.getType(0) == Tuple::ElementType::BOOL) {
-			any = t.getBool(0);
 		} else if (t.getType(0) == Tuple::ElementType::FLOAT) {
 			any = t.getFloat(0);
 		} else if (t.getType(0) == Tuple::ElementType::DOUBLE) {
@@ -115,26 +97,19 @@ void GlobalConfig::insert(KeyRef key, ValueRef value) {
 			ASSERT(false);
 		}
 		data[stableKey] = makeReference<ConfigValue>(std::move(arena), std::move(any));
-
-		if (callbacks.find(stableKey) != callbacks.end()) {
-			callbacks[stableKey](data[stableKey]->value);
-		}
 	} catch (Error& e) {
 		TraceEvent("GlobalConfigTupleParseError").detail("What", e.what());
 	}
 }
 
-void GlobalConfig::erase(Key key) {
-	erase(KeyRangeRef(key, keyAfter(key)));
+void GlobalConfig::erase(KeyRef key) {
+	data.erase(key);
 }
 
 void GlobalConfig::erase(KeyRangeRef range) {
 	auto it = data.begin();
 	while (it != data.end()) {
 		if (range.contains(it->first)) {
-			if (callbacks.find(it->first) != callbacks.end()) {
-				callbacks[it->first](std::nullopt);
-			}
 			it = data.erase(it);
 		} else {
 			++it;
@@ -188,7 +163,7 @@ ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
 // Updates local copy of global configuration by reading the entire key-range
 // from storage.
 ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
-	self->erase(KeyRangeRef(""_sr, "\xff"_sr));
+	self->data.clear();
 
 	Transaction tr(self->cx);
 	RangeResult result = wait(tr.getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY));
@@ -201,8 +176,7 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 
 // Applies updates to the local copy of the global configuration when this
 // process receives an updated history.
-ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self) {
-	// wait(self->cx->onConnected());
+ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self, Reference<AsyncVar<ClientDBInfo>> dbInfo) {
 	wait(self->migrate(self));
 
 	wait(self->refresh(self));
@@ -210,9 +184,9 @@ ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self) {
 
 	loop {
 		try {
-			wait(self->dbInfo->onChange());
+			wait(dbInfo->onChange());
 
-			auto& history = self->dbInfo->get().history;
+			auto& history = dbInfo->get().history;
 			if (history.size() == 0) {
 				continue;
 			}
@@ -222,8 +196,8 @@ ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self) {
 				// history updates or the protocol version changed, so it
 				// must re-read the entire configuration range.
 				wait(self->refresh(self));
-				if (self->dbInfo->get().history.size() > 0) {
-					self->lastUpdate = self->dbInfo->get().history.back().version;
+				if (dbInfo->get().history.size() > 0) {
+					self->lastUpdate = dbInfo->get().history.back().version;
 				}
 			} else {
 				// Apply history in order, from lowest version to highest
@@ -248,8 +222,6 @@ ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self) {
 					self->lastUpdate = vh.version;
 				}
 			}
-
-			self->configChanged.trigger();
 		} catch (Error& e) {
 			throw;
 		}
diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index 967ec77f8d0..5c3693f450e 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -27,9 +27,7 @@
 #define FDBCLIENT_GLOBALCONFIG_ACTOR_H
 
 #include <any>
-#include <functional>
 #include <map>
-#include <optional>
 #include <type_traits>
 #include <unordered_map>
 
@@ -51,9 +49,6 @@ extern const KeyRef fdbClientInfoTxnSizeLimit;
 extern const KeyRef transactionTagSampleRate;
 extern const KeyRef transactionTagSampleCost;
 
-extern const KeyRef samplingFrequency;
-extern const KeyRef samplingWindow;
-
 // Structure used to hold the values stored by global configuration. The arena
 // is used as memory to store both the key and the value (the value is only
 // stored in the arena if it is an object; primitives are just copied).
@@ -77,13 +72,6 @@ class GlobalConfig : NonCopyable {
 	// configuration.
 	static GlobalConfig& globalConfig();
 
-	// Updates the ClientDBInfo object used by global configuration to read new
-	// data. For server processes, this value needs to be set by the cluster
-	// controller, but global config is initialized before the cluster
-	// controller is, so this function provides a mechanism to update the
-	// object after initialization.
-	void updateDBInfo(Reference<AsyncVar<ClientDBInfo>> dbInfo);
-
 	// Use this function to turn a global configuration key defined above into
 	// the full path needed to set the value in the database.
 	//
@@ -126,16 +114,6 @@ class GlobalConfig : NonCopyable {
 	// been created and is ready.
 	Future<Void> onInitialized();
 
-	// Triggers the returned future when any key-value pair in the global
-	// configuration changes.
-	Future<Void> onChange();
-
-	// Calls \ref fn when the value associated with \ref key is changed. \ref
-	// fn is passed the updated value for the key, or an empty optional if the
-	// key has been cleared. If the value is an allocated object, its memory
-	// remains in the control of the global configuration.
-	void trigger(KeyRef key, std::function<void(std::optional<std::any>)> fn);
-
 private:
 	GlobalConfig();
 
@@ -149,23 +127,20 @@ class GlobalConfig : NonCopyable {
 	void insert(KeyRef key, ValueRef value);
 	// Removes the given key (and associated value) from the local copy of the
 	// global configuration keyspace.
-	void erase(Key key);
+	void erase(KeyRef key);
 	// Removes the given key range (and associated values) from the local copy
 	// of the global configuration keyspace.
 	void erase(KeyRangeRef range);
 
 	ACTOR static Future<Void> migrate(GlobalConfig* self);
 	ACTOR static Future<Void> refresh(GlobalConfig* self);
-	ACTOR static Future<Void> updater(GlobalConfig* self);
+	ACTOR static Future<Void> updater(GlobalConfig* self, Reference<AsyncVar<ClientDBInfo>> dbInfo);
 
 	Database cx;
-	Reference<AsyncVar<ClientDBInfo>> dbInfo;
 	Future<Void> _updater;
 	Promise<Void> initialized;
-	AsyncTrigger configChanged;
 	std::unordered_map<StringRef, Reference<ConfigValue>> data;
 	Version lastUpdate;
-	std::unordered_map<KeyRef, std::function<void(std::optional<std::any>)>> callbacks;
 };
 
 #endif
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index a9bc969a130..75c11db5941 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -32,8 +32,6 @@
 #include "fdbrpc/FailureMonitor.h"
 #include "fdbrpc/MultiInterface.h"
 
-#include "fdbclient/ActorLineageProfiler.h"
-#include "fdbclient/AnnotateActor.h"
 #include "fdbclient/Atomic.h"
 #include "fdbclient/ClusterInterface.h"
 #include "fdbclient/CoordinationInterface.h"
@@ -50,7 +48,6 @@
 #include "fdbclient/SpecialKeySpace.actor.h"
 #include "fdbclient/StorageServerInterface.h"
 #include "fdbclient/SystemData.h"
-#include "fdbclient/TransactionLineage.h"
 #include "fdbclient/versions.h"
 #include "fdbrpc/LoadBalance.h"
 #include "fdbrpc/Net2FileSystem.h"
@@ -88,8 +85,6 @@ using std::pair;
 
 namespace {
 
-TransactionLineageCollector transactionLineageCollector;
-
 template <class Interface, class Request>
 Future<REPLY_TYPE(Request)> loadBalance(
     DatabaseContext* ctx,
@@ -963,8 +958,6 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 	getValueCompleted.init(LiteralStringRef("NativeAPI.GetValueCompleted"));
 
 	GlobalConfig::create(this, clientInfo);
-	GlobalConfig::globalConfig().trigger(samplingFrequency, samplingProfilerUpdateFrequency);
-	GlobalConfig::globalConfig().trigger(samplingWindow, samplingProfilerUpdateWindow);
 
 	monitorProxiesInfoChange = monitorProxiesChange(clientInfo, &proxiesChangeTrigger);
 	clientStatusUpdater.actor = clientStatusUpdateActor(this);
@@ -1069,14 +1062,6 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 		    std::make_unique<DataDistributionImpl>(
 		        KeyRangeRef(LiteralStringRef("data_distribution/"), LiteralStringRef("data_distribution0"))
 		            .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
-		registerSpecialKeySpaceModule(
-		    SpecialKeySpace::MODULE::ACTORLINEAGE,
-		    SpecialKeySpace::IMPLTYPE::READONLY,
-		    std::make_unique<ActorLineageImpl>(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::ACTORLINEAGE)));
-		registerSpecialKeySpaceModule(SpecialKeySpace::MODULE::ACTOR_PROFILER_CONF,
-		                              SpecialKeySpace::IMPLTYPE::READWRITE,
-		                              std::make_unique<ActorProfilerConf>(SpecialKeySpace::getModuleRange(
-		                                  SpecialKeySpace::MODULE::ACTOR_PROFILER_CONF)));
 	}
 	if (apiVersionAtLeast(630)) {
 		registerSpecialKeySpaceModule(SpecialKeySpace::MODULE::TRANSACTION,
@@ -2523,10 +2508,8 @@ ACTOR Future<Version> watchValue(Future<Version> version,
 				cx->invalidateCache(key);
 				wait(delay(CLIENT_KNOBS->WRONG_SHARD_SERVER_DELAY, info.taskID));
 			} else if (e.code() == error_code_watch_cancelled || e.code() == error_code_process_behind) {
-				// clang-format off
-				TEST(e.code() == error_code_watch_cancelled); // Too many watches on the storage server, poll for changes instead
+				TEST(e.code() == error_code_watch_cancelled); // Too many watches on storage server, poll for changes
 				TEST(e.code() == error_code_process_behind); // The storage servers are all behind
-				// clang-format on
 				wait(delay(CLIENT_KNOBS->WATCH_POLLING_TIME, info.taskID));
 			} else if (e.code() == error_code_timed_out) { // The storage server occasionally times out watches in case
 				                                           // it was cancelled
@@ -3099,7 +3082,6 @@ ACTOR Future<RangeResult> getRange(Database cx,
 						throw deterministicRandom()->randomChoice(
 						    std::vector<Error>{ transaction_too_old(), future_version() });
 					}
-					state AnnotateActor annotation(currentLineage);
 					GetKeyValuesReply _rep =
 					    wait(loadBalance(cx.getPtr(),
 					                     beginServer.second,
diff --git a/fdbclient/ProcessInterface.h b/fdbclient/ProcessInterface.h
deleted file mode 100644
index 11bafc29871..00000000000
--- a/fdbclient/ProcessInterface.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * ProcessInterface.h
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fdbclient/AnnotateActor.h"
-#include "fdbclient/FDBTypes.h"
-#include "fdbrpc/fdbrpc.h"
-
-constexpr UID WLTOKEN_PROCESS(-1, 11);
-
-struct ProcessInterface {
-	constexpr static FileIdentifier file_identifier = 985636;
-	RequestStream<struct GetProcessInterfaceRequest> getInterface;
-	RequestStream<struct ActorLineageRequest> actorLineage;
-
-	template <class Ar>
-	void serialize(Ar& ar) {
-		serializer(ar, actorLineage);
-	}
-};
-
-struct GetProcessInterfaceRequest {
-	constexpr static FileIdentifier file_identifier = 7632546;
-	ReplyPromise<ProcessInterface> reply;
-
-	template <class Ar>
-	void serialize(Ar& ar) {
-		serializer(ar, reply);
-	}
-};
-
-// This type is used to send serialized sample data over the network.
-struct SerializedSample {
-	constexpr static FileIdentifier file_identifier = 15785634;
-
-	double time;
-	std::unordered_map<WaitState, std::string> data;
-
-	template <class Ar>
-	void serialize(Ar& ar) {
-		serializer(ar, time, data);
-	}
-};
-
-struct ActorLineageReply {
-	constexpr static FileIdentifier file_identifier = 1887656;
-	std::vector<SerializedSample> samples;
-
-	template <class Ar>
-	void serialize(Ar& ar) {
-		serializer(ar, samples);
-	}
-};
-
-struct ActorLineageRequest {
-	constexpr static FileIdentifier file_identifier = 11654765;
-	WaitState waitStateStart, waitStateEnd;
-	time_t timeStart, timeEnd;
-	ReplyPromise<ActorLineageReply> reply;
-
-	template <class Ar>
-	void serialize(Ar& ar) {
-		serializer(ar, waitStateStart, waitStateEnd, timeStart, timeEnd, reply);
-	}
-};
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 5d24fa4c985..6b147eaa07a 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -21,14 +21,6 @@
 #include "boost/lexical_cast.hpp"
 #include "boost/algorithm/string.hpp"
 
-#include <time.h>
-#include <msgpack.hpp>
-
-#include <exception>
-
-#include "fdbclient/ActorLineageProfiler.h"
-#include "fdbclient/Knobs.h"
-#include "fdbclient/ProcessInterface.h"
 #include "fdbclient/GlobalConfig.actor.h"
 #include "fdbclient/SpecialKeySpace.actor.h"
 #include "flow/Arena.h"
@@ -75,12 +67,7 @@ std::unordered_map<SpecialKeySpace::MODULE, KeyRange> SpecialKeySpace::moduleToB
 	{ SpecialKeySpace::MODULE::GLOBALCONFIG,
 	  KeyRangeRef(LiteralStringRef("\xff\xff/global_config/"), LiteralStringRef("\xff\xff/global_config0")) },
 	{ SpecialKeySpace::MODULE::TRACING,
-	  KeyRangeRef(LiteralStringRef("\xff\xff/tracing/"), LiteralStringRef("\xff\xff/tracing0")) },
-	{ SpecialKeySpace::MODULE::ACTORLINEAGE,
-	  KeyRangeRef(LiteralStringRef("\xff\xff/actor_lineage/"), LiteralStringRef("\xff\xff/actor_lineage0")) },
-	{ SpecialKeySpace::MODULE::ACTOR_PROFILER_CONF,
-	  KeyRangeRef(LiteralStringRef("\xff\xff/actor_profiler_conf/"),
-	              LiteralStringRef("\xff\xff/actor_profiler_conf0")) }
+	  KeyRangeRef(LiteralStringRef("\xff\xff/tracing/"), LiteralStringRef("\xff\xff/tracing0")) }
 };
 
 std::unordered_map<std::string, KeyRange> SpecialKeySpace::managementApiCommandToRange = {
@@ -111,15 +98,6 @@ std::unordered_map<std::string, KeyRange> SpecialKeySpace::managementApiCommandT
 	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) }
 };
 
-std::unordered_map<std::string, KeyRange> SpecialKeySpace::actorLineageApiCommandToRange = {
-	{ "state",
-	  KeyRangeRef(LiteralStringRef("state/"), LiteralStringRef("state0"))
-	      .withPrefix(moduleToBoundary[MODULE::ACTORLINEAGE].begin) },
-	{ "time",
-	  KeyRangeRef(LiteralStringRef("time/"), LiteralStringRef("time0"))
-	      .withPrefix(moduleToBoundary[MODULE::ACTORLINEAGE].begin) }
-};
-
 std::set<std::string> SpecialKeySpace::options = { "excluded/force", "failed/force" };
 
 std::set<std::string> SpecialKeySpace::tracingOptions = { kTracingTransactionIdKey, kTracingTokenKey };
@@ -1406,9 +1384,6 @@ Future<RangeResult> GlobalConfigImpl::getRange(ReadYourWritesTransaction* ryw, K
 			} else if (config->value.type() == typeid(int64_t)) {
 				result.push_back_deep(result.arena(),
 				                      KeyValueRef(prefixedKey, std::to_string(std::any_cast<int64_t>(config->value))));
-			} else if (config->value.type() == typeid(bool)) {
-				result.push_back_deep(result.arena(),
-				                      KeyValueRef(prefixedKey, std::to_string(std::any_cast<bool>(config->value))));
 			} else if (config->value.type() == typeid(float)) {
 				result.push_back_deep(result.arena(),
 				                      KeyValueRef(prefixedKey, std::to_string(std::any_cast<float>(config->value))));
@@ -1930,272 +1905,6 @@ void ClientProfilingImpl::clear(ReadYourWritesTransaction* ryw, const KeyRef& ke
 	    "Clear operation is forbidden for profile client. You can set it to default to disable profiling.");
 }
 
-ActorLineageImpl::ActorLineageImpl(KeyRangeRef kr) : SpecialKeyRangeReadImpl(kr) {}
-
-void parse(StringRef& val, int& i) {
-	i = std::stoi(val.toString());
-}
-
-void parse(StringRef& val, double& d) {
-	d = std::stod(val.toString());
-}
-
-void parse(StringRef& val, WaitState& w) {
-	if (val == LiteralStringRef("disk")) {
-		w = WaitState::Disk;
-	} else if (val == LiteralStringRef("network")) {
-		w = WaitState::Network;
-	} else if (val == LiteralStringRef("running")) {
-		w = WaitState::Running;
-	} else {
-		throw std::range_error("failed to parse run state");
-	}
-}
-
-void parse(StringRef& val, time_t& t) {
-	struct tm tm = { 0 };
-	if (strptime(val.toString().c_str(), "%FT%T%z", &tm) == nullptr) {
-		throw std::invalid_argument("failed to parse ISO 8601 datetime");
-	}
-
-	long timezone = tm.tm_gmtoff;
-	t = timegm(&tm);
-	if (t == -1) {
-		throw std::runtime_error("failed to convert ISO 8601 datetime");
-	}
-	t -= timezone;
-}
-
-void parse(StringRef& val, NetworkAddress& a) {
-	auto address = NetworkAddress::parse(val.toString());
-	if (!address.isValid()) {
-		throw std::invalid_argument("invalid host");
-	}
-	a = address;
-}
-
-// Base case function for parsing function below.
-template <typename T>
-void parse(std::vector<StringRef>::iterator it, std::vector<StringRef>::iterator end, T& t1) {
-	if (it == end) {
-		return;
-	}
-	parse(*it, t1);
-}
-
-// Given an iterator into a vector of string tokens, an iterator to the end of
-// the search space in the vector (exclusive), and a list of references to
-// types, parses each token in the vector into the associated type according to
-// the order of the arguments.
-//
-// For example, given the vector ["1", "1.5", "127.0.0.1:4000"] and the
-// argument list int a, double b, NetworkAddress c, after this function returns
-// each parameter passed in will hold the parsed value from the token list.
-//
-// The appropriate parsing function must be implemented for the type you wish
-// to parse. See the existing parsing functions above, and add your own if
-// necessary.
-template <typename T, typename... Types>
-void parse(std::vector<StringRef>::iterator it, std::vector<StringRef>::iterator end, T& t1, Types&... remaining) {
-	// Return as soon as all tokens have been parsed. This allows parameters
-	// passed at the end to act as optional parameters -- they will only be set
-	// if the value exists.
-	if (it == end) {
-		return;
-	}
-
-	try {
-		parse(*it, t1);
-		parse(++it, end, remaining...);
-	} catch (Error& e) {
-		throw e;
-	} catch (std::exception& e) {
-		throw e;
-	}
-}
-
-ACTOR static Future<RangeResult> actorLineageGetRangeActor(ReadYourWritesTransaction* ryw,
-                                                           KeyRef prefix,
-                                                           KeyRangeRef kr) {
-	state RangeResult result;
-
-	// Set default values for all fields. The default will be used if the field
-	// is missing in the key.
-	state NetworkAddress host;
-	state WaitState waitStateStart = WaitState{ 0 };
-	state WaitState waitStateEnd = WaitState{ 2 };
-	state time_t timeStart = 0;
-	state time_t timeEnd = std::numeric_limits<time_t>::max();
-	state int seqStart = 0;
-	state int seqEnd = std::numeric_limits<int>::max();
-
-	state std::vector<StringRef> beginValues = kr.begin.removePrefix(prefix).splitAny("/"_sr);
-	state std::vector<StringRef> endValues = kr.end.removePrefix(prefix).splitAny("/"_sr);
-	// Require index (either "state" or "time") and address:port.
-	if (beginValues.size() < 2 || endValues.size() < 2) {
-		ryw->setSpecialKeySpaceErrorMsg("missing required parameters (index, host)");
-		throw special_keys_api_failure();
-	}
-
-	state NetworkAddress endRangeHost;
-	try {
-		if (SpecialKeySpace::getActorLineageApiCommandRange("state").contains(kr)) {
-			// For the range \xff\xff/actor_lineage/state/ip:port/wait-state/time/seq
-			parse(beginValues.begin() + 1, beginValues.end(), host, waitStateStart, timeStart, seqStart);
-			if (kr.begin != kr.end) {
-				parse(endValues.begin() + 1, endValues.end(), endRangeHost, waitStateEnd, timeEnd, seqEnd);
-			}
-		} else if (SpecialKeySpace::getActorLineageApiCommandRange("time").contains(kr)) {
-			// For the range \xff\xff/actor_lineage/time/ip:port/time/wait-state/seq
-			parse(beginValues.begin() + 1, beginValues.end(), host, timeStart, waitStateStart, seqStart);
-			if (kr.begin != kr.end) {
-				parse(endValues.begin() + 1, endValues.end(), endRangeHost, timeEnd, waitStateEnd, seqEnd);
-			}
-		} else {
-			ryw->setSpecialKeySpaceErrorMsg("invalid index in actor_lineage");
-			throw special_keys_api_failure();
-		}
-	} catch (Error& e) {
-		if (e.code() != special_keys_api_failure().code()) {
-			ryw->setSpecialKeySpaceErrorMsg("failed to parse key");
-			throw special_keys_api_failure();
-		} else {
-			throw e;
-		}
-	}
-
-	if (kr.begin != kr.end && host != endRangeHost) {
-		// The client doesn't know about all the hosts, so a get range covering
-		// multiple hosts has no way of knowing which IP:port combos to use.
-		ryw->setSpecialKeySpaceErrorMsg("the host must remain the same on both ends of the range");
-		throw special_keys_api_failure();
-	}
-
-	// Open endpoint to target process on each call. This can be optimized at
-	// some point...
-	state ProcessInterface process;
-	process.getInterface = RequestStream<GetProcessInterfaceRequest>(Endpoint({ host }, WLTOKEN_PROCESS));
-	ProcessInterface p = wait(retryBrokenPromise(process.getInterface, GetProcessInterfaceRequest{}));
-	process = p;
-
-	ActorLineageRequest actorLineageRequest;
-	actorLineageRequest.waitStateStart = waitStateStart;
-	actorLineageRequest.waitStateEnd = waitStateEnd;
-	actorLineageRequest.timeStart = timeStart;
-	actorLineageRequest.timeEnd = timeEnd;
-	ActorLineageReply reply = wait(process.actorLineage.getReply(actorLineageRequest));
-
-	time_t dt = 0;
-	int seq = -1;
-	for (const auto& sample : reply.samples) {
-		for (const auto& [waitState, data] : sample.data) {
-			time_t datetime = (time_t)sample.time;
-			seq = dt == datetime ? seq + 1 : 0;
-			dt = datetime;
-
-			if (seq < seqStart) { continue; }
-			else if (seq >= seqEnd) { break; }
-
-			char buf[50];
-			struct tm* tm;
-			tm = localtime(&datetime);
-			size_t size = strftime(buf, 50, "%FT%T%z", tm);
-			std::string date(buf, size);
-
-			std::ostringstream streamKey;
-			if (SpecialKeySpace::getActorLineageApiCommandRange("state").contains(kr)) {
-				streamKey << SpecialKeySpace::getActorLineageApiCommandPrefix("state").toString() << host.toString()
-				          << "/" << to_string(waitState) << "/" << date;
-			} else if (SpecialKeySpace::getActorLineageApiCommandRange("time").contains(kr)) {
-				streamKey << SpecialKeySpace::getActorLineageApiCommandPrefix("time").toString() << host.toString()
-				          << "/" << date << "/" << to_string(waitState);
-				;
-			} else {
-				ASSERT(false);
-			}
-			streamKey << "/" << seq;
-
-			msgpack::object_handle oh = msgpack::unpack(data.data(), data.size());
-			msgpack::object deserialized = oh.get();
-
-			std::ostringstream stream;
-			stream << deserialized;
-
-			result.push_back_deep(result.arena(), KeyValueRef(streamKey.str(), stream.str()));
-		}
-	}
-
-	return result;
-}
-
-Future<RangeResult> ActorLineageImpl::getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const {
-	return actorLineageGetRangeActor(ryw, getKeyRange().begin, kr);
-}
-
-namespace {
-std::string_view to_string_view(StringRef sr) {
-	return std::string_view(reinterpret_cast<const char*>(sr.begin()), sr.size());
-}
-} // namespace
-
-ActorProfilerConf::ActorProfilerConf(KeyRangeRef kr)
-  : SpecialKeyRangeRWImpl(kr), config(ProfilerConfig::instance().getConfig()) {}
-
-Future<RangeResult> ActorProfilerConf::getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const {
-	RangeResult res;
-	std::string_view begin(to_string_view(kr.begin.removePrefix(range.begin))),
-	    end(to_string_view(kr.end.removePrefix(range.begin)));
-	for (auto& p : config) {
-		if (p.first > end) {
-			break;
-		} else if (p.first > begin) {
-			KeyValueRef kv;
-			kv.key = StringRef(res.arena(), p.first);
-			kv.value = StringRef(res.arena(), p.second);
-			res.push_back(res.arena(), kv);
-		}
-	}
-	return res;
-}
-
-void ActorProfilerConf::set(ReadYourWritesTransaction* ryw, const KeyRef& key, const ValueRef& value) {
-	config[key.removePrefix(range.begin).toString()] = value.toString();
-	didWrite = true;
-}
-
-void ActorProfilerConf::clear(ReadYourWritesTransaction* ryw, const KeyRangeRef& kr) {
-	std::string begin(kr.begin.removePrefix(range.begin).toString()), end(kr.end.removePrefix(range.begin).toString());
-	auto first = config.lower_bound(begin);
-	if (first == config.end()) {
-		// nothing to clear
-		return;
-	}
-	didWrite = true;
-	auto last = config.upper_bound(end);
-	config.erase(first, last);
-}
-
-void ActorProfilerConf::clear(ReadYourWritesTransaction* ryw, const KeyRef& key) {
-	std::string k = key.removePrefix(range.begin).toString();
-	auto iter = config.find(k);
-	if (iter != config.end()) {
-		config.erase(iter);
-	}
-	didWrite = true;
-}
-
-Future<Optional<std::string>> ActorProfilerConf::commit(ReadYourWritesTransaction* ryw) {
-	Optional<std::string> res{};
-	try {
-		if (didWrite) {
-			ProfilerConfig::instance().reset(config);
-		}
-		return res;
-	} catch (ConfigError& err) {
-		return Optional<std::string>{ err.description };
-	}
-}
-
 MaintenanceImpl::MaintenanceImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
 
 // Used to read the healthZoneKey
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index 9bf6bb7109a..084135bfb65 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -140,8 +140,6 @@ class SpecialKeyRangeAsyncImpl : public SpecialKeyRangeReadImpl {
 class SpecialKeySpace {
 public:
 	enum class MODULE {
-		ACTORLINEAGE, // Sampling data
-		ACTOR_PROFILER_CONF, // profiler configuration
 		CLUSTERFILEPATH,
 		CONFIGURATION, // Configuration of the cluster
 		CONNECTIONSTRING,
@@ -199,12 +197,6 @@ class SpecialKeySpace {
 	static KeyRef getManagementApiCommandPrefix(const std::string& command) {
 		return managementApiCommandToRange.at(command).begin;
 	}
-	static KeyRangeRef getActorLineageApiCommandRange(const std::string& command) {
-		return actorLineageApiCommandToRange.at(command);
-	}
-	static KeyRef getActorLineageApiCommandPrefix(const std::string& command) {
-		return actorLineageApiCommandToRange.at(command).begin;
-	}
 	static Key getManagementApiCommandOptionSpecialKey(const std::string& command, const std::string& option);
 	static const std::set<std::string>& getManagementApiOptionsSet() { return options; }
 	static const std::set<std::string>& getTracingOptions() { return tracingOptions; }
@@ -233,7 +225,6 @@ class SpecialKeySpace {
 	static std::unordered_map<SpecialKeySpace::MODULE, KeyRange> moduleToBoundary;
 	static std::unordered_map<std::string, KeyRange>
 	    managementApiCommandToRange; // management command to its special keys' range
-	static std::unordered_map<std::string, KeyRange> actorLineageApiCommandToRange;
 	static std::set<std::string> options; // "<command>/<option>"
 	static std::set<std::string> tracingOptions;
 
@@ -395,32 +386,12 @@ class ClientProfilingImpl : public SpecialKeyRangeRWImpl {
 	void clear(ReadYourWritesTransaction* ryw, const KeyRef& key) override;
 };
 
-class ActorLineageImpl : public SpecialKeyRangeReadImpl {
-public:
-	explicit ActorLineageImpl(KeyRangeRef kr);
-	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const override;
-};
-
-class ActorProfilerConf : public SpecialKeyRangeRWImpl {
-	bool didWrite = false;
-	std::map<std::string, std::string> config;
-
-public:
-	explicit ActorProfilerConf(KeyRangeRef kr);
-	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const override;
-	void set(ReadYourWritesTransaction* ryw, const KeyRef& key, const ValueRef& value) override;
-	void clear(ReadYourWritesTransaction* ryw, const KeyRangeRef& range) override;
-	void clear(ReadYourWritesTransaction* ryw, const KeyRef& key) override;
-	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
-};
-
 class MaintenanceImpl : public SpecialKeyRangeRWImpl {
 public:
 	explicit MaintenanceImpl(KeyRangeRef kr);
 	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const override;
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
-
 class DataDistributionImpl : public SpecialKeyRangeRWImpl {
 public:
 	explicit DataDistributionImpl(KeyRangeRef kr);
diff --git a/fdbclient/TransactionLineage.cpp b/fdbclient/TransactionLineage.cpp
deleted file mode 100644
index 9ef0f21e1bd..00000000000
--- a/fdbclient/TransactionLineage.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * TransactionLineage.cpp
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fdbclient/TransactionLineage.h"
-
-namespace {
-TransactionLineageCollector transactionLineageCollector;
-}
\ No newline at end of file
diff --git a/fdbclient/TransactionLineage.h b/fdbclient/TransactionLineage.h
deleted file mode 100644
index 711d89101c6..00000000000
--- a/fdbclient/TransactionLineage.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * TransactionLineage.h
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "fdbclient/ActorLineageProfiler.h"
-
-struct TransactionLineage : LineageProperties<TransactionLineage> {
-	enum class Operation {
-		Unset,
-		GetValue,
-		GetKey,
-		GetKeyValues,
-		WatchValue,
-		GetConsistentReadVersion,
-		Commit,
-		GetKeyServersLocations
-	};
-	static constexpr std::string_view name = "Transaction"sv;
-	uint64_t txID;
-	Operation operation = Operation::Unset;
-
-	bool isSet(uint64_t TransactionLineage::*member) const { return this->*member > 0; }
-	bool isSet(Operation TransactionLineage::*member) const { return this->*member != Operation::Unset; }
-};
-
-struct TransactionLineageCollector : IALPCollector<TransactionLineage> {
-	using Operation = TransactionLineage::Operation;
-	std::optional<std::any> collect(ActorLineage* lineage) {
-		std::map<std::string_view, std::any> res;
-		auto txID = lineage->get(&TransactionLineage::txID);
-		if (txID.has_value()) {
-			res["ID"sv] = txID.value();
-		}
-		auto operation = lineage->get(&TransactionLineage::operation);
-		if (operation.has_value()) {
-			switch (operation.value()) {
-			case Operation::Unset:
-				res["operation"sv] = "Unset"sv;
-				break;
-			case Operation::GetValue:
-				res["operation"sv] = "GetValue"sv;
-				break;
-			case Operation::GetKey:
-				res["operation"sv] = "GetKey"sv;
-				break;
-			case Operation::GetKeyValues:
-				res["operation"sv] = "GetKeyValues"sv;
-				break;
-			case Operation::WatchValue:
-				res["operation"sv] = "WatchValue"sv;
-				break;
-			case Operation::GetConsistentReadVersion:
-				res["operation"sv] = "GetConsistentReadVersion"sv;
-				break;
-			case Operation::Commit:
-				res["operation"sv] = "Commit"sv;
-				break;
-			case Operation::GetKeyServersLocations:
-				res["operation"sv] = "GetKeyServersLocations"sv;
-				break;
-			}
-		}
-		if (res.empty()) {
-			return std::optional<std::any>{};
-		} else {
-			return res;
-		}
-	}
-};
-
-template <class T, class V>
-class ScopedLineage {
-	V before;
-	V T::*member;
-	bool valid = true;
-
-public:
-	ScopedLineage(V T::*member, V const& value) : member(member) {
-		auto& val = currentLineage->modify(member);
-		before = val;
-		val = value;
-	}
-	~ScopedLineage() {
-		if (!valid) {
-			return;
-		}
-		currentLineage->modify(member) = before;
-	}
-	ScopedLineage(ScopedLineage<T, V>&& o) : before(std::move(o.before)), member(o.member), valid(o.valid) {
-		o.release();
-	}
-	ScopedLineage& operator=(ScopedLineage<T, V>&& o) {
-		if (valid) {
-			currentLineage->modify(member) = before;
-		}
-		before = std::move(o.before);
-		member = o.member;
-		valid = o.valid;
-		o.release();
-		return *this;
-	}
-	ScopedLineage(const ScopedLineage<T, V>&) = delete;
-	ScopedLineage& operator=(const ScopedLineage<T, V>&) = delete;
-	void release() { valid = false; }
-};
-
-template <class T, class V>
-ScopedLineage<T, V> make_scoped_lineage(V T::*member, V const& value) {
-	return ScopedLineage<T, V>(member, value);
-}
diff --git a/fdbclient/Tuple.cpp b/fdbclient/Tuple.cpp
index ab1fcb0314f..367a7b80fb9 100644
--- a/fdbclient/Tuple.cpp
+++ b/fdbclient/Tuple.cpp
@@ -71,8 +71,6 @@ Tuple::Tuple(StringRef const& str, bool exclude_incomplete) {
 			i += sizeof(float) + 1;
 		} else if (data[i] == 0x21) {
 			i += sizeof(double) + 1;
-		} else if (data[i] == 0x26 || data[i] == 0x27) {
-			i += 1;
 		} else if (data[i] == '\x00') {
 			i += 1;
 		} else {
@@ -146,16 +144,6 @@ Tuple& Tuple::append(int64_t value) {
 	return *this;
 }
 
-Tuple& Tuple::appendBool(bool value) {
-	offsets.push_back(data.size());
-	if (value) {
-		data.push_back(data.arena(), 0x27);
-	} else {
-		data.push_back(data.arena(), 0x26);
-	}
-	return *this;
-}
-
 Tuple& Tuple::appendFloat(float value) {
 	offsets.push_back(data.size());
 	float swap = bigEndianFloat(value);
@@ -204,8 +192,6 @@ Tuple::ElementType Tuple::getType(size_t index) const {
 		return ElementType::FLOAT;
 	} else if (code == 0x21) {
 		return ElementType::DOUBLE;
-	} else if (code == 0x26 || code == 0x27) {
-		return ElementType::BOOL;
 	} else {
 		throw invalid_tuple_data_type();
 	}
@@ -301,21 +287,6 @@ int64_t Tuple::getInt(size_t index, bool allow_incomplete) const {
 }
 
 // TODO: Combine with bindings/flow/Tuple.*. This code is copied from there.
-bool Tuple::getBool(size_t index) const {
-	if (index >= offsets.size()) {
-		throw invalid_tuple_index();
-	}
-	ASSERT_LT(offsets[index], data.size());
-	uint8_t code = data[offsets[index]];
-	if (code == 0x26) {
-		return false;
-	} else if (code == 0x27) {
-		return true;
-	} else {
-		throw invalid_tuple_data_type();
-	}
-}
-
 float Tuple::getFloat(size_t index) const {
 	if (index >= offsets.size()) {
 		throw invalid_tuple_index();
diff --git a/fdbclient/Tuple.h b/fdbclient/Tuple.h
index 62feba307b1..3dc597f2629 100644
--- a/fdbclient/Tuple.h
+++ b/fdbclient/Tuple.h
@@ -40,7 +40,6 @@ struct Tuple {
 	Tuple& append(int64_t);
 	// There are some ambiguous append calls in fdbclient, so to make it easier
 	// to add append for floats and doubles, name them differently for now.
-	Tuple& appendBool(bool);
 	Tuple& appendFloat(float);
 	Tuple& appendDouble(double);
 	Tuple& appendNull();
@@ -52,7 +51,7 @@ struct Tuple {
 		return append(t);
 	}
 
-	enum ElementType { NULL_TYPE, INT, BYTES, UTF8, BOOL, FLOAT, DOUBLE };
+	enum ElementType { NULL_TYPE, INT, BYTES, UTF8, FLOAT, DOUBLE };
 
 	// this is number of elements, not length of data
 	size_t size() const { return offsets.size(); }
@@ -60,7 +59,6 @@ struct Tuple {
 	ElementType getType(size_t index) const;
 	Standalone<StringRef> getString(size_t index) const;
 	int64_t getInt(size_t index, bool allow_incomplete = false) const;
-	bool getBool(size_t index) const;
 	float getFloat(size_t index) const;
 	double getDouble(size_t index) const;
 
diff --git a/fdbrpc/AsyncFileKAIO.actor.h b/fdbrpc/AsyncFileKAIO.actor.h
index cdc7fe99548..5e6592e6bad 100644
--- a/fdbrpc/AsyncFileKAIO.actor.h
+++ b/fdbrpc/AsyncFileKAIO.actor.h
@@ -242,12 +242,7 @@ class AsyncFileKAIO final : public IAsyncFile, public ReferenceCounted<AsyncFile
 		// result = map(result, [=](int r) mutable { KAIOLogBlockEvent(io, OpLogEntry::READY, r); return r; });
 #endif
 
-		auto& actorLineageSet = IAsyncFileSystem::filesystem()->getActorLineageSet();
-		auto index = actorLineageSet.insert(currentLineage);
-		ASSERT(index != ActorLineageSet::npos);
-		Future<Void> res = success(result);
-		actorLineageSet.erase(index);
-		return res;
+		return success(result);
 	}
 // TODO(alexmiller): Remove when we upgrade the dev docker image to >14.10
 #ifndef FALLOC_FL_ZERO_RANGE
diff --git a/fdbrpc/FlowTests.actor.cpp b/fdbrpc/FlowTests.actor.cpp
index c965149f704..40e4ed1c523 100644
--- a/fdbrpc/FlowTests.actor.cpp
+++ b/fdbrpc/FlowTests.actor.cpp
@@ -24,7 +24,6 @@
 #include "flow/UnitTest.h"
 #include "flow/DeterministicRandom.h"
 #include "flow/IThreadPool.h"
-#include "flow/WriteOnlySet.h"
 #include "fdbrpc/fdbrpc.h"
 #include "fdbrpc/IAsyncFile.h"
 #include "flow/TLSConfig.actor.h"
@@ -284,9 +283,6 @@ struct YieldMockNetwork final : INetwork, ReferenceCounted<YieldMockNetwork> {
 		static TLSConfig emptyConfig;
 		return emptyConfig;
 	}
-	ActorLineageSet& getActorLineageSet() override {
-		throw std::exception();
-	}
 	ProtocolVersion protocolVersion() override { return baseNetwork->protocolVersion(); }
 };
 
diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index fe0f2277efe..8cc9d0d8e6c 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -334,7 +334,7 @@ ACTOR Future<Void> pingLatencyLogger(TransportData* self) {
 }
 
 TransportData::TransportData(uint64_t transportId)
-  : endpoints(/*wellKnownTokenCount*/ 12), endpointNotFoundReceiver(endpoints), pingReceiver(endpoints),
+  : endpoints(/*wellKnownTokenCount*/ 11), endpointNotFoundReceiver(endpoints), pingReceiver(endpoints),
     warnAlwaysForLargePacket(true), lastIncompatibleMessage(0), transportId(transportId),
     numIncompatibleConnections(0) {
 	degraded = makeReference<AsyncVar<bool>>(false);
diff --git a/fdbrpc/IAsyncFile.h b/fdbrpc/IAsyncFile.h
index ad48db5f07c..ed703514c6b 100644
--- a/fdbrpc/IAsyncFile.h
+++ b/fdbrpc/IAsyncFile.h
@@ -25,7 +25,6 @@
 
 #include <ctime>
 #include "flow/flow.h"
-#include "flow/WriteOnlySet.h"
 #include "fdbrpc/IRateControl.h"
 
 // All outstanding operations must be cancelled before the destructor of IAsyncFile is called.
@@ -119,9 +118,6 @@ class IAsyncFileSystem {
 	// Returns the time of the last modification of the file.
 	virtual Future<std::time_t> lastWriteTime(const std::string& filename) = 0;
 
-	// Returns the shared memory data structure used to store actor lineages.
-	virtual ActorLineageSet& getActorLineageSet() = 0;
-
 	static IAsyncFileSystem* filesystem() { return filesystem(g_network); }
 	static runCycleFuncPtr runCycleFunc() {
 		return reinterpret_cast<runCycleFuncPtr>(
diff --git a/fdbrpc/Locality.h b/fdbrpc/Locality.h
index 3d712f5699c..0a7467e0bf5 100644
--- a/fdbrpc/Locality.h
+++ b/fdbrpc/Locality.h
@@ -71,7 +71,6 @@ struct ProcessClass {
 		Ratekeeper,
 		StorageCache,
 		Backup,
-		Worker, // used for actor lineage tracking
 		NoRole
 	};
 	enum ClassSource { CommandLineSource, AutoSource, DBSource, InvalidSource = -1 };
diff --git a/fdbrpc/Net2FileSystem.cpp b/fdbrpc/Net2FileSystem.cpp
index 8e895c08dc8..71a7d784a1f 100644
--- a/fdbrpc/Net2FileSystem.cpp
+++ b/fdbrpc/Net2FileSystem.cpp
@@ -89,10 +89,6 @@ Future<std::time_t> Net2FileSystem::lastWriteTime(const std::string& filename) {
 	return Net2AsyncFile::lastWriteTime(filename);
 }
 
-ActorLineageSet& Net2FileSystem::getActorLineageSet() {
-	return actorLineageSet;
-}
-
 void Net2FileSystem::newFileSystem(double ioTimeout, const std::string& fileSystemPath) {
 	g_network->setGlobal(INetwork::enFileSystem, (flowGlobalType) new Net2FileSystem(ioTimeout, fileSystemPath));
 }
diff --git a/fdbrpc/Net2FileSystem.h b/fdbrpc/Net2FileSystem.h
index 0c2229b5ca8..702b87828fc 100644
--- a/fdbrpc/Net2FileSystem.h
+++ b/fdbrpc/Net2FileSystem.h
@@ -39,8 +39,6 @@ class Net2FileSystem final : public IAsyncFileSystem {
 
 	Future<Void> renameFile(std::string const& from, std::string const& to) override;
 
-	ActorLineageSet& getActorLineageSet() override;
-
 	// void init();
 	static void stop();
 
@@ -54,7 +52,6 @@ class Net2FileSystem final : public IAsyncFileSystem {
 	dev_t fileSystemDeviceId;
 	bool checkFileSystem;
 #endif
-	ActorLineageSet actorLineageSet;
 };
 
 #endif
diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index 5cf65da0a5e..1af14ec676c 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -31,7 +31,6 @@
 #include "flow/IThreadPool.h"
 #include "flow/ProtocolVersion.h"
 #include "flow/Util.h"
-#include "flow/WriteOnlySet.h"
 #include "fdbrpc/IAsyncFile.h"
 #include "fdbrpc/AsyncFileCached.actor.h"
 #include "fdbrpc/AsyncFileNonDurable.actor.h"
@@ -976,10 +975,6 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 
 	bool checkRunnable() override { return net2->checkRunnable(); }
 
-	ActorLineageSet& getActorLineageSet() override {
-		return actorLineageSet;
-	}
-
 	void stop() override { isStopped = true; }
 	void addStopCallback(std::function<void()> fn) override { stopCallbacks.emplace_back(std::move(fn)); }
 	bool isSimulated() const override { return true; }
@@ -2122,8 +2117,6 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 	// Whether or not yield has returned true during the current iteration of the run loop
 	bool yielded;
 	int yield_limit; // how many more times yield may return false before next returning true
-
-	ActorLineageSet actorLineageSet;
 };
 
 class UDPSimSocket : public IUDPSocket, ReferenceCounted<UDPSimSocket> {
@@ -2501,10 +2494,6 @@ Future<std::time_t> Sim2FileSystem::lastWriteTime(const std::string& filename) {
 	return fileWrites[filename];
 }
 
-ActorLineageSet& Sim2FileSystem::getActorLineageSet() {
-	return actorLineageSet;
-}
-
 void Sim2FileSystem::newFileSystem() {
 	g_network->setGlobal(INetwork::enFileSystem, (flowGlobalType) new Sim2FileSystem());
 }
diff --git a/fdbrpc/simulator.h b/fdbrpc/simulator.h
index 8cf8d1ec372..4b74ed91bae 100644
--- a/fdbrpc/simulator.h
+++ b/fdbrpc/simulator.h
@@ -472,8 +472,6 @@ class Sim2FileSystem : public IAsyncFileSystem {
 
 	Future<std::time_t> lastWriteTime(const std::string& filename) override;
 
-	ActorLineageSet& getActorLineageSet() override;
-
 	Future<Void> renameFile(std::string const& from, std::string const& to) override;
 
 	Sim2FileSystem() {}
@@ -481,8 +479,6 @@ class Sim2FileSystem : public IAsyncFileSystem {
 	~Sim2FileSystem() override {}
 
 	static void newFileSystem();
-
-	ActorLineageSet actorLineageSet;
 };
 
 #endif
diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index 019c207556c..f3d37bb01e9 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -85,11 +85,8 @@ set(FDBSERVER_SRCS
   RestoreWorker.actor.cpp
   Resolver.actor.cpp
   ResolverInterface.h
-  RoleLineage.actor.h
-  RoleLineage.actor.cpp
   ServerDBInfo.actor.h
   ServerDBInfo.h
-  SigStack.cpp
   SimulatedCluster.actor.cpp
   SimulatedCluster.h
   SkipList.cpp
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index b031957c38e..ea02d3f7472 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -135,9 +135,7 @@ class ClusterControllerData {
 		                                                                         true,
 		                                                                         TaskPriority::DefaultEndpoint,
 		                                                                         true)) // SOMEDAY: Locality!
-		{
-			GlobalConfig::globalConfig().updateDBInfo(clientInfo);
-		}
+		{}
 
 		void setDistributor(const DataDistributorInterface& interf) {
 			auto newInfo = serverInfo->get();
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 208744e3a0e..d1469c0d3b1 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -28,7 +28,6 @@
 #include "fdbclient/CommitProxyInterface.h"
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/SystemData.h"
-#include "fdbclient/TransactionLineage.h"
 #include "fdbrpc/sim_validation.h"
 #include "fdbserver/ApplyMetadataMutation.h"
 #include "fdbserver/ConflictSet.h"
@@ -1397,7 +1396,6 @@ ACTOR Future<Void> commitBatch(ProxyCommitData* self,
 	// WARNING: this code is run at a high priority (until the first delay(0)), so it needs to do as little work as
 	// possible
 	state CommitBatch::CommitBatchContext context(self, trs, currentBatchMemBytesCount);
-	currentLineage->modify(&TransactionLineage::operation) = TransactionLineage::Operation::Commit;
 
 	// Active load balancing runs at a very high priority (to obtain accurate estimate of memory used by commit batches)
 	// so we need to downgrade here
@@ -1434,8 +1432,6 @@ ACTOR Future<Void> commitBatch(ProxyCommitData* self,
 
 ACTOR static Future<Void> doKeyServerLocationRequest(GetKeyServerLocationsRequest req, ProxyCommitData* commitData) {
 	// We can't respond to these requests until we have valid txnStateStore
-	currentLineage->modify(&TransactionLineage::operation) = TransactionLineage::Operation::GetKeyServersLocations;
-	currentLineage->modify(&TransactionLineage::txID) = req.spanContext.first();
 	wait(commitData->validState.getFuture());
 	wait(delay(0, TaskPriority::DefaultEndpoint));
 
@@ -1941,7 +1937,7 @@ ACTOR Future<Void> commitProxyServerCore(CommitProxyInterface proxy,
 					state KeyRange txnKeys = allKeys;
 					RangeResult UIDtoTagMap = commitData.txnStateStore->readRange(serverTagKeys).get();
 					state std::map<Tag, UID> tag_uid;
-					for (const KeyValueRef& kv : UIDtoTagMap) {
+					for (const KeyValueRef kv : UIDtoTagMap) {
 						tag_uid[decodeServerTagValue(kv.value)] = decodeServerTagKey(kv.key);
 					}
 					loop {
diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp
index d0b1da26764..aaf9f8b1863 100644
--- a/fdbserver/GrvProxyServer.actor.cpp
+++ b/fdbserver/GrvProxyServer.actor.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "fdbclient/Notified.h"
-#include "fdbclient/TransactionLineage.h"
 #include "fdbserver/LogSystem.h"
 #include "fdbserver/LogSystemDiskQueueAdapter.h"
 #include "fdbclient/CommitProxyInterface.h"
@@ -356,11 +355,8 @@ ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>>
                                                GrvProxyStats* stats,
                                                GrvTransactionRateInfo* batchRateInfo,
                                                TransactionTagMap<uint64_t>* transactionTagCounter) {
-	currentLineage->modify(&TransactionLineage::operation) = TransactionLineage::Operation::GetConsistentReadVersion;
 	loop choose {
 		when(GetReadVersionRequest req = waitNext(readVersionRequests)) {
-			auto lineage = make_scoped_lineage(&TransactionLineage::txID, req.spanContext.first());
-			// currentLineage->modify(&TransactionLineage::txID) =
 			// WARNING: this code is run at a high priority, so it needs to do as little work as possible
 			if (stats->txnRequestIn.getValue() - stats->txnRequestOut.getValue() >
 			    SERVER_KNOBS->START_TRANSACTION_MAX_QUEUE_SIZE) {
@@ -654,7 +650,6 @@ ACTOR static Future<Void> transactionStarter(GrvProxyInterface proxy,
 	state Span span;
 
 	state int64_t midShardSize = SERVER_KNOBS->MIN_SHARD_BYTES;
-	currentLineage->modify(&TransactionLineage::operation) = TransactionLineage::Operation::GetConsistentReadVersion;
 	addActor.send(monitorDDMetricsChanges(&midShardSize, db));
 
 	addActor.send(getRate(proxy.id(),
diff --git a/fdbserver/RoleLineage.actor.cpp b/fdbserver/RoleLineage.actor.cpp
deleted file mode 100644
index b54282f5f08..00000000000
--- a/fdbserver/RoleLineage.actor.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * RoleLineage.cpp
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2020 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "fdbserver/RoleLineage.actor.h"
-
-using namespace std::literals;
-
-std::string_view RoleLineage::name = "RoleLineage"sv;
diff --git a/fdbserver/RoleLineage.actor.h b/fdbserver/RoleLineage.actor.h
deleted file mode 100644
index 5cbf65ed53f..00000000000
--- a/fdbserver/RoleLineage.actor.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * RoleLineage.actor.h
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2020 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include "flow/flow.h"
-#if defined(NO_INTELLISENSE) && !defined(FDBSERVER_ROLE_LINEAGE_ACTOR_G_H)
-#define FDBSERVER_ROLE_LINEAGE_ACTOR_G_H
-#include "fdbserver/RoleLineage.actor.g.h"
-#elif !defined(FDBSERVER_ROLE_LINEAGE_ACTOR_H)
-#define FDBSERVER_ROLE_LINEAGE_ACTOR_H
-
-#include "flow/singleton.h"
-#include "fdbrpc/Locality.h"
-#include "fdbclient/ActorLineageProfiler.h"
-#include "fdbserver/WorkerInterface.actor.h"
-
-#include <string_view>
-#include <msgpack.hpp>
-#include <any>
-#include "flow/actorcompiler.h" // This must be the last include
-
-struct RoleLineage : LineageProperties<RoleLineage> {
-	static std::string_view name;
-	ProcessClass::ClusterRole role = ProcessClass::NoRole;
-
-	bool isSet(ProcessClass::ClusterRole RoleLineage::*member) const { return this->*member != ProcessClass::NoRole; }
-};
-
-struct RoleLineageCollector : IALPCollector<RoleLineage> {
-	RoleLineageCollector() : IALPCollector() {}
-	std::optional<std::any> collect(ActorLineage* lineage) override {
-		auto res = lineage->get(&RoleLineage::role);
-		if (res.has_value()) {
-			return Role::get(res.value()).abbreviation;
-		} else {
-			return std::optional<std::any>();
-		}
-	}
-};
-
-// creates a new root and sets the role lineage
-ACTOR template <class Fun>
-Future<decltype(std::declval<Fun>()())> runInRole(Fun fun, ProcessClass::ClusterRole role) {
-	currentLineage->makeRoot();
-	currentLineage->modify(&RoleLineage::role) = role;
-	decltype(std::declval<Fun>()()) res = wait(fun());
-	return res;
-}
-
-#endif
diff --git a/fdbserver/SigStack.cpp b/fdbserver/SigStack.cpp
deleted file mode 100644
index 0c35326766c..00000000000
--- a/fdbserver/SigStack.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "flow/flow.h"
-#include <csignal>
-#include <iostream>
-#include <string_view>
-
-// This is not yet correct, as this is not async safe
-// However, this should be good enough for an initial
-// proof of concept.
-extern "C" void stackSignalHandler(int sig) {
-	auto stack = getActorStackTrace();
-	int i = 0;
-	while (!stack.empty()) {
-		auto s = stack.back();
-		stack.pop_back();
-		std::string_view n(reinterpret_cast<const char*>(s.begin()), s.size());
-		std::cout << i << ": " << n << std::endl;
-		++i;
-	}
-}
-
-void setupStackSignal() {
-	std::signal(SIGUSR1, &stackSignalHandler);
-}
diff --git a/fdbserver/WorkerInterface.actor.h b/fdbserver/WorkerInterface.actor.h
index fb9a190feb6..3446b3a7b8f 100644
--- a/fdbserver/WorkerInterface.actor.h
+++ b/fdbserver/WorkerInterface.actor.h
@@ -789,41 +789,6 @@ struct Role {
 	std::string abbreviation;
 	bool includeInTraceRoles;
 
-	static const Role& get(ProcessClass::ClusterRole role) {
-		switch (role) {
-		case ProcessClass::Storage:
-			return STORAGE_SERVER;
-		case ProcessClass::TLog:
-			return TRANSACTION_LOG;
-		case ProcessClass::CommitProxy:
-			return COMMIT_PROXY;
-		case ProcessClass::GrvProxy:
-			return GRV_PROXY;
-		case ProcessClass::Master:
-			return MASTER;
-		case ProcessClass::Resolver:
-			return RESOLVER;
-		case ProcessClass::LogRouter:
-			return LOG_ROUTER;
-		case ProcessClass::ClusterController:
-			return CLUSTER_CONTROLLER;
-		case ProcessClass::DataDistributor:
-			return DATA_DISTRIBUTOR;
-		case ProcessClass::Ratekeeper:
-			return RATEKEEPER;
-		case ProcessClass::StorageCache:
-			return STORAGE_CACHE;
-		case ProcessClass::Backup:
-			return BACKUP;
-		case ProcessClass::Worker:
-			return WORKER;
-		case ProcessClass::NoRole:
-		default:
-			ASSERT(false);
-			throw internal_error();
-		}
-	}
-
 	bool operator==(const Role& r) const { return roleName == r.roleName; }
 	bool operator!=(const Role& r) const { return !(*this == r); }
 
diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp
index ac75e879473..712186affec 100644
--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@@ -66,9 +66,7 @@
 #include "flow/SystemMonitor.h"
 #include "flow/TLSConfig.actor.h"
 #include "flow/Tracing.h"
-#include "flow/WriteOnlySet.h"
 #include "flow/UnitTest.h"
-#include "fdbclient/ActorLineageProfiler.h"
 
 #if defined(__linux__) || defined(__FreeBSD__)
 #include <execinfo.h>
@@ -86,8 +84,6 @@
 
 #include "flow/actorcompiler.h" // This must be the last #include.
 
-using namespace std::literals;
-
 // clang-format off
 enum {
 	OPT_CONNFILE, OPT_SEEDCONNFILE, OPT_SEEDCONNSTRING, OPT_ROLE, OPT_LISTEN, OPT_PUBLICADDR, OPT_DATAFOLDER, OPT_LOGFOLDER, OPT_PARENTPID, OPT_TRACER, OPT_NEWCONSOLE,
@@ -95,7 +91,7 @@ enum {
 	OPT_DCID, OPT_MACHINE_CLASS, OPT_BUGGIFY, OPT_VERSION, OPT_BUILD_FLAGS, OPT_CRASHONERROR, OPT_HELP, OPT_NETWORKIMPL, OPT_NOBUFSTDOUT, OPT_BUFSTDOUTERR,
 	OPT_TRACECLOCK, OPT_NUMTESTERS, OPT_DEVHELP, OPT_ROLLSIZE, OPT_MAXLOGS, OPT_MAXLOGSSIZE, OPT_KNOB, OPT_UNITTESTPARAM, OPT_TESTSERVERS, OPT_TEST_ON_SERVERS, OPT_METRICSCONNFILE,
 	OPT_METRICSPREFIX, OPT_LOGGROUP, OPT_LOCALITY, OPT_IO_TRUST_SECONDS, OPT_IO_TRUST_WARN_ONLY, OPT_FILESYSTEM, OPT_PROFILER_RSS_SIZE, OPT_KVFILE,
-	OPT_TRACE_FORMAT, OPT_WHITELIST_BINPATH, OPT_BLOB_CREDENTIAL_FILE, OPT_PROFILER
+	OPT_TRACE_FORMAT, OPT_WHITELIST_BINPATH, OPT_BLOB_CREDENTIAL_FILE
 };
 
 CSimpleOpt::SOption g_rgOptions[] = {
@@ -175,10 +171,9 @@ CSimpleOpt::SOption g_rgOptions[] = {
 	{ OPT_METRICSPREFIX,         "--metrics_prefix",            SO_REQ_SEP },
 	{ OPT_IO_TRUST_SECONDS,      "--io_trust_seconds",          SO_REQ_SEP },
 	{ OPT_IO_TRUST_WARN_ONLY,    "--io_trust_warn_only",        SO_NONE },
-	{ OPT_TRACE_FORMAT,          "--trace_format",              SO_REQ_SEP },
+	{ OPT_TRACE_FORMAT      ,    "--trace_format",              SO_REQ_SEP },
 	{ OPT_WHITELIST_BINPATH,     "--whitelist_binpath",         SO_REQ_SEP },
 	{ OPT_BLOB_CREDENTIAL_FILE,  "--blob_credential_file",      SO_REQ_SEP },
-	{ OPT_PROFILER,	             "--profiler_",                 SO_REQ_SEP},
 
 #ifndef TLS_DISABLED
 	TLS_OPTION_FLAGS
@@ -622,11 +617,6 @@ static void printUsage(const char* name, bool devhelp) {
 	                 " Machine class (valid options are storage, transaction,"
 	                 " resolution, grv_proxy, commit_proxy, master, test, unset, stateless, log, router,"
 	                 " and cluster_controller).");
-	printOptionUsage("--profiler_",
-	                 "Set an actor profiler option. Supported options are:\n"
-	                 "  collector -- None or FluentD (FluentD requires collector_endpoint to be set)\n"
-	                 "  collector_endpoint -- IP:PORT of the fluentd server\n"
-	                 "  collector_protocol -- UDP or TCP (default is UDP)");
 #ifndef TLS_DISABLED
 	printf(TLS_HELP);
 #endif
@@ -990,8 +980,6 @@ struct CLIOptions {
 	Standalone<StringRef> machineId;
 	UnitTestParameters testParams;
 
-	std::map<std::string, std::string> profilerConfig;
-
 	static CLIOptions parseArgs(int argc, char* argv[]) {
 		CLIOptions opts;
 		opts.parseArgsInternal(argc, argv);
@@ -1065,18 +1053,6 @@ struct CLIOptions {
 				knobs.push_back(std::make_pair(syn, args.OptionArg()));
 				break;
 			}
-			case OPT_PROFILER: {
-				std::string syn = args.OptionSyntax();
-				std::string_view key = syn;
-				auto prefix = "--profiler_"sv;
-				if (key.find(prefix) != 0) {
-					fprintf(stderr, "ERROR: unable to parse profiler option '%s'\n", syn.c_str());
-					flushAndExit(FDB_EXIT_ERROR);
-				}
-				key.remove_prefix(prefix.size());
-				profilerConfig.emplace(key, args.OptionArg());
-				break;
-			};
 			case OPT_UNITTESTPARAM: {
 				std::string syn = args.OptionSyntax();
 				if (!StringRef(syn).startsWith(LiteralStringRef("--test_"))) {
@@ -1477,13 +1453,6 @@ struct CLIOptions {
 			}
 		}
 
-		try {
-			ProfilerConfig::instance().reset(profilerConfig);
-		} catch (ConfigError& e) {
-			printf("Error seting up profiler: %s", e.description.c_str());
-			flushAndExit(FDB_EXIT_ERROR);
-		}
-
 		if (seedConnString.length() && seedConnFile.length()) {
 			fprintf(
 			    stderr, "%s\n", "--seed_cluster_file and --seed_connection_string may not both be specified at once.");
@@ -1624,9 +1593,6 @@ struct CLIOptions {
 } // namespace
 
 int main(int argc, char* argv[]) {
-	// TODO: Remove later, this is just to force the statics to be initialized
-	// otherwise the unit test won't run
-	ActorLineageSet _;
 	try {
 		platformInit();
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index c92402ce0d8..ecb96c9696b 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -42,7 +42,6 @@
 #include "fdbclient/Notified.h"
 #include "fdbclient/StatusClient.h"
 #include "fdbclient/SystemData.h"
-#include "fdbclient/TransactionLineage.h"
 #include "fdbclient/VersionedMap.h"
 #include "fdbserver/FDBExecHelper.actor.h"
 #include "fdbserver/IKeyValueStore.h"
@@ -1105,7 +1104,6 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 	state int64_t resultSize = 0;
 	Span span("SS:getValue"_loc, { req.spanContext });
 	span.addTag("key"_sr, req.key);
-	currentLineage->modify(&TransactionLineage::txID) = req.spanContext.first();
 
 	try {
 		++data->counters.getValueQueries;
@@ -1802,7 +1800,6 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 {
 	state Span span("SS:getKeyValues"_loc, { req.spanContext });
 	state int64_t resultSize = 0;
-	currentLineage->modify(&TransactionLineage::txID) = req.spanContext.first();
 
 	++data->counters.getRangeQueries;
 	++data->counters.allQueries;
@@ -1963,7 +1960,6 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 ACTOR Future<Void> getKeyQ(StorageServer* data, GetKeyRequest req) {
 	state Span span("SS:getKey"_loc, { req.spanContext });
 	state int64_t resultSize = 0;
-	currentLineage->modify(&TransactionLineage::txID) = req.spanContext.first();
 
 	++data->counters.getKeyQueries;
 	++data->counters.allQueries;
@@ -4337,7 +4333,6 @@ ACTOR Future<Void> checkBehind(StorageServer* self) {
 }
 
 ACTOR Future<Void> serveGetValueRequests(StorageServer* self, FutureStream<GetValueRequest> getValue) {
-	currentLineage->modify(&TransactionLineage::operation) = TransactionLineage::Operation::GetValue;
 	loop {
 		GetValueRequest req = waitNext(getValue);
 		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
@@ -4355,7 +4350,6 @@ ACTOR Future<Void> serveGetValueRequests(StorageServer* self, FutureStream<GetVa
 }
 
 ACTOR Future<Void> serveGetKeyValuesRequests(StorageServer* self, FutureStream<GetKeyValuesRequest> getKeyValues) {
-	currentLineage->modify(&TransactionLineage::operation) = TransactionLineage::Operation::GetKeyValues;
 	loop {
 		GetKeyValuesRequest req = waitNext(getKeyValues);
 		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
@@ -4365,7 +4359,6 @@ ACTOR Future<Void> serveGetKeyValuesRequests(StorageServer* self, FutureStream<G
 }
 
 ACTOR Future<Void> serveGetKeyRequests(StorageServer* self, FutureStream<GetKeyRequest> getKey) {
-	currentLineage->modify(&TransactionLineage::operation) = TransactionLineage::Operation::GetKey;
 	loop {
 		GetKeyRequest req = waitNext(getKey);
 		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
@@ -4378,7 +4371,6 @@ ACTOR Future<Void> watchValueWaitForVersion(StorageServer* self,
                                             WatchValueRequest req,
                                             PromiseStream<WatchValueRequest> stream) {
 	state Span span("SS:watchValueWaitForVersion"_loc, { req.spanContext });
-	currentLineage->modify(&TransactionLineage::txID) = req.spanContext.first();
 	try {
 		wait(success(waitForVersionNoTooOld(self, req.version)));
 		stream.send(req);
@@ -4392,11 +4384,9 @@ ACTOR Future<Void> watchValueWaitForVersion(StorageServer* self,
 
 ACTOR Future<Void> serveWatchValueRequestsImpl(StorageServer* self, FutureStream<WatchValueRequest> stream) {
 	loop {
-		currentLineage->modify(&TransactionLineage::txID) = 0;
 		state WatchValueRequest req = waitNext(stream);
 		state Reference<ServerWatchMetadata> metadata = self->getWatchMetadata(req.key.contents());
 		state Span span("SS:serveWatchValueRequestsImpl"_loc, { req.spanContext });
-		currentLineage->modify(&TransactionLineage::txID) = req.spanContext.first();
 
 		if (!metadata.isValid()) { // case 1: no watch set for the current key
 			metadata = makeReference<ServerWatchMetadata>(req.key, req.value, req.version, req.tags, req.debugID);
@@ -4470,7 +4460,6 @@ ACTOR Future<Void> serveWatchValueRequestsImpl(StorageServer* self, FutureStream
 
 ACTOR Future<Void> serveWatchValueRequests(StorageServer* self, FutureStream<WatchValueRequest> watchValue) {
 	state PromiseStream<WatchValueRequest> stream;
-	currentLineage->modify(&TransactionLineage::operation) = TransactionLineage::Operation::WatchValue;
 	self->actors.add(serveWatchValueRequestsImpl(self, stream.getFuture()));
 
 	loop {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 15151f3d126..5a568fc96dd 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -22,8 +22,6 @@
 #include <boost/lexical_cast.hpp>
 
 #include "fdbrpc/Locality.h"
-#include "fdbclient/GlobalConfig.actor.h"
-#include "fdbclient/ProcessInterface.h"
 #include "fdbclient/StorageServerInterface.h"
 #include "fdbserver/Knobs.h"
 #include "flow/ActorCollection.h"
@@ -34,7 +32,6 @@
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbserver/MetricLogger.actor.h"
 #include "fdbserver/BackupInterface.h"
-#include "fdbserver/RoleLineage.actor.h"
 #include "fdbserver/WorkerInterface.actor.h"
 #include "fdbserver/IKeyValueStore.h"
 #include "fdbserver/WaitFailure.h"
@@ -50,7 +47,6 @@
 #include "flow/Profiler.h"
 #include "flow/ThreadHelper.actor.h"
 #include "flow/Trace.h"
-#include "flow/flow.h"
 #include "flow/network.h"
 
 #ifdef __linux__
@@ -80,10 +76,6 @@ extern IKeyValueStore* keyValueStoreCompressTestData(IKeyValueStore* store);
 #define KV_STORE(filename, uid) keyValueStoreMemory(filename, uid)
 #endif
 
-namespace {
-RoleLineageCollector roleLineageCollector;
-}
-
 ACTOR Future<std::vector<Endpoint>> tryDBInfoBroadcast(RequestStream<UpdateServerDBInfoRequest> stream,
                                                        UpdateServerDBInfoRequest req) {
 	ErrorOr<std::vector<Endpoint>> rep =
@@ -1049,8 +1041,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 			metricsLogger = runMetrics(openDBOnServer(dbInfo, TaskPriority::DefaultEndpoint, true, lockAware),
 			                           KeyRef(metricsPrefix));
 		}
-
-		GlobalConfig::globalConfig().trigger(samplingFrequency, samplingProfilerUpdateFrequency);
 	}
 
 	errorForwarders.add(resetAfter(degraded,
@@ -1098,8 +1088,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 			DiskStore s = stores[f];
 			// FIXME: Error handling
 			if (s.storedComponent == DiskStore::Storage) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::Storage;
 				IKeyValueStore* kv =
 				    openKVStore(s.storeType, s.filename, s.storeID, memoryLimit, false, validateDataFiles);
 				Future<Void> kvClosed = kv->onClosed();
@@ -1144,8 +1132,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				                                  kv);
 				errorForwarders.add(forwardError(errors, Role::STORAGE_SERVER, recruited.id(), f));
 			} else if (s.storedComponent == DiskStore::TLogData) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::TLog;
 				std::string logQueueBasename;
 				const std::string filename = basename(s.filename);
 				if (StringRef(filename).startsWith(fileLogDataPrefix)) {
@@ -1345,8 +1331,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				}
 			}
 			when(RecruitMasterRequest req = waitNext(interf.master.getFuture())) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::Master;
 				MasterInterface recruited;
 				recruited.locality = locality;
 				recruited.initEndpoints();
@@ -1369,8 +1353,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				req.reply.send(recruited);
 			}
 			when(InitializeDataDistributorRequest req = waitNext(interf.dataDistributor.getFuture())) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::DataDistributor;
 				DataDistributorInterface recruited(locality);
 				recruited.initEndpoints();
 
@@ -1393,8 +1375,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				req.reply.send(recruited);
 			}
 			when(InitializeRatekeeperRequest req = waitNext(interf.ratekeeper.getFuture())) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::Ratekeeper;
 				RatekeeperInterface recruited(locality, req.reqId);
 				recruited.initEndpoints();
 
@@ -1421,8 +1401,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 			}
 			when(InitializeBackupRequest req = waitNext(interf.backup.getFuture())) {
 				if (!backupWorkerCache.exists(req.reqId)) {
-					LocalLineage _;
-					currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::Backup;
 					BackupInterface recruited(locality);
 					recruited.initEndpoints();
 
@@ -1452,8 +1430,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 					    .detail("MinRecruitable", TLogVersion::MIN_RECRUITABLE);
 					req.reply.sendError(internal_error());
 				}
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::TLog;
 				TLogOptions tLogOptions(req.logVersion, req.spillType);
 				TLogFn tLogFn = tLogFnForOptions(tLogOptions);
 				auto& logData = sharedLogs[SharedLogsKey(tLogOptions, req.storeType)];
@@ -1507,8 +1483,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 			}
 			when(InitializeStorageRequest req = waitNext(interf.storage.getFuture())) {
 				if (!storageCache.exists(req.reqId)) {
-					LocalLineage _;
-					currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::Storage;
 					StorageServerInterface recruited(req.interfaceId);
 					recruited.locality = locality;
 					recruited.initEndpoints();
@@ -1557,8 +1531,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 					forwardPromise(req.reply, storageCache.get(req.reqId));
 			}
 			when(InitializeCommitProxyRequest req = waitNext(interf.commitProxy.getFuture())) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::CommitProxy;
 				CommitProxyInterface recruited;
 				recruited.processId = locality.processId();
 				recruited.provisional = false;
@@ -1584,8 +1556,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				req.reply.send(recruited);
 			}
 			when(InitializeGrvProxyRequest req = waitNext(interf.grvProxy.getFuture())) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::GrvProxy;
 				GrvProxyInterface recruited;
 				recruited.processId = locality.processId();
 				recruited.provisional = false;
@@ -1606,8 +1576,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				req.reply.send(recruited);
 			}
 			when(InitializeResolverRequest req = waitNext(interf.resolver.getFuture())) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::Resolver;
 				ResolverInterface recruited;
 				recruited.locality = locality;
 				recruited.initEndpoints();
@@ -1625,8 +1593,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				req.reply.send(recruited);
 			}
 			when(InitializeLogRouterRequest req = waitNext(interf.logRouter.getFuture())) {
-				LocalLineage _;
-				currentLineage->modify(&RoleLineage::role) = ProcessClass::ClusterRole::LogRouter;
 				TLogInterface recruited(locality);
 				recruited.initEndpoints();
 
@@ -2034,8 +2000,6 @@ ACTOR Future<Void> monitorLeaderRemotelyWithDelayedCandidacy(
 	}
 }
 
-extern void setupStackSignal();
-
 ACTOR Future<Void> serveProtocolInfo() {
 	state RequestStream<ProtocolInfoRequest> protocolInfo(
 	    PeerCompatibilityPolicy{ RequirePeer::AtLeast, ProtocolVersion::withStableInterfaces() });
@@ -2046,37 +2010,6 @@ ACTOR Future<Void> serveProtocolInfo() {
 	}
 }
 
-// Handles requests from ProcessInterface, an interface meant for direct
-// communication between the client and FDB processes.
-ACTOR Future<Void> serveProcess() {
-	state ProcessInterface process;
-	process.getInterface.makeWellKnownEndpoint(WLTOKEN_PROCESS, TaskPriority::DefaultEndpoint);
-	loop {
-		choose {
-			when(GetProcessInterfaceRequest req = waitNext(process.getInterface.getFuture())) {
-				req.reply.send(process);
-			}
-			when(ActorLineageRequest req = waitNext(process.actorLineage.getFuture())) {
-				state SampleCollection sampleCollector;
-				auto samples = sampleCollector->get(req.timeStart, req.timeEnd);
-
-				std::vector<SerializedSample> serializedSamples;
-				for (const auto& samplePtr : samples) {
-					auto serialized = SerializedSample{ .time = samplePtr->time };
-					for (const auto& [waitState, pair] : samplePtr->data) {
-						if (waitState >= req.waitStateStart && waitState <= req.waitStateEnd) {
-							serialized.data[waitState] = std::string(pair.first, pair.second);
-						}
-					}
-					serializedSamples.push_back(std::move(serialized));
-				}
-				ActorLineageReply reply{ serializedSamples };
-				req.reply.send(reply);
-			}
-		}
-	}
-}
-
 ACTOR Future<Void> fdbd(Reference<ClusterConnectionFile> connFile,
                         LocalityData localities,
                         ProcessClass processClass,
@@ -2089,11 +2022,8 @@ ACTOR Future<Void> fdbd(Reference<ClusterConnectionFile> connFile,
                         std::string whitelistBinPaths) {
 	state vector<Future<Void>> actors;
 	state Promise<Void> recoveredDiskFiles;
-	setupStackSignal();
-	currentLineage->modify(&RoleLineage::role) = ProcessClass::Worker;
 
 	actors.push_back(serveProtocolInfo());
-	actors.push_back(serveProcess());
 
 	try {
 		ServerCoordinators coordinators(connFile);
diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index 4c28aee4374..c838e8eff8e 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -69,7 +69,6 @@ set(FLOW_SRCS
   TreeBenchmark.h
   UnitTest.cpp
   UnitTest.h
-  WriteOnlySet.actor.cpp
   XmlTraceLogFormatter.cpp
   XmlTraceLogFormatter.h
   actorcompiler.h
diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index af5613f1faf..bb0b0325c60 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -204,8 +204,6 @@ class Net2 final : public INetwork, public INetworkConnections {
 
 	bool checkRunnable() override;
 
-	ActorLineageSet& getActorLineageSet() override;
-
 	bool useThreadPool;
 
 	// private:
@@ -228,15 +226,11 @@ class Net2 final : public INetwork, public INetworkConnections {
 	TaskPriority currentTaskID;
 	uint64_t tasksIssued;
 	TDMetricCollection tdmetrics;
-	// we read now() from a different thread. On Intel, reading a double is atomic anyways, but on other platforms it's
-	// not. For portability this should be atomic
-	std::atomic<double> currentTime;
+	double currentTime;
 	// May be accessed off the network thread, e.g. by onMainThread
 	std::atomic<bool> stopped;
 	mutable std::map<IPAddress, bool> addressOnHostCache;
 
-	ActorLineageSet actorLineageSet;
-
 	std::atomic<bool> started;
 
 	uint64_t numYields;
@@ -1389,10 +1383,6 @@ bool Net2::checkRunnable() {
 	return !started.exchange(true);
 }
 
-ActorLineageSet& Net2::getActorLineageSet() {
-	return actorLineageSet;
-}
-
 void Net2::run() {
 	TraceEvent::setNetworkThread();
 	TraceEvent("Net2Running");
diff --git a/flow/Platform.actor.cpp b/flow/Platform.actor.cpp
index 8cdb34f7695..42d8decccc0 100644
--- a/flow/Platform.actor.cpp
+++ b/flow/Platform.actor.cpp
@@ -48,10 +48,6 @@
 #include "flow/UnitTest.h"
 #include "flow/FaultInjection.h"
 
-#include "fdbrpc/IAsyncFile.h"
-
-#include "fdbclient/AnnotateActor.h"
-
 #ifdef _WIN32
 #include <windows.h>
 #include <winioctl.h>
diff --git a/flow/Platform.h b/flow/Platform.h
index c50c13e11a8..74c9395c538 100644
--- a/flow/Platform.h
+++ b/flow/Platform.h
@@ -791,17 +791,17 @@ inline void fdb_probe_actor_exit(const char* name, unsigned long id, int index)
 #include <inttypes.h>
 static inline uint32_t hwCrc32cU8(unsigned int crc, unsigned char v) {
 	uint32_t ret;
-	asm volatile("crc32cb %w[r], %w[c], %w[v]" : [ r ] "=r"(ret) : [ c ] "r"(crc), [ v ] "r"(v));
+	asm volatile("crc32cb %w[r], %w[c], %w[v]" : [r] "=r"(ret) : [c] "r"(crc), [v] "r"(v));
 	return ret;
 }
 static inline uint32_t hwCrc32cU32(unsigned int crc, unsigned int v) {
 	uint32_t ret;
-	asm volatile("crc32cw %w[r], %w[c], %w[v]" : [ r ] "=r"(ret) : [ c ] "r"(crc), [ v ] "r"(v));
+	asm volatile("crc32cw %w[r], %w[c], %w[v]" : [r] "=r"(ret) : [c] "r"(crc), [v] "r"(v));
 	return ret;
 }
 static inline uint64_t hwCrc32cU64(uint64_t crc, uint64_t v) {
 	uint64_t ret;
-	asm volatile("crc32cx %w[r], %w[c], %x[v]" : [ r ] "=r"(ret) : [ c ] "r"(crc), [ v ] "r"(v));
+	asm volatile("crc32cx %w[r], %w[c], %x[v]" : [r] "=r"(ret) : [c] "r"(crc), [v] "r"(v));
 	return ret;
 }
 #else
diff --git a/flow/Profiler.actor.cpp b/flow/Profiler.actor.cpp
index 24bba877395..1275c5d4102 100644
--- a/flow/Profiler.actor.cpp
+++ b/flow/Profiler.actor.cpp
@@ -142,8 +142,6 @@ struct Profiler {
 	}
 
 	void signal_handler() { // async signal safe!
-		static std::atomic<bool> inSigHandler = false;
-		if (inSigHandler.exchange(true)) { return; }
 		if (profilingEnabled) {
 			double t = timer();
 			output_buffer->push(*(void**)&t);
@@ -152,7 +150,6 @@ struct Profiler {
 				output_buffer->push(addresses[i]);
 			output_buffer->push((void*)-1LL);
 		}
-		inSigHandler.store(false);
 	}
 
 	static void signal_handler_for_closure(int, siginfo_t* si, void*, void* self) { // async signal safe!
diff --git a/flow/WriteOnlySet.actor.cpp b/flow/WriteOnlySet.actor.cpp
deleted file mode 100644
index 4a2e60d542e..00000000000
--- a/flow/WriteOnlySet.actor.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * WriteOnlySet.actor.cpp
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "flow/DeterministicRandom.h"
-#include "flow/WriteOnlySet.h"
-#include "flow/flow.h"
-#include "flow/UnitTest.h"
-
-#include <chrono>
-#include <random>
-#include "flow/actorcompiler.h" // has to be last include
-
-template <class T, class IndexType, IndexType CAPACITY>
-auto WriteOnlySet<T, IndexType, CAPACITY>::insert(const Reference<T>& lineage) -> Index {
-	Index res;
-	if (!freeQueue.pop(res)) {
-		TraceEvent(SevWarnAlways, "NoCapacityInWriteOnlySet");
-		return npos;
-	}
-	ASSERT(_set[res].load() == 0);
-	auto ptr = reinterpret_cast<uintptr_t>(lineage.getPtr());
-	ASSERT((ptr % 2) == 0); // this needs to be at least 2-byte aligned
-	ASSERT(ptr != 0);
-	lineage->addref();
-	_set[res].store(ptr);
-	return res;
-}
-
-template <class T, class IndexType, IndexType CAPACITY>
-bool WriteOnlySet<T, IndexType, CAPACITY>::eraseImpl(Index idx) {
-	while (true) {
-		auto ptr = _set[idx].load();
-		if (ptr & LOCK) {
-			_set[idx].store(0);
-			freeList.push(reinterpret_cast<T*>(ptr ^ LOCK));
-			return false;
-		} else {
-			if (_set[idx].compare_exchange_strong(ptr, 0)) {
-				reinterpret_cast<T*>(ptr)->delref();
-				return true;
-			}
-		}
-	}
-}
-
-template <class T, class IndexType, IndexType CAPACITY>
-bool WriteOnlySet<T, IndexType, CAPACITY>::erase(Index idx) {
-	ASSERT(idx >= 0 && idx < CAPACITY);
-	auto res = eraseImpl(idx);
-	ASSERT(freeQueue.push(idx));
-	return res;
-}
-
-template <class T, class IndexType, IndexType CAPACITY>
-bool WriteOnlySet<T, IndexType, CAPACITY>::replace(Index idx, const Reference<T>& lineage) {
-	auto lineagePtr = reinterpret_cast<uintptr_t>(lineage.getPtr());
-	if (lineage.isValid()) {
-		lineage->addref();
-	}
-	ASSERT((lineagePtr % 2) == 0); // this needs to be at least 2-byte aligned
-
-	while (true) {
-		auto ptr = _set[idx].load();
-		if (ptr & LOCK) {
-			_set[idx].store(lineagePtr);
-			ASSERT(freeList.push(reinterpret_cast<T*>(ptr ^ LOCK)));
-			return false;
-		} else {
-			if (_set[idx].compare_exchange_strong(ptr, lineagePtr)) {
-				if (ptr) {
-					reinterpret_cast<T*>(ptr)->delref();
-				}
-				return ptr != 0;
-			}
-		}
-	}
-}
-
-template <class T, class IndexType, IndexType CAPACITY>
-WriteOnlySet<T, IndexType, CAPACITY>::WriteOnlySet() : _set(CAPACITY) {
-	// insert the free indexes in reverse order
-	for (unsigned i = CAPACITY; i > 0; --i) {
-		freeQueue.push(i - 1);
-		std::atomic_init(&_set[i - 1], uintptr_t(0));
-	}
-}
-
-template <class T, class IndexType, IndexType CAPACITY>
-std::vector<Reference<T>> WriteOnlySet<T, IndexType, CAPACITY>::copy() {
-	std::vector<Reference<T>> result;
-	for (int i = 0; i < CAPACITY; ++i) {
-		auto ptr = _set[i].load();
-		if (ptr) {
-			ASSERT((ptr & LOCK) == 0); // if we lock something we need to immediately unlock after we're done copying
-			// We attempt lock so this won't get deleted. We will try this only once, if the other thread removed the
-			// object from the set between the previews lines and now, we just won't make it part of the result.
-			if (_set[i].compare_exchange_strong(ptr, ptr | LOCK)) {
-				T* entry = reinterpret_cast<T*>(ptr);
-				ptr |= LOCK;
-				entry->addref();
-				// we try to unlock now. If this element was removed while we incremented the refcount, the element will
-				// end up in the freeList, so we will decrement later.
-				_set[i].compare_exchange_strong(ptr, ptr ^ LOCK);
-				result.push_back(Reference(entry));
-			}
-		}
-	}
-	// after we're done we need to clean up all objects that contented on a lock. This won't be perfect (as some thread
-	// might not yet added the object to the free list), but whatever we don't get now we'll clean up in the next
-	// iteration
-	freeList.consume_all([](auto toClean) { toClean->delref(); });
-	return result;
-}
-
-template <class T, class IndexType>
-WriteOnlyVariable<T, IndexType>::WriteOnlyVariable() : WriteOnlySet<T, IndexType, 1>() {}
-
-template <class T, class IndexType>
-Reference<T> WriteOnlyVariable<T, IndexType>::get() {
-	auto result = WriteOnlySet<T, IndexType, 1>::copy();
-	return result.size() ? result.at(0) : Reference<T>();
-}
-
-template <class T, class IndexType>
-bool WriteOnlyVariable<T, IndexType>::replace(const Reference<T>& element) {
-	return WriteOnlySet<T, IndexType, 1>::replace(0, element);
-}
-
-// Explicit instantiation
-template class WriteOnlySet<ActorLineage, unsigned, 1024>;
-template class WriteOnlyVariable<ActorLineage, unsigned>;
-
-// testing code
-namespace {
-
-// Some statistics
-std::atomic<unsigned long> instanceCounter = 0;
-std::atomic<unsigned long> numInserts = 0;
-std::atomic<unsigned long> numErase = 0;
-std::atomic<unsigned long> numLockedErase = 0;
-std::atomic<unsigned long> numCopied = 0;
-
-// A simple object that counts the number of its instances. This is used to detect memory leaks.
-struct TestObject {
-	mutable std::atomic<unsigned> _refCount = 1;
-	TestObject() { instanceCounter.fetch_add(1); }
-	void delref() const {
-		if (--_refCount == 0) {
-			delete this;
-			--instanceCounter;
-		}
-	}
-	void addref() const { ++_refCount; }
-};
-
-using TestSet = WriteOnlySet<TestObject, unsigned, 128>;
-using Clock = std::chrono::steady_clock;
-
-// An actor that can join a set of threads in an async way.
-ACTOR Future<Void> threadjoiner(std::shared_ptr<std::vector<std::thread>> threads, std::shared_ptr<TestSet> set) {
-	loop {
-		wait(delay(0.1));
-		for (unsigned i = 0;;) {
-			if (threads->size() == i) {
-				break;
-			}
-			auto& t = (*threads)[i];
-			if (t.joinable()) {
-				t.join();
-				if (i + 1 < threads->size()) {
-					std::swap(*threads->rbegin(), (*threads)[i]);
-				}
-				threads->pop_back();
-			} else {
-				++i;
-			}
-		}
-		if (threads->empty()) {
-			set->copy();
-			ASSERT(instanceCounter.load() == 0);
-			return Void();
-		}
-	}
-}
-
-// occasionally copy the contents of the past set.
-void testCopier(std::shared_ptr<TestSet> set, std::chrono::seconds runFor) {
-	auto start = Clock::now();
-	while (true) {
-		if (Clock::now() - start > runFor) {
-			return;
-		}
-		auto copy = set->copy();
-		numCopied.fetch_add(copy.size());
-		std::this_thread::sleep_for(std::chrono::milliseconds(10));
-	}
-}
-
-// In a loop adds and removes a set of objects to the set
-void writer(std::shared_ptr<TestSet> set, std::chrono::seconds runFor) {
-	auto start = Clock::now();
-	std::random_device rDev;
-	DeterministicRandom rnd(rDev());
-	while (true) {
-		unsigned inserts = 0, erases = 0;
-		if (Clock::now() - start > runFor) {
-			return;
-		}
-		std::vector<TestSet::Index> positions;
-		for (int i = 0; i < rnd.randomInt(1, 101); ++i) {
-			Reference<TestObject> o(new TestObject());
-			auto pos = set->insert(o);
-			if (pos == TestSet::npos) {
-				// could not insert -- ignore
-				break;
-			}
-			++inserts;
-			ASSERT(pos < TestSet::capacity);
-			positions.push_back(pos);
-		}
-		rnd.randomShuffle(positions);
-		for (auto p : positions) {
-			if (!set->erase(p)) {
-				++numLockedErase;
-			}
-			++erases;
-		}
-		numInserts.fetch_add(inserts);
-		numErase.fetch_add(erases);
-		ASSERT(inserts == erases);
-		std::this_thread::sleep_for(std::chrono::milliseconds(1));
-	}
-}
-
-// This unit test creates 5 writer threads and one copier thread.
-TEST_CASE("/flow/WriteOnlySet") {
-	if (g_network->isSimulated()) {
-		// This test is not deterministic, so we shouldn't run it in simulation
-		return Void();
-	}
-	auto set = std::make_shared<TestSet>();
-	auto threads = std::make_shared<std::vector<std::thread>>();
-	std::chrono::seconds runFor(10);
-	for (int i = 0; i < 5; ++i) {
-		threads->emplace_back([set, runFor]() { writer(set, runFor); });
-	}
-	threads->emplace_back([set, runFor]() { testCopier(set, runFor); });
-	wait(threadjoiner(threads, set));
-	TraceEvent("WriteOnlySetTestResult")
-	    .detail("Inserts", numInserts.load())
-	    .detail("Erases", numErase.load())
-	    .detail("Copies", numCopied.load())
-	    .detail("LockedErase", numLockedErase.load());
-	return Void();
-}
-} // namespace
diff --git a/flow/WriteOnlySet.h b/flow/WriteOnlySet.h
deleted file mode 100644
index 73da2bfac16..00000000000
--- a/flow/WriteOnlySet.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * WriteOnlySet.h
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#include "flow/Error.h"
-#include "flow/FastRef.h"
-#include "flow/Trace.h"
-#include <boost/lockfree/queue.hpp>
-
-/**
- * This is a Write-Only set that supports copying the whole content. This data structure is lock-free and allows a user
- * to insert and remove objects up to a given capacity (passed by a template).
- *
- * Template parameters:
- * \param T The type to store.
- * \param IndexType The type used as an index
- * \param CAPACITY The maximum number of object this structure can store (if a user tries to store more, insert will
- *                 fail gracefully)
- * \pre T implements `void addref() const` and `void delref() const`
- * \pre IndexType must have a copy constructor
- * \pre IndexType must have a trivial assignment operator
- * \pre IndexType must have a trivial destructor
- * \pre IndexType can be used as an index into a std::vector
- */
-template <class T, class IndexType, IndexType CAPACITY>
-class WriteOnlySet {
-public:
-	// The type we use for lookup into the set. Gets assigned during insert
-	using Index = IndexType;
-	// For now we use a fixed size capacity
-	constexpr static Index npos = std::numeric_limits<Index>::max();
-	constexpr static IndexType capacity = CAPACITY;
-
-	explicit WriteOnlySet();
-	WriteOnlySet(const WriteOnlySet&) = delete;
-	WriteOnlySet(WriteOnlySet&&) = delete;
-	WriteOnlySet& operator=(const WriteOnlySet&) = delete;
-	WriteOnlySet& operator=(WriteOnlySet&&) = delete;
-
-	/**
-	 * Attempts to insert \p lineage into the set. This method can fail if the set is full (its size is equal to its
-	 * capacity). Calling insert on a full set is safe but the method will return \ref npos if the operation fails.
-	 *
-	 * \param lineage A reference to the object the user wants to insert.
-	 * \ret An index that can later be used to erase the value again or \ref npos if the insert failed.
-	 * \pre lineage.getPtr() % 2 == 0 (the memory for lineage has to be at least 2 byte aligned)
-	 */
-	[[nodiscard]] Index insert(const Reference<T>& lineage);
-
-	/**
-	 * Erases the object associated with \p idx from the set.
-	 *
-	 * \ret Whether the reference count was decremented. Usually the return value is only interesting for testing and
-	 *      benchmarking purposes and will in most cases be ignored. If \ref delref wasn't called, it will be called
-	 *      later. Note that at the time the return value is checked, \ref delref might already have been called.
-	 */
-	bool erase(Index idx);
-
-	/**
-	 * Replaces the object associated with \p idx with \p lineage.
-	 *
-	 * \ret Whether the reference count of the replaced object was decremented. Usually the return value is only
-	 *      interesting for testing and benchmarking purposes and will in most cases be ignored. If \ref delref
-	 *      wasn't called, it will be called later. Note that at the time the return value is checked, \ref delref
-	 *      might already have been called.
-	 */
-	bool replace(Index idx, const Reference<T>& lineage);
-
-	/**
-	 * Copies all elements that are stored in the set into a vector. This copy operation does NOT provide a snapshot of
-	 * the data structure. The contract is weak:
-	 * - All object that were in the set before copy is called and weren't removed until after copy returned are
-	 *   guaranteed to be in the result.
-	 * - Any object that was inserted while copy is running might be in the result.
-	 * - Any object that was erased while copy is running might be in the result.
-	 */
-	std::vector<Reference<T>> copy();
-
-protected:
-	// the implementation of erase -- the wrapper just makes the function a bit more readable.
-	bool eraseImpl(Index idx);
-
-	// the last bit of a pointer within the set is used like a boolean and true means that the object is locked. Locking
-	// an object is only relevant for memory management. A locked pointer can still be erased from the set, but the
-	// erase won't call delref on the object. Instead it will push the pointer into the \ref freeList and copy will call
-	// delref later.
-	static constexpr uintptr_t LOCK = 0b1;
-
-	// The actual memory
-	std::vector<std::atomic<std::uintptr_t>> _set;
-	static_assert(std::atomic<Index>::is_always_lock_free, "Index type can't be used as a lock-free type");
-	static_assert(std::atomic<uintptr_t>::is_always_lock_free, "uintptr_t can't be used as a lock-free type");
-
-	// The freeQueue. On creation all indexes (0..capacity-1) are pushed into this queue. On insert one element from
-	// this queue is consumed and the resulting number is used as an index into the set. On erase the index is given
-	// back to the freeQueue.
-	boost::lockfree::queue<Index, boost::lockfree::fixed_sized<true>, boost::lockfree::capacity<CAPACITY>> freeQueue;
-
-	// The freeList is used for memory management. Generally copying a shared pointer can't be done in a lock-free way.
-	// Instead, when we copy the data structure we first copy the address, then attempt to set the last bit to 1 and
-	// only if that succeeds we will increment the reference count. Whenever we attempt to remove an object
-	// in \ref erase we remove the object from the set (using an atomic compare and swap) and only decrement the
-	// reference count if the last bit is 0. If it's not we'll push the pointer into this free list.
-	// \ref copy will consume all elements from this freeList each time it runs and decrements the refcount for each
-	// element.
-	boost::lockfree::queue<T*, boost::lockfree::fixed_sized<true>, boost::lockfree::capacity<CAPACITY>> freeList;
-};
-
-/**
- * Provides a thread safe, lock-free write only variable.
- *
- * Template parameters:
- * \param T The type to store.
- * \param IndexType The type used as an index
- * \pre T implements `void addref() const` and `void delref() const`
- * \pre IndexType must have a copy constructor
- * \pre IndexType must have a trivial assignment operator
- * \pre IndexType must have a trivial destructor
- * \pre IndexType can be used as an index into a std::vector
- */
-template <class T, class IndexType>
-class WriteOnlyVariable : private WriteOnlySet<T, IndexType, 1> {
-public:
-	explicit WriteOnlyVariable();
-
-	/**
-	 * Returns a copied reference to the stored variable.
-	 */
-	Reference<T> get();
-
-	/**
-	 * Replaces the variable with \p lineage. \p lineage is permitted to be an invalid pointer.
-	 *
-	 * \ret Whether the reference count of the replaced object was decremented. Note that if the reference being replaced
-	 *      is invalid, this function will always return false. If \ref delref wasn't called and the reference was valid,
-	 *      it will be called later. Note that at the time the return value is checked, \ref delref might already have
-	 *      been called.
-	 */
-	bool replace(const Reference<T>& element);
-};
-
-class ActorLineage;
-extern template class WriteOnlySet<ActorLineage, unsigned, 1024>;
-
-using ActorLineageSet = WriteOnlySet<ActorLineage, unsigned, 1024>;
diff --git a/flow/actorcompiler/ActorCompiler.cs b/flow/actorcompiler/ActorCompiler.cs
index 28771f45030..7aef82a42eb 100644
--- a/flow/actorcompiler/ActorCompiler.cs
+++ b/flow/actorcompiler/ActorCompiler.cs
@@ -452,7 +452,6 @@ public void Write(TextWriter writer)
                     fullClassName,
                     string.Join(", ", actor.parameters.Select(p => p.name).ToArray()));
 
-            writer.WriteLine("\trestore_lineage _;");
             if (actor.returnType != null)
                 writer.WriteLine("\treturn Future<{1}>({0});", newActor, actor.returnType);
             else
@@ -1287,7 +1286,6 @@ void WriteConstructor(Function body, TextWriter writer, string fullStateClassNam
             constructor.WriteLine("{");
             constructor.Indent(+1);
             ProbeEnter(constructor, actor.name);
-            constructor.WriteLine("currentLineage->modify(&StackLineage::actorName) = LiteralStringRef(\"{0}\");", actor.name);
             constructor.WriteLine("this->{0};", body.call());
             ProbeExit(constructor, actor.name);
             WriteFunction(writer, constructor, constructor.BodyText);
diff --git a/flow/actorcompiler/actorcompiler.csproj b/flow/actorcompiler/actorcompiler.csproj
index b5909136347..e737adabd28 100644
--- a/flow/actorcompiler/actorcompiler.csproj
+++ b/flow/actorcompiler/actorcompiler.csproj
@@ -1,8 +1,108 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <ProductVersion>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>actorcompiler</RootNamespace>
+    <AssemblyName>actorcompiler</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <OutputPath>$(SolutionDir)bin\$(Configuration)\</OutputPath>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>default</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>default</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="Microsoft.CSharp">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ActorCompiler.cs" />
+    <Compile Include="ActorParser.cs" />
+    <Compile Include="ParseTree.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Actor checklist.txt" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/flow/actorcompiler/actorcompiler.sln b/flow/actorcompiler/actorcompiler.sln
deleted file mode 100644
index a4292bfaaa3..00000000000
--- a/flow/actorcompiler/actorcompiler.sln
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "actorcompiler", "actorcompiler.csproj", "{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Debug|x64.Build.0 = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Debug|x86.Build.0 = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Release|x64.ActiveCfg = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Release|x64.Build.0 = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Release|x86.ActiveCfg = Debug|Any CPU
-		{0ECC1314-3FC2-458D-8E41-B50B4EA24E51}.Release|x86.Build.0 = Debug|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/flow/flow.cpp b/flow/flow.cpp
index ec65640fe2f..74f0b334f58 100644
--- a/flow/flow.cpp
+++ b/flow/flow.cpp
@@ -26,27 +26,6 @@
 #include <stdarg.h>
 #include <cinttypes>
 
-thread_local Reference<ActorLineage> currentLineage;
-WriteOnlyVariable<ActorLineage, unsigned> currentLineageThreadSafe;
-
-LineagePropertiesBase::~LineagePropertiesBase() {}
-
-ActorLineage::ActorLineage() : properties(), parent(currentLineage) {}
-
-ActorLineage::~ActorLineage() {
-	for (auto ptr : properties) {
-		delete ptr.second;
-	}
-}
-
-using namespace std::literals;
-
-const std::string_view StackLineage::name = "StackLineage"sv;
-
-std::vector<StringRef> getActorStackTrace() {
-	return currentLineage->stack(&StackLineage::actorName);
-}
-
 #if (defined(__linux__) || defined(__FreeBSD__)) && defined(__AVX__) && !defined(MEMORY_SANITIZER)
 // For benchmarking; need a version of rte_memcpy that doesn't live in the same compilation unit as the test.
 void* rte_memcpy_noinline(void* __restrict __dest, const void* __restrict __src, size_t __n) {
diff --git a/flow/flow.h b/flow/flow.h
index 8388113253b..987572d7c5b 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -20,8 +20,6 @@
 
 #ifndef FLOW_FLOW_H
 #define FLOW_FLOW_H
-#include "flow/Arena.h"
-#include "flow/FastRef.h"
 #pragma once
 
 #pragma warning(disable : 4244 4267) // SOMEDAY: Carefully check for integer overflow issues (e.g. size_t to int
@@ -31,18 +29,14 @@
 
 #include <vector>
 #include <queue>
-#include <stack>
 #include <map>
 #include <unordered_map>
 #include <set>
 #include <functional>
 #include <iostream>
 #include <string>
-#include <string_view>
 #include <utility>
 #include <algorithm>
-#include <memory>
-#include <mutex>
 
 #include "flow/Platform.h"
 #include "flow/FastAlloc.h"
@@ -52,7 +46,6 @@
 #include "flow/ThreadPrimitives.h"
 #include "flow/network.h"
 #include "flow/FileIdentifier.h"
-#include "flow/WriteOnlySet.h"
 
 #include <boost/version.hpp>
 
@@ -427,127 +420,6 @@ struct SingleCallback {
 	}
 };
 
-struct LineagePropertiesBase {
-	virtual ~LineagePropertiesBase();
-};
-
-// helper class to make implementation of LineageProperties easier
-template <class Derived>
-struct LineageProperties : LineagePropertiesBase {
-	// Contract:
-	//
-	// StringRef name = "SomeUniqueName"_str;
-
-	// this has to be implemented by subclasses
-	// but can't be made virtual.
-	// A user should implement this for any type
-	// within the properies class.
-	template <class Value>
-	bool isSet(Value Derived::*member) const {
-		return true;
-	}
-};
-
-struct ActorLineage : ThreadSafeReferenceCounted<ActorLineage> {
-	friend class LocalLineage;
-
-private:
-	std::unordered_map<std::string_view, LineagePropertiesBase*> properties;
-	Reference<ActorLineage> parent;
-	mutable std::mutex mutex;
-	using Lock = std::unique_lock<std::mutex>;
-
-public:
-	ActorLineage();
-	~ActorLineage();
-	bool isRoot() const {
-		Lock _{ mutex };
-		return parent.getPtr() == nullptr;
-	}
-	void makeRoot() {
-		Lock _{ mutex };
-		parent.clear();
-	}
-	template <class T, class V>
-	V& modify(V T::*member) {
-		Lock _{ mutex };
-		auto& res = properties[T::name];
-		if (!res) {
-			res = new T{};
-		}
-		T* map = static_cast<T*>(res);
-		return map->*member;
-	}
-	template <class T, class V>
-	std::optional<V> get(V T::*member) const {
-		Lock _{ mutex };
-		auto current = this;
-		while (current != nullptr) {
-			auto iter = current->properties.find(T::name);
-			if (iter != current->properties.end()) {
-				T const& map = static_cast<T const&>(*iter->second);
-				if (map.isSet(member)) {
-					return map.*member;
-				}
-			}
-			current = current->parent.getPtr();
-		}
-		return std::optional<V>{};
-	}
-	template <class T, class V>
-	std::vector<V> stack(V T::*member) const {
-		Lock _{ mutex };
-		auto current = this;
-		std::vector<V> res;
-		while (current != nullptr) {
-			auto iter = current->properties.find(T::name);
-			if (iter != current->properties.end()) {
-				T const& map = static_cast<T const&>(*iter->second);
-				if (map.isSet(member)) {
-					res.push_back(map.*member);
-				}
-			}
-			current = current->parent.getPtr();
-		}
-		return res;
-	}
-};
-
-extern thread_local Reference<ActorLineage> currentLineage;
-extern WriteOnlyVariable<ActorLineage, unsigned> currentLineageThreadSafe;
-
-// This class can be used in order to modify all lineage properties
-// of actors created within a (non-actor) scope
-struct LocalLineage {
-	Reference<ActorLineage> lineage = Reference<ActorLineage>{ new ActorLineage() };
-	Reference<ActorLineage> oldLineage;
-	LocalLineage() {
-		oldLineage = currentLineage;
-		currentLineage = lineage;
-		currentLineageThreadSafe.replace(lineage);
-	}
-	~LocalLineage() {
-		currentLineage = oldLineage;
-		currentLineageThreadSafe.replace(oldLineage);
-	}
-};
-
-struct restore_lineage {
-	Reference<ActorLineage> prev;
-	restore_lineage() : prev(currentLineage) {}
-	~restore_lineage() {
-		currentLineage = prev;
-		currentLineageThreadSafe.replace(prev);
-	}
-};
-
-struct StackLineage : LineageProperties<StackLineage> {
-	static const std::string_view name;
-	StringRef actorName;
-};
-
-extern std::vector<StringRef> getActorStackTrace();
-
 // SAV is short for Single Assignment Variable: It can be assigned for only once!
 template <class T>
 struct SAV : private Callback<T>, FastAllocated<SAV<T>> {
@@ -589,9 +461,8 @@ struct SAV : private Callback<T>, FastAllocated<SAV<T>> {
 		ASSERT(canBeSet());
 		new (&value_storage) T(std::forward<U>(value));
 		this->error_state = Error::fromCode(SET_ERROR_CODE);
-		while (Callback<T>::next != this) {
+		while (Callback<T>::next != this)
 			Callback<T>::next->fire(this->value());
-		}
 	}
 
 	void send(Never) {
@@ -602,9 +473,8 @@ struct SAV : private Callback<T>, FastAllocated<SAV<T>> {
 	void sendError(Error err) {
 		ASSERT(canBeSet() && int16_t(err.code()) > 0);
 		this->error_state = err;
-		while (Callback<T>::next != this) {
+		while (Callback<T>::next != this)
 			Callback<T>::next->error(err);
-		}
 	}
 
 	template <class U>
@@ -753,9 +623,8 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 			return;
 
 		this->error = err;
-		if (SingleCallback<T>::next != this) {
+		if (SingleCallback<T>::next != this)
 			SingleCallback<T>::next->error(err);
-		}
 	}
 
 	void addPromiseRef() { promises++; }
@@ -1123,73 +992,36 @@ static inline void destruct(T& t) {
 
 template <class ReturnValue>
 struct Actor : SAV<ReturnValue> {
-	Reference<ActorLineage> lineage = Reference<ActorLineage>{ new ActorLineage() };
 	int8_t actor_wait_state; // -1 means actor is cancelled; 0 means actor is not waiting; 1-N mean waiting in callback
 	                         // group #
 
-	Actor() : SAV<ReturnValue>(1, 1), actor_wait_state(0) {
-		/*++actorCount;*/
-		currentLineage = lineage;
-		currentLineageThreadSafe.replace(lineage);
+	Actor() : SAV<ReturnValue>(1, 1), actor_wait_state(0) { /*++actorCount;*/
 	}
 	//~Actor() { --actorCount; }
-
-	Reference<ActorLineage> setLineage() {
-		auto res = currentLineage;
-		currentLineage = lineage;
-		currentLineageThreadSafe.replace(lineage);
-		return res;
-	}
 };
 
 template <>
 struct Actor<void> {
 	// This specialization is for a void actor (one not returning a future, hence also uncancellable)
 
-	Reference<ActorLineage> lineage = Reference<ActorLineage>{ new ActorLineage() };
 	int8_t actor_wait_state; // 0 means actor is not waiting; 1-N mean waiting in callback group #
 
-	Actor() : actor_wait_state(0) {
-		/*++actorCount;*/
-		currentLineage = lineage;
-		currentLineageThreadSafe.replace(lineage);
+	Actor() : actor_wait_state(0) { /*++actorCount;*/
 	}
 	//~Actor() { --actorCount; }
-
-	Reference<ActorLineage> setLineage() {
-		auto res = currentLineage;
-		currentLineage = lineage;
-		currentLineageThreadSafe.replace(lineage);
-		return res;
-	}
 };
 
 template <class ActorType, int CallbackNumber, class ValueType>
 struct ActorCallback : Callback<ValueType> {
-	virtual void fire(ValueType const& value) override {
-		auto _ = static_cast<ActorType*>(this)->setLineage();
-		static_cast<ActorType*>(this)->a_callback_fire(this, value);
-	}
-	virtual void error(Error e) override {
-		auto _ = static_cast<ActorType*>(this)->setLineage();
-		static_cast<ActorType*>(this)->a_callback_error(this, e);
-	}
+	void fire(ValueType const& value) override { static_cast<ActorType*>(this)->a_callback_fire(this, value); }
+	void error(Error e) override { static_cast<ActorType*>(this)->a_callback_error(this, e); }
 };
 
 template <class ActorType, int CallbackNumber, class ValueType>
 struct ActorSingleCallback : SingleCallback<ValueType> {
-	void fire(ValueType const& value) override {
-		auto _ = static_cast<ActorType*>(this)->setLineage();
-		static_cast<ActorType*>(this)->a_callback_fire(this, value);
-	}
-	void fire(ValueType&& value) override {
-		auto _ = static_cast<ActorType*>(this)->setLineage();
-		static_cast<ActorType*>(this)->a_callback_fire(this, std::move(value));
-	}
-	void error(Error e) override {
-		auto _ = static_cast<ActorType*>(this)->setLineage();
-		static_cast<ActorType*>(this)->a_callback_error(this, e);
-	}
+	void fire(ValueType const& value) override { static_cast<ActorType*>(this)->a_callback_fire(this, value); }
+	void fire(ValueType&& value) override { static_cast<ActorType*>(this)->a_callback_fire(this, std::move(value)); }
+	void error(Error e) override { static_cast<ActorType*>(this)->a_callback_error(this, e); }
 };
 inline double now() {
 	return g_network->now();
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 8561bc623c8..46cdb6d73fd 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1547,10 +1547,6 @@ struct YieldedFutureActor : SAV<Void>, ActorCallback<YieldedFutureActor, 1, Void
 
 	void destroy() override { delete this; }
 
-	Reference<ActorLineage> setLineage() {
-		return currentLineage;
-	}
-
 	void a_callback_fire(ActorCallback<YieldedFutureActor, 1, Void>*, Void) {
 		if (int16_t(in_error_state.code()) == UNSET_ERROR_CODE) {
 			in_error_state = Error::fromCode(SET_ERROR_CODE);
diff --git a/flow/network.h b/flow/network.h
index e5683e4ca79..1eeb5bdc2d7 100644
--- a/flow/network.h
+++ b/flow/network.h
@@ -35,7 +35,6 @@
 #include "flow/Arena.h"
 #include "flow/IRandom.h"
 #include "flow/Trace.h"
-#include "flow/WriteOnlySet.h"
 
 enum class TaskPriority {
 	Max = 1000000,
@@ -560,9 +559,6 @@ class INetwork {
 	// returns false.
 	virtual bool checkRunnable() = 0;
 
-	// Returns the shared memory data structure used to store actor lineages.
-	virtual ActorLineageSet& getActorLineageSet() = 0;
-
 	virtual ProtocolVersion protocolVersion() = 0;
 
 	// Shorthand for transport().getLocalAddress()
diff --git a/flow/singleton.h b/flow/singleton.h
deleted file mode 100644
index c6a256ac42a..00000000000
--- a/flow/singleton.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * (C) Copyright 2015 ETH Zurich Systems Group (http://www.systems.ethz.ch/) and others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- *     Markus Pilman <mpilman@inf.ethz.ch>
- *     Simon Loesing <sloesing@inf.ethz.ch>
- *     Thomas Etter <etterth@gmail.com>
- *     Kevin Bocksrocker <kevin.bocksrocker@gmail.com>
- *     Lucas Braun <braunl@inf.ethz.ch>
- */
-#pragma once
-
-#include <mutex>
-#include <memory>
-#include <cstdlib>
-#include <cassert>
-
-namespace crossbow {
-
-/**
- * @brief A mock mutex for disabling locking in the singleton
- *
- * This class implements the mutex concept with empty methods.
- * This can be used to disable synchronization in the singleton
- * holder.
- */
-struct no_locking {
-	void lock() {}
-	void unlock() {}
-	bool try_lock() { return true; }
-};
-
-template <typename T>
-struct create_static {
-	static constexpr bool supports_recreation = false;
-	union max_align {
-		char t_[sizeof(T)];
-		short int short_int_;
-		long int long_int_;
-		float float_;
-		double double_;
-		long double longDouble_;
-		struct Test;
-		int Test::*pMember_;
-		int (Test::*pMemberFn_)(int);
-	};
-
-	static T* create() {
-		static max_align static_memory_;
-		return new (&static_memory_) T;
-	}
-
-	static void destroy(T* ptr) { ptr->~T(); }
-};
-
-template <typename T>
-struct create_using_new {
-	static constexpr bool supports_recreation = true;
-	static T* create() { return new T; };
-
-	static void destroy(T* ptr) { delete ptr; }
-};
-
-template <typename T>
-struct create_using_malloc {
-	static constexpr bool supports_recreation = true;
-	static T* create() {
-		void* p = std::malloc(sizeof(T));
-		if (!p)
-			return nullptr;
-		return new (p) T;
-	}
-
-	static void destroy(T* ptr) {
-		ptr->~T();
-		free(ptr);
-	}
-};
-
-template <class T, class allocator>
-struct create_using {
-	static constexpr bool supports_recreation = true;
-	static allocator alloc_;
-
-	static T* create() {
-		T* p = alloc_.allocate(1);
-		if (!p)
-			return nullptr;
-		alloc_.construct(p);
-		return p;
-	};
-
-	static void destroy(T* ptr) {
-		alloc_.destroy(ptr);
-		alloc_.deallocate(ptr, 1);
-	}
-};
-
-template <typename T>
-struct default_lifetime {
-	static void schedule_destruction(T*, void (*func)()) { std::atexit(func); }
-
-	static void on_dead_ref() { throw std::logic_error("Dead reference detected"); }
-};
-
-template <typename T>
-struct phoenix_lifetime {
-	static void schedule_destruction(T*, void (*func)()) { std::atexit(func); }
-
-	static void on_dead_ref() {}
-};
-
-template <typename T>
-struct infinite_lifetime {
-	static void schedule_destruction(T*, void (*)()) {}
-	static void on_dead_ref() {}
-};
-
-template <typename T>
-struct lifetime_traits {
-	static constexpr bool supports_recreation = true;
-};
-
-template <typename T>
-struct lifetime_traits<infinite_lifetime<T>> {
-	static constexpr bool supports_recreation = false;
-};
-
-template <typename T>
-struct lifetime_traits<default_lifetime<T>> {
-	static constexpr bool supports_recreation = false;
-};
-
-template <typename Type,
-          typename Create = create_static<Type>,
-          typename LifetimePolicy = default_lifetime<Type>,
-          typename Mutex = std::mutex>
-class singleton {
-public:
-	typedef Type value_type;
-	typedef Type* pointer;
-	typedef const Type* const_pointer;
-	typedef const Type& const_reference;
-	typedef Type& reference;
-
-private:
-	static bool destroyed_;
-	static pointer instance_;
-	static Mutex mutex_;
-
-	static void destroy() {
-		if (destroyed_)
-			return;
-		Create::destroy(instance_);
-		instance_ = nullptr;
-		destroyed_ = true;
-	}
-
-public:
-	static reference instance() {
-		static_assert(Create::supports_recreation || !lifetime_traits<LifetimePolicy>::supports_recreation,
-		              "The creation policy does not support instance recreation, while the lifetime does support it.");
-		if (!instance_) {
-			std::lock_guard<Mutex> l(mutex_);
-			if (!instance_) {
-				if (destroyed_) {
-					destroyed_ = false;
-					LifetimePolicy::on_dead_ref();
-				}
-				instance_ = Create::create();
-				LifetimePolicy::schedule_destruction(instance_, &destroy);
-			}
-		}
-		return *instance_;
-	}
-	/**
-	 * WARNING: DO NOT EXECUTE THIS MULTITHREADED!!!
-	 */
-	static void destroy_instance() {
-		if (instance_) {
-			std::lock_guard<Mutex> l(mutex_);
-			destroy();
-		}
-	}
-
-public:
-	pointer operator->() {
-		if (!instance_) {
-			instance();
-		}
-		return instance_;
-	}
-
-	reference operator*() {
-		if (!instance_) {
-			instance();
-		}
-		return *instance_;
-	}
-
-	const_pointer operator->() const {
-		if (!instance_) {
-			instance();
-		}
-		return instance_;
-	}
-
-	const_reference operator*() const {
-		if (!instance_) {
-			instance();
-		}
-		return *instance_;
-	}
-};
-
-template <typename T, typename C, typename L, typename M>
-bool singleton<T, C, L, M>::destroyed_ = false;
-
-template <typename T, typename C, typename L, typename M>
-typename singleton<T, C, L, M>::pointer singleton<T, C, L, M>::instance_ = nullptr;
-
-template <typename T, typename C, typename L, typename M>
-M singleton<T, C, L, M>::mutex_;
-
-} // namespace crossbow
\ No newline at end of file
diff --git a/tests/TestRunner/local_cluster.py b/tests/TestRunner/local_cluster.py
index 85f2094774e..68318d51ddd 100644
--- a/tests/TestRunner/local_cluster.py
+++ b/tests/TestRunner/local_cluster.py
@@ -38,7 +38,7 @@ class LocalCluster:
 command = {fdbserver_bin}
 public_address = auto:$ID
 listen_address = public
-datadir = {datadir}/$ID
+datadir = {datadir}
 logdir = {logdir}
 # logsize = 10MiB
 # maxlogssize = 100MiB

From c8d7087fb64ffaa7120f3ae49d52dbc9b0269cdb Mon Sep 17 00:00:00 2001
From: Russell Sears <russell_sears@apple.com>
Date: Wed, 12 May 2021 08:58:57 -0700
Subject: [PATCH 156/740] Merge pull request #4807 from Daniel-B-Smith/patch-1

Set connectionFile instead of creating a shadow
---
 fdbserver/fdbserver.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp
index ac75e879473..345bdb5fe04 100644
--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@@ -1536,7 +1536,7 @@ struct CLIOptions {
 					fprintf(stderr, "%s\n", ClusterConnectionString::getErrorString(connectionString, e).c_str());
 					throw;
 				}
-				auto connectionFile = makeReference<ClusterConnectionFile>(connFile, ccs);
+				connectionFile = makeReference<ClusterConnectionFile>(connFile, ccs);
 			} else {
 				std::pair<std::string, bool> resolvedClusterFile;
 				try {

From 50495ae486021750afde740e4ec140c9227ad52d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 14 May 2021 11:30:24 -0700
Subject: [PATCH 157/740] readThrough and more flags were not being set
 properly

---
 fdbclient/NativeAPI.actor.cpp | 64 +++++++++++++----------------------
 1 file changed, 23 insertions(+), 41 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 6e9aeacdc16..3c418dcfe95 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3352,16 +3352,29 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					if (info.debugID.present())
 						g_traceBatch.addEvent(
 						    "TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
-					RangeResult output(RangeResultRef(rep.data, true), rep.arena);
+					RangeResult output(RangeResultRef(rep.data, rep.more), rep.arena);
+
+					int64_t bytes = 0;
+					for (const KeyValueRef& kv : output) {
+						bytes += kv.key.size() + kv.value.size();
+					}
+
+					cx->transactionBytesRead += bytes;
+					cx->transactionKeysRead += output.size();
+
+					// FIXME: figure out appropriate metrics for the client event log
+					// if( trLogInfo ) {
+					//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime,
+					// cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
+					//}
 
-					bool more = rep.more;
 					// If the reply says there is more but we know that we finished the shard, then fix rep.more
-					if (reverse && more && rep.data.size() > 0 &&
+					if (reverse && output.more && rep.data.size() > 0 &&
 					    output[output.size() - 1].key == locations[shard].first.begin) {
-						more = false;
+						output.more = false;
 					}
 
-					if (more) {
+					if (output.more) {
 						if (!rep.data.size()) {
 							TraceEvent(SevError, "GetRangeStreamError")
 							    .detail("Reason", "More data indicated but no rows present")
@@ -3383,7 +3396,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 							    KeyRangeRef(keyAfter(output[output.size() - 1].key), locations[shard].first.end);
 					}
 
-					if (!more || locations[shard].first.empty()) {
+					if (!output.more || locations[shard].first.empty()) {
 						TEST(true); // getRangeStream (!more || locations[shard].first.empty())
 						const KeyRange& range = locations[shard].first;
 						if (shard == locations.size() - 1) {
@@ -3399,37 +3412,19 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 								}
 								output.arena().dependsOn(keys.arena());
 								output.readThrough = reverse ? keys.begin : keys.end;
-
-								int64_t bytes = 0;
-								for (const KeyValueRef& kv : output) {
-									bytes += kv.key.size() + kv.value.size();
-								}
-
-								cx->transactionBytesRead += bytes;
-								cx->transactionKeysRead += output.size();
-
-								// FIXME: figure out appropriate metrics for the client event log
-								// if( trLogInfo ) {
-								//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime,
-								//cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
-								//}
-
 								results->send(std::move(output));
 								results->finish();
 								return Void();
 							}
-
-							results->send(std::move(output));
 							keys = KeyRangeRef(begin, end);
 							breakAgain = true;
-							break;
 						} else {
-							output.arena().dependsOn(range.arena());
-							output.readThrough = reverse ? range.begin : range.end;
-							results->send(std::move(output));
 							++shard;
-							break;
 						}
+						output.arena().dependsOn(range.arena());
+						output.readThrough = reverse ? range.begin : range.end;
+						results->send(std::move(output));
+						break;
 					}
 
 					ASSERT(output.size());
@@ -3439,19 +3434,6 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					if (keys.end == allKeys.end && reverse) {
 						output.readThroughEnd = true;
 					}
-					int64_t bytes = 0;
-					for (const KeyValueRef& kv : output) {
-						bytes += kv.key.size() + kv.value.size();
-					}
-
-					cx->transactionBytesRead += bytes;
-					cx->transactionKeysRead += output.size();
-
-					// FIXME: figure out appropriate metrics for the client event log
-					// if( trLogInfo ) {
-					//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime, cx->clientLocality.dcId(),
-					// now()-startTime, bytes, begin.getKey(), end.getKey()));
-					//}
 					results->send(std::move(output));
 				}
 				if (breakAgain) {

From f800fb765f96b4eeb8f85f6456da2791608f1ab4 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Fri, 14 May 2021 11:12:47 -0700
Subject: [PATCH 158/740] Fix accounting for time spent in run loop after
 breaking due to yield

---
 flow/Net2.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index bb0b0325c60..c3b35f12032 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -1513,6 +1513,7 @@ void Net2::run() {
 			double newTaskBegin = timer_monotonic();
 			if (check_yield(TaskPriority::Max, tscNow)) {
 				checkForSlowTask(tscBegin, tscNow, newTaskBegin - taskBegin, currentTaskID);
+				taskBegin = newTaskBegin;	
 				FDB_TRACE_PROBE(run_loop_yield);
 				++countYields;
 				break;

From 544bc594067f04c21df493a993fda2d44b560fd2 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Fri, 14 May 2021 12:38:26 -0700
Subject: [PATCH 159/740] Add release note

---
 documentation/sphinx/source/release-notes/release-notes-630.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index f4b5c8aacbf..2057e7fcb2a 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -2,9 +2,11 @@
 Release Notes
 #############
 
+
 6.3.13
 ======
 * The multi-version client now requires at most two client connections with version 6.2 or larger, regardless of how many external clients are configured. Clients older than 6.2 will continue to create an additional connection each. `(PR #4667) <https://github.com/apple/foundationdb/pull/4667>`_
+* Fix an accounting error that could potentially result in inaccuracies in priority busyness metrics. `(PR #4824) <https://github.com/apple/foundationdb/pull/4824>`_
 
 6.3.12
 ======

From 68067cc7151912acb0d557dbcf5ba7150902d383 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sat, 15 May 2021 14:28:07 -0700
Subject: [PATCH 160/740] added rate limiting to fetch keys so that in
 saturation fetch keys will use at most 20% of the storage server's write
 bandwidth, but can go much faster if the process has the spare resources

---
 fdbclient/FDBTypes.h              |  3 ---
 fdbserver/Knobs.cpp               |  3 ++-
 fdbserver/Knobs.h                 |  1 +
 fdbserver/storageserver.actor.cpp | 30 ++++++++++++++++++++++--------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index 267aea38fb1..3c2be41bb3a 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -707,9 +707,6 @@ struct RangeResultRef : VectorRef<KeyValueRef> {
 		       " readToBegin:" + std::to_string(readToBegin) + " readThroughEnd:" + std::to_string(readThroughEnd);
 	}
 };
-using RangeResult = Standalone<RangeResultRef>;
-
-using RangeResult = Standalone<RangeResultRef>;
 
 template <>
 struct Traceable<RangeResultRef> : std::true_type {
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index 88b98a1b5d0..2b783c0d197 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -579,10 +579,11 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( BUGGIFY_LIMIT_BYTES,                                  1000 );
 	init( FETCH_BLOCK_BYTES,                                     2e6 );
 	init( FETCH_KEYS_PARALLELISM_BYTES,                          4e6 ); if( randomize && BUGGIFY ) FETCH_KEYS_PARALLELISM_BYTES = 3e6;
-	init( FETCH_KEYS_PARALLELISM,                                  1 );
+	init( FETCH_KEYS_PARALLELISM,                                  2 );
 	init( FETCH_KEYS_LOWER_PRIORITY,                               0 );
 	init( BUGGIFY_BLOCK_BYTES,                                 10000 );
 	init( STORAGE_COMMIT_BYTES,                             10000000 ); if( randomize && BUGGIFY ) STORAGE_COMMIT_BYTES = 2000000;
+	init( STORAGE_FETCH_BYTES,                               2500000 ); if( randomize && BUGGIFY ) STORAGE_FETCH_BYTES =  500000;
 	init( STORAGE_DURABILITY_LAG_REJECT_THRESHOLD,              0.25 );
 	init( STORAGE_DURABILITY_LAG_MIN_RATE,                       0.1 );
 	init( STORAGE_COMMIT_INTERVAL,                               0.5 ); if( randomize && BUGGIFY ) STORAGE_COMMIT_INTERVAL = 2.0;
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 8ca0e871842..0d70efd6bd1 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -512,6 +512,7 @@ class ServerKnobs : public Knobs {
 	double STORAGE_DURABILITY_LAG_REJECT_THRESHOLD;
 	double STORAGE_DURABILITY_LAG_MIN_RATE;
 	int STORAGE_COMMIT_BYTES;
+	int STORAGE_FETCH_BYTES;
 	double STORAGE_COMMIT_INTERVAL;
 	double UPDATE_SHARD_VERSION_INTERVAL;
 	int BYTE_SAMPLING_FACTOR;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 74000e4223f..4f7d5474e73 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -577,6 +577,8 @@ struct StorageServer {
 
 	FlowLock durableVersionLock;
 	FlowLock fetchKeysParallelismLock;
+	int64_t fetchKeysBytesBudget;
+	AsyncVar<bool> fetchKeysBudgetUsed;
 	vector<Promise<FetchInjectionInfo*>> readyFetchKeys;
 
 	int64_t instanceID;
@@ -729,7 +731,8 @@ struct StorageServer {
 	    db(db), actors(false), lastTLogVersion(0), lastVersionWithData(0), restoredVersion(0),
 	    rebootAfterDurableVersion(std::numeric_limits<Version>::max()), durableInProgress(Void()), versionLag(0),
 	    primaryLocality(tagLocalityInvalid), updateEagerReads(0), shardChangeCounter(0),
-	    fetchKeysParallelismLock(SERVER_KNOBS->FETCH_KEYS_PARALLELISM_BYTES), shuttingDown(false),
+	    fetchKeysParallelismLock(SERVER_KNOBS->FETCH_KEYS_PARALLELISM),
+	    fetchKeysBytesBudget(SERVER_KNOBS->STORAGE_FETCH_BYTES), fetchKeysBudgetUsed(false), shuttingDown(false),
 	    debug_inApplyUpdate(false), debug_lastValidateTime(0), watchBytes(0), numWatches(0), logProtocol(0),
 	    counters(this), tag(invalidTag), maxQueryQueue(0), thisServerID(ssi.id()),
 	    readQueueSizeMetric(LiteralStringRef("StorageServer.ReadQueueSize")), behind(false), versionBehind(false),
@@ -2760,15 +2763,18 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 			try {
 				loop {
 					TEST(true); // Fetching keys for transferred shard
+					while (data->fetchKeysBudgetUsed.get()) {
+						wait(data->fetchKeysBudgetUsed.onChange());
+					}
 					state RangeResult this_block = waitNext(results.getFuture());
 
-					int expectedSize =
+					state int expectedBlockSize =
 					    (int)this_block.expectedSize() + (8 - (int)sizeof(KeyValueRef)) * this_block.size();
 
 					TraceEvent(SevDebug, "FetchKeysBlock", data->thisServerID)
 					    .detail("FKID", interval.pairID)
 					    .detail("BlockRows", this_block.size())
-					    .detail("BlockBytes", expectedSize)
+					    .detail("BlockBytes", expectedBlockSize)
 					    .detail("KeyBegin", keys.begin)
 					    .detail("KeyEnd", keys.end)
 					    .detail("Last", this_block.size() ? this_block.end()[-1].key : std::string())
@@ -2778,8 +2784,8 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 					for (auto k = this_block.begin(); k != this_block.end(); ++k)
 						DEBUG_MUTATION("fetch", fetchVersion, MutationRef(MutationRef::SetValue, k->key, k->value));
 
-					metricReporter.addFetchedBytes(expectedSize);
-					data->counters.bytesFetched += expectedSize;
+					metricReporter.addFetchedBytes(expectedBlockSize);
+					data->counters.bytesFetched += expectedBlockSize;
 
 					// Write this_block to storage
 					state KeyValueRef* kvItr = this_block.begin();
@@ -2798,6 +2804,11 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 					nfk = this_block.readThrough.present() ? this_block.readThrough.get()
 					                                       : keyAfter(this_block.end()[-1].key);
 					this_block = RangeResult();
+
+					data->fetchKeysBytesBudget -= expectedBlockSize;
+					if (data->fetchKeysBytesBudget <= 0) {
+						data->fetchKeysBudgetUsed.set(true);
+					}
 				}
 			} catch (Error& e) {
 				if (e.code() != error_code_end_of_stream && e.code() != error_code_connection_failed &&
@@ -2876,8 +2887,8 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 		// being recovered. Instead we wait for the updateStorage loop to commit something (and consequently also what
 		// we have written)
 
-		wait(data->durableVersion.whenAtLeast(data->storageVersion() + 1));
 		holdingFKPL.release();
+		wait(data->durableVersion.whenAtLeast(data->storageVersion() + 1));
 
 		TraceEvent(SevDebug, "FKAfterFinalCommit", data->thisServerID)
 		    .detail("FKID", interval.pairID)
@@ -3785,8 +3796,11 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
 		data->durableVersionLock.release();
 
 		//TraceEvent("StorageServerDurable", data->thisServerID).detail("Version", newOldestVersion);
-
-		wait(durableDelay);
+		data->fetchKeysBytesBudget = SERVER_KNOBS->STORAGE_FETCH_BYTES;
+		data->fetchKeysBudgetUsed.set(false);
+		if (!data->fetchKeysBudgetUsed.get()) {
+			wait(durableDelay || data->fetchKeysBudgetUsed.onChange());
+		}
 	}
 }
 

From 16f63f59b9314fc366e96aed4b57088981a8b496 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sat, 15 May 2021 15:05:32 -0700
Subject: [PATCH 161/740] avoid choosing failed endpoints for replyStreams

---
 fdbclient/NativeAPI.actor.cpp | 68 +++++++++++++++++++++++++++++++++--
 1 file changed, 65 insertions(+), 3 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 3c418dcfe95..4a9fc208a46 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3324,11 +3324,73 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					return Void();
 				}
 
-				// FIXME: add load balancing
+				state int useIdx = -1;
+
+				loop {
+					int count = 0;
+					for (int i = 0; i < locations[shard].second->size(); i++) {
+						if (!IFailureMonitor::failureMonitor()
+						         .getState(locations[shard]
+						                       .second->get(i, &StorageServerInterface::getKeyValuesStream)
+						                       .getEndpoint())
+						         .failed) {
+							if (deterministicRandom()->random01() <= 1.0 / ++count) {
+								useIdx = i;
+							}
+						}
+					}
+
+					if (useIdx >= 0) {
+						break;
+					}
+
+					vector<Future<Void>> ok(locations[shard].second->size());
+					for (int i = 0; i < ok.size(); i++) {
+						ok[i] = IFailureMonitor::failureMonitor().onStateEqual(
+						    locations[shard].second->get(i, &StorageServerInterface::getKeyValuesStream).getEndpoint(),
+						    FailureStatus(false));
+					}
+
+					if (now() - g_network->networkInfo.newestAlternativesFailure >
+					    FLOW_KNOBS->ALTERNATIVES_FAILURE_RESET_TIME) {
+						g_network->networkInfo.oldestAlternativesFailure = now();
+					}
+
+					double delay = FLOW_KNOBS->ALTERNATIVES_FAILURE_MIN_DELAY;
+					if (now() - g_network->networkInfo.lastAlternativesFailureSkipDelay >
+					    FLOW_KNOBS->ALTERNATIVES_FAILURE_SKIP_DELAY) {
+						g_network->networkInfo.lastAlternativesFailureSkipDelay = now();
+					} else {
+						double elapsed = now() - g_network->networkInfo.oldestAlternativesFailure;
+						delay = std::max(delay,
+						                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_DELAY_RATIO,
+						                          FLOW_KNOBS->ALTERNATIVES_FAILURE_MAX_DELAY));
+						delay = std::max(delay,
+						                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_DELAY_RATIO,
+						                          FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_MAX_DELAY));
+					}
+
+					// Making this SevWarn means a lot of clutter
+					if (now() - g_network->networkInfo.newestAlternativesFailure > 1 ||
+					    deterministicRandom()->random01() < 0.01) {
+						TraceEvent("AllAlternativesFailed")
+						    .detail("Interval", FLOW_KNOBS->CACHE_REFRESH_INTERVAL_WHEN_ALL_ALTERNATIVES_FAILED)
+						    .detail("Alternatives", locations[shard].second->description())
+						    .detail("Delay", delay);
+					}
+
+					g_network->networkInfo.newestAlternativesFailure = now();
+
+					choose {
+						when(wait(quorum(ok, 1))) {}
+						when(wait(::delayJittered(delay))) { throw all_alternatives_failed(); }
+					}
+				}
+
 				state ReplyPromiseStream<GetKeyValuesStreamReply> replyStream =
 				    locations[shard]
-				        .second->getInterface(deterministicRandom()->randomInt(0, locations[shard].second->size()))
-				        .getKeyValuesStream.getReplyStream(req);
+				        .second->get(useIdx, &StorageServerInterface::getKeyValuesStream)
+				        .getReplyStream(req);
 				state bool breakAgain = false;
 				loop {
 					try {

From b31fa9188d13654b89ac60446a2ed9f121f6396f Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sat, 15 May 2021 15:10:06 -0700
Subject: [PATCH 162/740] added comments and code cleanup

---
 fdbrpc/fdbrpc.h | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 5d5ee2f83b1..386dc238177 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -379,6 +379,9 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 template <class T>
 class ReplyPromiseStream {
 public:
+	// The endpoints of a ReplyPromiseStream must be initialized at Task::ReadSocket, because with lower priorities a
+	// delay(0) in FlowTransport deliver can cause out of order delivery.
+
 	// stream.send( request )
 	//   Unreliable at most once delivery: Delivers request unless there is a connection failure (zero or one times)
 
@@ -654,23 +657,6 @@ class RequestStream {
 	//   end_of_stream error. If the connection is ever broken the remote endpoint will stop attempting to send replies.
 	//   The caller sends acknowledgements to the remote endpoint so that at most 2MB of replies is ever inflight.
 
-	template <class X>
-	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value, TaskPriority taskID) const {
-		setReplyPriority(value, taskID);
-		if (queue->isRemoteEndpoint()) {
-			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint(taskID));
-			auto& p = getReplyPromiseStream(value);
-			Reference<Peer> peer =
-			    FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(taskID), true);
-			// FIXME: defer sending the message until we know the connection is established
-			endStreamOnDisconnect(disc, p, getEndpoint(taskID), peer);
-			return p;
-		}
-		send(value);
-		auto& p = getReplyPromiseStream(value);
-		return p;
-	}
-
 	template <class X>
 	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value) const {
 		if (queue->isRemoteEndpoint()) {

From fd24d0a92e857f20ca0c7d0a55e7e29afdc01e18 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sat, 15 May 2021 15:14:23 -0700
Subject: [PATCH 163/740] if the locations keyrange is empty, we cannot have
 anymore data, it is possible this could be made into an assert

---
 fdbclient/NativeAPI.actor.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 4a9fc208a46..05294d5256a 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3458,8 +3458,11 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 							    KeyRangeRef(keyAfter(output[output.size() - 1].key), locations[shard].first.end);
 					}
 
-					if (!output.more || locations[shard].first.empty()) {
-						TEST(true); // getRangeStream (!more || locations[shard].first.empty())
+					if (locations[shard].first.empty()) {
+						output.more = false;
+					}
+
+					if (!output.more) {
 						const KeyRange& range = locations[shard].first;
 						if (shard == locations.size() - 1) {
 							KeyRef begin = reverse ? keys.begin : range.end;

From 4a9afc832872e1dcbd5beda4c3e710a3f0101a79 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sat, 15 May 2021 15:18:41 -0700
Subject: [PATCH 164/740] updated out of date trace events and removed unneeded
 code

---
 fdbserver/storageserver.actor.cpp | 41 +++++++------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 4f7d5474e73..54c3844f027 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1982,7 +1982,8 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 
 	try {
 		if (req.debugID.present())
-			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Before");
+			g_traceBatch.addEvent(
+			    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValuesStream.Before");
 		state Version version = wait(waitForVersion(data, req.version, span.context));
 
 		state uint64_t changeCounter = data->shardChangeCounter;
@@ -1991,7 +1992,7 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 
 		if (req.debugID.present())
 			g_traceBatch.addEvent(
-			    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterVersion");
+			    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValuesStream.AfterVersion");
 		//.detail("ShardBegin", shard.begin).detail("ShardEnd", shard.end);
 		//} catch (Error& e) { TraceEvent("WrongShardServer", data->thisServerID).detail("Begin",
 		//req.begin.toString()).detail("End", req.end.toString()).detail("Version", version).detail("Shard",
@@ -2016,7 +2017,7 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 		state Key end = wait(fEnd);
 		if (req.debugID.present())
 			g_traceBatch.addEvent(
-			    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterKeys");
+			    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValuesStream.AfterKeys");
 		//.detail("Off1",offset1).detail("Off2",offset2).detail("ReqBegin",req.begin.getKey()).detail("ReqEnd",req.end.getKey());
 
 		// Offsets of zero indicate begin/end keys in this shard, which obviously means we can answer the query
@@ -2035,7 +2036,8 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 
 		if (begin >= end) {
 			if (req.debugID.present())
-				g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Send");
+				g_traceBatch.addEvent(
+				    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValuesStream.Send");
 			//.detail("Begin",begin).detail("End",end);
 
 			GetKeyValuesStreamReply none;
@@ -2061,8 +2063,9 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 				GetKeyValuesStreamReply r(_r);
 
 				if (req.debugID.present())
-					g_traceBatch.addEvent(
-					    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");
+					g_traceBatch.addEvent("TransactionDebug",
+					                      req.debugID.get().first(),
+					                      "storageserver.getKeyValuesStream.AfterReadRange");
 				//.detail("Begin",begin).detail("End",end).detail("SizeOf",r.data.size());
 				data->checkChangeCounter(
 				    changeCounter,
@@ -2118,19 +2121,6 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 				}
 
 				data->transactionTagCounter.addRequest(req.tags, resultSize);
-
-				// FIXME: figure out what to do with latency measurements
-				// double duration = g_network->timer() - req.requestTime();
-				// data->counters.readLatencySample.addMeasurement(duration);
-				// if(data->latencyBandConfig.present()) {
-				//	int maxReadBytes =
-				//data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max()); 	int
-				//maxSelectorOffset =
-				//data->latencyBandConfig.get().readConfig.maxKeySelectorOffset.orDefault(std::numeric_limits<int>::max());
-				//	data->counters.readLatencyBands.addMeasurement(
-				//		duration, resultSize > maxReadBytes || abs(req.begin.offset) > maxSelectorOffset ||
-				//										abs(req.end.offset) > maxSelectorOffset);
-				//}
 			}
 		}
 	} catch (Error& e) {
@@ -2145,19 +2135,6 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 	++data->counters.finishedQueries;
 	--data->readQueueSizeMetric;
 
-	// FIXME: figure out what to do with latency measurements
-	// double duration = g_network->timer() - req.requestTime();
-	// data->counters.readLatencySample.addMeasurement(duration);
-	// if(data->latencyBandConfig.present()) {
-	//	int maxReadBytes =
-	//data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max()); 	int
-	//maxSelectorOffset =
-	//data->latencyBandConfig.get().readConfig.maxKeySelectorOffset.orDefault(std::numeric_limits<int>::max());
-	//	data->counters.readLatencyBands.addMeasurement(
-	//		duration, resultSize > maxReadBytes || abs(req.begin.offset) > maxSelectorOffset ||
-	//										abs(req.end.offset) > maxSelectorOffset);
-	//}
-
 	return Void();
 }
 

From 38054f195229801d00704e323880127e2ad409d7 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Sun, 16 May 2021 21:57:22 -0700
Subject: [PATCH 165/740] ReplyPromiseStream did not send broken_promise errors
 when destroyed before sending an error

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 fdbrpc/fdbrpc.h               | 9 ++++++++-
 fdbserver/worker.actor.cpp    | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index d9af95b57eb..d9f187c2405 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3491,7 +3491,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					throw;
 				}
 				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed ||
-				    e.code() == error_code_connection_failed) {
+				    e.code() == error_code_connection_failed || e.code() == error_code_broken_promise) {
 					const KeyRangeRef& range = locations[shard].first;
 
 					if (reverse)
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 386dc238177..b77b60b79e1 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -311,6 +311,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 
 	AcknowledgementReceiver acknowledgements;
 	Endpoint requestStreamEndpoint;
+	bool sentError = false;
 
 	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
@@ -371,6 +372,11 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 			    acknowledgements.getEndpoint(TaskPriority::ReadSocket),
 			    false);
 		}
+		if (isRemoteEndpoint() && !sentError) {
+			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(broken_promise()),
+			                                          getEndpoint(TaskPriority::ReadSocket),
+			                                          false);
+		}
 	}
 
 	bool isStream() const override { return true; }
@@ -407,7 +413,8 @@ class ReplyPromiseStream {
 
 	template <class E>
 	void sendError(const E& exc) const {
-		if (queue->isRemoteEndpoint()) {
+		if (queue->isRemoteEndpoint() && !queue->sentError) {
+			queue->sentError = true;
 			FlowTransport::transport().sendUnreliable(
 			    SerializeSource<ErrorOr<EnsureTable<T>>>(exc), getEndpoint(), false);
 		} else {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 5a568fc96dd..fcedd302297 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -767,6 +767,7 @@ ACTOR Future<Void> storageServerRollbackRebooter(Future<Void> prevStorageServer,
 		DUMPTOKEN(recruited.getQueuingMetrics);
 		DUMPTOKEN(recruited.getKeyValueStoreType);
 		DUMPTOKEN(recruited.watchValue);
+		DUMPTOKEN(recruited.getKeyValuesStream);
 
 		prevStorageServer =
 		    storageServer(store, recruited, db, folder, Promise<Void>(), Reference<ClusterConnectionFile>(nullptr));
@@ -1115,6 +1116,7 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				DUMPTOKEN(recruited.getQueuingMetrics);
 				DUMPTOKEN(recruited.getKeyValueStoreType);
 				DUMPTOKEN(recruited.watchValue);
+				DUMPTOKEN(recruited.getKeyValuesStream);
 
 				Promise<Void> recovery;
 				Future<Void> f = storageServer(kv, recruited, dbInfo, folder, recovery, connFile);
@@ -1504,6 +1506,7 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 					DUMPTOKEN(recruited.getQueuingMetrics);
 					DUMPTOKEN(recruited.getKeyValueStoreType);
 					DUMPTOKEN(recruited.watchValue);
+					DUMPTOKEN(recruited.getKeyValuesStream);
 					// printf("Recruited as storageServer\n");
 
 					std::string filename =

From bd700033efcfea3c4f592bfbb6e11a93b5fc5946 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 17 May 2021 10:56:49 -0700
Subject: [PATCH 166/740] do not send broken_promise if the connection failed

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index b77b60b79e1..0c2439d59b4 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -372,7 +372,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 			    acknowledgements.getEndpoint(TaskPriority::ReadSocket),
 			    false);
 		}
-		if (isRemoteEndpoint() && !sentError) {
+		if (isRemoteEndpoint() && !sentError && !acknowledgements.failures.isReady()) {
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(broken_promise()),
 			                                          getEndpoint(TaskPriority::ReadSocket),
 			                                          false);

From 8793aafe0439704ef07b6c18dab12a1a882f5a48 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 18 May 2021 13:23:55 -0700
Subject: [PATCH 167/740] prevent range streams from holding too much memory in
 unconsumed promise streams

---
 documentation/tutorial/tutorial.actor.cpp    |   2 +-
 fdbclient/NativeAPI.actor.cpp                |  39 +-----
 fdbclient/NativeAPI.actor.h                  |   8 +-
 fdbclient/ParallelStream.actor.cpp           |  23 ++--
 fdbclient/ParallelStream.actor.h             |   8 +-
 fdbrpc/FlowTransport.actor.cpp               |  27 ++++
 fdbrpc/FlowTransport.h                       |   2 +
 fdbrpc/LoadBalance.actor.h                   |  36 +----
 fdbserver/storageserver.actor.cpp            |   2 +-
 fdbserver/workloads/GetRangeStream.actor.cpp |   2 +-
 flow/flow.h                                  | 131 ++++++++++++++++++-
 flow/genericactors.actor.h                   |   2 +-
 12 files changed, 198 insertions(+), 84 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index 50d6fbb7ac7..81de2d45e03 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -416,7 +416,7 @@ ACTOR Future<Void> fdbClientStream() {
 	state int64_t bytes = 0;
 	state Future<Void> logFuture = logThroughput(&bytes, &next);
 	loop {
-		state PromiseStream<Standalone<RangeResultRef>> results;
+		state BoundedPromiseStream<Standalone<RangeResultRef>> results;
 		try {
 			state Future<Void> stream = tx.getRangeStream(results,
 			                                              KeySelector(firstGreaterOrEqual(next), next.arena()),
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index d9f187c2405..74a468f0d6a 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3333,40 +3333,14 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 						    FailureStatus(false));
 					}
 
-					if (now() - g_network->networkInfo.newestAlternativesFailure >
-					    FLOW_KNOBS->ALTERNATIVES_FAILURE_RESET_TIME) {
-						g_network->networkInfo.oldestAlternativesFailure = now();
-					}
-
-					double delay = FLOW_KNOBS->ALTERNATIVES_FAILURE_MIN_DELAY;
-					if (now() - g_network->networkInfo.lastAlternativesFailureSkipDelay >
-					    FLOW_KNOBS->ALTERNATIVES_FAILURE_SKIP_DELAY) {
-						g_network->networkInfo.lastAlternativesFailureSkipDelay = now();
-					} else {
-						double elapsed = now() - g_network->networkInfo.oldestAlternativesFailure;
-						delay = std::max(delay,
-						                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_DELAY_RATIO,
-						                          FLOW_KNOBS->ALTERNATIVES_FAILURE_MAX_DELAY));
-						delay = std::max(delay,
-						                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_DELAY_RATIO,
-						                          FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_MAX_DELAY));
-					}
-
 					// Making this SevWarn means a lot of clutter
 					if (now() - g_network->networkInfo.newestAlternativesFailure > 1 ||
 					    deterministicRandom()->random01() < 0.01) {
 						TraceEvent("AllAlternativesFailed")
-						    .detail("Interval", FLOW_KNOBS->CACHE_REFRESH_INTERVAL_WHEN_ALL_ALTERNATIVES_FAILED)
-						    .detail("Alternatives", locations[shard].second->description())
-						    .detail("Delay", delay);
+						    .detail("Alternatives", locations[shard].second->description());
 					}
 
-					g_network->networkInfo.newestAlternativesFailure = now();
-
-					choose {
-						when(wait(quorum(ok, 1))) {}
-						when(wait(::delayJittered(delay))) { throw all_alternatives_failed(); }
-					}
+					wait(allAlternativesFailedDelay(quorum(ok, 1)));
 				}
 
 				state ReplyPromiseStream<GetKeyValuesStreamReply> replyStream =
@@ -3375,6 +3349,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 				        .getReplyStream(req);
 				state bool breakAgain = false;
 				loop {
+					wait(results->onReady());
 					try {
 						choose {
 							when(wait(cx->connectionFileChanged())) {
@@ -3491,7 +3466,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					throw;
 				}
 				if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed ||
-				    e.code() == error_code_connection_failed || e.code() == error_code_broken_promise) {
+				    e.code() == error_code_connection_failed) {
 					const KeyRangeRef& range = locations[shard].first;
 
 					if (reverse)
@@ -3517,7 +3492,7 @@ static KeyRange intersect(KeyRangeRef lhs, KeyRangeRef rhs) {
 	return KeyRange(KeyRangeRef(std::max(lhs.begin, rhs.begin), std::min(lhs.end, rhs.end)));
 }
 
-ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results,
+ACTOR Future<Void> getRangeStream(BoundedPromiseStream<RangeResult> _results,
                                   Database cx,
                                   Reference<TransactionLogInfo> trLogInfo,
                                   Future<Version> fVersion,
@@ -3960,7 +3935,7 @@ Future<RangeResult> Transaction::getRange(const KeySelector& begin,
 	return getRange(begin, end, GetRangeLimits(limit), snapshot, reverse);
 }
 
-Future<Void> Transaction::getRangeStream(const PromiseStream<RangeResult>& results,
+Future<Void> Transaction::getRangeStream(const BoundedPromiseStream<RangeResult>& results,
                                          const KeySelector& begin,
                                          const KeySelector& end,
                                          GetRangeLimits limits,
@@ -4019,7 +3994,7 @@ Future<Void> Transaction::getRangeStream(const PromiseStream<RangeResult>& resul
 	                     results);
 }
 
-Future<Void> Transaction::getRangeStream(const PromiseStream<RangeResult>& results,
+Future<Void> Transaction::getRangeStream(const BoundedPromiseStream<RangeResult>& results,
                                          const KeySelector& begin,
                                          const KeySelector& end,
                                          int limit,
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 10ce0180b15..3a9cc80e7fe 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -283,19 +283,19 @@ class Transaction : NonCopyable {
 		                reverse);
 	}
 
-	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+	[[nodiscard]] Future<Void> getRangeStream(const BoundedPromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeySelector& begin,
 	                                          const KeySelector& end,
 	                                          int limit,
 	                                          bool snapshot = false,
 	                                          bool reverse = false);
-	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+	[[nodiscard]] Future<Void> getRangeStream(const BoundedPromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeySelector& begin,
 	                                          const KeySelector& end,
 	                                          GetRangeLimits limits,
 	                                          bool snapshot = false,
 	                                          bool reverse = false);
-	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+	[[nodiscard]] Future<Void> getRangeStream(const BoundedPromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeyRange& keys,
 	                                          int limit,
 	                                          bool snapshot = false,
@@ -307,7 +307,7 @@ class Transaction : NonCopyable {
 		                      snapshot,
 		                      reverse);
 	}
-	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
+	[[nodiscard]] Future<Void> getRangeStream(const BoundedPromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeyRange& keys,
 	                                          GetRangeLimits limits,
 	                                          bool snapshot = false,
diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index e8372b39fa2..c7be45102f1 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -26,7 +26,14 @@
 
 namespace ParallelStreamTest {
 
-ACTOR static Future<Void> produce(ParallelStream<int>::Fragment* fragment, int value) {
+struct TestValue {
+	int x;
+	TestValue(int x) : x(x) {}
+	int expectedSize() const { return sizeof(int); }
+};
+
+ACTOR static Future<Void> produce(ParallelStream<ParallelStreamTest::TestValue>::Fragment* fragment,
+                                  ParallelStreamTest::TestValue value) {
 	wait(delay(deterministicRandom()->random01()));
 	fragment->send(value);
 	wait(delay(deterministicRandom()->random01()));
@@ -34,12 +41,12 @@ ACTOR static Future<Void> produce(ParallelStream<int>::Fragment* fragment, int v
 	return Void();
 }
 
-ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
+ACTOR static Future<Void> consume(FutureStream<ParallelStreamTest::TestValue> stream, int expected) {
 	state int next;
 	try {
 		loop {
-			int value = waitNext(stream);
-			ASSERT(value == next++);
+			ParallelStreamTest::TestValue value = waitNext(stream);
+			ASSERT(value.x == next++);
 		}
 	} catch (Error& e) {
 		ASSERT(e.code() == error_code_end_of_stream);
@@ -51,11 +58,11 @@ ACTOR static Future<Void> consume(FutureStream<int> stream, int expected) {
 } // namespace ParallelStreamTest
 
 TEST_CASE("/fdbclient/ParallelStream") {
-	state PromiseStream<int> results;
+	state BoundedPromiseStream<ParallelStreamTest::TestValue> results;
 	state size_t concurrency = deterministicRandom()->randomInt(1, 11);
 	state size_t bufferLimit = concurrency + deterministicRandom()->randomInt(0, 11);
 	state size_t numProducers = deterministicRandom()->randomInt(1, 1001);
-	state ParallelStream<int> parallelStream(results, concurrency, bufferLimit);
+	state ParallelStream<ParallelStreamTest::TestValue> parallelStream(results, concurrency, bufferLimit);
 	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), numProducers);
 	state std::vector<Future<Void>> producers;
 	TraceEvent("StartingParallelStreamTest")
@@ -64,8 +71,8 @@ TEST_CASE("/fdbclient/ParallelStream") {
 	    .detail("NumProducers", numProducers);
 	state int i = 0;
 	for (; i < numProducers; ++i) {
-		ParallelStream<int>::Fragment* fragment = wait(parallelStream.createFragment());
-		producers.push_back(ParallelStreamTest::produce(fragment, i));
+		ParallelStream<ParallelStreamTest::TestValue>::Fragment* fragment = wait(parallelStream.createFragment());
+		producers.push_back(ParallelStreamTest::produce(fragment, ParallelStreamTest::TestValue(i)));
 	}
 	wait(parallelStream.finish());
 	wait(consumer);
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index d4562749da9..74aac4398d2 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -41,7 +41,7 @@ class ParallelStream {
 public:
 	class Fragment : public ReferenceCounted<Fragment> {
 		ParallelStream* parallelStream;
-		PromiseStream<T> stream;
+		BoundedPromiseStream<T> stream;
 		BoundedFlowLock::Releaser releaser;
 		friend class ParallelStream;
 
@@ -57,12 +57,13 @@ class ParallelStream {
 			releaser.release(); // Release before destruction to free up pending fragments
 			stream.sendError(end_of_stream());
 		}
+		Future<Void> onReady() { return stream.onReady(); }
 	};
 
 private:
 	PromiseStream<Reference<Fragment>> fragments;
 	size_t fragmentsProcessed{ 0 };
-	PromiseStream<T> results;
+	BoundedPromiseStream<T> results;
 	Future<Void> flusher;
 
 public:
@@ -74,6 +75,7 @@ class ParallelStream {
 				state Reference<Fragment> fragment = waitNext(self->fragments.getFuture());
 				loop {
 					try {
+						wait(self->results.onReady());
 						T value = waitNext(fragment->stream.getFuture());
 						self->results.send(value);
 						if (++messagesSinceYield == messagesBetweenYields) {
@@ -99,7 +101,7 @@ class ParallelStream {
 		}
 	}
 
-	ParallelStream(PromiseStream<T> results, size_t concurrency, size_t bufferLimit)
+	ParallelStream(BoundedPromiseStream<T> results, size_t concurrency, size_t bufferLimit)
 	  : results(results), semaphore(concurrency, bufferLimit) {
 		flusher = flushToClient(this);
 	}
diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 83a9f00c6c7..f628652eb0b 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1714,3 +1714,30 @@ void FlowTransport::createInstance(bool isClient, uint64_t transportId) {
 HealthMonitor* FlowTransport::healthMonitor() {
 	return &self->healthMonitor;
 }
+
+ACTOR Future<Void> allAlternativesFailedDelay(Future<Void> okFuture) {
+	if (now() - g_network->networkInfo.newestAlternativesFailure > FLOW_KNOBS->ALTERNATIVES_FAILURE_RESET_TIME) {
+		g_network->networkInfo.oldestAlternativesFailure = now();
+	}
+
+	double delay = FLOW_KNOBS->ALTERNATIVES_FAILURE_MIN_DELAY;
+	if (now() - g_network->networkInfo.lastAlternativesFailureSkipDelay > FLOW_KNOBS->ALTERNATIVES_FAILURE_SKIP_DELAY) {
+		g_network->networkInfo.lastAlternativesFailureSkipDelay = now();
+	} else {
+		double elapsed = now() - g_network->networkInfo.oldestAlternativesFailure;
+		delay = std::max(delay,
+		                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_DELAY_RATIO,
+		                          FLOW_KNOBS->ALTERNATIVES_FAILURE_MAX_DELAY));
+		delay = std::max(delay,
+		                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_DELAY_RATIO,
+		                          FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_MAX_DELAY));
+	}
+
+	g_network->networkInfo.newestAlternativesFailure = now();
+
+	choose {
+		when(wait(okFuture)) {}
+		when(wait(::delayJittered(delay))) { throw all_alternatives_failed(); }
+	}
+	return Void();
+}
diff --git a/fdbrpc/FlowTransport.h b/fdbrpc/FlowTransport.h
index e7078288034..4eb7c141bbc 100644
--- a/fdbrpc/FlowTransport.h
+++ b/fdbrpc/FlowTransport.h
@@ -270,4 +270,6 @@ inline bool Endpoint::isLocal() const {
 	       (localAddrs.secondaryAddress.present() && addresses.address == localAddrs.secondaryAddress.get());
 }
 
+Future<Void> allAlternativesFailedDelay(Future<Void> const& okFuture);
+
 #endif
diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 393c3c0ee25..59efda892b4 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -412,43 +412,17 @@ Future<REPLY_TYPE(Request)> loadBalance(
 				                                                       FailureStatus(false));
 			}
 
-			if (!alternatives->alwaysFresh()) {
-				if (now() - g_network->networkInfo.newestAlternativesFailure >
-				    FLOW_KNOBS->ALTERNATIVES_FAILURE_RESET_TIME) {
-					g_network->networkInfo.oldestAlternativesFailure = now();
-				}
-
-				double delay = FLOW_KNOBS->ALTERNATIVES_FAILURE_MIN_DELAY;
-				if (now() - g_network->networkInfo.lastAlternativesFailureSkipDelay >
-				    FLOW_KNOBS->ALTERNATIVES_FAILURE_SKIP_DELAY) {
-					g_network->networkInfo.lastAlternativesFailureSkipDelay = now();
-				} else {
-					double elapsed = now() - g_network->networkInfo.oldestAlternativesFailure;
-					delay = std::max(delay,
-					                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_DELAY_RATIO,
-					                          FLOW_KNOBS->ALTERNATIVES_FAILURE_MAX_DELAY));
-					delay = std::max(delay,
-					                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_DELAY_RATIO,
-					                          FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_MAX_DELAY));
-				}
+			Future<Void> okFuture = quorum(ok, 1);
 
+			if (!alternatives->alwaysFresh()) {
 				// Making this SevWarn means a lot of clutter
 				if (now() - g_network->networkInfo.newestAlternativesFailure > 1 ||
 				    deterministicRandom()->random01() < 0.01) {
-					TraceEvent("AllAlternativesFailed")
-					    .detail("Interval", FLOW_KNOBS->CACHE_REFRESH_INTERVAL_WHEN_ALL_ALTERNATIVES_FAILED)
-					    .detail("Alternatives", alternatives->description())
-					    .detail("Delay", delay);
-				}
-
-				g_network->networkInfo.newestAlternativesFailure = now();
-
-				choose {
-					when(wait(quorum(ok, 1))) {}
-					when(wait(::delayJittered(delay))) { throw all_alternatives_failed(); }
+					TraceEvent("AllAlternativesFailed").detail("Alternatives", alternatives->description());
 				}
+				wait(allAlternativesFailedDelay(okFuture));
 			} else {
-				wait(quorum(ok, 1));
+				wait(okFuture);
 			}
 
 			numAttempts = 0; // now that we've got a server back, reset the backoff
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 960575187aa..3f1979a4456 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2729,7 +2729,7 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 				shard->updates.pop_front();
 			tr.setVersion(fetchVersion);
 			tr.info.taskID = TaskPriority::FetchKeys;
-			state PromiseStream<RangeResult> results;
+			state BoundedPromiseStream<RangeResult> results;
 			state Future<Void> hold = tr.getRangeStream(results, keys, GetRangeLimits(), true);
 			state Key nfk = keys.begin;
 
diff --git a/fdbserver/workloads/GetRangeStream.actor.cpp b/fdbserver/workloads/GetRangeStream.actor.cpp
index b63e2129799..7e42b22e8a5 100644
--- a/fdbserver/workloads/GetRangeStream.actor.cpp
+++ b/fdbserver/workloads/GetRangeStream.actor.cpp
@@ -96,7 +96,7 @@ struct GetRangeStream : TestWorkload {
 		state Key next = self->begin;
 		state Future<Void> logFuture = logThroughput(self, &next);
 		loop {
-			state PromiseStream<Standalone<RangeResultRef>> results;
+			state BoundedPromiseStream<Standalone<RangeResultRef>> results;
 			try {
 				state Future<Void> stream = tx.getRangeStream(results,
 				                                              KeySelector(firstGreaterOrEqual(next), next.arena()),
diff --git a/flow/flow.h b/flow/flow.h
index 3f4494db67c..6d223706b39 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -653,6 +653,8 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	virtual void fire(T const&) override { ASSERT(false); }
 	virtual void fire(T&&) override { ASSERT(false); }
 
+	bool shouldFireImmediately() { return SingleCallback<T>::next != this; }
+
 protected:
 	T popImpl() {
 		if (queue.empty()) {
@@ -665,8 +667,6 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 		return copy;
 	}
 
-	bool shouldFireImmediately() { return SingleCallback<T>::next != this; }
-
 	bool hasError() { return error.isValid(); }
 };
 
@@ -996,6 +996,133 @@ class PromiseStream {
 	NotifiedQueue<T>* queue;
 };
 
+template <class T>
+struct BoundedNotifiedQueue final : NotifiedQueue<T>, FastAllocated<BoundedNotifiedQueue<T>> {
+	using FastAllocated<BoundedNotifiedQueue<T>>::operator new;
+	using FastAllocated<BoundedNotifiedQueue<T>>::operator delete;
+
+	int64_t bytesSent = 0;
+	int64_t bytesAcknowledged = 0;
+	int64_t bytesLimit = 1;
+	Promise<Void> ready;
+
+	BoundedNotifiedQueue(int futures, int promises) : NotifiedQueue<T>(futures, promises), ready(nullptr) {}
+
+	void destroy() override { delete this; }
+
+	T pop() override {
+		T res = this->popImpl();
+		bytesAcknowledged += res.expectedSize();
+		if (bytesSent - bytesAcknowledged < bytesLimit && ready.isValid() && ready.canBeSet()) {
+			Promise<Void> hold = ready;
+			ready.send(Void());
+		}
+		return res;
+	}
+};
+
+template <class T>
+class BoundedPromiseStream {
+public:
+	// stream.send( request )
+	//   Unreliable at most once delivery: Delivers request unless there is a connection failure (zero or one times)
+
+	void send(const T& value) const {
+		if (!queue->shouldFireImmediately()) {
+			queue->bytesSent += value.expectedSize();
+			if ((!queue->ready.isValid() || (queue->ready.isSet() && !queue->ready.getFuture().isError())) &&
+			    queue->bytesSent - queue->bytesAcknowledged >= queue->bytesLimit) {
+				queue->ready = Promise<Void>();
+			}
+		}
+		queue->send(value);
+	}
+	void send(T&& value) const {
+		if (!queue->shouldFireImmediately()) {
+			queue->bytesSent += value.expectedSize();
+			if ((!queue->ready.isValid() || (queue->ready.isSet() && !queue->ready.getFuture().isError())) &&
+			    queue->bytesSent - queue->bytesAcknowledged >= queue->bytesLimit) {
+				queue->ready = Promise<Void>();
+			}
+		}
+		queue->send(std::move(value));
+	}
+	void sendError(const Error& error) const { queue->sendError(error); }
+
+	// stream.getReply( request )
+	//   Reliable at least once delivery: Eventually delivers request at least once and returns one of the replies if
+	//   communication is possible.  Might deliver request
+	//      more than once.
+	//   If a reply is returned, request was or will be delivered one or more times.
+	//   If cancelled, request was or will be delivered zero or more times.
+	template <class X>
+	Future<REPLY_TYPE(X)> getReply(const X& value) const {
+		send(value);
+		return getReplyPromise(value).getFuture();
+	}
+	template <class X>
+	Future<REPLY_TYPE(X)> getReply(const X& value, TaskPriority taskID) const {
+		setReplyPriority(value, taskID);
+		return getReplyPromise(value).getFuture();
+	}
+
+	template <class X>
+	Future<X> getReply() const {
+		return getReply(Promise<X>());
+	}
+	template <class X>
+	Future<X> getReplyWithTaskID(TaskPriority taskID) const {
+		Promise<X> reply;
+		reply.getEndpoint(taskID);
+		return getReply(reply);
+	}
+
+	FutureStream<T> getFuture() const {
+		queue->addFutureRef();
+		return FutureStream<T>(queue);
+	}
+	BoundedPromiseStream() : queue(new BoundedNotifiedQueue<T>(0, 1)) {}
+	BoundedPromiseStream(const BoundedPromiseStream& rhs) : queue(rhs.queue) { queue->addPromiseRef(); }
+	BoundedPromiseStream(BoundedPromiseStream&& rhs) noexcept : queue(rhs.queue) { rhs.queue = 0; }
+	void operator=(const BoundedPromiseStream& rhs) {
+		rhs.queue->addPromiseRef();
+		if (queue)
+			queue->delPromiseRef();
+		queue = rhs.queue;
+	}
+	void operator=(BoundedPromiseStream&& rhs) noexcept {
+		if (queue != rhs.queue) {
+			if (queue)
+				queue->delPromiseRef();
+			queue = rhs.queue;
+			rhs.queue = 0;
+		}
+	}
+	~BoundedPromiseStream() {
+		if (queue)
+			queue->delPromiseRef();
+		// queue = (NotifiedQueue<T>*)0xdeadbeef;
+	}
+
+	bool operator==(const BoundedPromiseStream<T>& rhs) const { return queue == rhs.queue; }
+	bool isEmpty() const { return !queue->isReady(); }
+
+	Future<Void> onReady() {
+		if (queue->ready.isValid() && queue->ready.isSet() && queue->ready.getFuture().isError()) {
+			return queue->ready.getFuture().getError();
+		}
+		if (queue->bytesSent - queue->bytesAcknowledged < queue->bytesLimit) {
+			return Void();
+		}
+		return queue->ready.getFuture();
+	}
+
+	void setByteLimit(int64_t limit) { queue->bytesLimit = limit; }
+
+private:
+	BoundedNotifiedQueue<T>* queue;
+};
+
 // Neither of these implementations of REPLY_TYPE() works on both MSVC and g++, so...
 #ifdef __GNUG__
 #define REPLYSTREAM_TYPE(RequestType) decltype(getReplyPromiseStream(std::declval<RequestType>()).getFuture().pop())
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index b977d4c4ae6..da4049be1e8 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1262,7 +1262,7 @@ Future<T> waitOrError(Future<T> f, Future<Void> errorSignal) {
 }
 
 ACTOR template <class T, class V>
-Future<T> forwardErrors(Future<T> f, PromiseStream<V> output) {
+Future<T> forwardErrors(Future<T> f, BoundedPromiseStream<V> output) {
 	try {
 		T val = wait(f);
 		return val;

From daf7da5bf36aeb99c87150ef52cd1c801c0200fc Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 18 May 2021 13:46:19 -0700
Subject: [PATCH 168/740] Added some asserts to prevent sending to a full
 BoundedPromiseStream

---
 flow/flow.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flow/flow.h b/flow/flow.h
index 6d223706b39..1e28abe5337 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -1028,6 +1028,7 @@ class BoundedPromiseStream {
 	//   Unreliable at most once delivery: Delivers request unless there is a connection failure (zero or one times)
 
 	void send(const T& value) const {
+		ASSERT(queue->bytesSent - queue->bytesAcknowledged < queue->bytesLimit);
 		if (!queue->shouldFireImmediately()) {
 			queue->bytesSent += value.expectedSize();
 			if ((!queue->ready.isValid() || (queue->ready.isSet() && !queue->ready.getFuture().isError())) &&
@@ -1038,6 +1039,7 @@ class BoundedPromiseStream {
 		queue->send(value);
 	}
 	void send(T&& value) const {
+		ASSERT(queue->bytesSent - queue->bytesAcknowledged < queue->bytesLimit);
 		if (!queue->shouldFireImmediately()) {
 			queue->bytesSent += value.expectedSize();
 			if ((!queue->ready.isValid() || (queue->ready.isSet() && !queue->ready.getFuture().isError())) &&

From b8c6d9c2565c5ce8c09e00aab37bf3589fb25aa0 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 18 May 2021 21:02:11 -0700
Subject: [PATCH 169/740] got rid of BoundedPromiseStream in favor of added on
 onEmpty() function to regular promise stream

---
 documentation/tutorial/tutorial.actor.cpp    |   2 +-
 fdbclient/NativeAPI.actor.cpp                |  26 +-
 fdbclient/NativeAPI.actor.h                  |   8 +-
 fdbclient/ParallelStream.actor.cpp           |   2 +-
 fdbclient/ParallelStream.actor.h             |  10 +-
 fdbserver/storageserver.actor.cpp            |   2 +-
 fdbserver/workloads/GetRangeStream.actor.cpp |   2 +-
 flow/flow.h                                  | 324 +++++++------------
 flow/genericactors.actor.h                   |   2 +-
 9 files changed, 129 insertions(+), 249 deletions(-)

diff --git a/documentation/tutorial/tutorial.actor.cpp b/documentation/tutorial/tutorial.actor.cpp
index 81de2d45e03..50d6fbb7ac7 100644
--- a/documentation/tutorial/tutorial.actor.cpp
+++ b/documentation/tutorial/tutorial.actor.cpp
@@ -416,7 +416,7 @@ ACTOR Future<Void> fdbClientStream() {
 	state int64_t bytes = 0;
 	state Future<Void> logFuture = logThroughput(&bytes, &next);
 	loop {
-		state BoundedPromiseStream<Standalone<RangeResultRef>> results;
+		state PromiseStream<Standalone<RangeResultRef>> results;
 		try {
 			state Future<Void> stream = tx.getRangeStream(results,
 			                                              KeySelector(firstGreaterOrEqual(next), next.arena()),
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 74a468f0d6a..91681ce6cb1 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3349,7 +3349,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 				        .getReplyStream(req);
 				state bool breakAgain = false;
 				loop {
-					wait(results->onReady());
+					wait(results->onEmpty());
 					try {
 						choose {
 							when(wait(cx->connectionFileChanged())) {
@@ -3492,7 +3492,7 @@ static KeyRange intersect(KeyRangeRef lhs, KeyRangeRef rhs) {
 	return KeyRange(KeyRangeRef(std::max(lhs.begin, rhs.begin), std::min(lhs.end, rhs.end)));
 }
 
-ACTOR Future<Void> getRangeStream(BoundedPromiseStream<RangeResult> _results,
+ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results,
                                   Database cx,
                                   Reference<TransactionLogInfo> trLogInfo,
                                   Future<Version> fVersion,
@@ -3537,7 +3537,7 @@ ACTOR Future<Void> getRangeStream(BoundedPromiseStream<RangeResult> _results,
 	// or allKeys.begin exists in the database and will be part of the conflict range anyways
 
 	state std::vector<Future<Void>> outstandingRequests;
-	loop {
+	while (b < e) {
 		state pair<KeyRange, Reference<LocationInfo>> ssi =
 		    wait(getKeyLocation(cx, reverse ? e : b, &StorageServerInterface::getKeyValuesStream, info, reverse));
 		state KeyRange shardIntersection = intersect(ssi.first, KeyRangeRef(b, e));
@@ -3572,9 +3572,6 @@ ACTOR Future<Void> getRangeStream(BoundedPromiseStream<RangeResult> _results,
 		} else {
 			b = shardIntersection.end;
 		}
-		if (b >= e) {
-			break;
-		}
 	}
 	wait(waitForAll(outstandingRequests) && results.finish());
 	return Void();
@@ -3935,7 +3932,7 @@ Future<RangeResult> Transaction::getRange(const KeySelector& begin,
 	return getRange(begin, end, GetRangeLimits(limit), snapshot, reverse);
 }
 
-Future<Void> Transaction::getRangeStream(const BoundedPromiseStream<RangeResult>& results,
+Future<Void> Transaction::getRangeStream(const PromiseStream<RangeResult>& results,
                                          const KeySelector& begin,
                                          const KeySelector& end,
                                          GetRangeLimits limits,
@@ -3944,17 +3941,8 @@ Future<Void> Transaction::getRangeStream(const BoundedPromiseStream<RangeResult>
 	++cx->transactionLogicalReads;
 	++cx->transactionGetRangeStreamRequests;
 
-	if (limits.isReached()) {
-		results.sendError(end_of_stream());
-		return Void();
-	}
-
-	if (!limits.isValid()) {
-		results.sendError(range_limits_invalid());
-		return Void();
-	}
-
-	ASSERT(limits.rows != 0);
+	// FIXME: limits are not implemented yet, and this code has not be tested with reverse=true
+	ASSERT(!limits.hasByteLimit() && !limits.hasRowLimit() && !reverse);
 
 	KeySelector b = begin;
 	if (b.orEqual) {
@@ -3994,7 +3982,7 @@ Future<Void> Transaction::getRangeStream(const BoundedPromiseStream<RangeResult>
 	                     results);
 }
 
-Future<Void> Transaction::getRangeStream(const BoundedPromiseStream<RangeResult>& results,
+Future<Void> Transaction::getRangeStream(const PromiseStream<RangeResult>& results,
                                          const KeySelector& begin,
                                          const KeySelector& end,
                                          int limit,
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 3a9cc80e7fe..10ce0180b15 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -283,19 +283,19 @@ class Transaction : NonCopyable {
 		                reverse);
 	}
 
-	[[nodiscard]] Future<Void> getRangeStream(const BoundedPromiseStream<Standalone<RangeResultRef>>& results,
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeySelector& begin,
 	                                          const KeySelector& end,
 	                                          int limit,
 	                                          bool snapshot = false,
 	                                          bool reverse = false);
-	[[nodiscard]] Future<Void> getRangeStream(const BoundedPromiseStream<Standalone<RangeResultRef>>& results,
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeySelector& begin,
 	                                          const KeySelector& end,
 	                                          GetRangeLimits limits,
 	                                          bool snapshot = false,
 	                                          bool reverse = false);
-	[[nodiscard]] Future<Void> getRangeStream(const BoundedPromiseStream<Standalone<RangeResultRef>>& results,
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeyRange& keys,
 	                                          int limit,
 	                                          bool snapshot = false,
@@ -307,7 +307,7 @@ class Transaction : NonCopyable {
 		                      snapshot,
 		                      reverse);
 	}
-	[[nodiscard]] Future<Void> getRangeStream(const BoundedPromiseStream<Standalone<RangeResultRef>>& results,
+	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeyRange& keys,
 	                                          GetRangeLimits limits,
 	                                          bool snapshot = false,
diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index c7be45102f1..6f0f5178ee8 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -58,7 +58,7 @@ ACTOR static Future<Void> consume(FutureStream<ParallelStreamTest::TestValue> st
 } // namespace ParallelStreamTest
 
 TEST_CASE("/fdbclient/ParallelStream") {
-	state BoundedPromiseStream<ParallelStreamTest::TestValue> results;
+	state PromiseStream<ParallelStreamTest::TestValue> results;
 	state size_t concurrency = deterministicRandom()->randomInt(1, 11);
 	state size_t bufferLimit = concurrency + deterministicRandom()->randomInt(0, 11);
 	state size_t numProducers = deterministicRandom()->randomInt(1, 1001);
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index 74aac4398d2..ab57d5cbe42 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -41,7 +41,7 @@ class ParallelStream {
 public:
 	class Fragment : public ReferenceCounted<Fragment> {
 		ParallelStream* parallelStream;
-		BoundedPromiseStream<T> stream;
+		PromiseStream<T> stream;
 		BoundedFlowLock::Releaser releaser;
 		friend class ParallelStream;
 
@@ -57,13 +57,13 @@ class ParallelStream {
 			releaser.release(); // Release before destruction to free up pending fragments
 			stream.sendError(end_of_stream());
 		}
-		Future<Void> onReady() { return stream.onReady(); }
+		Future<Void> onEmpty() { return stream.onEmpty(); }
 	};
 
 private:
 	PromiseStream<Reference<Fragment>> fragments;
 	size_t fragmentsProcessed{ 0 };
-	BoundedPromiseStream<T> results;
+	PromiseStream<T> results;
 	Future<Void> flusher;
 
 public:
@@ -75,7 +75,7 @@ class ParallelStream {
 				state Reference<Fragment> fragment = waitNext(self->fragments.getFuture());
 				loop {
 					try {
-						wait(self->results.onReady());
+						wait(self->results.onEmpty());
 						T value = waitNext(fragment->stream.getFuture());
 						self->results.send(value);
 						if (++messagesSinceYield == messagesBetweenYields) {
@@ -101,7 +101,7 @@ class ParallelStream {
 		}
 	}
 
-	ParallelStream(BoundedPromiseStream<T> results, size_t concurrency, size_t bufferLimit)
+	ParallelStream(PromiseStream<T> results, size_t concurrency, size_t bufferLimit)
 	  : results(results), semaphore(concurrency, bufferLimit) {
 		flusher = flushToClient(this);
 	}
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 3f1979a4456..960575187aa 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2729,7 +2729,7 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 				shard->updates.pop_front();
 			tr.setVersion(fetchVersion);
 			tr.info.taskID = TaskPriority::FetchKeys;
-			state BoundedPromiseStream<RangeResult> results;
+			state PromiseStream<RangeResult> results;
 			state Future<Void> hold = tr.getRangeStream(results, keys, GetRangeLimits(), true);
 			state Key nfk = keys.begin;
 
diff --git a/fdbserver/workloads/GetRangeStream.actor.cpp b/fdbserver/workloads/GetRangeStream.actor.cpp
index 7e42b22e8a5..b63e2129799 100644
--- a/fdbserver/workloads/GetRangeStream.actor.cpp
+++ b/fdbserver/workloads/GetRangeStream.actor.cpp
@@ -96,7 +96,7 @@ struct GetRangeStream : TestWorkload {
 		state Key next = self->begin;
 		state Future<Void> logFuture = logThroughput(self, &next);
 		loop {
-			state BoundedPromiseStream<Standalone<RangeResultRef>> results;
+			state PromiseStream<Standalone<RangeResultRef>> results;
 			try {
 				state Future<Void> stream = tx.getRangeStream(results,
 				                                              KeySelector(firstGreaterOrEqual(next), next.arena()),
diff --git a/flow/flow.h b/flow/flow.h
index 1e28abe5337..7f0c1ba46d9 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -580,96 +580,6 @@ struct SAV : private Callback<T>, FastAllocated<SAV<T>> {
 	void fire(T const&) override { ASSERT(false); }
 };
 
-template <class T>
-struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>> {
-	int promises; // one for each promise (and one for an active actor if this is an actor)
-	int futures; // one for each future and one more if there are any callbacks
-
-	// Invariant: SingleCallback<T>::next==this || (queue.empty() && !error.isValid())
-	std::queue<T, Deque<T>> queue;
-	Error error;
-
-	NotifiedQueue(int futures, int promises) : futures(futures), promises(promises) { SingleCallback<T>::next = this; }
-
-	bool isReady() const { return !queue.empty() || error.isValid(); }
-	bool isError() const { return queue.empty() && error.isValid(); } // the *next* thing queued is an error
-	uint32_t size() const { return queue.size(); }
-
-	virtual T pop() { return popImpl(); }
-
-	template <class U>
-	void send(U&& value) {
-		if (error.isValid())
-			return;
-
-		if (SingleCallback<T>::next != this) {
-			SingleCallback<T>::next->fire(std::forward<U>(value));
-		} else {
-			queue.emplace(std::forward<U>(value));
-		}
-	}
-
-	void sendError(Error err) {
-		if (error.isValid())
-			return;
-
-		this->error = err;
-		if (shouldFireImmediately()) {
-			SingleCallback<T>::next->error(err);
-		}
-	}
-
-	void addPromiseRef() { promises++; }
-	void addFutureRef() { futures++; }
-
-	void delPromiseRef() {
-		if (!--promises) {
-			if (futures) {
-				sendError(broken_promise());
-			} else
-				destroy();
-		}
-	}
-	void delFutureRef() {
-		if (!--futures) {
-			if (promises)
-				cancel();
-			else
-				destroy();
-		}
-	}
-
-	int getFutureReferenceCount() const { return futures; }
-	int getPromiseReferenceCount() const { return promises; }
-
-	virtual void destroy() { delete this; }
-	virtual void cancel() {}
-
-	void addCallbackAndDelFutureRef(SingleCallback<T>* cb) {
-		ASSERT(SingleCallback<T>::next == this);
-		cb->insert(this);
-	}
-	virtual void unwait() override { delFutureRef(); }
-	virtual void fire(T const&) override { ASSERT(false); }
-	virtual void fire(T&&) override { ASSERT(false); }
-
-	bool shouldFireImmediately() { return SingleCallback<T>::next != this; }
-
-protected:
-	T popImpl() {
-		if (queue.empty()) {
-			if (error.isValid())
-				throw error;
-			throw internal_error();
-		}
-		auto copy = std::move(queue.front());
-		queue.pop();
-		return copy;
-	}
-
-	bool hasError() { return error.isValid(); }
-};
-
 template <class T>
 class Promise;
 
@@ -844,6 +754,107 @@ class Promise final {
 	SAV<T>* sav;
 };
 
+template <class T>
+struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>> {
+	int promises; // one for each promise (and one for an active actor if this is an actor)
+	int futures; // one for each future and one more if there are any callbacks
+
+	// Invariant: SingleCallback<T>::next==this || (queue.empty() && !error.isValid())
+	std::queue<T, Deque<T>> queue;
+	Promise<Void> onEmpty;
+	Error error;
+
+	NotifiedQueue(int futures, int promises) : futures(futures), promises(promises), onEmpty(nullptr) {
+		SingleCallback<T>::next = this;
+	}
+
+	bool isReady() const { return !queue.empty() || error.isValid(); }
+	bool isError() const { return queue.empty() && error.isValid(); } // the *next* thing queued is an error
+	uint32_t size() const { return queue.size(); }
+
+	virtual T pop() {
+		T res = popImpl();
+		if (onEmpty.isValid() && queue.empty()) {
+			Promise<Void> hold = onEmpty;
+			onEmpty = Promise<Void>(nullptr);
+			hold.send(Void());
+		}
+		return res;
+	}
+
+	template <class U>
+	void send(U&& value) {
+		if (error.isValid())
+			return;
+
+		if (SingleCallback<T>::next != this) {
+			SingleCallback<T>::next->fire(std::forward<U>(value));
+		} else {
+			queue.emplace(std::forward<U>(value));
+		}
+	}
+
+	void sendError(Error err) {
+		if (error.isValid())
+			return;
+
+		this->error = err;
+		if (shouldFireImmediately()) {
+			SingleCallback<T>::next->error(err);
+		}
+	}
+
+	void addPromiseRef() { promises++; }
+	void addFutureRef() { futures++; }
+
+	void delPromiseRef() {
+		if (!--promises) {
+			if (futures) {
+				sendError(broken_promise());
+			} else
+				destroy();
+		}
+	}
+	void delFutureRef() {
+		if (!--futures) {
+			if (promises)
+				cancel();
+			else
+				destroy();
+		}
+	}
+
+	int getFutureReferenceCount() const { return futures; }
+	int getPromiseReferenceCount() const { return promises; }
+
+	virtual void destroy() { delete this; }
+	virtual void cancel() {}
+
+	void addCallbackAndDelFutureRef(SingleCallback<T>* cb) {
+		ASSERT(SingleCallback<T>::next == this);
+		cb->insert(this);
+	}
+	virtual void unwait() override { delFutureRef(); }
+	virtual void fire(T const&) override { ASSERT(false); }
+	virtual void fire(T&&) override { ASSERT(false); }
+
+	bool shouldFireImmediately() { return SingleCallback<T>::next != this; }
+
+protected:
+	T popImpl() {
+		if (queue.empty()) {
+			if (error.isValid())
+				throw error;
+			throw internal_error();
+		}
+		auto copy = std::move(queue.front());
+		queue.pop();
+		return copy;
+	}
+
+	bool hasError() { return error.isValid(); }
+};
+
 template <class T>
 class FutureStream {
 public:
@@ -992,137 +1003,18 @@ class PromiseStream {
 	bool operator==(const PromiseStream<T>& rhs) const { return queue == rhs.queue; }
 	bool isEmpty() const { return !queue->isReady(); }
 
-private:
-	NotifiedQueue<T>* queue;
-};
-
-template <class T>
-struct BoundedNotifiedQueue final : NotifiedQueue<T>, FastAllocated<BoundedNotifiedQueue<T>> {
-	using FastAllocated<BoundedNotifiedQueue<T>>::operator new;
-	using FastAllocated<BoundedNotifiedQueue<T>>::operator delete;
-
-	int64_t bytesSent = 0;
-	int64_t bytesAcknowledged = 0;
-	int64_t bytesLimit = 1;
-	Promise<Void> ready;
-
-	BoundedNotifiedQueue(int futures, int promises) : NotifiedQueue<T>(futures, promises), ready(nullptr) {}
-
-	void destroy() override { delete this; }
-
-	T pop() override {
-		T res = this->popImpl();
-		bytesAcknowledged += res.expectedSize();
-		if (bytesSent - bytesAcknowledged < bytesLimit && ready.isValid() && ready.canBeSet()) {
-			Promise<Void> hold = ready;
-			ready.send(Void());
-		}
-		return res;
-	}
-};
-
-template <class T>
-class BoundedPromiseStream {
-public:
-	// stream.send( request )
-	//   Unreliable at most once delivery: Delivers request unless there is a connection failure (zero or one times)
-
-	void send(const T& value) const {
-		ASSERT(queue->bytesSent - queue->bytesAcknowledged < queue->bytesLimit);
-		if (!queue->shouldFireImmediately()) {
-			queue->bytesSent += value.expectedSize();
-			if ((!queue->ready.isValid() || (queue->ready.isSet() && !queue->ready.getFuture().isError())) &&
-			    queue->bytesSent - queue->bytesAcknowledged >= queue->bytesLimit) {
-				queue->ready = Promise<Void>();
-			}
-		}
-		queue->send(value);
-	}
-	void send(T&& value) const {
-		ASSERT(queue->bytesSent - queue->bytesAcknowledged < queue->bytesLimit);
-		if (!queue->shouldFireImmediately()) {
-			queue->bytesSent += value.expectedSize();
-			if ((!queue->ready.isValid() || (queue->ready.isSet() && !queue->ready.getFuture().isError())) &&
-			    queue->bytesSent - queue->bytesAcknowledged >= queue->bytesLimit) {
-				queue->ready = Promise<Void>();
-			}
-		}
-		queue->send(std::move(value));
-	}
-	void sendError(const Error& error) const { queue->sendError(error); }
-
-	// stream.getReply( request )
-	//   Reliable at least once delivery: Eventually delivers request at least once and returns one of the replies if
-	//   communication is possible.  Might deliver request
-	//      more than once.
-	//   If a reply is returned, request was or will be delivered one or more times.
-	//   If cancelled, request was or will be delivered zero or more times.
-	template <class X>
-	Future<REPLY_TYPE(X)> getReply(const X& value) const {
-		send(value);
-		return getReplyPromise(value).getFuture();
-	}
-	template <class X>
-	Future<REPLY_TYPE(X)> getReply(const X& value, TaskPriority taskID) const {
-		setReplyPriority(value, taskID);
-		return getReplyPromise(value).getFuture();
-	}
-
-	template <class X>
-	Future<X> getReply() const {
-		return getReply(Promise<X>());
-	}
-	template <class X>
-	Future<X> getReplyWithTaskID(TaskPriority taskID) const {
-		Promise<X> reply;
-		reply.getEndpoint(taskID);
-		return getReply(reply);
-	}
-
-	FutureStream<T> getFuture() const {
-		queue->addFutureRef();
-		return FutureStream<T>(queue);
-	}
-	BoundedPromiseStream() : queue(new BoundedNotifiedQueue<T>(0, 1)) {}
-	BoundedPromiseStream(const BoundedPromiseStream& rhs) : queue(rhs.queue) { queue->addPromiseRef(); }
-	BoundedPromiseStream(BoundedPromiseStream&& rhs) noexcept : queue(rhs.queue) { rhs.queue = 0; }
-	void operator=(const BoundedPromiseStream& rhs) {
-		rhs.queue->addPromiseRef();
-		if (queue)
-			queue->delPromiseRef();
-		queue = rhs.queue;
-	}
-	void operator=(BoundedPromiseStream&& rhs) noexcept {
-		if (queue != rhs.queue) {
-			if (queue)
-				queue->delPromiseRef();
-			queue = rhs.queue;
-			rhs.queue = 0;
-		}
-	}
-	~BoundedPromiseStream() {
-		if (queue)
-			queue->delPromiseRef();
-		// queue = (NotifiedQueue<T>*)0xdeadbeef;
-	}
-
-	bool operator==(const BoundedPromiseStream<T>& rhs) const { return queue == rhs.queue; }
-	bool isEmpty() const { return !queue->isReady(); }
-
-	Future<Void> onReady() {
-		if (queue->ready.isValid() && queue->ready.isSet() && queue->ready.getFuture().isError()) {
-			return queue->ready.getFuture().getError();
-		}
-		if (queue->bytesSent - queue->bytesAcknowledged < queue->bytesLimit) {
+	Future<Void> onEmpty() {
+		if (isEmpty()) {
 			return Void();
 		}
-		return queue->ready.getFuture();
+		if (!queue->onEmpty.isValid()) {
+			queue->onEmpty = Promise<Void>();
+		}
+		return queue->onEmpty.getFuture();
 	}
 
-	void setByteLimit(int64_t limit) { queue->bytesLimit = limit; }
-
 private:
-	BoundedNotifiedQueue<T>* queue;
+	NotifiedQueue<T>* queue;
 };
 
 // Neither of these implementations of REPLY_TYPE() works on both MSVC and g++, so...
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index da4049be1e8..b977d4c4ae6 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1262,7 +1262,7 @@ Future<T> waitOrError(Future<T> f, Future<Void> errorSignal) {
 }
 
 ACTOR template <class T, class V>
-Future<T> forwardErrors(Future<T> f, BoundedPromiseStream<V> output) {
+Future<T> forwardErrors(Future<T> f, PromiseStream<V> output) {
 	try {
 		T val = wait(f);
 		return val;

From 97a8daacb56c95af95eeb9cacd9325fca35832cc Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 18 May 2021 21:06:29 -0700
Subject: [PATCH 170/740] slight optimization of PromiseStream pop

---
 flow/flow.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/flow/flow.h b/flow/flow.h
index 7f0c1ba46d9..6fa8cd99de2 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -773,13 +773,19 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	uint32_t size() const { return queue.size(); }
 
 	virtual T pop() {
-		T res = popImpl();
+		if (queue.empty()) {
+			if (error.isValid())
+				throw error;
+			throw internal_error();
+		}
+		auto copy = std::move(queue.front());
+		queue.pop();
 		if (onEmpty.isValid() && queue.empty()) {
 			Promise<Void> hold = onEmpty;
 			onEmpty = Promise<Void>(nullptr);
 			hold.send(Void());
 		}
-		return res;
+		return copy;
 	}
 
 	template <class U>
@@ -838,8 +844,6 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	virtual void fire(T const&) override { ASSERT(false); }
 	virtual void fire(T&&) override { ASSERT(false); }
 
-	bool shouldFireImmediately() { return SingleCallback<T>::next != this; }
-
 protected:
 	T popImpl() {
 		if (queue.empty()) {
@@ -853,6 +857,8 @@ struct NotifiedQueue : private SingleCallback<T>, FastAllocated<NotifiedQueue<T>
 	}
 
 	bool hasError() { return error.isValid(); }
+
+	bool shouldFireImmediately() { return SingleCallback<T>::next != this; }
 };
 
 template <class T>

From 4f413889f185118965d7034f9ea2819cfafefa96 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 18 May 2021 22:42:12 -0700
Subject: [PATCH 171/740] refactors acknowledgements to clean the code up a
 little and make the byte limit configurable

---
 fdbrpc/fdbrpc.h                   | 50 ++++++++++++++++---------------
 fdbserver/Knobs.cpp               |  1 +
 fdbserver/Knobs.h                 |  1 +
 fdbserver/storageserver.actor.cpp |  1 +
 flow/Knobs.cpp                    |  1 -
 flow/Knobs.h                      |  1 -
 6 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 0c2439d59b4..fc3c210249b 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -277,44 +277,47 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 
 	int64_t bytesSent;
 	int64_t bytesAcknowledged;
+	int64_t bytesLimit;
 	Promise<Void> ready;
 	Future<Void> failures;
 
-	AcknowledgementReceiver() : bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
+	AcknowledgementReceiver() : bytesSent(0), bytesAcknowledged(0), bytesLimit(0), ready(nullptr) {}
 	AcknowledgementReceiver(const Endpoint& remoteEndpoint)
-	  : FlowReceiver(remoteEndpoint, false), bytesSent(0), bytesAcknowledged(0), ready(nullptr) {}
+	  : FlowReceiver(remoteEndpoint, false), bytesSent(0), bytesAcknowledged(0), bytesLimit(0), ready(nullptr) {}
 
 	void receive(ArenaObjectReader& reader) override {
 		ErrorOr<AcknowledgementReply> message;
 		reader.deserialize(message);
 		if (message.isError()) {
-			if (!ready.isValid() || ready.isSet()) {
+			if (!ready.isValid()) {
 				ready = Promise<Void>();
 			}
 			ready.sendError(message.getError());
 		} else {
 			ASSERT(message.get().bytes > bytesAcknowledged);
 			bytesAcknowledged = message.get().bytes;
-			if (bytesSent - bytesAcknowledged < FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES && ready.isValid() &&
-			    ready.canBeSet()) {
+			if (ready.isValid() && bytesSent - bytesAcknowledged < bytesLimit) {
 				Promise<Void> hold = ready;
-				ready.send(Void());
+				ready = Promise<Void>(nullptr);
+				hold.send(Void());
 			}
 		}
 	}
 };
 
 template <class T>
-struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAllocated<NetNotifiedQueueWithErrors<T>> {
-	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator new;
-	using FastAllocated<NetNotifiedQueueWithErrors<T>>::operator delete;
+struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
+                                                    FlowReceiver,
+                                                    FastAllocated<NetNotifiedQueueWithAcknowledgements<T>> {
+	using FastAllocated<NetNotifiedQueueWithAcknowledgements<T>>::operator new;
+	using FastAllocated<NetNotifiedQueueWithAcknowledgements<T>>::operator delete;
 
 	AcknowledgementReceiver acknowledgements;
 	Endpoint requestStreamEndpoint;
 	bool sentError = false;
 
-	NetNotifiedQueueWithErrors(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
-	NetNotifiedQueueWithErrors(int futures, int promises, const Endpoint& remoteEndpoint)
+	NetNotifiedQueueWithAcknowledgements(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
+	NetNotifiedQueueWithAcknowledgements(int futures, int promises, const Endpoint& remoteEndpoint)
 	  : NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
 		acknowledgements.failures = tagError<Void>(
 		    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), operation_obsolete());
@@ -365,7 +368,7 @@ struct NetNotifiedQueueWithErrors final : NotifiedQueue<T>, FlowReceiver, FastAl
 		return res;
 	}
 
-	~NetNotifiedQueueWithErrors() {
+	~NetNotifiedQueueWithAcknowledgements() {
 		if (acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
 			FlowTransport::transport().sendUnreliable(
 			    SerializeSource<ErrorOr<AcknowledgementReply>>(operation_obsolete()),
@@ -398,12 +401,6 @@ class ReplyPromiseStream {
 				value.acknowledgeToken = queue->acknowledgements.getEndpoint(TaskPriority::ReadSocket).token;
 			}
 			queue->acknowledgements.bytesSent += value.expectedSize();
-			if ((!queue->acknowledgements.ready.isValid() ||
-			     (queue->acknowledgements.ready.isSet() && !queue->acknowledgements.ready.getFuture().isError())) &&
-			    queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged >=
-			        FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES) {
-				queue->acknowledgements.ready = Promise<Void>();
-			}
 			FlowTransport::transport().sendUnreliable(
 			    SerializeSource<ErrorOr<EnsureTable<T>>>(value), getEndpoint(), false);
 		} else {
@@ -429,7 +426,7 @@ class ReplyPromiseStream {
 		queue->addFutureRef();
 		return FutureStream<T>(queue);
 	}
-	ReplyPromiseStream() : queue(new NetNotifiedQueueWithErrors<T>(0, 1)), errors(new SAV<Void>(0, 1)) {}
+	ReplyPromiseStream() : queue(new NetNotifiedQueueWithAcknowledgements<T>(0, 1)), errors(new SAV<Void>(0, 1)) {}
 	ReplyPromiseStream(const ReplyPromiseStream& rhs) : queue(rhs.queue), errors(rhs.errors) {
 		queue->addPromiseRef();
 		if (errors) {
@@ -441,7 +438,7 @@ class ReplyPromiseStream {
 		rhs.errors = nullptr;
 	}
 	explicit ReplyPromiseStream(const Endpoint& endpoint)
-	  : queue(new NetNotifiedQueueWithErrors<T>(0, 1, endpoint)), errors(nullptr) {}
+	  : queue(new NetNotifiedQueueWithAcknowledgements<T>(0, 1, endpoint)), errors(nullptr) {}
 
 	Future<Void> getErrorFutureAndDelPromiseRef() {
 		ASSERT(errors && errors->getPromiseReferenceCount() > 1);
@@ -468,20 +465,25 @@ class ReplyPromiseStream {
 	uint32_t size() const { return queue->size(); }
 
 	Future<Void> onReady() {
+		ASSERT(queue->acknowledgements.bytesLimit > 0);
 		if (queue->acknowledgements.failures.isError()) {
 			return queue->acknowledgements.failures.getError();
 		}
-		if (queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet() &&
-		    queue->acknowledgements.ready.getFuture().isError()) {
+		if (queue->acknowledgements.ready.isValid() && queue->acknowledgements.ready.isSet()) {
 			return queue->acknowledgements.ready.getFuture().getError();
 		}
 		if (queue->acknowledgements.bytesSent - queue->acknowledgements.bytesAcknowledged <
-		    FLOW_KNOBS->ACKNOWLEDGE_LIMIT_BYTES) {
+		    queue->acknowledgements.bytesLimit) {
 			return Void();
 		}
+		if (!queue->acknowledgements.ready.isValid()) {
+			queue->acknowledgements.ready = Promise<Void>();
+		}
 		return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
 	}
 
+	void setByteLimit(int64_t byteLimit) { queue->acknowledgements.bytesLimit = byteLimit; }
+
 	void operator=(const ReplyPromiseStream& rhs) {
 		rhs.queue->addPromiseRef();
 		if (queue)
@@ -509,7 +511,7 @@ class ReplyPromiseStream {
 	}
 
 private:
-	NetNotifiedQueueWithErrors<T>* queue;
+	NetNotifiedQueueWithAcknowledgements<T>* queue;
 	SAV<Void>* errors;
 };
 
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index 2b783c0d197..30ae8569cc0 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -610,6 +610,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( DD_METRICS_REPORT_INTERVAL,                           30.0 );
 	init( FETCH_KEYS_TOO_LONG_TIME_CRITERIA,                   300.0 );
 	init( MAX_STORAGE_COMMIT_TIME,                             120.0 ); //The max fsync stall time on the storage server and tlog before marking a disk as failed
+	init( RANGESTREAM_LIMIT_BYTES,                               2e6 ); if( randomize && BUGGIFY ) RANGESTREAM_LIMIT_BYTES = 1;
 
 	//Wait Failure
 	init( MAX_OUTSTANDING_WAIT_FAILURE_REQUESTS,                 250 ); if( randomize && BUGGIFY ) MAX_OUTSTANDING_WAIT_FAILURE_REQUESTS = 2;
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 0d70efd6bd1..b890e8c49b6 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -537,6 +537,7 @@ class ServerKnobs : public Knobs {
 	double DD_METRICS_REPORT_INTERVAL;
 	double FETCH_KEYS_TOO_LONG_TIME_CRITERIA;
 	double MAX_STORAGE_COMMIT_TIME;
+	int64_t RANGESTREAM_LIMIT_BYTES;
 
 	// Wait Failure
 	int MAX_OUTSTANDING_WAIT_FAILURE_REQUESTS;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 960575187aa..7a98a2a70e3 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -4468,6 +4468,7 @@ ACTOR Future<Void> serveGetKeyValuesStreamRequests(StorageServer* self,
                                                    FutureStream<GetKeyValuesStreamRequest> getKeyValuesStream) {
 	loop {
 		GetKeyValuesStreamRequest req = waitNext(getKeyValuesStream);
+		req.reply.setByteLimit(SERVER_KNOBS->RANGESTREAM_LIMIT_BYTES);
 		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
 		// before doing real work
 		// FIXME: add readGuard again
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index f00ec97251c..e4d5a4e6f96 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -63,7 +63,6 @@ void FlowKnobs::initialize(bool randomize, bool isSimulated) {
 	init( HUGE_ARENA_LOGGING_INTERVAL,                         5.0 );
 
 	init( WRITE_TRACING_ENABLED,                              true ); if( randomize && BUGGIFY ) WRITE_TRACING_ENABLED = false;
-	init( ACKNOWLEDGE_LIMIT_BYTES,                             2e6 ); if( randomize && BUGGIFY ) ACKNOWLEDGE_LIMIT_BYTES = 1;
 	init( TRACING_UDP_LISTENER_PORT,                          8889 ); // Only applicable if TracerType is set to a network option.
 
 	//connectionMonitor
diff --git a/flow/Knobs.h b/flow/Knobs.h
index 24272ee4749..67ec3b82b71 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -72,7 +72,6 @@ class FlowKnobs : public Knobs {
 	double HUGE_ARENA_LOGGING_INTERVAL;
 
 	bool WRITE_TRACING_ENABLED;
-	int64_t ACKNOWLEDGE_LIMIT_BYTES;
 	int TRACING_UDP_LISTENER_PORT;
 
 	// run loop profiling

From 8ab3131bd9eae3bbd3c74604ee99a570870fb81b Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 18 May 2021 23:01:03 -0700
Subject: [PATCH 172/740] move allAlternativesFailedDelay into
 LoadBalance.actor.cpp

---
 fdbrpc/CMakeLists.txt             |  1 +
 fdbrpc/FlowTransport.actor.cpp    | 29 +-----------------
 fdbrpc/FlowTransport.h            |  2 --
 fdbrpc/LoadBalance.actor.cpp      | 49 +++++++++++++++++++++++++++++++
 fdbrpc/LoadBalance.actor.h        |  2 ++
 fdbserver/storageserver.actor.cpp |  2 +-
 6 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 fdbrpc/LoadBalance.actor.cpp

diff --git a/fdbrpc/CMakeLists.txt b/fdbrpc/CMakeLists.txt
index 055e4970346..d30fd019075 100644
--- a/fdbrpc/CMakeLists.txt
+++ b/fdbrpc/CMakeLists.txt
@@ -14,6 +14,7 @@ set(FDBRPC_SRCS
   genericactors.actor.cpp
   HealthMonitor.actor.cpp
   IAsyncFile.actor.cpp
+  LoadBalance.actor.cpp
   LoadBalance.actor.h
   Locality.cpp
   Net2FileSystem.cpp
diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index f628652eb0b..f7ca6ce0db4 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1713,31 +1713,4 @@ void FlowTransport::createInstance(bool isClient, uint64_t transportId) {
 
 HealthMonitor* FlowTransport::healthMonitor() {
 	return &self->healthMonitor;
-}
-
-ACTOR Future<Void> allAlternativesFailedDelay(Future<Void> okFuture) {
-	if (now() - g_network->networkInfo.newestAlternativesFailure > FLOW_KNOBS->ALTERNATIVES_FAILURE_RESET_TIME) {
-		g_network->networkInfo.oldestAlternativesFailure = now();
-	}
-
-	double delay = FLOW_KNOBS->ALTERNATIVES_FAILURE_MIN_DELAY;
-	if (now() - g_network->networkInfo.lastAlternativesFailureSkipDelay > FLOW_KNOBS->ALTERNATIVES_FAILURE_SKIP_DELAY) {
-		g_network->networkInfo.lastAlternativesFailureSkipDelay = now();
-	} else {
-		double elapsed = now() - g_network->networkInfo.oldestAlternativesFailure;
-		delay = std::max(delay,
-		                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_DELAY_RATIO,
-		                          FLOW_KNOBS->ALTERNATIVES_FAILURE_MAX_DELAY));
-		delay = std::max(delay,
-		                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_DELAY_RATIO,
-		                          FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_MAX_DELAY));
-	}
-
-	g_network->networkInfo.newestAlternativesFailure = now();
-
-	choose {
-		when(wait(okFuture)) {}
-		when(wait(::delayJittered(delay))) { throw all_alternatives_failed(); }
-	}
-	return Void();
-}
+}
\ No newline at end of file
diff --git a/fdbrpc/FlowTransport.h b/fdbrpc/FlowTransport.h
index 4eb7c141bbc..e7078288034 100644
--- a/fdbrpc/FlowTransport.h
+++ b/fdbrpc/FlowTransport.h
@@ -270,6 +270,4 @@ inline bool Endpoint::isLocal() const {
 	       (localAddrs.secondaryAddress.present() && addresses.address == localAddrs.secondaryAddress.get());
 }
 
-Future<Void> allAlternativesFailedDelay(Future<Void> const& okFuture);
-
 #endif
diff --git a/fdbrpc/LoadBalance.actor.cpp b/fdbrpc/LoadBalance.actor.cpp
new file mode 100644
index 00000000000..68a0b45c4a8
--- /dev/null
+++ b/fdbrpc/LoadBalance.actor.cpp
@@ -0,0 +1,49 @@
+/*
+ * LoadBalance.actor.cpp
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "flow/flow.h"
+#include "flow/actorcompiler.h" // This must be the last #include.
+
+ACTOR Future<Void> allAlternativesFailedDelay(Future<Void> okFuture) {
+	if (now() - g_network->networkInfo.newestAlternativesFailure > FLOW_KNOBS->ALTERNATIVES_FAILURE_RESET_TIME) {
+		g_network->networkInfo.oldestAlternativesFailure = now();
+	}
+
+	double delay = FLOW_KNOBS->ALTERNATIVES_FAILURE_MIN_DELAY;
+	if (now() - g_network->networkInfo.lastAlternativesFailureSkipDelay > FLOW_KNOBS->ALTERNATIVES_FAILURE_SKIP_DELAY) {
+		g_network->networkInfo.lastAlternativesFailureSkipDelay = now();
+	} else {
+		double elapsed = now() - g_network->networkInfo.oldestAlternativesFailure;
+		delay = std::max(delay,
+		                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_DELAY_RATIO,
+		                          FLOW_KNOBS->ALTERNATIVES_FAILURE_MAX_DELAY));
+		delay = std::max(delay,
+		                 std::min(elapsed * FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_DELAY_RATIO,
+		                          FLOW_KNOBS->ALTERNATIVES_FAILURE_SLOW_MAX_DELAY));
+	}
+
+	g_network->networkInfo.newestAlternativesFailure = now();
+
+	choose {
+		when(wait(okFuture)) {}
+		when(wait(::delayJittered(delay))) { throw all_alternatives_failed(); }
+	}
+	return Void();
+}
\ No newline at end of file
diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 59efda892b4..d8f1a82f546 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -40,6 +40,8 @@
 
 using std::vector;
 
+ACTOR Future<Void> allAlternativesFailedDelay(Future<Void> okFuture);
+
 struct ModelHolder : NonCopyable, public ReferenceCounted<ModelHolder> {
 	QueueModel* model;
 	bool released;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 7a98a2a70e3..30a1a6b203f 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1963,6 +1963,7 @@ ACTOR Future<Void> getKeyValuesStreamQ(StorageServer* data, GetKeyValuesStreamRe
 	state Span span("SS:getKeyValuesStream"_loc, { req.spanContext });
 	state int64_t resultSize = 0;
 
+	req.reply.setByteLimit(SERVER_KNOBS->RANGESTREAM_LIMIT_BYTES);
 	++data->counters.getRangeStreamQueries;
 	++data->counters.allQueries;
 	++data->readQueueSizeMetric;
@@ -4468,7 +4469,6 @@ ACTOR Future<Void> serveGetKeyValuesStreamRequests(StorageServer* self,
                                                    FutureStream<GetKeyValuesStreamRequest> getKeyValuesStream) {
 	loop {
 		GetKeyValuesStreamRequest req = waitNext(getKeyValuesStream);
-		req.reply.setByteLimit(SERVER_KNOBS->RANGESTREAM_LIMIT_BYTES);
 		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
 		// before doing real work
 		// FIXME: add readGuard again

From eb568f9794cdf348a0f207af03ee9048f259e2fe Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 18 May 2021 23:39:01 -0700
Subject: [PATCH 173/740] Switched from a BoundedFlowLock to a FlowLock in
 parallelStream because onEmpty() will ensure that the locks are released in
 the order they were taken

---
 fdbclient/Knobs.cpp                |  3 +--
 fdbclient/Knobs.h                  |  1 -
 fdbclient/NativeAPI.actor.cpp      | 16 ++++++++--------
 fdbclient/NativeAPI.actor.h        |  2 ++
 fdbclient/ParallelStream.actor.cpp |  6 ++----
 fdbclient/ParallelStream.actor.h   | 15 +++++++--------
 6 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/fdbclient/Knobs.cpp b/fdbclient/Knobs.cpp
index bc1e9b43ffe..6e6cc94699e 100644
--- a/fdbclient/Knobs.cpp
+++ b/fdbclient/Knobs.cpp
@@ -98,8 +98,7 @@ void ClientKnobs::initialize(bool randomize) {
 	init( MID_SHARD_SIZE_MAX_STALENESS,           10.0 );
 	init( TAG_ENCODE_KEY_SERVERS,                false ); if( randomize && BUGGIFY ) TAG_ENCODE_KEY_SERVERS = true;
 	init( RANGESTREAM_FRAGMENT_SIZE,               1e6 );
-	init( RANGESTREAM_CONCURRENT_FRAGMENTS,         10 );
-	init( RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT,     2*RANGESTREAM_CONCURRENT_FRAGMENTS );
+	init( RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT,     20 );
 
 	//KeyRangeMap
 	init( KRM_GET_RANGE_LIMIT,                     1e5 ); if( randomize && BUGGIFY ) KRM_GET_RANGE_LIMIT = 10;
diff --git a/fdbclient/Knobs.h b/fdbclient/Knobs.h
index 6aa5cd939e8..8564a275664 100644
--- a/fdbclient/Knobs.h
+++ b/fdbclient/Knobs.h
@@ -91,7 +91,6 @@ class ClientKnobs : public Knobs {
 	double MID_SHARD_SIZE_MAX_STALENESS;
 	bool TAG_ENCODE_KEY_SERVERS;
 	int64_t RANGESTREAM_FRAGMENT_SIZE;
-	int RANGESTREAM_CONCURRENT_FRAGMENTS;
 	int RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT;
 
 	// KeyRangeMap
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 91681ce6cb1..97204a588a0 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3259,6 +3259,7 @@ ACTOR Future<RangeResult> getRange(Database cx,
 	}
 }
 
+// Streams all of the KV pairs in a target key range into a ParallelStream fragment
 ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment* results,
                                           Database cx,
                                           Reference<TransactionLogInfo> trLogInfo,
@@ -3309,6 +3310,8 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 				state int useIdx = -1;
 
 				loop {
+					// FIXME: create a load balance function for this code so future users of reply streams do not have
+					// to duplicate this code
 					int count = 0;
 					for (int i = 0; i < locations[shard].second->size(); i++) {
 						if (!IFailureMonitor::failureMonitor()
@@ -3381,12 +3384,6 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					cx->transactionBytesRead += bytes;
 					cx->transactionKeysRead += output.size();
 
-					// FIXME: figure out appropriate metrics for the client event log
-					// if( trLogInfo ) {
-					//	trLogInfo->addLog(FdbClientLogEvents::EventGetRange(startTime,
-					// cx->clientLocality.dcId(), now()-startTime, bytes, begin.getKey(), end.getKey()));
-					//}
-
 					// If the reply says there is more but we know that we finished the shard, then fix rep.more
 					if (reverse && output.more && rep.data.size() > 0 &&
 					    output[output.size() - 1].key == locations[shard].first.begin) {
@@ -3492,6 +3489,8 @@ static KeyRange intersect(KeyRangeRef lhs, KeyRangeRef rhs) {
 	return KeyRange(KeyRangeRef(std::max(lhs.begin, rhs.begin), std::min(lhs.end, rhs.end)));
 }
 
+// Divides the requested key range into 1MB fragments, create range streams for each fragment, and merges the results so
+// the client get them in order
 ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results,
                                   Database cx,
                                   Reference<TransactionLogInfo> trLogInfo,
@@ -3505,8 +3504,7 @@ ACTOR Future<Void> getRangeStream(PromiseStream<RangeResult> _results,
                                   TransactionInfo info,
                                   TagSet tags) {
 
-	state ParallelStream<RangeResult> results(
-	    _results, CLIENT_KNOBS->RANGESTREAM_CONCURRENT_FRAGMENTS, CLIENT_KNOBS->RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT);
+	state ParallelStream<RangeResult> results(_results, CLIENT_KNOBS->RANGESTREAM_BUFFERED_FRAGMENTS_LIMIT);
 
 	// FIXME: better handling to disable row limits
 	ASSERT(!limits.hasRowLimit());
@@ -3932,6 +3930,8 @@ Future<RangeResult> Transaction::getRange(const KeySelector& begin,
 	return getRange(begin, end, GetRangeLimits(limit), snapshot, reverse);
 }
 
+// A method for streaming data from the storage server that is more efficient than getRange when reading large amounts
+// of data
 Future<Void> Transaction::getRangeStream(const PromiseStream<RangeResult>& results,
                                          const KeySelector& begin,
                                          const KeySelector& end,
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 10ce0180b15..b06428f8874 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -283,6 +283,8 @@ class Transaction : NonCopyable {
 		                reverse);
 	}
 
+	// A method for streaming data from the storage server that is more efficient than getRange when reading large
+	// amounts of data
 	[[nodiscard]] Future<Void> getRangeStream(const PromiseStream<Standalone<RangeResultRef>>& results,
 	                                          const KeySelector& begin,
 	                                          const KeySelector& end,
diff --git a/fdbclient/ParallelStream.actor.cpp b/fdbclient/ParallelStream.actor.cpp
index 6f0f5178ee8..ff4177a115c 100644
--- a/fdbclient/ParallelStream.actor.cpp
+++ b/fdbclient/ParallelStream.actor.cpp
@@ -59,14 +59,12 @@ ACTOR static Future<Void> consume(FutureStream<ParallelStreamTest::TestValue> st
 
 TEST_CASE("/fdbclient/ParallelStream") {
 	state PromiseStream<ParallelStreamTest::TestValue> results;
-	state size_t concurrency = deterministicRandom()->randomInt(1, 11);
-	state size_t bufferLimit = concurrency + deterministicRandom()->randomInt(0, 11);
+	state size_t bufferLimit = deterministicRandom()->randomInt(0, 21);
 	state size_t numProducers = deterministicRandom()->randomInt(1, 1001);
-	state ParallelStream<ParallelStreamTest::TestValue> parallelStream(results, concurrency, bufferLimit);
+	state ParallelStream<ParallelStreamTest::TestValue> parallelStream(results, bufferLimit);
 	state Future<Void> consumer = ParallelStreamTest::consume(results.getFuture(), numProducers);
 	state std::vector<Future<Void>> producers;
 	TraceEvent("StartingParallelStreamTest")
-	    .detail("Concurrency", concurrency)
 	    .detail("BufferLimit", bufferLimit)
 	    .detail("NumProducers", numProducers);
 	state int i = 0;
diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index ab57d5cbe42..b2e68c51f15 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -33,7 +33,7 @@
 
 template <class T>
 class ParallelStream {
-	BoundedFlowLock semaphore;
+	FlowLock semaphore;
 	struct FragmentConstructorTag {
 		explicit FragmentConstructorTag() = default;
 	};
@@ -42,12 +42,12 @@ class ParallelStream {
 	class Fragment : public ReferenceCounted<Fragment> {
 		ParallelStream* parallelStream;
 		PromiseStream<T> stream;
-		BoundedFlowLock::Releaser releaser;
+		FlowLock::Releaser releaser;
 		friend class ParallelStream;
 
 	public:
-		Fragment(ParallelStream* parallelStream, int64_t permitNumber, FragmentConstructorTag)
-		  : parallelStream(parallelStream), releaser(&parallelStream->semaphore, permitNumber) {}
+		Fragment(ParallelStream* parallelStream, FragmentConstructorTag)
+		  : parallelStream(parallelStream), releaser(parallelStream->semaphore) {}
 		template <class U>
 		void send(U&& value) {
 			stream.send(std::forward<U>(value));
@@ -101,14 +101,13 @@ class ParallelStream {
 		}
 	}
 
-	ParallelStream(PromiseStream<T> results, size_t concurrency, size_t bufferLimit)
-	  : results(results), semaphore(concurrency, bufferLimit) {
+	ParallelStream(PromiseStream<T> results, size_t bufferLimit) : results(results), semaphore(bufferLimit) {
 		flusher = flushToClient(this);
 	}
 
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
-		int64_t permitNumber = wait(self->semaphore.take());
-		auto fragment = makeReference<Fragment>(self, permitNumber, FragmentConstructorTag());
+		wait(self->semaphore.take());
+		auto fragment = makeReference<Fragment>(self, FragmentConstructorTag());
 		self->fragments.send(fragment);
 		return fragment.getPtr();
 	}

From d82643ee1fec5962edd78b1bdfb1e7394f6a135d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 19 May 2021 09:23:16 -0700
Subject: [PATCH 174/740] go back to a boundedFlowLock because it is possible a
 fragment is finish with a single result

---
 fdbclient/ParallelStream.actor.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index b2e68c51f15..e2b9f256be4 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -33,7 +33,7 @@
 
 template <class T>
 class ParallelStream {
-	FlowLock semaphore;
+	BoundedFlowLock semaphore;
 	struct FragmentConstructorTag {
 		explicit FragmentConstructorTag() = default;
 	};
@@ -42,12 +42,12 @@ class ParallelStream {
 	class Fragment : public ReferenceCounted<Fragment> {
 		ParallelStream* parallelStream;
 		PromiseStream<T> stream;
-		FlowLock::Releaser releaser;
+		BoundedFlowLock::Releaser releaser;
 		friend class ParallelStream;
 
 	public:
-		Fragment(ParallelStream* parallelStream, FragmentConstructorTag)
-		  : parallelStream(parallelStream), releaser(parallelStream->semaphore) {}
+		Fragment(ParallelStream* parallelStream, int64_t permitNumber, FragmentConstructorTag)
+		  : parallelStream(parallelStream), releaser(&parallelStream->semaphore, permitNumber) {}
 		template <class U>
 		void send(U&& value) {
 			stream.send(std::forward<U>(value));
@@ -101,13 +101,13 @@ class ParallelStream {
 		}
 	}
 
-	ParallelStream(PromiseStream<T> results, size_t bufferLimit) : results(results), semaphore(bufferLimit) {
+	ParallelStream(PromiseStream<T> results, size_t bufferLimit) : results(results), semaphore(1, bufferLimit) {
 		flusher = flushToClient(this);
 	}
 
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
-		wait(self->semaphore.take());
-		auto fragment = makeReference<Fragment>(self, FragmentConstructorTag());
+		int64_t permitNumber = wait(self->semaphore.take());
+		auto fragment = makeReference<Fragment>(self, permitNumber, FragmentConstructorTag());
 		self->fragments.send(fragment);
 		return fragment.getPtr();
 	}

From dba8b738d9f6cf69c8a0b2e207c993b9473f7896 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 19 May 2021 09:46:08 -0700
Subject: [PATCH 175/740] added a lot of comments

---
 fdbclient/ParallelStream.actor.h |  5 +++++
 fdbrpc/LoadBalance.actor.cpp     |  3 +++
 fdbrpc/fdbrpc.h                  | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index e2b9f256be4..e25c7ee52d7 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -31,6 +31,8 @@
 #include "flow/genericactors.actor.h"
 #include "flow/actorcompiler.h" // must be last include
 
+// ParallelStream is used to fetch data from multiple streams in parallel and then merge them back into a single stream
+// in order.
 template <class T>
 class ParallelStream {
 	BoundedFlowLock semaphore;
@@ -39,6 +41,7 @@ class ParallelStream {
 	};
 
 public:
+	// A Fragment is a single stream that will get results to be merged back into the main output stream
 	class Fragment : public ReferenceCounted<Fragment> {
 		ParallelStream* parallelStream;
 		PromiseStream<T> stream;
@@ -67,6 +70,7 @@ class ParallelStream {
 	Future<Void> flusher;
 
 public:
+	// A background actor which take results from the oldest fragment and sends them to the main output stream
 	ACTOR static Future<Void> flushToClient(ParallelStream<T>* self) {
 		state const int messagesBetweenYields = 1000;
 		state int messagesSinceYield = 0;
@@ -105,6 +109,7 @@ class ParallelStream {
 		flusher = flushToClient(this);
 	}
 
+	// Creates a fragment to get merged into the main output stream
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
 		int64_t permitNumber = wait(self->semaphore.take());
 		auto fragment = makeReference<Fragment>(self, permitNumber, FragmentConstructorTag());
diff --git a/fdbrpc/LoadBalance.actor.cpp b/fdbrpc/LoadBalance.actor.cpp
index 68a0b45c4a8..e9f4409c9f4 100644
--- a/fdbrpc/LoadBalance.actor.cpp
+++ b/fdbrpc/LoadBalance.actor.cpp
@@ -21,6 +21,9 @@
 #include "flow/flow.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
+// Throwing all_alternatives_failed will cause the client to issue a GetKeyLocationRequest to the proxy, so this actor
+// attempts to limit the number of these errors thrown by a single client to prevent it from saturating the proxies with
+// these requests
 ACTOR Future<Void> allAlternativesFailedDelay(Future<Void> okFuture) {
 	if (now() - g_network->networkInfo.newestAlternativesFailure > FLOW_KNOBS->ALTERNATIVES_FAILURE_RESET_TIME) {
 		g_network->networkInfo.oldestAlternativesFailure = now();
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index fc3c210249b..9ea07b51d4e 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -271,6 +271,8 @@ struct AcknowledgementReply {
 	}
 };
 
+// Registered on the server to recieve acknowledgements that the client has received stream data. This prevents the
+// server from sending too much data to the client if the client is not consuming it.
 struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<AcknowledgementReceiver> {
 	using FastAllocated<AcknowledgementReceiver>::operator new;
 	using FastAllocated<AcknowledgementReceiver>::operator delete;
@@ -289,6 +291,8 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 		ErrorOr<AcknowledgementReply> message;
 		reader.deserialize(message);
 		if (message.isError()) {
+			// The client will send an operation_obsolete error on the acknowledgement stream when it cancels the
+			// ReplyPromiseStream
 			if (!ready.isValid()) {
 				ready = Promise<Void>();
 			}
@@ -299,12 +303,14 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 			if (ready.isValid() && bytesSent - bytesAcknowledged < bytesLimit) {
 				Promise<Void> hold = ready;
 				ready = Promise<Void>(nullptr);
+				// Sending to this promise could cause the ready to be replaced, so we need to hold a local copy
 				hold.send(Void());
 			}
 		}
 	}
 };
 
+// A version of NetNotifiedQueue which adds support for acknowledgments.
 template <class T>
 struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
                                                     FlowReceiver,
@@ -319,6 +325,7 @@ struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
 	NetNotifiedQueueWithAcknowledgements(int futures, int promises) : NotifiedQueue<T>(futures, promises) {}
 	NetNotifiedQueueWithAcknowledgements(int futures, int promises, const Endpoint& remoteEndpoint)
 	  : NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
+		// A ReplyPromiseStream will be terminated on the server side if the network connection with the client breaks
 		acknowledgements.failures = tagError<Void>(
 		    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), operation_obsolete());
 	}
@@ -332,6 +339,9 @@ struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
 		if (message.isError()) {
 			if (message.getError().code() == error_code_broken_promise) {
 				ASSERT(requestStreamEndpoint.isValid());
+				// We will get a broken_promise on the client side only if the ReplyPromiseStream was cancelled without
+				// sending an error. In this case the storage server actor must have been cancelled so future
+				// GetKeyValuesStream requests on the same endpoint will fail
 				IFailureMonitor::failureMonitor().endpointNotFound(requestStreamEndpoint);
 			}
 			this->sendError(message.getError());
@@ -341,6 +351,8 @@ struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
 				    FlowTransport::transport().loadedEndpoint(message.get().asUnderlyingType().acknowledgeToken.get()));
 			}
 			if (this->shouldFireImmediately()) {
+				// This message is going to be consumed by the client immediately (and therefore will not call pop()) so
+				// send an ack immediately
 				if (acknowledgements.getRawEndpoint().isValid()) {
 					acknowledgements.bytesAcknowledged += message.get().asUnderlyingType().expectedSize();
 					FlowTransport::transport().sendUnreliable(
@@ -358,6 +370,7 @@ struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
 
 	T pop() override {
 		T res = this->popImpl();
+		// A reply that has been queued up is being consumed, so send an ack to the server
 		if (acknowledgements.getRawEndpoint().isValid()) {
 			acknowledgements.bytesAcknowledged += res.expectedSize();
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<AcknowledgementReply>>(
@@ -370,12 +383,14 @@ struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
 
 	~NetNotifiedQueueWithAcknowledgements() {
 		if (acknowledgements.getRawEndpoint().isValid() && acknowledgements.isRemoteEndpoint() && !this->hasError()) {
+			// Notify the server that a client is not using this ReplyPromiseStream anymore
 			FlowTransport::transport().sendUnreliable(
 			    SerializeSource<ErrorOr<AcknowledgementReply>>(operation_obsolete()),
 			    acknowledgements.getEndpoint(TaskPriority::ReadSocket),
 			    false);
 		}
 		if (isRemoteEndpoint() && !sentError && !acknowledgements.failures.isReady()) {
+			// The ReplyPromiseStream was cancelled before sending an error, so the storage server must have died
 			FlowTransport::transport().sendUnreliable(SerializeSource<ErrorOr<EnsureTable<T>>>(broken_promise()),
 			                                          getEndpoint(TaskPriority::ReadSocket),
 			                                          false);
@@ -440,6 +455,7 @@ class ReplyPromiseStream {
 	explicit ReplyPromiseStream(const Endpoint& endpoint)
 	  : queue(new NetNotifiedQueueWithAcknowledgements<T>(0, 1, endpoint)), errors(nullptr) {}
 
+	// Used by endStreamOnDisconnect to detect when all references to the ReplyPromiseStream have been dropped
 	Future<Void> getErrorFutureAndDelPromiseRef() {
 		ASSERT(errors && errors->getPromiseReferenceCount() > 1);
 		errors->addFutureRef();
@@ -464,6 +480,8 @@ class ReplyPromiseStream {
 	bool isEmpty() const { return !queue->isReady(); }
 	uint32_t size() const { return queue->size(); }
 
+	// Must be called on the server before sending results on the stream to ratelimit the amount of data outstanding to
+	// the client
 	Future<Void> onReady() {
 		ASSERT(queue->acknowledgements.bytesLimit > 0);
 		if (queue->acknowledgements.failures.isError()) {
@@ -482,6 +500,8 @@ class ReplyPromiseStream {
 		return queue->acknowledgements.ready.getFuture() || queue->acknowledgements.failures;
 	}
 
+	// Must be called on the server before using a ReplyPromiseStream to limit the amount of outstanding bytes to the
+	// client
 	void setByteLimit(int64_t byteLimit) { queue->acknowledgements.bytesLimit = byteLimit; }
 
 	void operator=(const ReplyPromiseStream& rhs) {

From 545b9f44ada6fbd1ed1a41846719266257e9ebbb Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 19 May 2021 14:30:33 -0700
Subject: [PATCH 176/740] need to handle the possibility of getting
 broken_promise errors from range streams

---
 fdbclient/NativeAPI.actor.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 97204a588a0..541755f9601 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3365,11 +3365,13 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 						++cx->transactionPhysicalReadsCompleted;
 					} catch (Error& e) {
 						++cx->transactionPhysicalReadsCompleted;
-						if (e.code() == error_code_end_of_stream) {
-							rep = GetKeyValuesStreamReply();
-						} else {
+						if (e.code() == error_code_broken_promise) {
+							throw connection_failed();
+						}
+						if (e.code() != error_code_end_of_stream) {
 							throw;
 						}
+						rep = GetKeyValuesStreamReply();
 					}
 					if (info.debugID.present())
 						g_traceBatch.addEvent(

From 983f1c43cca29ce9a24e6e0962ce85434abaa3a4 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 19 May 2021 17:07:18 -0700
Subject: [PATCH 177/740] onDisconnect should only trigger when the connect
 actually closes (rather than marking the address as failed for a different
 reason) because otherwise the server might think the range stream is finished
 while the client is still waiting for results

---
 fdbrpc/FailureMonitor.actor.cpp | 12 ++++--------
 fdbrpc/FailureMonitor.h         |  7 ++++---
 fdbrpc/fdbrpc.h                 |  6 ++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/fdbrpc/FailureMonitor.actor.cpp b/fdbrpc/FailureMonitor.actor.cpp
index 58980d1f085..31ad94d4f9c 100644
--- a/fdbrpc/FailureMonitor.actor.cpp
+++ b/fdbrpc/FailureMonitor.actor.cpp
@@ -69,7 +69,7 @@ Future<Void> IFailureMonitor::onFailedFor(Endpoint const& endpoint, double susta
 	return waitForContinuousFailure(this, endpoint, sustainedFailureDuration, slope);
 }
 
-SimpleFailureMonitor::SimpleFailureMonitor() : endpointKnownFailed() {
+SimpleFailureMonitor::SimpleFailureMonitor() {
 	// Mark ourselves as available in FailureMonitor
 	const auto& localAddresses = FlowTransport::transport().getLocalAddresses();
 	addressStatus[localAddresses.address] = FailureStatus(false);
@@ -139,6 +139,7 @@ void SimpleFailureMonitor::endpointNotFound(Endpoint const& endpoint) {
 void SimpleFailureMonitor::notifyDisconnect(NetworkAddress const& address) {
 	//TraceEvent("NotifyDisconnect").detail("Address", address);
 	endpointKnownFailed.triggerRange(Endpoint({ address }, UID()), Endpoint({ address }, UID(-1, -1)));
+	disconnectTriggers.trigger(address);
 }
 
 Future<Void> SimpleFailureMonitor::onDisconnectOrFailure(Endpoint const& endpoint) {
@@ -155,13 +156,8 @@ Future<Void> SimpleFailureMonitor::onDisconnectOrFailure(Endpoint const& endpoin
 	return endpointKnownFailed.onChange(endpoint);
 }
 
-Future<Void> SimpleFailureMonitor::onDisconnect(Endpoint const& endpoint) {
-	// If the endpoint is permanently failed, return right away
-	if (failedEndpoints.count(endpoint)) {
-		TraceEvent("AlreadyDisconnected").detail("Addr", endpoint.getPrimaryAddress()).detail("Tok", endpoint.token);
-		return Void();
-	}
-	return endpointKnownFailed.onChange(endpoint);
+Future<Void> SimpleFailureMonitor::onDisconnect(NetworkAddress const& address) {
+	return disconnectTriggers.onChange(address);
 }
 
 Future<Void> SimpleFailureMonitor::onStateChanged(Endpoint const& endpoint) {
diff --git a/fdbrpc/FailureMonitor.h b/fdbrpc/FailureMonitor.h
index 7a38531bfee..62a9ceb0277 100644
--- a/fdbrpc/FailureMonitor.h
+++ b/fdbrpc/FailureMonitor.h
@@ -101,8 +101,8 @@ class IFailureMonitor {
 	// Returns when onFailed(endpoint) || transport().onDisconnect( endpoint.getPrimaryAddress() )
 	virtual Future<Void> onDisconnectOrFailure(Endpoint const& endpoint) = 0;
 
-	// Returns when transport().onDisconnect( endpoint.getPrimaryAddress() ) or the endpoint is permanently failed
-	virtual Future<Void> onDisconnect(Endpoint const& endpoint) = 0;
+	// Returns when transport().onDisconnect( address )
+	virtual Future<Void> onDisconnect(NetworkAddress const& address) = 0;
 
 	// Returns true if the endpoint is failed but the address of the endpoint is not failed.
 	virtual bool onlyEndpointFailed(Endpoint const& endpoint) const = 0;
@@ -150,7 +150,7 @@ class SimpleFailureMonitor : public IFailureMonitor {
 	FailureStatus getState(Endpoint const& endpoint) const override;
 	FailureStatus getState(NetworkAddress const& address) const override;
 	Future<Void> onDisconnectOrFailure(Endpoint const& endpoint) override;
-	Future<Void> onDisconnect(Endpoint const& endpoint) override;
+	Future<Void> onDisconnect(NetworkAddress const& address) override;
 	bool onlyEndpointFailed(Endpoint const& endpoint) const override;
 	bool permanentlyFailed(Endpoint const& endpoint) const override;
 
@@ -159,6 +159,7 @@ class SimpleFailureMonitor : public IFailureMonitor {
 private:
 	std::unordered_map<NetworkAddress, FailureStatus> addressStatus;
 	YieldedAsyncMap<Endpoint, bool> endpointKnownFailed;
+	YieldedAsyncMap<NetworkAddress, bool> disconnectTriggers;
 	std::unordered_set<Endpoint> failedEndpoints;
 
 	friend class OnStateChangedActorActor;
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index 9ea07b51d4e..eb2fcb0ea88 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -327,7 +327,8 @@ struct NetNotifiedQueueWithAcknowledgements final : NotifiedQueue<T>,
 	  : NotifiedQueue<T>(futures, promises), FlowReceiver(remoteEndpoint, true) {
 		// A ReplyPromiseStream will be terminated on the server side if the network connection with the client breaks
 		acknowledgements.failures = tagError<Void>(
-		    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint), operation_obsolete());
+		    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(remoteEndpoint.getPrimaryAddress()),
+		    operation_obsolete());
 	}
 
 	void destroy() override { delete this; }
@@ -689,7 +690,8 @@ class RequestStream {
 	template <class X>
 	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value) const {
 		if (queue->isRemoteEndpoint()) {
-			Future<Void> disc = makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint());
+			Future<Void> disc =
+			    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint().getPrimaryAddress());
 			auto& p = getReplyPromiseStream(value);
 			Reference<Peer> peer =
 			    FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);

From c852bdb65e8b02846cf9eb568f4e2a948efe6036 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 19 May 2021 17:30:09 -0700
Subject: [PATCH 178/740] the client should still fail on endpoint failures

---
 fdbrpc/fdbrpc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index eb2fcb0ea88..ece284c75df 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -691,7 +691,7 @@ class RequestStream {
 	ReplyPromiseStream<REPLYSTREAM_TYPE(X)> getReplyStream(const X& value) const {
 		if (queue->isRemoteEndpoint()) {
 			Future<Void> disc =
-			    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnect(getEndpoint().getPrimaryAddress());
+			    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint());
 			auto& p = getReplyPromiseStream(value);
 			Reference<Peer> peer =
 			    FlowTransport::transport().sendUnreliable(SerializeSource<T>(value), getEndpoint(), true);

From 0cdb05f14102797f38a82f050780b1c40b14157a Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Mon, 24 May 2021 15:24:09 -0400
Subject: [PATCH 179/740] Update release notes to match the ones on release-6.3

---
 .../sphinx/source/release-notes/release-notes-630.rst        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index 2057e7fcb2a..f2ceee9359f 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -5,14 +5,19 @@ Release Notes
 
 6.3.13
 ======
+* Added ``commit_batching_window_size`` to the proxy roles section of status to record statistics about commit batching window size on each proxy. `(PR #4736) <https://github.com/apple/foundationdb/pull/4736>`_
 * The multi-version client now requires at most two client connections with version 6.2 or larger, regardless of how many external clients are configured. Clients older than 6.2 will continue to create an additional connection each. `(PR #4667) <https://github.com/apple/foundationdb/pull/4667>`_
 * Fix an accounting error that could potentially result in inaccuracies in priority busyness metrics. `(PR #4824) <https://github.com/apple/foundationdb/pull/4824>`_
+* Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 
 6.3.12
 ======
 * Change the default for --knob_tls_server_handshake_threads to 64. The previous was 1000. This avoids starting 1000 threads by default, but may adversely affect recovery time for large clusters using tls. Users with large tls clusters should consider explicitly setting this knob in their foundationdb.conf file. `(PR #4421) <https://github.com/apple/foundationdb/pull/4421>`_
 * Fix accounting error that could cause commits to incorrectly fail with ``proxy_memory_limit_exceeded``. `(PR #4526) <https://github.com/apple/foundationdb/pull/4526>`_
 * As an optimization, partial restore using target key ranges now filters backup log data prior to loading it into the database.  `(PR #4554) <https://github.com/apple/foundationdb/pull/4554>`_
+* Fix fault tolerance calculation when there are no tLogs in LogSet.  `(PR #4454) <https://github.com/apple/foundationdb/pull/4454>`_
 
 6.3.11
 ======

From 9b724b34f09b6a4104bb8e8616b2a4e6fa28388a Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Mon, 24 May 2021 15:56:33 -0400
Subject: [PATCH 180/740] Move patch notes to the appropriate section, and add
 new 6.3.14 notes. Also added notes under 7.0 Status section

---
 .../sphinx/source/release-notes/release-notes-630.rst  | 10 +++++++---
 .../sphinx/source/release-notes/release-notes-700.rst  |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index f2ceee9359f..3582abdd4f8 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -3,14 +3,18 @@ Release Notes
 #############
 
 
+6.3.14
+======
+* Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added the ``bypass_unreadable`` transaction option which allows ``get`` operations to read from sections of keyspace that have become unreadable because of versionstamp operations. `(PR #4774) <https://github.com/apple/foundationdb/pull/4774>`_
+
 6.3.13
 ======
 * Added ``commit_batching_window_size`` to the proxy roles section of status to record statistics about commit batching window size on each proxy. `(PR #4736) <https://github.com/apple/foundationdb/pull/4736>`_
 * The multi-version client now requires at most two client connections with version 6.2 or larger, regardless of how many external clients are configured. Clients older than 6.2 will continue to create an additional connection each. `(PR #4667) <https://github.com/apple/foundationdb/pull/4667>`_
 * Fix an accounting error that could potentially result in inaccuracies in priority busyness metrics. `(PR #4824) <https://github.com/apple/foundationdb/pull/4824>`_
-* Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
-* Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
-* Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 
 6.3.12
 ======
diff --git a/documentation/sphinx/source/release-notes/release-notes-700.rst b/documentation/sphinx/source/release-notes/release-notes-700.rst
index 99fcc930c1f..a0f9f49136f 100644
--- a/documentation/sphinx/source/release-notes/release-notes-700.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-700.rst
@@ -31,6 +31,9 @@ Fixes
 Status
 ------
 * Added ``commit_batching_window_size`` to the proxy roles section of status to record statistics about commit batching window size on each proxy. `(PR #4735) <https://github.com/apple/foundationdb/pull/4735>`_
+* Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 
 
 Bindings

From 64b1f344db4e76ca2f33b03935e70d7d51e96cd4 Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Mon, 24 May 2021 16:04:53 -0400
Subject: [PATCH 181/740] more patch notes added

---
 documentation/sphinx/source/release-notes/release-notes-630.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index 3582abdd4f8..307e08ce871 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -9,6 +9,7 @@ Release Notes
 * Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added the ``bypass_unreadable`` transaction option which allows ``get`` operations to read from sections of keyspace that have become unreadable because of versionstamp operations. `(PR #4774) <https://github.com/apple/foundationdb/pull/4774>`_
+* Fix several packaging issues. The osx package should now install successfully, and the structure of the RPM and DEB packages should match that of 6.2. `(PR #4810) <https://github.com/apple/foundationdb/pull/4810>`_
 
 6.3.13
 ======

From 92b949cba12293e0f33e16320aa8ddd85c0e1cb7 Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Mon, 24 May 2021 16:30:24 -0400
Subject: [PATCH 182/740] move note to 6.3.14

---
 documentation/sphinx/source/release-notes/release-notes-630.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index 307e08ce871..af5b2a02c79 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -10,12 +10,12 @@ Release Notes
 * Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added the ``bypass_unreadable`` transaction option which allows ``get`` operations to read from sections of keyspace that have become unreadable because of versionstamp operations. `(PR #4774) <https://github.com/apple/foundationdb/pull/4774>`_
 * Fix several packaging issues. The osx package should now install successfully, and the structure of the RPM and DEB packages should match that of 6.2. `(PR #4810) <https://github.com/apple/foundationdb/pull/4810>`_
+* Fix an accounting error that could potentially result in inaccuracies in priority busyness metrics. `(PR #4824) <https://github.com/apple/foundationdb/pull/4824>`_
 
 6.3.13
 ======
 * Added ``commit_batching_window_size`` to the proxy roles section of status to record statistics about commit batching window size on each proxy. `(PR #4736) <https://github.com/apple/foundationdb/pull/4736>`_
 * The multi-version client now requires at most two client connections with version 6.2 or larger, regardless of how many external clients are configured. Clients older than 6.2 will continue to create an additional connection each. `(PR #4667) <https://github.com/apple/foundationdb/pull/4667>`_
-* Fix an accounting error that could potentially result in inaccuracies in priority busyness metrics. `(PR #4824) <https://github.com/apple/foundationdb/pull/4824>`_
 
 6.3.12
 ======

From 3dacca2f59a982a250b7c343acc4258ef715b5ff Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Mon, 24 May 2021 18:24:00 -0400
Subject: [PATCH 183/740] add 6.3.12 notes

---
 documentation/sphinx/source/release-notes/release-notes-630.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index af5b2a02c79..859aee0eb4c 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -23,6 +23,8 @@ Release Notes
 * Fix accounting error that could cause commits to incorrectly fail with ``proxy_memory_limit_exceeded``. `(PR #4526) <https://github.com/apple/foundationdb/pull/4526>`_
 * As an optimization, partial restore using target key ranges now filters backup log data prior to loading it into the database.  `(PR #4554) <https://github.com/apple/foundationdb/pull/4554>`_
 * Fix fault tolerance calculation when there are no tLogs in LogSet.  `(PR #4454) <https://github.com/apple/foundationdb/pull/4454>`_
+* Change client's ``iteration_progression`` size defaults from 256 to 4096 bytes for better performance. `(PR #4416) <https://github.com/apple/foundationdb/pull/4416>`_
+* Add the ability to instrument java driver actions, such as FDBTransaction and RangeQuery. `(PR #4385) <https://github.com/apple/foundationdb/pull/4385>`_
 
 6.3.11
 ======

From af29b04074656d0337897106a9f33aa7c37eea9c Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Mon, 24 May 2021 18:27:23 -0400
Subject: [PATCH 184/740] update formatting

---
 documentation/sphinx/source/release-notes/release-notes-630.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index 859aee0eb4c..bebd55e8590 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -24,7 +24,7 @@ Release Notes
 * As an optimization, partial restore using target key ranges now filters backup log data prior to loading it into the database.  `(PR #4554) <https://github.com/apple/foundationdb/pull/4554>`_
 * Fix fault tolerance calculation when there are no tLogs in LogSet.  `(PR #4454) <https://github.com/apple/foundationdb/pull/4454>`_
 * Change client's ``iteration_progression`` size defaults from 256 to 4096 bytes for better performance. `(PR #4416) <https://github.com/apple/foundationdb/pull/4416>`_
-* Add the ability to instrument java driver actions, such as FDBTransaction and RangeQuery. `(PR #4385) <https://github.com/apple/foundationdb/pull/4385>`_
+* Add the ability to instrument java driver actions, such as ``FDBTransaction`` and ``RangeQuery``. `(PR #4385) <https://github.com/apple/foundationdb/pull/4385>`_
 
 6.3.11
 ======

From bf051096d5c82ca2f61eb757a70d83f2792eb140 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 24 May 2021 20:42:58 -0700
Subject: [PATCH 185/740] Fix several package issues (#4801) (#4808)

* Make the structure of the server pkg match 6.2.28

* Fix OSX lib path

* Fix install destinations in client

Previously, backup_agent would map to fdbmonitor installation dir -
which is incorrect in the sense that it disagrees with where the default
foundationdb.conf expects to find backup_agent. Add a new backupagent
installation dir and install there, matching foundationdb.conf's
expectations.

Also fix an issue where several of the versions of fdbbackup weren't
being installed

* Update packaging/osx/buildpkg.sh for cmake

* Update README instructions for pkg file

* Remove osx cpack config

* Remove pm install destinations

* Fix weird syntax

* Remove cpack reference to PM

* Address review comments
---
 README.md                                |  4 +-
 cmake/CPackConfig.cmake                  | 18 ---------
 cmake/FDBInstall.cmake                   | 24 +++++++++---
 cmake/InstallLayout.cmake                | 46 +++--------------------
 fdbbackup/CMakeLists.txt                 |  4 +-
 packaging/osx/buildpkg.sh                | 48 +++++++++++++++---------
 packaging/osx/scripts-server/postinstall |  6 +--
 7 files changed, 61 insertions(+), 89 deletions(-)

diff --git a/README.md b/README.md
index cd28c798f0f..9e0ddb78a5b 100755
--- a/README.md
+++ b/README.md
@@ -157,11 +157,11 @@ The build under MacOS will work the same way as on Linux. To get boost and ninja
 cmake -G Ninja <PATH_TO_FOUNDATIONDB_SOURCE>
 ```
 
-To generate a installable package, you can use cpack:
+To generate a installable package,
 
 ```sh
 ninja
-cpack -G productbuild
+$SRCDIR/packaging/osx/buildpkg.sh . $SRCDIR
 ```
 
 ### Windows
diff --git a/cmake/CPackConfig.cmake b/cmake/CPackConfig.cmake
index 08f90bc0c53..c67059ec65c 100644
--- a/cmake/CPackConfig.cmake
+++ b/cmake/CPackConfig.cmake
@@ -9,24 +9,6 @@ elseif(CPACK_GENERATOR MATCHES "DEB")
   set(CPACK_COMPONENTS_ALL clients-deb server-deb clients-versioned server-versioned)
   set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.md)
   set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
-elseif(CPACK_GENERATOR MATCHES "productbuild")
-  set(CPACK_PACKAGING_INSTALL_PREFIX "/")
-  set(CPACK_COMPONENTS_ALL clients-pm server-pm)
-  set(CPACK_STRIP_FILES TRUE)
-  set(CPACK_PREFLIGHT_SERVER_SCRIPT ${CMAKE_SOURCE_DIR}/packaging/osx/scripts-server/preinstall)
-  set(CPACK_POSTFLIGHT_SERVER_SCRIPT ${CMAKE_SOURCE_DIR}/packaging/osx/scripts-server/postinstall)
-  set(CPACK_POSTFLIGHT_CLIENTS_SCRIPT ${CMAKE_SOURCE_DIR}/packaging/osx/scripts-server/preinstall)
-# Commenting out this readme file until it works within packaging
-  set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/packaging/osx/resources/conclusion.rtf)
-  set(CPACK_PRODUCTBUILD_RESOURCES_DIR ${CMAKE_SOURCE_DIR}/packaging/osx/resources)
-# Changing the path of this file as CMAKE_BINARY_DIR does not seem to be defined
-  set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_BINARY_DIR}/License.txt)
-  if(NOT FDB_RELEASE)
-    set(prerelease_string "-PRERELEASE")
-  else()
-    set(prerelease_string "")
-  endif()
-  set(CPACK_PACKAGE_FILE_NAME "FoundationDB-${PROJECT_VERSION}${prerelease_string}")
 elseif(CPACK_GENERATOR MATCHES "TGZ")
   set(CPACK_STRIP_FILES TRUE)
   set(CPACK_COMPONENTS_ALL clients-tgz server-tgz)
diff --git a/cmake/FDBInstall.cmake b/cmake/FDBInstall.cmake
index 263291c4335..2dd4be696f2 100644
--- a/cmake/FDBInstall.cmake
+++ b/cmake/FDBInstall.cmake
@@ -214,7 +214,7 @@ endfunction()
 
 function(fdb_install)
   if(NOT WIN32 AND NOT OPEN_FOR_IDE)
-    set(one_value_options COMPONENT DESTINATION EXPORT DESTINATION_SUFFIX)
+    set(one_value_options COMPONENT DESTINATION EXPORT DESTINATION_SUFFIX RENAME)
     set(multi_value_options TARGETS FILES PROGRAMS DIRECTORY)
     cmake_parse_arguments(IN "${options}" "${one_value_options}" "${multi_value_options}" "${ARGN}")
 
@@ -237,6 +237,9 @@ function(fdb_install)
       get_install_dest(${pkg} ${destination} install_path)
       string(TOLOWER "${pkg}" package)
       if(install_export)
+        if(IN_RENAME)
+          message(FATAL_ERROR "RENAME for EXPORT target not implemented")
+        endif()
         install(
           EXPORT "${IN_EXPORT}-${package}"
           DESTINATION "${install_path}${IN_DESTINATION_SUFFIX}"
@@ -248,11 +251,20 @@ function(fdb_install)
           set(export_args EXPORT "${IN_EXPORT}-${package}")
         endif()
         if(NOT ${install_path} STREQUAL "")
-          install(
-            ${args}
-            ${export_args}
-            DESTINATION "${install_path}${IN_DESTINATION_SUFFIX}"
-            COMPONENT "${IN_COMPONENT}-${package}")
+          if(IN_RENAME)
+            install(
+              ${args}
+              ${export_args}
+              DESTINATION "${install_path}${IN_DESTINATION_SUFFIX}"
+              COMPONENT "${IN_COMPONENT}-${package}"
+              RENAME ${IN_RENAME})
+          else()
+            install(
+              ${args}
+              ${export_args}
+              DESTINATION "${install_path}${IN_DESTINATION_SUFFIX}"
+              COMPONENT "${IN_COMPONENT}-${package}")
+          endif()
         endif()
       endif()
     endforeach()
diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index a037b65df29..91d39d4125a 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -46,10 +46,6 @@ function(install_symlink)
           TO "../${rel_path}bin/${IN_FILE_NAME}"
           DESTINATION "usr/lib64/${IN_LINK_NAME}"
           COMPONENTS "${IN_COMPONENT}-deb")
-        install_symlink_impl(
-          TO "../${rel_path}local/bin/${IN_FILE_NAME}"
-          DESTINATION "usr/lib64/${IN_LINK_NAME}"
-          COMPONENTS "${IN_COMPONENT}-pm")
       elseif("${IN_LINK_DIR}" MATCHES "bin")
         install_symlink_impl(
           TO "../${rel_path}bin/${IN_FILE_NAME}"
@@ -61,10 +57,6 @@ function(install_symlink)
           COMPONENTS "${IN_COMPONENT}-el6"
                      "${IN_COMPONENT}-el7"
                      "${IN_COMPONENT}-deb")
-        install_symlink_impl(
-          TO "../${rel_path}/bin/${IN_FILE_NAME}"
-          DESTINATION "usr/local/bin/${IN_LINK_NAME}"
-          COMPONENTS "${IN_COMPONENT}-pm")
       elseif("${IN_LINK_DIR}" MATCHES "fdbmonitor")
         install_symlink_impl(
           TO "../../${rel_path}bin/${IN_FILE_NAME}"
@@ -76,10 +68,6 @@ function(install_symlink)
           COMPONENTS "${IN_COMPONENT}-el6"
                      "${IN_COMPONENT}-el7"
                      "${IN_COMPONENT}-deb")
-        install_symlink_impl(
-          TO "../../${rel_path}/bin/${IN_FILE_NAME}"
-          DESTINATION "usr/local/lib/foundationdb/${IN_LINK_NAME}"
-          COMPONENTS "${IN_COMPONENT}-pm")
       else()
         message(FATAL_ERROR "Unknown LINK_DIR ${IN_LINK_DIR}")
       endif()
@@ -103,8 +91,8 @@ function(symlink_files)
   endif()
 endfunction()
 
-fdb_install_packages(TGZ DEB EL7 PM VERSIONED)
-fdb_install_dirs(BIN SBIN LIB FDBMONITOR INCLUDE ETC LOG DATA)
+fdb_install_packages(TGZ DEB EL7 VERSIONED)
+fdb_install_dirs(BIN SBIN LIB FDBMONITOR INCLUDE ETC LOG DATA BACKUPAGENT)
 message(STATUS "FDB_INSTALL_DIRS -> ${FDB_INSTALL_DIRS}")
 
 install_destinations(TGZ
@@ -112,6 +100,7 @@ install_destinations(TGZ
   SBIN sbin
   LIB lib
   FDBMONITOR sbin
+  BACKUPAGENT usr/lib/foundationdb
   INCLUDE include
   ETC etc/foundationdb
   LOG log/foundationdb
@@ -122,19 +111,13 @@ install_destinations(DEB
   SBIN usr/sbin
   LIB usr/lib
   FDBMONITOR usr/lib/foundationdb
+  BACKUPAGENT usr/lib/foundationdb
   INCLUDE usr/include
   ETC etc/foundationdb
   LOG var/log/foundationdb
   DATA var/lib/foundationdb/data)
 copy_install_destinations(DEB EL7)
 install_destinations(EL7 LIB usr/lib64)
-install_destinations(PM
-  BIN usr/local/bin
-  SBIN usr/local/sbin
-  LIB lib
-  FDBMONITOR usr/local/libexec
-  INCLUDE usr/local/include
-  ETC usr/local/etc/foundationdb)
 
 # This can be used for debugging in case above is behaving funky
 #print_install_destinations()
@@ -142,7 +125,7 @@ install_destinations(PM
 set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
 
 if(APPLE)
-  set(CPACK_GENERATOR TGZ productbuild)
+  set(CPACK_GENERATOR TGZ)
 else()
   set(CPACK_GENERATOR RPM DEB TGZ)
 endif()
@@ -212,19 +195,16 @@ set(CPACK_PACKAGE_CONTACT "The FoundationDB Community")
 set(CPACK_COMPONENT_SERVER-EL7_DEPENDS clients-el7)
 set(CPACK_COMPONENT_SERVER-DEB_DEPENDS clients-deb)
 set(CPACK_COMPONENT_SERVER-TGZ_DEPENDS clients-tgz)
-set(CPACK_COMPONENT_SERVER-PM_DEPENDS clients-pm)
 set(CPACK_COMPONENT_SERVER-VERSIONED_DEPENDS clients-versioned)
 
 set(CPACK_COMPONENT_SERVER-EL7_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-DEB_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-TGZ_DISPLAY_NAME "foundationdb-server")
-set(CPACK_COMPONENT_SERVER-PM_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-VERSIONED_DISPLAY_NAME "foundationdb-server-${PROJECT_VERSION}")
 
 set(CPACK_COMPONENT_CLIENTS-EL7_DISPLAY_NAME "foundationdb-clients")
 set(CPACK_COMPONENT_CLIENTS-DEB_DISPLAY_NAME "foundationdb-clients")
 set(CPACK_COMPONENT_CLIENTS-TGZ_DISPLAY_NAME "foundationdb-clients")
-set(CPACK_COMPONENT_CLIENTS-PM_DISPLAY_NAME "foundationdb-clients")
 set(CPACK_COMPONENT_CLIENTS-VERSIONED_DISPLAY_NAME "foundationdb-clients-${PROJECT_VERSION}")
 
 
@@ -382,19 +362,6 @@ set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_CONTROL_EXTRA
   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst
   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/prerm)
 
-################################################################################
-# MacOS configuration
-################################################################################
-
-if(APPLE)
-  install(PROGRAMS ${CMAKE_SOURCE_DIR}/packaging/osx/uninstall-FoundationDB.sh
-    DESTINATION "usr/local/foundationdb"
-    COMPONENT clients-pm)
-  install(FILES ${CMAKE_SOURCE_DIR}/packaging/osx/com.foundationdb.fdbmonitor.plist
-    DESTINATION "Library/LaunchDaemons"
-    COMPONENT server-pm)
-endif()
-
 ################################################################################
 # Configuration for DEB
 ################################################################################
@@ -413,9 +380,6 @@ set(CLUSTER_DESCRIPTION1 ${description1} CACHE STRING "Cluster description")
 set(CLUSTER_DESCRIPTION2 ${description2} CACHE STRING "Cluster description")
 
 if(NOT WIN32)
-  install(FILES ${CMAKE_SOURCE_DIR}/packaging/osx/foundationdb.conf.new
-    DESTINATION "usr/local/etc"
-    COMPONENT server-pm)
   fdb_install(FILES ${CMAKE_SOURCE_DIR}/packaging/foundationdb.conf
     DESTINATION etc
     COMPONENT server)
diff --git a/fdbbackup/CMakeLists.txt b/fdbbackup/CMakeLists.txt
index 48b1ad1aef5..da2457b8500 100644
--- a/fdbbackup/CMakeLists.txt
+++ b/fdbbackup/CMakeLists.txt
@@ -23,14 +23,14 @@ target_link_libraries(fdbdecode PRIVATE fdbclient)
 if(NOT OPEN_FOR_IDE)
   if(GENERATE_DEBUG_PACKAGES)
     fdb_install(TARGETS fdbbackup DESTINATION bin COMPONENT clients)
-    fdb_install(PROGRAMS $<TARGET_FILE:fdbbackup> DESTINATION fdbmonitor COMPONENT clients RENAME backup_agent/backup_agent)
+    fdb_install(PROGRAMS $<TARGET_FILE:fdbbackup> DESTINATION backupagent COMPONENT clients RENAME backup_agent/backup_agent)
     fdb_install(PROGRAMS $<TARGET_FILE:fdbbackup> DESTINATION bin COMPONENT clients RENAME fdbrestore)
     fdb_install(PROGRAMS $<TARGET_FILE:fdbbackup> DESTINATION bin COMPONENT clients RENAME dr_agent)
     fdb_install(PROGRAMS $<TARGET_FILE:fdbbackup> DESTINATION bin COMPONENT clients RENAME fdbdr)
   else()
     add_custom_target(prepare_fdbbackup_install ALL DEPENDS strip_only_fdbbackup)
     fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION bin COMPONENT clients)
-    fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION fdbmonitor COMPONENT clients RENAME backup_agent/backup_agent)
+    fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION backupagent COMPONENT clients RENAME backup_agent/backup_agent)
     fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION bin COMPONENT clients RENAME fdbrestore)
     fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION bin COMPONENT clients RENAME dr_agent)
     fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION bin COMPONENT clients RENAME fdbdr)
diff --git a/packaging/osx/buildpkg.sh b/packaging/osx/buildpkg.sh
index 60b441b1913..d8b9f560a52 100755
--- a/packaging/osx/buildpkg.sh
+++ b/packaging/osx/buildpkg.sh
@@ -1,12 +1,26 @@
 #!/bin/bash
 
-set -e
+set -Eeuo pipefail
 
 umask 0022
 
-PKGFILE=$1
-VERSION=$2
-RELEASE=$3
+if [ "$#" -ne 2 ] ; then
+    echo "Usage: $0 <BUILDDIR> <SRCDIR>"
+    exit 1
+fi
+
+# BUILDDIR is the path to the cmake build directory
+# SRCDIR is the path to the source directory
+#
+# e.g. If your current directory is the project root and the build directory is _build, then you want to do
+#     $ ./packaging/osx/buildpkg.sh _build .
+#
+BUILDDIR="$1"
+SRCDIR="$2"
+
+VERSION="$(grep 'CMAKE_PROJECT_VERSION[^_]' "$BUILDDIR/CMakeCache.txt" | sed -e 's/[^=]*=//')"
+
+PKGFILE="$BUILDDIR/packages/FoundationDB-$VERSION.pkg"
 
 CLIENTSDIR=$( mktemp -d -t fdb-clients-pkg )
 SERVERDIR=$( mktemp -d -t fdb-server-pkg )
@@ -23,20 +37,20 @@ mkdir -p -m 0755 $CLIENTSDIR/Library/Python/2.7/site-packages/fdb
 mkdir -p -m 0775 $CLIENTSDIR/usr/local/etc/foundationdb
 mkdir -p -m 0755 $CLIENTSDIR/usr/local/foundationdb/backup_agent
 
-install -m 0755 bin/fdbcli $CLIENTSDIR/usr/local/bin
-install -m 0644 bindings/c/foundationdb/fdb_c.h bindings/c/foundationdb/fdb_c_options.g.h fdbclient/vexillographer/fdb.options $CLIENTSDIR/usr/local/include/foundationdb
-install -m 0755 lib/libfdb_c.dylib $CLIENTSDIR/usr/local/lib
-install -m 0644 bindings/python/fdb/*.py $CLIENTSDIR/Library/Python/2.7/site-packages/fdb
-install -m 0755 bin/fdbbackup $CLIENTSDIR/usr/local/foundationdb/backup_agent/backup_agent
-install -m 0755 packaging/osx/uninstall-FoundationDB.sh $CLIENTSDIR/usr/local/foundationdb
-dos2unix README.md $CLIENTSDIR/usr/local/foundationdb/README
+install -m 0755 "$BUILDDIR"/bin/fdbcli $CLIENTSDIR/usr/local/bin
+install -m 0644 "$SRCDIR"/bindings/c/foundationdb/fdb_c.h "$BUILDDIR"/bindings/c/foundationdb/fdb_c_options.g.h "$SRCDIR"/fdbclient/vexillographer/fdb.options $CLIENTSDIR/usr/local/include/foundationdb
+install -m 0755 "$BUILDDIR"/lib/libfdb_c.dylib $CLIENTSDIR/usr/local/lib
+install -m 0644 "$BUILDDIR"/bindings/python/fdb/*.py $CLIENTSDIR/Library/Python/2.7/site-packages/fdb
+install -m 0755 "$BUILDDIR"/bin/fdbbackup $CLIENTSDIR/usr/local/foundationdb/backup_agent/backup_agent
+install -m 0755 "$SRCDIR"/packaging/osx/uninstall-FoundationDB.sh $CLIENTSDIR/usr/local/foundationdb
+dos2unix "$SRCDIR"/README.md $CLIENTSDIR/usr/local/foundationdb/README
 chmod 0644 $CLIENTSDIR/usr/local/foundationdb/README
 ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbbackup
 ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbrestore
 ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbdr
 ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/dr_agent
 
-pkgbuild --root $CLIENTSDIR --identifier FoundationDB-clients --version $VERSION.$RELEASE --scripts packaging/osx/scripts-clients FoundationDB-clients.pkg
+pkgbuild --root $CLIENTSDIR --identifier FoundationDB-clients --version $VERSION --scripts "$SRCDIR"/packaging/osx/scripts-clients FoundationDB-clients.pkg
 
 rm -rf $CLIENTSDIR
 
@@ -46,14 +60,14 @@ mkdir -p -m 0755 $SERVERDIR/Library/LaunchDaemons
 mkdir -p -m 0700 $SERVERDIR/usr/local/foundationdb/data
 mkdir -p -m 0700 $SERVERDIR/usr/local/foundationdb/logs
 
-install -m 0664 packaging/osx/foundationdb.conf.new $SERVERDIR/usr/local/etc/foundationdb
-install -m 0755 bin/fdbserver bin/fdbmonitor $SERVERDIR/usr/local/libexec
-install -m 0644 packaging/osx/com.foundationdb.fdbmonitor.plist $SERVERDIR/Library/LaunchDaemons
+install -m 0664 "$SRCDIR"/packaging/osx/foundationdb.conf.new $SERVERDIR/usr/local/etc/foundationdb
+install -m 0755 "$BUILDDIR"/bin/fdbserver "$BUILDDIR"/bin/fdbmonitor $SERVERDIR/usr/local/libexec
+install -m 0644 "$SRCDIR"/packaging/osx/com.foundationdb.fdbmonitor.plist $SERVERDIR/Library/LaunchDaemons
 
-pkgbuild --root $SERVERDIR --identifier FoundationDB-server --version $VERSION.$RELEASE --scripts packaging/osx/scripts-server FoundationDB-server.pkg
+pkgbuild --root $SERVERDIR --identifier FoundationDB-server --version "$VERSION" --scripts "$SRCDIR"/packaging/osx/scripts-server FoundationDB-server.pkg
 
 rm -rf $SERVERDIR
 
-productbuild --distribution packaging/osx/Distribution.xml --resources packaging/osx/resources --package-path . $PKGFILE
+productbuild --distribution "$SRCDIR"/packaging/osx/Distribution.xml --resources "$SRCDIR"/packaging/osx/resources --package-path . "$PKGFILE"
 
 rm FoundationDB-clients.pkg FoundationDB-server.pkg
diff --git a/packaging/osx/scripts-server/postinstall b/packaging/osx/scripts-server/postinstall
index a31c3fd4167..34ce9f7dad7 100755
--- a/packaging/osx/scripts-server/postinstall
+++ b/packaging/osx/scripts-server/postinstall
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 if [ ! -f /usr/local/etc/foundationdb/fdb.cluster ]; then
-    description=`LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 8`
-    random_str=`LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 8`
+    description=`LC_CTYPE=C tr -dc '[:lower:][:upper:][:digit:]' < /dev/urandom | head -c 8`
+    random_str=`LC_CTYPE=C tr -dc '[:lower:][:upper:][:digit:]' < /dev/urandom | head -c 8`
     echo $description:$random_str@127.0.0.1:4689 > /usr/local/etc/foundationdb/fdb.cluster
-    chmod 0664 /etc/foundationdb/fdb.cluster
+    chmod 0664 /usr/local/etc/foundationdb/fdb.cluster
     NEWDB=1
 fi
 

From b1744e85d1c7a8fbfeb073154c1d8857c4eba107 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Tue, 25 May 2021 15:32:49 +0000
Subject: [PATCH 186/740] Removing spaces in SevWarn trace event names

---
 fdbserver/FDBExecHelper.actor.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/fdbserver/FDBExecHelper.actor.cpp b/fdbserver/FDBExecHelper.actor.cpp
index 618bba35be1..1a32999e7d9 100644
--- a/fdbserver/FDBExecHelper.actor.cpp
+++ b/fdbserver/FDBExecHelper.actor.cpp
@@ -148,7 +148,10 @@ ACTOR Future<int> spawnProcess(std::string path,
 	state pid_t pid = pidAndReadFD.first;
 	state Optional<int> readFD = pidAndReadFD.second;
 	if (pid == -1) {
-		TraceEvent(SevWarnAlways, "SpawnProcess: Command failed to spawn").detail("Cmd", path).detail("Args", allArgs);
+		TraceEvent(SevWarnAlways, "SpawnProcessFailure")
+		    .detail("Reason", "Command failed to spawn")
+		    .detail("Cmd", path)
+		    .detail("Args", allArgs);
 		return -1;
 	} else if (pid > 0) {
 		state int status = -1;
@@ -160,7 +163,8 @@ ACTOR Future<int> spawnProcess(std::string path,
 			if (runTime > maxWaitTime) {
 				// timing out
 
-				TraceEvent(SevWarnAlways, "SpawnProcess : Command failed, timeout")
+				TraceEvent(SevWarnAlways, "SpawnProcessFailure")
+				    .detail("Reason", "Command failed, timeout")
 				    .detail("Cmd", path)
 				    .detail("Args", allArgs);
 				return -1;
@@ -175,9 +179,10 @@ ACTOR Future<int> spawnProcess(std::string path,
 			}
 
 			if (err < 0) {
-				TraceEvent event(SevWarnAlways, "SpawnProcess : Command failed");
+				TraceEvent event(SevWarnAlways, "SpawnProcessFailure");
 				setupTraceWithOutput(event, bytesRead, outputBuffer);
-				event.detail("Cmd", path)
+				event.detail("Reason", "Command failed")
+				    .detail("Cmd", path)
 				    .detail("Args", allArgs)
 				    .detail("Errno", WIFEXITED(status) ? WEXITSTATUS(status) : -1);
 				return -1;
@@ -194,14 +199,15 @@ ACTOR Future<int> spawnProcess(std::string path,
 			} else {
 				// child process completed
 				if (!(WIFEXITED(status) && WEXITSTATUS(status) == 0)) {
-					TraceEvent event(SevWarnAlways, "SpawnProcess : Command failed");
+					TraceEvent event(SevWarnAlways, "SpawnProcessFailure");
 					setupTraceWithOutput(event, bytesRead, outputBuffer);
-					event.detail("Cmd", path)
+					event.detail("Reason", "Command failed")
+					    .detail("Cmd", path)
 					    .detail("Args", allArgs)
 					    .detail("Errno", WIFEXITED(status) ? WEXITSTATUS(status) : -1);
 					return WIFEXITED(status) ? WEXITSTATUS(status) : -1;
 				}
-				TraceEvent event("SpawnProcess : Command status");
+				TraceEvent event("SpawnProcessCommandStatus");
 				setupTraceWithOutput(event, bytesRead, outputBuffer);
 				event.detail("Cmd", path)
 				    .detail("Args", allArgs)

From 741d15ea01fce5e3daa5a0b01ab0eed0af57c652 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 21 May 2021 16:40:29 -0700
Subject: [PATCH 187/740] Only enable backup worker when using partitioned logs

This addresses issue #4849.
---
 fdbclient/FileBackupAgent.actor.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/fdbclient/FileBackupAgent.actor.cpp b/fdbclient/FileBackupAgent.actor.cpp
index dfd33b5b670..317e4cc095e 100644
--- a/fdbclient/FileBackupAgent.actor.cpp
+++ b/fdbclient/FileBackupAgent.actor.cpp
@@ -2705,13 +2705,17 @@ struct StartFullBackupTaskFunc : BackupTaskFuncBase {
 		wait(checkTaskVersion(cx, task, StartFullBackupTaskFunc::name, StartFullBackupTaskFunc::version));
 
 		state Reference<ReadYourWritesTransaction> tr(new ReadYourWritesTransaction(cx));
+		state BackupConfig config(task);
+		state Future<Optional<bool>> partitionedLog;
 		loop {
 			try {
 				tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 				tr->setOption(FDBTransactionOptions::LOCK_AWARE);
-				Version startVersion = wait(tr->getReadVersion());
+				partitionedLog = config.partitionedLogEnabled().get(tr);
+				state Future<Version> startVersionFuture = tr->getReadVersion();
+				wait(success(partitionedLog) && success(startVersionFuture));
 
-				Params.beginVersion().set(task, startVersion);
+				Params.beginVersion().set(task, startVersionFuture.get());
 				break;
 			} catch (Error& e) {
 				wait(tr->onError(e));
@@ -2721,14 +2725,15 @@ struct StartFullBackupTaskFunc : BackupTaskFuncBase {
 		// Check if backup worker is enabled
 		DatabaseConfiguration dbConfig = wait(getDatabaseConfiguration(cx));
 		state bool backupWorkerEnabled = dbConfig.backupWorkerEnabled;
-		if (!backupWorkerEnabled) {
+		if (!backupWorkerEnabled && partitionedLog.get().present() && partitionedLog.get().get()) {
+			// Change configuration only when we set to use partitioned logs and
+			// the flag was not set before.
 			wait(success(changeConfig(cx, "backup_worker_enabled:=1", true)));
 			backupWorkerEnabled = true;
 		}
 
 		// Set the "backupStartedKey" and wait for all backup worker started
 		tr->reset();
-		state BackupConfig config(task);
 		loop {
 			state Future<Void> watchFuture;
 			try {
@@ -2738,7 +2743,7 @@ struct StartFullBackupTaskFunc : BackupTaskFuncBase {
 
 				state Future<Optional<Value>> started = tr->get(backupStartedKey);
 				state Future<Optional<Value>> taskStarted = tr->get(config.allWorkerStarted().key);
-				state Future<Optional<bool>> partitionedLog = config.partitionedLogEnabled().get(tr);
+				partitionedLog = config.partitionedLogEnabled().get(tr);
 				wait(success(started) && success(taskStarted) && success(partitionedLog));
 
 				if (!partitionedLog.get().present() || !partitionedLog.get().get()) {

From 06ae8d1f0bf0b697147e1cc7ecc251c3225669d6 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 25 May 2021 14:35:51 -0700
Subject: [PATCH 188/740] Update releast notes for 6.3

---
 .../sphinx/source/release-notes/release-notes-630.rst          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index bebd55e8590..00d8bab1b6a 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -2,6 +2,9 @@
 Release Notes
 #############
 
+6.3.14
+======
+* Fixed fdbbackup start command that automatically configures database with backup workers to only do so when using partitioned logs. `(PR #4863) <https://github.com/apple/foundationdb/pull/4863>`_
 
 6.3.14
 ======

From fe73c020cfaa95862a3b91f1afe5f8d69227c399 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 25 May 2021 22:07:45 -0700
Subject: [PATCH 189/740] Fix release notes after merge

---
 .../sphinx/source/release-notes/release-notes-630.rst         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index 00d8bab1b6a..ca6a8fd029a 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -2,12 +2,10 @@
 Release Notes
 #############
 
-6.3.14
-======
-* Fixed fdbbackup start command that automatically configures database with backup workers to only do so when using partitioned logs. `(PR #4863) <https://github.com/apple/foundationdb/pull/4863>`_
 
 6.3.14
 ======
+* Fixed fdbbackup start command that automatically configures database with backup workers to only do so when using partitioned logs. `(PR #4863) <https://github.com/apple/foundationdb/pull/4863>`_
 * Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_

From 47afdad833266c29cf83a9e5b48859eccc32da26 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Fri, 21 May 2021 08:34:18 -0700
Subject: [PATCH 190/740] Merge pull request #4770 from sbodagala/master

Expose "bounce impact" and Storage Server "version catch-up rate" metrics

- Report bounce impact in fdbcli status

Changes:

Schemas.cpp: Extend the JSON schema to include new fields that report
whether the cluster is bounceable and if not, report the reason for why it
is not bounceable.

Status.actor.cpp: Extend recoveryStateStatusFetcher() to populate the
bounce related field(s).

mr-status-json-schemas.rst.inc: Update the schema to reflect the change
made in Schemas.cpp.

release-notes-700.rst: Add a note about the new status fields in "Status"
section.

- Report how fast an SS is catching up to its tLog-SS lag

Changes:

LogSystem.h, LogSystemPeekCursor.actor.cpp: Add APIs to find the ID
of the tLog from which an SS has fetched the latest set of versions.

storagegroupserver.actor.cpp:

Add two new counters to StorageServer::Counters in order to capture
(a) SS version fetch rate and (b) SS version fetch frequency.

Add a new field to StorageServer in order to capture the ID of the tLog
from which the latest set of versions have been fetched.

update(): Populate the new counters; report the source tLog ID in a
trace event (and report the tLog ID only when it changes).

Status.actor.cpp: Extend Storage Server addRole() to report the SS
version fetch rate and the SS version fetch frequency.

Schemas.cpp: Extend the JSON schema to report the new metrics.

mr-status-json-schemas.rst.inc: Update the schema to reflect the
changes made to the JSON schema.

release-notes-700.rst: Add a note about the new metrics in "Status"
section.
---
 .../source/mr-status-json-schemas.rst.inc     | 14 ++++++++++
 .../release-notes/release-notes-700.rst       |  1 -
 fdbclient/Schemas.cpp                         | 14 ++++++++++
 fdbserver/LogSystem.h                         |  7 +++++
 fdbserver/LogSystemPeekCursor.actor.cpp       | 28 ++++++++++++++++++-
 fdbserver/Status.actor.cpp                    | 22 +++++++++++++++
 fdbserver/storageserver.actor.cpp             | 26 ++++++++++++++---
 7 files changed, 106 insertions(+), 6 deletions(-)

diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index 73a0c225783..79793318984 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -121,6 +121,16 @@
                      "counter":0,
                      "roughness":0.0
                   },
+                  "fetched_versions":{
+                     "hz":0.0,
+                     "counter":0,
+                     "roughness":0.0
+                  },
+                  "fetches_from_logs":{
+                     "hz":0.0,
+                     "counter":0,
+                     "roughness":0.0
+                  },
                   "grv_latency_statistics":{ // GRV Latency metrics are grouped according to priority (currently batch or default).
                      "default":{
                          "count":0,
@@ -604,6 +614,10 @@
       "data_distribution_disabled_for_rebalance":true,
       "data_distribution_disabled":true,
       "active_primary_dc":"pv",
+      "bounce_impact":{
+         "can_clean_bounce":true,
+         "reason":""
+      },
       "configuration":{
          "log_anti_quorum":0,
          "log_replicas":2,
diff --git a/documentation/sphinx/source/release-notes/release-notes-700.rst b/documentation/sphinx/source/release-notes/release-notes-700.rst
index a0f9f49136f..ea78b9a10b9 100644
--- a/documentation/sphinx/source/release-notes/release-notes-700.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-700.rst
@@ -35,7 +35,6 @@ Status
 * Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 
-
 Bindings
 --------
 * Python: The function ``get_estimated_range_size_bytes`` will now throw an error if the ``begin_key`` or ``end_key`` is ``None``. `(PR #3394) <https://github.com/apple/foundationdb/pull/3394>`_
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 682ddc9c9a5..5fef5fb6eb1 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -144,6 +144,16 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
                      "counter":0,
                      "roughness":0.0
                   },
+                  "fetched_versions":{
+                     "hz":0.0,
+                     "counter":0,
+                     "roughness":0.0
+                  },
+                  "fetches_from_logs":{
+                     "hz":0.0,
+                     "counter":0,
+                     "roughness":0.0
+                  },
                   "grv_latency_statistics":{
                      "default":{
                         "count":0,
@@ -648,6 +658,10 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
       "data_distribution_disabled_for_rebalance":true,
       "data_distribution_disabled":true,
       "active_primary_dc":"pv",
+      "bounce_impact":{
+         "can_clean_bounce":true,
+         "reason":""
+      },
       "configuration":{
          "log_anti_quorum":0,
          "log_replicas":2,
diff --git a/fdbserver/LogSystem.h b/fdbserver/LogSystem.h
index f8a3e0b7251..da2fbcf5f22 100644
--- a/fdbserver/LogSystem.h
+++ b/fdbserver/LogSystem.h
@@ -410,6 +410,8 @@ struct ILogSystem {
 
 		virtual Optional<UID> getPrimaryPeekLocation() const = 0;
 
+		virtual Optional<UID> getCurrentPeekLocation() const = 0;
+
 		virtual void addref() = 0;
 
 		virtual void delref() = 0;
@@ -473,6 +475,7 @@ struct ILogSystem {
 		Version popped() const override;
 		Version getMinKnownCommittedVersion() const override;
 		Optional<UID> getPrimaryPeekLocation() const override;
+		Optional<UID> getCurrentPeekLocation() const override;
 
 		void addref() override { ReferenceCounted<ServerPeekCursor>::addref(); }
 
@@ -534,6 +537,7 @@ struct ILogSystem {
 		Version popped() const override;
 		Version getMinKnownCommittedVersion() const override;
 		Optional<UID> getPrimaryPeekLocation() const override;
+		Optional<UID> getCurrentPeekLocation() const override;
 
 		void addref() override { ReferenceCounted<MergedPeekCursor>::addref(); }
 
@@ -589,6 +593,7 @@ struct ILogSystem {
 		Version popped() const override;
 		Version getMinKnownCommittedVersion() const override;
 		Optional<UID> getPrimaryPeekLocation() const override;
+		Optional<UID> getCurrentPeekLocation() const override;
 
 		void addref() override { ReferenceCounted<SetPeekCursor>::addref(); }
 
@@ -620,6 +625,7 @@ struct ILogSystem {
 		Version popped() const override;
 		Version getMinKnownCommittedVersion() const override;
 		Optional<UID> getPrimaryPeekLocation() const override;
+		Optional<UID> getCurrentPeekLocation() const override;
 
 		void addref() override { ReferenceCounted<MultiCursor>::addref(); }
 
@@ -698,6 +704,7 @@ struct ILogSystem {
 		Version popped() const override;
 		Version getMinKnownCommittedVersion() const override;
 		Optional<UID> getPrimaryPeekLocation() const override;
+		Optional<UID> getCurrentPeekLocation() const override;
 
 		void addref() override { ReferenceCounted<BufferedCursor>::addref(); }
 
diff --git a/fdbserver/LogSystemPeekCursor.actor.cpp b/fdbserver/LogSystemPeekCursor.actor.cpp
index cc8a350845a..26287919cd1 100644
--- a/fdbserver/LogSystemPeekCursor.actor.cpp
+++ b/fdbserver/LogSystemPeekCursor.actor.cpp
@@ -393,12 +393,16 @@ Version ILogSystem::ServerPeekCursor::getMinKnownCommittedVersion() const {
 }
 
 Optional<UID> ILogSystem::ServerPeekCursor::getPrimaryPeekLocation() const {
-	if (interf) {
+	if (interf && interf->get().present()) {
 		return interf->get().id();
 	}
 	return Optional<UID>();
 }
 
+Optional<UID> ILogSystem::ServerPeekCursor::getCurrentPeekLocation() const {
+	return ILogSystem::ServerPeekCursor::getPrimaryPeekLocation();
+}
+
 Version ILogSystem::ServerPeekCursor::popped() const {
 	return poppedVersion;
 }
@@ -673,6 +677,13 @@ Optional<UID> ILogSystem::MergedPeekCursor::getPrimaryPeekLocation() const {
 	return Optional<UID>();
 }
 
+Optional<UID> ILogSystem::MergedPeekCursor::getCurrentPeekLocation() const {
+	if (currentCursor >= 0) {
+		return serverCursors[currentCursor]->getPrimaryPeekLocation();
+	}
+	return Optional<UID>();
+}
+
 Version ILogSystem::MergedPeekCursor::popped() const {
 	Version poppedVersion = 0;
 	for (auto& c : serverCursors)
@@ -1023,6 +1034,13 @@ Optional<UID> ILogSystem::SetPeekCursor::getPrimaryPeekLocation() const {
 	return Optional<UID>();
 }
 
+Optional<UID> ILogSystem::SetPeekCursor::getCurrentPeekLocation() const {
+	if (currentCursor >= 0 && currentSet >= 0) {
+		return serverCursors[currentSet][currentCursor]->getPrimaryPeekLocation();
+	}
+	return Optional<UID>();
+}
+
 Version ILogSystem::SetPeekCursor::popped() const {
 	Version poppedVersion = 0;
 	for (auto& cursors : serverCursors) {
@@ -1123,6 +1141,10 @@ Optional<UID> ILogSystem::MultiCursor::getPrimaryPeekLocation() const {
 	return cursors.back()->getPrimaryPeekLocation();
 }
 
+Optional<UID> ILogSystem::MultiCursor::getCurrentPeekLocation() const {
+	return cursors.back()->getCurrentPeekLocation();
+}
+
 Version ILogSystem::MultiCursor::popped() const {
 	return std::max(poppedVersion, cursors.back()->popped());
 }
@@ -1403,6 +1425,10 @@ Optional<UID> ILogSystem::BufferedCursor::getPrimaryPeekLocation() const {
 	return Optional<UID>();
 }
 
+Optional<UID> ILogSystem::BufferedCursor::getCurrentPeekLocation() const {
+	return Optional<UID>();
+}
+
 Version ILogSystem::BufferedCursor::popped() const {
 	if (initialPoppedVersion == poppedVersion) {
 		return 0;
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 8579fcd2df9..271f87d939f 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -387,6 +387,19 @@ JsonBuilderObject getLagObject(int64_t versions) {
 	return lag;
 }
 
+static JsonBuilderObject getBounceImpactInfo(int recoveryStatusCode) {
+	JsonBuilderObject bounceImpact;
+
+	if (recoveryStatusCode == RecoveryStatus::fully_recovered) {
+		bounceImpact["can_clean_bounce"] = true;
+	} else {
+		bounceImpact["can_clean_bounce"] = false;
+		bounceImpact["reason"] = "cluster hasn't fully recovered yet";
+	}
+
+	return bounceImpact;
+}
+
 struct MachineMemoryInfo {
 	double memoryUsage;
 	double aggregateLimit;
@@ -478,6 +491,13 @@ struct RolesInfo {
 			obj["mutation_bytes"] = StatusCounter(storageMetrics.getValue("MutationBytes")).getStatus();
 			obj["mutations"] = StatusCounter(storageMetrics.getValue("Mutations")).getStatus();
 			obj.setKeyRawNumber("local_rate", storageMetrics.getValue("LocalRate"));
+			try {
+				obj["fetched_versions"] = StatusCounter(storageMetrics.getValue("FetchedVersions")).getStatus();
+				obj["fetches_from_logs"] = StatusCounter(storageMetrics.getValue("FetchesFromLogs")).getStatus();
+			} catch (Error& e) {
+				if (e.code() != error_code_attribute_not_found)
+					throw e;
+			}
 
 			Version version = storageMetrics.getInt64("Version");
 			Version durableVersion = storageMetrics.getInt64("DurableVersion");
@@ -1169,6 +1189,7 @@ ACTOR static Future<JsonBuilderObject> recoveryStateStatusFetcher(Database cx,
 		} else if (mStatusCode == RecoveryStatus::locking_old_transaction_servers) {
 			message["missing_logs"] = md.getValue("MissingIDs").c_str();
 		}
+
 		// TODO:  time_in_recovery: 0.5
 		//        time_in_state: 0.1
 
@@ -2775,6 +2796,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 
 		statusObj["protocol_version"] = format("%" PRIx64, g_network->protocolVersion().version());
 		statusObj["connection_string"] = coordinators.ccf->getConnectionString().toString();
+		statusObj["bounce_impact"] = getBounceImpactInfo(statusCode);
 
 		state Optional<DatabaseConfiguration> configuration;
 		state Optional<LoadConfigurationResult> loadResult;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index ecb96c9696b..67895499444 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -544,6 +544,8 @@ struct StorageServer {
 	int64_t versionLag; // An estimate for how many versions it takes for the data to move from the logs to this storage
 	                    // server
 
+	Optional<UID> sourceTLogID; // the tLog from which the latest batch of versions were fetched
+
 	ProtocolVersion logProtocol;
 
 	Reference<ILogSystem> logSystem;
@@ -677,6 +679,8 @@ struct StorageServer {
 		Counter loops;
 		Counter fetchWaitingMS, fetchWaitingCount, fetchExecutingMS, fetchExecutingCount;
 		Counter readsRejected;
+		Counter fetchedVersions;
+		Counter fetchesFromLogs;
 
 		LatencySample readLatencySample;
 		LatencyBands readLatencyBands;
@@ -694,10 +698,11 @@ struct StorageServer {
 		    updateBatches("UpdateBatches", cc), updateVersions("UpdateVersions", cc), loops("Loops", cc),
 		    fetchWaitingMS("FetchWaitingMS", cc), fetchWaitingCount("FetchWaitingCount", cc),
 		    fetchExecutingMS("FetchExecutingMS", cc), fetchExecutingCount("FetchExecutingCount", cc),
-		    readsRejected("ReadsRejected", cc), readLatencySample("ReadLatencyMetrics",
-		                                                          self->thisServerID,
-		                                                          SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-		                                                          SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    readsRejected("ReadsRejected", cc), fetchedVersions("FetchedVersions", cc),
+		    fetchesFromLogs("FetchesFromLogs", cc), readLatencySample("ReadLatencyMetrics",
+                                                                      self->thisServerID,
+                                                                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+                                                                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
 			specialCounter(cc, "LastTLogVersion", [self]() { return self->lastTLogVersion; });
 			specialCounter(cc, "Version", [self]() { return self->version.get(); });
@@ -3519,9 +3524,22 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 			if (data->otherError.getFuture().isReady())
 				data->otherError.getFuture().get();
 
+			data->counters.fetchedVersions += (ver - data->version.get());
+			++data->counters.fetchesFromLogs;
+			Optional<UID> curSourceTLogID = cursor->getCurrentPeekLocation();
+
+			if (curSourceTLogID != data->sourceTLogID) {
+				data->sourceTLogID = curSourceTLogID;
+
+				TraceEvent("StorageServerSourceTLogID", data->thisServerID)
+					.detail("SourceTLogID", data->sourceTLogID.present() ? data->sourceTLogID.get().toString() : "unknown")
+					.trackLatest(data->thisServerID.toString() + "/StorageServerSourceTLogID");
+			}
+
 			data->noRecentUpdates.set(false);
 			data->lastUpdate = now();
 			data->version.set(ver); // Triggers replies to waiting gets for new version(s)
+
 			setDataVersion(data->thisServerID, data->version.get());
 			if (data->otherError.getFuture().isReady())
 				data->otherError.getFuture().get();

From 7758ddfc469f3eccb75c09ff1421193e12ca9e99 Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <sbodagala@apple.com>
Date: Mon, 24 May 2021 18:24:06 +0000
Subject: [PATCH 191/740] Update the status section of release-notes-630.rst

---
 .../sphinx/source/release-notes/release-notes-630.rst          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index bebd55e8590..63ddecf1e59 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -125,6 +125,9 @@ Status
 * If a process is unable to flush trace logs to disk, the problem will now be reported via the output of ``status`` command inside ``fdbcli``. `(PR #2605) <https://github.com/apple/foundationdb/pull/2605>`_ `(PR #2820) <https://github.com/apple/foundationdb/pull/2820>`_
 * When a configuration key is changed, it will always be included in ``status json`` output, even the value is reverted back to the default value. [6.3.5] `(PR #3610) <https://github.com/apple/foundationdb/pull/3610>`_
 * Added transactions.rejected_for_queued_too_long for bookkeeping the number of transactions rejected by commit proxy because its queuing time exceeds MVCC window.[6.3.11] `(PR #4353) <https://github.com/apple/foundationdb/pull/4353>`_
+* Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 
 Bindings
 --------

From e5a7166ee3b4c835d6ec21c033bcb9a17a41ed57 Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <sbodagala@apple.com>
Date: Wed, 26 May 2021 15:31:29 +0000
Subject: [PATCH 192/740] Release notes cleanup.

---
 .../sphinx/source/release-notes/release-notes-630.rst          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index 63ddecf1e59..bebd55e8590 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -125,9 +125,6 @@ Status
 * If a process is unable to flush trace logs to disk, the problem will now be reported via the output of ``status`` command inside ``fdbcli``. `(PR #2605) <https://github.com/apple/foundationdb/pull/2605>`_ `(PR #2820) <https://github.com/apple/foundationdb/pull/2820>`_
 * When a configuration key is changed, it will always be included in ``status json`` output, even the value is reverted back to the default value. [6.3.5] `(PR #3610) <https://github.com/apple/foundationdb/pull/3610>`_
 * Added transactions.rejected_for_queued_too_long for bookkeeping the number of transactions rejected by commit proxy because its queuing time exceeds MVCC window.[6.3.11] `(PR #4353) <https://github.com/apple/foundationdb/pull/4353>`_
-* Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
-* Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
-* Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 
 Bindings
 --------

From 6fae0f19db7533fbfb03d70ef11aa57e045d7130 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Fri, 28 May 2021 18:32:00 +0000
Subject: [PATCH 193/740] cherry-pick PR#4765

---
 documentation/sphinx/source/developer-guide.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/documentation/sphinx/source/developer-guide.rst b/documentation/sphinx/source/developer-guide.rst
index d26f235304f..f51db018bbc 100644
--- a/documentation/sphinx/source/developer-guide.rst
+++ b/documentation/sphinx/source/developer-guide.rst
@@ -955,11 +955,27 @@ that process, and wait for necessary data to be moved away.
    Maintenance mode will be unable to use until the key is cleared, which is the same as the fdbcli command ``datadistribution enable ssfailure``.
    While the key is set, any commit that tries to set a key in the range will fail with the ``special_keys_api_failure`` error.
 #. ``\xff\xff/management/data_distribution/<mode|rebalance_ignored>`` Read/write. Changing these two keys will change the two corresponding system keys ``\xff/dataDistributionMode`` and ``\xff\x02/rebalanceDDIgnored``. The value of ``\xff\xff/management/data_distribution/mode`` is a literal text of ``0`` (disable) or ``1`` (enable). Transactions committed with invalid values will throw ``special_keys_api_failure`` . The value of ``\xff\xff/management/data_distribution/rebalance_ignored`` is empty. If present, it means data distribution is disabled for rebalance. Any transaction committed with non-empty value for this key will throw ``special_keys_api_failure``. For more details, see help text of ``fdbcli`` command ``datadistribution``.
+#. ``\xff\xff/management/consistency_check_suspended`` Read/write. Set or read this key will set or read the underlying system key ``\xff\x02/ConsistencyCheck/Suspend``. The value of this special key is unused thus if present, will be empty. In particular, if the key exists, then consistency is suspended. For more details, see help text of ``fdbcli`` command ``consistencycheck``.
+#. ``\xff\xff/management/db_locked`` Read/write. A single key that can be read and modified. Set the key will lock the database and clear the key will unlock. If the database is already locked, then the commit will fail with the ``special_keys_api_failure`` error. For more details, see help text of ``fdbcli`` command ``lock`` and ``unlock``.
+#. ``\xff\xff/management/auto_coordinators`` Read-only. A single key, if read, will return a set of processes which is able to satisfy the current redundency level and serve as new coordinators. The return value is formatted as a comma delimited string of network addresses of coordinators, i.e. ``<ip:port>,<ip:port>,...,<ip:port>``.
 
 An exclusion is syntactically either an ip address (e.g. ``127.0.0.1``), or
 an ip address and port (e.g. ``127.0.0.1:4500``). If no port is specified,
 then all processes on that host match the exclusion.
 
+Configuration module
+~~~~~~~~~~~~~~~~~~~~
+
+The configuration module is for changing the cluster configuration.
+For example, you can change a process type or update coordinators by manipulating related special keys through transactions.
+
+#. ``\xff\xff/configuration/process/class_type/<address> := <class_type>`` Read/write. Reading keys in the range will retrieve processes' class types. Setting keys in the range will update processes' class types. The process matching ``<address>`` will be assigned to the given class type if the commit is successful. The valid class types are ``storage``, ``transaction``, ``resolution``, etc. A full list of class type can be found via ``fdbcli`` command ``help setclass``. Clearing keys is forbidden in the range. Instead, you can set the type as ``default``, which will clear the assigned class type if existing. For more details, see help text of ``fdbcli`` command ``setclass``.
+#. ``\xff\xff/configuration/process/class_source/<address> := <class_source>`` Read-only. Reading keys in the range will retrieve processes' class source. The class source is one of ``command_line``, ``configure_auto``, ``set_class`` and ``invalid``, indicating the source that the process's class type comes from.
+#. ``\xff\xff/configuration/coordinators/processes := <ip:port>,<ip:port>,...,<ip:port>`` Read/write. A single key, if read, will return a comma delimited string of coordinators's network addresses. Thus to provide a new set of cooridinators, set the key with a correct formatted string of new coordinators' network addresses. As there's always the need to have coordinators, clear on the key is forbidden and a transaction will fail with the ``special_keys_api_failure`` error if the clear is committed. For more details, see help text of ``fdbcli`` command ``coordinators``.
+#. ``\xff\xff/configuration/coordinators/cluster_description := <new_description>`` Read/write. A single key, if read, will return the cluster description. Thus modifying the key will update the cluster decription. The new description needs to match ``[A-Za-z0-9_]+``, otherwise, the ``special_keys_api_failure`` error will be thrown. In addition, clear on the key is meaningless thus forbidden. For more details, see help text of ``fdbcli`` command ``coordinators``.
+
+The ``<address>`` here is the network address of the corresponding process. Thus the general form is ``ip:port``.
+
 Error message module
 ~~~~~~~~~~~~~~~~~~~~
 

From 5c9004cdfa34730103382f2888de62d799d02f17 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Fri, 28 May 2021 18:44:37 +0000
Subject: [PATCH 194/740] fix typos

---
 documentation/sphinx/source/developer-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/developer-guide.rst b/documentation/sphinx/source/developer-guide.rst
index f51db018bbc..fa66977520b 100644
--- a/documentation/sphinx/source/developer-guide.rst
+++ b/documentation/sphinx/source/developer-guide.rst
@@ -971,7 +971,7 @@ For example, you can change a process type or update coordinators by manipulatin
 
 #. ``\xff\xff/configuration/process/class_type/<address> := <class_type>`` Read/write. Reading keys in the range will retrieve processes' class types. Setting keys in the range will update processes' class types. The process matching ``<address>`` will be assigned to the given class type if the commit is successful. The valid class types are ``storage``, ``transaction``, ``resolution``, etc. A full list of class type can be found via ``fdbcli`` command ``help setclass``. Clearing keys is forbidden in the range. Instead, you can set the type as ``default``, which will clear the assigned class type if existing. For more details, see help text of ``fdbcli`` command ``setclass``.
 #. ``\xff\xff/configuration/process/class_source/<address> := <class_source>`` Read-only. Reading keys in the range will retrieve processes' class source. The class source is one of ``command_line``, ``configure_auto``, ``set_class`` and ``invalid``, indicating the source that the process's class type comes from.
-#. ``\xff\xff/configuration/coordinators/processes := <ip:port>,<ip:port>,...,<ip:port>`` Read/write. A single key, if read, will return a comma delimited string of coordinators's network addresses. Thus to provide a new set of cooridinators, set the key with a correct formatted string of new coordinators' network addresses. As there's always the need to have coordinators, clear on the key is forbidden and a transaction will fail with the ``special_keys_api_failure`` error if the clear is committed. For more details, see help text of ``fdbcli`` command ``coordinators``.
+#. ``\xff\xff/configuration/coordinators/processes := <ip:port>,<ip:port>,...,<ip:port>`` Read/write. A single key, if read, will return a comma delimited string of coordinators' network addresses. Thus to provide a new set of cooridinators, set the key with a correct formatted string of new coordinators' network addresses. As there's always the need to have coordinators, clear on the key is forbidden and a transaction will fail with the ``special_keys_api_failure`` error if the clear is committed. For more details, see help text of ``fdbcli`` command ``coordinators``.
 #. ``\xff\xff/configuration/coordinators/cluster_description := <new_description>`` Read/write. A single key, if read, will return the cluster description. Thus modifying the key will update the cluster decription. The new description needs to match ``[A-Za-z0-9_]+``, otherwise, the ``special_keys_api_failure`` error will be thrown. In addition, clear on the key is meaningless thus forbidden. For more details, see help text of ``fdbcli`` command ``coordinators``.
 
 The ``<address>`` here is the network address of the corresponding process. Thus the general form is ``ip:port``.

From a0a4730d7465da51783d5ca5490f228605a56f4e Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Thu, 27 May 2021 21:54:59 -0700
Subject: [PATCH 195/740] Reduce the frequency that buggified reads are failed
 so that transactions with a lot of reads aren't doomed to almost always fail.

---
 fdbclient/NativeAPI.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 75c11db5941..214b8196aca 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2235,7 +2235,7 @@ ACTOR Future<Optional<Value>> getValue(Future<Version> version,
 
 			state GetValueReply reply;
 			try {
-				if (CLIENT_BUGGIFY) {
+				if (CLIENT_BUGGIFY_WITH_PROB(.01)) {
 					throw deterministicRandom()->randomChoice(
 					    std::vector<Error>{ transaction_too_old(), future_version() });
 				}
@@ -3078,7 +3078,7 @@ ACTOR Future<RangeResult> getRange(Database cx,
 				++cx->transactionPhysicalReads;
 				state GetKeyValuesReply rep;
 				try {
-					if (CLIENT_BUGGIFY) {
+					if (CLIENT_BUGGIFY_WITH_PROB(.01)) {
 						throw deterministicRandom()->randomChoice(
 						    std::vector<Error>{ transaction_too_old(), future_version() });
 					}

From 28f2a8c2dbd8e6d6d9443763363ea77b6f33336e Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Fri, 28 May 2021 12:43:30 -0700
Subject: [PATCH 196/740] Require a minimum of 6.2.33 for 6.2 snapshot
 restarting tests to avoid a bug in prior versions

---
 tests/CMakeLists.txt                             | 16 ++++++++--------
 .../SnapCycleRestart-1.txt                       |  0
 .../SnapCycleRestart-2.txt                       |  0
 .../SnapTestAttrition-1.txt                      |  0
 .../SnapTestAttrition-2.txt                      |  0
 .../SnapTestRestart-1.txt                        |  0
 .../SnapTestRestart-2.txt                        |  0
 .../SnapTestSimpleRestart-1.txt                  |  0
 .../SnapTestSimpleRestart-2.txt                  |  0
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/restarting/{from_6.2.29 => from_6.2.33}/SnapCycleRestart-1.txt (100%)
 rename tests/restarting/{from_6.2.29 => from_6.2.33}/SnapCycleRestart-2.txt (100%)
 rename tests/restarting/{from_6.2.29 => from_6.2.33}/SnapTestAttrition-1.txt (100%)
 rename tests/restarting/{from_6.2.29 => from_6.2.33}/SnapTestAttrition-2.txt (100%)
 rename tests/restarting/{from_6.2.29 => from_6.2.33}/SnapTestRestart-1.txt (100%)
 rename tests/restarting/{from_6.2.29 => from_6.2.33}/SnapTestRestart-2.txt (100%)
 rename tests/restarting/{from_6.2.29 => from_6.2.33}/SnapTestSimpleRestart-1.txt (100%)
 rename tests/restarting/{from_6.2.29 => from_6.2.33}/SnapTestSimpleRestart-2.txt (100%)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 94203e109ad..84cdeaaafeb 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -186,17 +186,17 @@ if(WITH_PYTHON)
     TEST_FILES restarting/from_5.0.0/StorefrontTestRestart-1.txt
                restarting/from_5.0.0/StorefrontTestRestart-2.txt)
   add_fdb_test(
-    TEST_FILES restarting/from_6.2.29/SnapTestAttrition-1.txt
-               restarting/from_6.2.29/SnapTestAttrition-2.txt)
+    TEST_FILES restarting/from_6.2.33/SnapTestAttrition-1.txt
+               restarting/from_6.2.33/SnapTestAttrition-2.txt)
   add_fdb_test(
-    TEST_FILES restarting/from_6.2.29/SnapTestSimpleRestart-1.txt
-               restarting/from_6.2.29/SnapTestSimpleRestart-2.txt)
+    TEST_FILES restarting/from_6.2.33/SnapTestSimpleRestart-1.txt
+               restarting/from_6.2.33/SnapTestSimpleRestart-2.txt)
   add_fdb_test(
-    TEST_FILES restarting/from_6.2.29/SnapTestRestart-1.txt
-               restarting/from_6.2.29/SnapTestRestart-2.txt)
+    TEST_FILES restarting/from_6.2.33/SnapTestRestart-1.txt
+               restarting/from_6.2.33/SnapTestRestart-2.txt)
   add_fdb_test(
-    TEST_FILES restarting/from_6.2.29/SnapCycleRestart-1.txt
-               restarting/from_6.2.29/SnapCycleRestart-2.txt)
+    TEST_FILES restarting/from_6.2.33/SnapCycleRestart-1.txt
+               restarting/from_6.2.33/SnapCycleRestart-2.txt)
   add_fdb_test(
     TEST_FILES restarting/from_5.1.7/DrUpgradeRestart-1.txt
                restarting/from_5.1.7/DrUpgradeRestart-2.txt)
diff --git a/tests/restarting/from_6.2.29/SnapCycleRestart-1.txt b/tests/restarting/from_6.2.33/SnapCycleRestart-1.txt
similarity index 100%
rename from tests/restarting/from_6.2.29/SnapCycleRestart-1.txt
rename to tests/restarting/from_6.2.33/SnapCycleRestart-1.txt
diff --git a/tests/restarting/from_6.2.29/SnapCycleRestart-2.txt b/tests/restarting/from_6.2.33/SnapCycleRestart-2.txt
similarity index 100%
rename from tests/restarting/from_6.2.29/SnapCycleRestart-2.txt
rename to tests/restarting/from_6.2.33/SnapCycleRestart-2.txt
diff --git a/tests/restarting/from_6.2.29/SnapTestAttrition-1.txt b/tests/restarting/from_6.2.33/SnapTestAttrition-1.txt
similarity index 100%
rename from tests/restarting/from_6.2.29/SnapTestAttrition-1.txt
rename to tests/restarting/from_6.2.33/SnapTestAttrition-1.txt
diff --git a/tests/restarting/from_6.2.29/SnapTestAttrition-2.txt b/tests/restarting/from_6.2.33/SnapTestAttrition-2.txt
similarity index 100%
rename from tests/restarting/from_6.2.29/SnapTestAttrition-2.txt
rename to tests/restarting/from_6.2.33/SnapTestAttrition-2.txt
diff --git a/tests/restarting/from_6.2.29/SnapTestRestart-1.txt b/tests/restarting/from_6.2.33/SnapTestRestart-1.txt
similarity index 100%
rename from tests/restarting/from_6.2.29/SnapTestRestart-1.txt
rename to tests/restarting/from_6.2.33/SnapTestRestart-1.txt
diff --git a/tests/restarting/from_6.2.29/SnapTestRestart-2.txt b/tests/restarting/from_6.2.33/SnapTestRestart-2.txt
similarity index 100%
rename from tests/restarting/from_6.2.29/SnapTestRestart-2.txt
rename to tests/restarting/from_6.2.33/SnapTestRestart-2.txt
diff --git a/tests/restarting/from_6.2.29/SnapTestSimpleRestart-1.txt b/tests/restarting/from_6.2.33/SnapTestSimpleRestart-1.txt
similarity index 100%
rename from tests/restarting/from_6.2.29/SnapTestSimpleRestart-1.txt
rename to tests/restarting/from_6.2.33/SnapTestSimpleRestart-1.txt
diff --git a/tests/restarting/from_6.2.29/SnapTestSimpleRestart-2.txt b/tests/restarting/from_6.2.33/SnapTestSimpleRestart-2.txt
similarity index 100%
rename from tests/restarting/from_6.2.29/SnapTestSimpleRestart-2.txt
rename to tests/restarting/from_6.2.33/SnapTestSimpleRestart-2.txt

From 1d7652f28a1ee77c0a171c2a8b46d8857ef77c50 Mon Sep 17 00:00:00 2001
From: Markus Pilman <markus.pilman@snowflake.com>
Date: Wed, 24 Mar 2021 16:27:35 -0600
Subject: [PATCH 197/740] Actually close files in simulation

---
 fdbrpc/AsyncFileNonDurable.actor.h |  4 ++++
 fdbrpc/sim2.actor.cpp              | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index 00c0f7441d7..c5f065a4e36 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -276,6 +276,10 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 			Future<Void> deleteFuture = deleteFile(this);
 			if (!deleteFuture.isReady())
 				filesBeingDeleted[filename] = deleteFuture;
+		} else if (isSoleOwner()) {
+			// isSoleOwner is a bit confusing here. What we mean is that the openFiles map is the sole owner. If we
+			// we remove the file from the map to make sure it gets closed.
+			g_simulator.getCurrentProcess()->machine->openFiles.erase(filename);
 		}
 	}
 
diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index 1af14ec676c..6cddbb7e886 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -536,7 +536,10 @@ class SimpleFile : public IAsyncFile, public ReferenceCounted<SimpleFile> {
 
 	std::string getFilename() const override { return actualFilename; }
 
-	~SimpleFile() override { _close(h); }
+	~SimpleFile() override {
+		_close(h);
+		--openCount;
+	}
 
 private:
 	int h;
@@ -1933,10 +1936,7 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 		TraceEvent("ClogInterface")
 		    .detail("IP", ip.toString())
 		    .detail("Delay", seconds)
-		    .detail("Queue",
-		            mode == ClogSend      ? "Send"
-		            : mode == ClogReceive ? "Receive"
-		                                  : "All");
+		    .detail("Queue", mode == ClogSend ? "Send" : mode == ClogReceive ? "Receive" : "All");
 
 		if (mode == ClogSend || mode == ClogAll)
 			g_clogging.clogSendFor(ip, seconds);
@@ -2408,9 +2408,9 @@ int sf_open(const char* filename, int flags, int convFlags, int mode) {
 	                       GENERIC_READ | ((flags & IAsyncFile::OPEN_READWRITE) ? GENERIC_WRITE : 0),
 	                       FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
 	                       nullptr,
-	                       (flags & IAsyncFile::OPEN_EXCLUSIVE) ? CREATE_NEW
-	                       : (flags & IAsyncFile::OPEN_CREATE)  ? OPEN_ALWAYS
-	                                                            : OPEN_EXISTING,
+	                       (flags & IAsyncFile::OPEN_EXCLUSIVE)
+	                           ? CREATE_NEW
+	                           : (flags & IAsyncFile::OPEN_CREATE) ? OPEN_ALWAYS : OPEN_EXISTING,
 	                       FILE_ATTRIBUTE_NORMAL,
 	                       nullptr);
 	int h = -1;

From 4bcc77881cfc0c9e699d8347cf3e20bd36126408 Mon Sep 17 00:00:00 2001
From: Markus Pilman <markus.pilman@snowflake.com>
Date: Wed, 24 Mar 2021 16:56:11 -0600
Subject: [PATCH 198/740] fix typo

---
 fdbrpc/AsyncFileNonDurable.actor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index c5f065a4e36..a1508f7fef6 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -278,7 +278,7 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 				filesBeingDeleted[filename] = deleteFuture;
 		} else if (isSoleOwner()) {
 			// isSoleOwner is a bit confusing here. What we mean is that the openFiles map is the sole owner. If we
-			// we remove the file from the map to make sure it gets closed.
+			// remove the file from the map to make sure it gets closed.
 			g_simulator.getCurrentProcess()->machine->openFiles.erase(filename);
 		}
 	}

From 681c1a6d3b4fc72aa95bd0d4d409462482456e71 Mon Sep 17 00:00:00 2001
From: Markus Pilman <markus.pilman@snowflake.com>
Date: Wed, 24 Mar 2021 19:57:24 -0600
Subject: [PATCH 199/740] handle file renames properly

---
 fdbrpc/AsyncFileNonDurable.actor.h | 12 +++++++++++-
 flow/flow.h                        |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index a1508f7fef6..28b3506d6e0 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -279,7 +279,17 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 		} else if (isSoleOwner()) {
 			// isSoleOwner is a bit confusing here. What we mean is that the openFiles map is the sole owner. If we
 			// remove the file from the map to make sure it gets closed.
-			g_simulator.getCurrentProcess()->machine->openFiles.erase(filename);
+			auto& openFiles = g_simulator.getCurrentProcess()->machine->openFiles;
+			auto iter = openFiles.find(filename);
+			// the file could've been renamed (DiskQueue does that for example). In that case the file won't be in the
+			// map anymore.
+			if (iter != openFiles.end()) {
+				// even if the filename exists, it doesn't mean that it references the same file. It could be that the
+				// file was renamed and later a file with the same name was opened.
+				if (iter->second.canGet() && iter->second.get().getPtr() == this) {
+					openFiles.erase(filename);
+				}
+			}
 		}
 	}
 
diff --git a/flow/flow.h b/flow/flow.h
index 987572d7c5b..e03d598d9b1 100644
--- a/flow/flow.h
+++ b/flow/flow.h
@@ -674,6 +674,8 @@ class Future {
 	bool isValid() const { return sav != 0; }
 	bool isReady() const { return sav->isSet(); }
 	bool isError() const { return sav->isError(); }
+	// returns true if get can be called on this future (counterpart of canBeSet on Promises)
+	bool canGet() const { return isValid() && isReady() && !isError(); }
 	Error& getError() const {
 		ASSERT(isError());
 		return sav->error_state;

From ccf1d05ba743f7b538ef6ea6a47c49aca867e300 Mon Sep 17 00:00:00 2001
From: Markus Pilman <markus.pilman@snowflake.com>
Date: Thu, 25 Mar 2021 13:22:29 -0600
Subject: [PATCH 200/740] only remove files from the open map if they have no
 modifications in flight

---
 fdbrpc/AsyncFileNonDurable.actor.h | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index 28b3506d6e0..ef686271c51 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -268,6 +268,37 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 		//TraceEvent("AsyncFileNonDurable_Destroy", id).detail("Filename", filename);
 	}
 
+	// The purpose of this actor is to simply keep a reference to a non-durable file until all pending modifications
+	// have completed. When they return, this actor will die and therefore decrement the reference count by 1.
+	ACTOR void waitOnOutstandingModifications(Reference<AsyncFileNonDurable> self) {
+		state ISimulator::ProcessInfo* currentProcess = g_simulator.getCurrentProcess();
+		state TaskPriority currentTaskID = g_network->getCurrentTask();
+		state std::string filename = self->filename;
+
+		wait(g_simulator.onMachine(currentProcess));
+		try {
+			Promise<bool> startSyncPromise = self->startSyncPromise;
+			self->startSyncPromise = Promise<bool>();
+			startSyncPromise.send(true);
+
+			std::vector<Future<Void>> outstandingModifications;
+
+			for (auto itr = self->pendingModifications.ranges().begin();
+			     itr != self->pendingModifications.ranges().end();
+			     ++itr)
+				if (itr->value().isValid() && !itr->value().isReady())
+					outstandingModifications.push_back(itr->value());
+
+			// Ignore errors here so that all modifications can finish
+			wait(waitForAllReady(outstandingModifications));
+			wait(g_simulator.onProcess(currentProcess, currentTaskID));
+		} catch (Error& e) {
+			state Error err = e;
+			wait(g_simulator.onProcess(currentProcess, currentTaskID));
+			throw err;
+		}
+	}
+
 	void addref() override { ReferenceCounted<AsyncFileNonDurable>::addref(); }
 	void delref() override {
 		if (delref_no_destroy()) {
@@ -279,6 +310,24 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 		} else if (isSoleOwner()) {
 			// isSoleOwner is a bit confusing here. What we mean is that the openFiles map is the sole owner. If we
 			// remove the file from the map to make sure it gets closed.
+			bool hasPendingModifications = false;
+			for (auto iter = pendingModifications.ranges().begin(); iter != pendingModifications.ranges().end();
+			     ++iter) {
+				if (iter->value().isValid() && !iter->value().isReady()) {
+					hasPendingModifications = true;
+					break;
+				}
+			}
+			if (hasPendingModifications) {
+				// If we still have pending references we won't close the file and instead wait for them. But while we
+				// wait for those to complete, another actor might open the file. So we call into an actor that will
+				// hold a refernce until all pending operations are complete. If someone opens this file before this
+				// completes, nothing will happen. Otherwise we will enter delref again but this time
+				// hasPendingModifications will evalualte to false.
+				addref();
+				waitOnOutstandingModifications(Reference<AsyncFileNonDurable>(this));
+				return;
+			}
 			auto& openFiles = g_simulator.getCurrentProcess()->machine->openFiles;
 			auto iter = openFiles.find(filename);
 			// the file could've been renamed (DiskQueue does that for example). In that case the file won't be in the

From ddd0961d3ce4d5cd557b64750d3309857a23a422 Mon Sep 17 00:00:00 2001
From: Markus Pilman <markus.pilman@snowflake.com>
Date: Thu, 25 Mar 2021 14:00:07 -0600
Subject: [PATCH 201/740] Revert change

---
 fdbrpc/AsyncFileNonDurable.actor.h | 47 +++++++-----------------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index ef686271c51..cc341ea1553 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -276,27 +276,20 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 		state std::string filename = self->filename;
 
 		wait(g_simulator.onMachine(currentProcess));
-		try {
-			Promise<bool> startSyncPromise = self->startSyncPromise;
-			self->startSyncPromise = Promise<bool>();
-			startSyncPromise.send(true);
+		Promise<bool> startSyncPromise = self->startSyncPromise;
+		self->startSyncPromise = Promise<bool>();
+		startSyncPromise.send(true);
 
-			std::vector<Future<Void>> outstandingModifications;
+		std::vector<Future<Void>> outstandingModifications;
 
-			for (auto itr = self->pendingModifications.ranges().begin();
-			     itr != self->pendingModifications.ranges().end();
-			     ++itr)
-				if (itr->value().isValid() && !itr->value().isReady())
-					outstandingModifications.push_back(itr->value());
+		for (auto itr = self->pendingModifications.ranges().begin(); itr != self->pendingModifications.ranges().end();
+		     ++itr)
+			if (itr->value().isValid() && !itr->value().isReady())
+				outstandingModifications.push_back(itr->value());
 
-			// Ignore errors here so that all modifications can finish
-			wait(waitForAllReady(outstandingModifications));
-			wait(g_simulator.onProcess(currentProcess, currentTaskID));
-		} catch (Error& e) {
-			state Error err = e;
-			wait(g_simulator.onProcess(currentProcess, currentTaskID));
-			throw err;
-		}
+		// Ignore errors here so that all modifications can finish
+		wait(waitForAllReady(outstandingModifications));
+		wait(g_simulator.onProcess(currentProcess, currentTaskID));
 	}
 
 	void addref() override { ReferenceCounted<AsyncFileNonDurable>::addref(); }
@@ -310,24 +303,6 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 		} else if (isSoleOwner()) {
 			// isSoleOwner is a bit confusing here. What we mean is that the openFiles map is the sole owner. If we
 			// remove the file from the map to make sure it gets closed.
-			bool hasPendingModifications = false;
-			for (auto iter = pendingModifications.ranges().begin(); iter != pendingModifications.ranges().end();
-			     ++iter) {
-				if (iter->value().isValid() && !iter->value().isReady()) {
-					hasPendingModifications = true;
-					break;
-				}
-			}
-			if (hasPendingModifications) {
-				// If we still have pending references we won't close the file and instead wait for them. But while we
-				// wait for those to complete, another actor might open the file. So we call into an actor that will
-				// hold a refernce until all pending operations are complete. If someone opens this file before this
-				// completes, nothing will happen. Otherwise we will enter delref again but this time
-				// hasPendingModifications will evalualte to false.
-				addref();
-				waitOnOutstandingModifications(Reference<AsyncFileNonDurable>(this));
-				return;
-			}
 			auto& openFiles = g_simulator.getCurrentProcess()->machine->openFiles;
 			auto iter = openFiles.find(filename);
 			// the file could've been renamed (DiskQueue does that for example). In that case the file won't be in the

From 0ce997d9b42f4e8323289405117fd937eb1b9688 Mon Sep 17 00:00:00 2001
From: Markus Pilman <markus.pilman@snowflake.com>
Date: Thu, 1 Apr 2021 14:06:13 -0600
Subject: [PATCH 202/740] delete dead code

---
 fdbrpc/AsyncFileNonDurable.actor.h | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index cc341ea1553..28b3506d6e0 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -268,30 +268,6 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 		//TraceEvent("AsyncFileNonDurable_Destroy", id).detail("Filename", filename);
 	}
 
-	// The purpose of this actor is to simply keep a reference to a non-durable file until all pending modifications
-	// have completed. When they return, this actor will die and therefore decrement the reference count by 1.
-	ACTOR void waitOnOutstandingModifications(Reference<AsyncFileNonDurable> self) {
-		state ISimulator::ProcessInfo* currentProcess = g_simulator.getCurrentProcess();
-		state TaskPriority currentTaskID = g_network->getCurrentTask();
-		state std::string filename = self->filename;
-
-		wait(g_simulator.onMachine(currentProcess));
-		Promise<bool> startSyncPromise = self->startSyncPromise;
-		self->startSyncPromise = Promise<bool>();
-		startSyncPromise.send(true);
-
-		std::vector<Future<Void>> outstandingModifications;
-
-		for (auto itr = self->pendingModifications.ranges().begin(); itr != self->pendingModifications.ranges().end();
-		     ++itr)
-			if (itr->value().isValid() && !itr->value().isReady())
-				outstandingModifications.push_back(itr->value());
-
-		// Ignore errors here so that all modifications can finish
-		wait(waitForAllReady(outstandingModifications));
-		wait(g_simulator.onProcess(currentProcess, currentTaskID));
-	}
-
 	void addref() override { ReferenceCounted<AsyncFileNonDurable>::addref(); }
 	void delref() override {
 		if (delref_no_destroy()) {

From c1f0f9b0befa50d9b177bea5a06024422a0af594 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Wed, 26 May 2021 13:38:24 -0700
Subject: [PATCH 203/740] Use a weak reference in the open files cache
 (abstracted from a similar cache in AsyncFileCached) to avoid a problem where
 removing an item from the cache could cause us to reentrantly remove it
 again.

---
 fdbrpc/AsyncFileCached.actor.cpp     |  3 +-
 fdbrpc/AsyncFileCached.actor.h       | 28 ++++------------
 fdbrpc/AsyncFileNonDurable.actor.h   | 40 +++++++++++++----------
 fdbrpc/sim2.actor.cpp                | 32 ++++++++++++-------
 fdbrpc/simulator.h                   |  6 +++-
 fdbserver/SimulatedCluster.actor.cpp |  6 ++--
 flow/genericactors.actor.h           | 48 ++++++++++++++++++++++++++++
 7 files changed, 109 insertions(+), 54 deletions(-)

diff --git a/fdbrpc/AsyncFileCached.actor.cpp b/fdbrpc/AsyncFileCached.actor.cpp
index f4a57d46463..984795c1056 100644
--- a/fdbrpc/AsyncFileCached.actor.cpp
+++ b/fdbrpc/AsyncFileCached.actor.cpp
@@ -46,7 +46,8 @@ EvictablePage::~EvictablePage() {
 	}
 }
 
-std::map<std::string, OpenFileInfo> AsyncFileCached::openFiles;
+// A map of filename to the file handle for all opened cached files
+std::map<std::string, WeakFutureReference<IAsyncFile>> AsyncFileCached::openFiles;
 
 void AsyncFileCached::remove_page(AFCPage* page) {
 	pages.erase(page->pageOffset);
diff --git a/fdbrpc/AsyncFileCached.actor.h b/fdbrpc/AsyncFileCached.actor.h
index c5b6b3127c5..2915b0557c1 100644
--- a/fdbrpc/AsyncFileCached.actor.h
+++ b/fdbrpc/AsyncFileCached.actor.h
@@ -132,27 +132,13 @@ struct EvictablePageCache : ReferenceCounted<EvictablePageCache> {
 	const CacheEvictionType cacheEvictionType;
 };
 
-struct OpenFileInfo : NonCopyable {
-	IAsyncFile* f;
-	Future<Reference<IAsyncFile>> opened; // Only valid until the file is fully opened
-
-	OpenFileInfo() : f(0) {}
-	OpenFileInfo(OpenFileInfo&& r) noexcept : f(r.f), opened(std::move(r.opened)) { r.f = 0; }
-
-	Future<Reference<IAsyncFile>> get() {
-		if (f)
-			return Reference<IAsyncFile>::addRef(f);
-		else
-			return opened;
-	}
-};
-
 struct AFCPage;
 
 class AsyncFileCached final : public IAsyncFile, public ReferenceCounted<AsyncFileCached> {
 	friend struct AFCPage;
 
 public:
+	// Opens a file that uses the FDB in-memory page cache
 	static Future<Reference<IAsyncFile>> open(std::string filename, int flags, int mode) {
 		//TraceEvent("AsyncFileCachedOpen").detail("Filename", filename);
 		if (openFiles.find(filename) == openFiles.end()) {
@@ -160,7 +146,7 @@ class AsyncFileCached final : public IAsyncFile, public ReferenceCounted<AsyncFi
 			if (f.isReady() && f.isError())
 				return f;
 			if (!f.isReady())
-				openFiles[filename].opened = f;
+				openFiles[filename] = WeakFutureReference<IAsyncFile>(f);
 			else
 				return f.get();
 		}
@@ -263,7 +249,9 @@ class AsyncFileCached final : public IAsyncFile, public ReferenceCounted<AsyncFi
 	~AsyncFileCached() override;
 
 private:
-	static std::map<std::string, OpenFileInfo> openFiles;
+	// A map of filename to the file handle for all opened cached files
+	static std::map<std::string, WeakFutureReference<IAsyncFile>> openFiles;
+
 	std::string filename;
 	Reference<IAsyncFile> uncached;
 	int64_t length;
@@ -330,6 +318,7 @@ class AsyncFileCached final : public IAsyncFile, public ReferenceCounted<AsyncFi
 
 	static Future<Reference<IAsyncFile>> open_impl(std::string filename, int flags, int mode);
 
+	// Opens a file that uses the FDB in-memory page cache
 	ACTOR static Future<Reference<IAsyncFile>> open_impl(std::string filename,
 	                                                     int flags,
 	                                                     int mode,
@@ -345,10 +334,7 @@ class AsyncFileCached final : public IAsyncFile, public ReferenceCounted<AsyncFi
 			TraceEvent("AFCUnderlyingOpenEnd").detail("Filename", filename);
 			int64_t l = wait(f->size());
 			TraceEvent("AFCUnderlyingSize").detail("Filename", filename).detail("Size", l);
-			auto& of = openFiles[filename];
-			of.f = new AsyncFileCached(f, filename, l, pageCache);
-			of.opened = Future<Reference<IAsyncFile>>();
-			return Reference<IAsyncFile>(of.f);
+			return new AsyncFileCached(f, filename, l, pageCache);
 		} catch (Error& e) {
 			if (e.code() != error_code_actor_cancelled)
 				openFiles.erase(filename);
diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index 28b3506d6e0..ccc2ad42b49 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -130,6 +130,9 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 	UID id;
 	std::string filename;
 
+	// For files that use atomic write and create, they are initially created with an extra suffix
+	std::string initialFilename;
+
 	// An approximation of the size of the file; .size() should be used instead of this variable in most cases
 	mutable int64_t approximateSize;
 
@@ -182,11 +185,13 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 	    reponses; // cannot call getResult on this actor collection, since the actors will be on different processes
 
 	AsyncFileNonDurable(const std::string& filename,
+	                    const std::string& initialFilename,
 	                    Reference<IAsyncFile> file,
 	                    Reference<DiskParameters> diskParameters,
 	                    NetworkAddress openedAddress,
 	                    bool aio)
-	  : openedAddress(openedAddress), pendingModifications(uint64_t(-1)), approximateSize(0), reponses(false),
+	  : filename(filename), initialFilename(initialFilename), file(file), diskParameters(diskParameters),
+	    openedAddress(openedAddress), pendingModifications(uint64_t(-1)), approximateSize(0), reponses(false),
 	    aio(aio) {
 
 		// This is only designed to work in simulation
@@ -194,9 +199,6 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 		this->id = deterministicRandom()->randomUniqueID();
 
 		//TraceEvent("AsyncFileNonDurable_Create", id).detail("Filename", filename);
-		this->file = file;
-		this->filename = filename;
-		this->diskParameters = diskParameters;
 		maxWriteDelay = FLOW_KNOBS->NON_DURABLE_MAX_WRITE_DELAY;
 		hasBeenSynced = false;
 
@@ -239,7 +241,7 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 			}
 
 			state Reference<AsyncFileNonDurable> nonDurableFile(
-			    new AsyncFileNonDurable(filename, file, diskParameters, currentProcess->address, aio));
+			    new AsyncFileNonDurable(filename, actualFilename, file, diskParameters, currentProcess->address, aio));
 
 			// Causes the approximateSize member to be set
 			state Future<int64_t> sizeFuture = nonDurableFile->size();
@@ -269,25 +271,29 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 	}
 
 	void addref() override { ReferenceCounted<AsyncFileNonDurable>::addref(); }
+
 	void delref() override {
 		if (delref_no_destroy()) {
-			ASSERT(filesBeingDeleted.count(filename) == 0);
-			//TraceEvent("AsyncFileNonDurable_StartDelete", id).detail("Filename", filename);
-			Future<Void> deleteFuture = deleteFile(this);
-			if (!deleteFuture.isReady())
-				filesBeingDeleted[filename] = deleteFuture;
-		} else if (isSoleOwner()) {
-			// isSoleOwner is a bit confusing here. What we mean is that the openFiles map is the sole owner. If we
-			// remove the file from the map to make sure it gets closed.
+			if (filesBeingDeleted.count(filename) == 0) {
+				//TraceEvent("AsyncFileNonDurable_StartDelete", id).detail("Filename", filename);
+				Future<Void> deleteFuture = deleteFile(this);
+				if (!deleteFuture.isReady())
+					filesBeingDeleted[filename] = deleteFuture;
+			}
+
 			auto& openFiles = g_simulator.getCurrentProcess()->machine->openFiles;
 			auto iter = openFiles.find(filename);
-			// the file could've been renamed (DiskQueue does that for example). In that case the file won't be in the
-			// map anymore.
+			if (iter == openFiles.end()) {
+				iter = openFiles.find(initialFilename);
+			}
+
+			// Various actions (e.g. simulated delete) can remove a file from openFiles prematurely, so it may already
+			// be gone
 			if (iter != openFiles.end()) {
 				// even if the filename exists, it doesn't mean that it references the same file. It could be that the
 				// file was renamed and later a file with the same name was opened.
-				if (iter->second.canGet() && iter->second.get().getPtr() == this) {
-					openFiles.erase(filename);
+				if (iter->second.getPtrIfReady().orDefault(nullptr) == this) {
+					openFiles.erase(iter);
 				}
 			}
 		}
diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index 6cddbb7e886..f11caa54617 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -1018,8 +1018,8 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 
 		// Get the size of all files we've created on the server and subtract them from the free space
 		for (auto file = proc->machine->openFiles.begin(); file != proc->machine->openFiles.end(); ++file) {
-			if (file->second.isReady()) {
-				totalFileSize += ((AsyncFileNonDurable*)file->second.get().getPtr())->approximateSize;
+			if (file->second.get().isReady()) {
+				totalFileSize += ((AsyncFileNonDurable*)file->second.get().get().getPtr())->approximateSize;
 			}
 			numFiles++;
 		}
@@ -1936,7 +1936,10 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 		TraceEvent("ClogInterface")
 		    .detail("IP", ip.toString())
 		    .detail("Delay", seconds)
-		    .detail("Queue", mode == ClogSend ? "Send" : mode == ClogReceive ? "Receive" : "All");
+		    .detail("Queue",
+		            mode == ClogSend      ? "Send"
+		            : mode == ClogReceive ? "Receive"
+		                                  : "All");
 
 		if (mode == ClogSend || mode == ClogAll)
 			g_clogging.clogSendFor(ip, seconds);
@@ -2408,9 +2411,9 @@ int sf_open(const char* filename, int flags, int convFlags, int mode) {
 	                       GENERIC_READ | ((flags & IAsyncFile::OPEN_READWRITE) ? GENERIC_WRITE : 0),
 	                       FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
 	                       nullptr,
-	                       (flags & IAsyncFile::OPEN_EXCLUSIVE)
-	                           ? CREATE_NEW
-	                           : (flags & IAsyncFile::OPEN_CREATE) ? OPEN_ALWAYS : OPEN_EXISTING,
+	                       (flags & IAsyncFile::OPEN_EXCLUSIVE) ? CREATE_NEW
+	                       : (flags & IAsyncFile::OPEN_CREATE)  ? OPEN_ALWAYS
+	                                                            : OPEN_EXISTING,
 	                       FILE_ATTRIBUTE_NORMAL,
 	                       nullptr);
 	int h = -1;
@@ -2440,7 +2443,7 @@ Future<Reference<class IAsyncFile>> Sim2FileSystem::open(const std::string& file
 			actualFilename = filename + ".part";
 			auto partFile = machineCache.find(actualFilename);
 			if (partFile != machineCache.end()) {
-				Future<Reference<IAsyncFile>> f = AsyncFileDetachable::open(partFile->second);
+				Future<Reference<IAsyncFile>> f = AsyncFileDetachable::open(partFile->second.get());
 				if (FLOW_KNOBS->PAGE_WRITE_CHECKSUM_HISTORY > 0)
 					f = map(f, [=](Reference<IAsyncFile> r) {
 						return Reference<IAsyncFile>(new AsyncFileWriteChecker(r));
@@ -2448,19 +2451,26 @@ Future<Reference<class IAsyncFile>> Sim2FileSystem::open(const std::string& file
 				return f;
 			}
 		}
-		if (machineCache.find(actualFilename) == machineCache.end()) {
+
+		Future<Reference<IAsyncFile>> f;
+		auto itr = machineCache.find(actualFilename);
+		if (itr == machineCache.end()) {
 			// Simulated disk parameters are shared by the AsyncFileNonDurable and the underlying SimpleFile.
 			// This way, they can both keep up with the time to start the next operation
 			auto diskParameters =
 			    makeReference<DiskParameters>(FLOW_KNOBS->SIM_DISK_IOPS, FLOW_KNOBS->SIM_DISK_BANDWIDTH);
-			machineCache[actualFilename] =
-			    AsyncFileNonDurable::open(filename,
+			f = AsyncFileNonDurable::open(filename,
 			                              actualFilename,
 			                              SimpleFile::open(filename, flags, mode, diskParameters, false),
 			                              diskParameters,
 			                              (flags & IAsyncFile::OPEN_NO_AIO) == 0);
+
+			machineCache[actualFilename] = WeakFutureReference<IAsyncFile>(f);
+		} else {
+			f = itr->second.get();
 		}
-		Future<Reference<IAsyncFile>> f = AsyncFileDetachable::open(machineCache[actualFilename]);
+
+		f = AsyncFileDetachable::open(f);
 		if (FLOW_KNOBS->PAGE_WRITE_CHECKSUM_HISTORY > 0)
 			f = map(f, [=](Reference<IAsyncFile> r) { return Reference<IAsyncFile>(new AsyncFileWriteChecker(r)); });
 		return f;
diff --git a/fdbrpc/simulator.h b/fdbrpc/simulator.h
index 4b74ed91bae..19bed013f28 100644
--- a/fdbrpc/simulator.h
+++ b/fdbrpc/simulator.h
@@ -188,10 +188,14 @@ class ISimulator : public INetwork {
 		Promise<KillType> shutdownSignal;
 	};
 
+	// A set of data associated with a simulated machine
 	struct MachineInfo {
 		ProcessInfo* machineProcess;
 		std::vector<ProcessInfo*> processes;
-		std::map<std::string, Future<Reference<IAsyncFile>>> openFiles;
+
+		// A map from filename to file handle for all open files on a machine
+		std::map<std::string, WeakFutureReference<IAsyncFile>> openFiles;
+
 		std::set<std::string> deletingFiles;
 		std::set<std::string> closingFiles;
 		Optional<Standalone<StringRef>> machineId;
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index f10ca774bb7..a5068150c3c 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -507,8 +507,8 @@ ACTOR Future<Void> simulatedMachine(ClusterConnectionString connStr,
 				// Copy the file pointers to a vector because the map may be modified while we are killing files
 				std::vector<AsyncFileNonDurable*> files;
 				for (auto fileItr = machineCache.begin(); fileItr != machineCache.end(); ++fileItr) {
-					ASSERT(fileItr->second.isReady());
-					files.push_back((AsyncFileNonDurable*)fileItr->second.get().getPtr());
+					ASSERT(fileItr->second.get().isReady());
+					files.push_back((AsyncFileNonDurable*)fileItr->second.get().get().getPtr());
 				}
 
 				std::vector<Future<Void>> killFutures;
@@ -524,7 +524,7 @@ ACTOR Future<Void> simulatedMachine(ClusterConnectionString connStr,
 			for (auto it : machineCache) {
 				filenames.insert(it.first);
 				closingStr += it.first + ", ";
-				ASSERT(it.second.isReady() && !it.second.isError());
+				ASSERT(it.second.get().canGet());
 			}
 
 			for (auto it : g_simulator.getMachineById(localities.machineId())->deletingFiles) {
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 46cdb6d73fd..ba17f8d970e 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1891,6 +1891,54 @@ Future<U> operator>>(Future<T> const& lhs, Future<U> const& rhs) {
 	return runAfter(lhs, rhs);
 }
 
+// A weak reference type to wrap a future Reference<T> object.
+// Once the future is complete, this object holds a pointer to the referenced object but does
+// not contribute to its reference count.
+template <class T>
+class WeakFutureReference {
+public:
+	WeakFutureReference() {}
+	WeakFutureReference(Future<Reference<T>> future) : data(new WeakFutureReferenceData(future)) {}
+
+	// Returns a future to obtain a normal reference handle
+	// If the future is ready, this creates a Reference<T> to wrap the object
+	Future<Reference<T>> get() {
+		if (!data) {
+			return Reference<T>();
+		} else if (data->ptr.present()) {
+			return Reference<T>::addRef(data->ptr.get());
+		} else {
+			return data->future;
+		}
+	}
+
+	// Returns the raw pointer, if the object is ready
+	// Note: this should be used with care, as this pointer is not counted as a reference to the object and
+	// it could be deleted if all normal references are destroyed.
+	Optional<T*> getPtrIfReady() { return data->ptr; }
+
+private:
+	// A class to hold the state for a WeakFutureReference
+	struct WeakFutureReferenceData : public ReferenceCounted<WeakFutureReferenceData>, NonCopyable {
+		Optional<T*> ptr;
+		Future<Reference<T>> future;
+		Future<Void> moveResultFuture;
+
+		WeakFutureReferenceData(Future<Reference<T>> future) : future(future) { moveResultFuture = moveResult(this); }
+
+		// Waits for the future to complete and then stores the pointer in local storage
+		// When this completes, we will no longer be counted toward the reference count of the object
+		ACTOR Future<Void> moveResult(WeakFutureReferenceData* self) {
+			Reference<T> result = wait(self->future);
+			self->ptr = result.getPtr();
+			self->future = Future<Reference<T>>();
+			return Void();
+		}
+	};
+
+	Reference<WeakFutureReferenceData> data;
+};
+
 #include "flow/unactorcompiler.h"
 
 #endif

From 8505359b9bd96b4253afb53467a8e1b35a451353 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Wed, 26 May 2021 16:26:45 -0700
Subject: [PATCH 204/740] For files that use the atomic write and create
 mechanism, attempt to remove the file from the openFiles map at both its old
 and new name

---
 fdbrpc/AsyncFileNonDurable.actor.h | 31 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index ccc2ad42b49..bde8e0fe9e6 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -281,20 +281,27 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 					filesBeingDeleted[filename] = deleteFuture;
 			}
 
-			auto& openFiles = g_simulator.getCurrentProcess()->machine->openFiles;
-			auto iter = openFiles.find(filename);
-			if (iter == openFiles.end()) {
-				iter = openFiles.find(initialFilename);
+			removeOpenFile(filename, this);
+			if (initialFilename != filename) {
+				removeOpenFile(initialFilename, this);
 			}
+		}
+	}
 
-			// Various actions (e.g. simulated delete) can remove a file from openFiles prematurely, so it may already
-			// be gone
-			if (iter != openFiles.end()) {
-				// even if the filename exists, it doesn't mean that it references the same file. It could be that the
-				// file was renamed and later a file with the same name was opened.
-				if (iter->second.getPtrIfReady().orDefault(nullptr) == this) {
-					openFiles.erase(iter);
-				}
+	// Removes a file from the openFiles map
+	static void removeOpenFile(std::string filename, AsyncFileNonDurable* file) {
+		auto& openFiles = g_simulator.getCurrentProcess()->machine->openFiles;
+
+		auto iter = openFiles.find(filename);
+
+		// Various actions (e.g. simulated delete) can remove a file from openFiles prematurely, so it may already
+		// be gone. Renamed files (from atomic write and create) will also be present under only one of the two
+		// names.
+		if (iter != openFiles.end()) {
+			// even if the filename exists, it doesn't mean that it references the same file. It could be that the
+			// file was renamed and later a file with the same name was opened.
+			if (iter->second.getPtrIfReady().orDefault(nullptr) == file) {
+				openFiles.erase(iter);
 			}
 		}
 	}

From 8013ffab0a19412ca87578e038c35b18273e6595 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Thu, 27 May 2021 20:41:49 -0700
Subject: [PATCH 205/740] Fix a test issue where closing an AsyncFileNonDurable
 could permanently prevent you from reopening the file if the machine was in a
 failed state during cleanup

---
 fdbrpc/AsyncFileNonDurable.actor.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index bde8e0fe9e6..f813c1a354c 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -238,6 +238,7 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 				//TraceEvent("AsyncFileNonDurableOpenWaitOnDelete2").detail("Filename", filename);
 				if (shutdown.isReady())
 					throw io_error().asInjectedFault();
+				wait(g_simulator.onProcess(currentProcess, currentTaskID));
 			}
 
 			state Reference<AsyncFileNonDurable> nonDurableFile(
@@ -859,11 +860,9 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 			//TraceEvent("AsyncFileNonDurable_FinishDelete", self->id).detail("Filename", self->filename);
 
 			delete self;
-			wait(g_simulator.onProcess(currentProcess, currentTaskID));
 			return Void();
 		} catch (Error& e) {
 			state Error err = e;
-			wait(g_simulator.onProcess(currentProcess, currentTaskID));
 			throw err;
 		}
 	}

From 09d3266b6817ccf07fb0f43b22a66e3e23df8807 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Fri, 28 May 2021 14:34:20 -0700
Subject: [PATCH 206/740] Rename WeakFutureReference to
 UnsafeWeakFutureReference and add warning comment

---
 fdbrpc/AsyncFileCached.actor.cpp |  2 +-
 fdbrpc/AsyncFileCached.actor.h   |  4 ++--
 fdbrpc/sim2.actor.cpp            |  2 +-
 fdbrpc/simulator.h               |  2 +-
 flow/genericactors.actor.h       | 21 +++++++++++++--------
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/fdbrpc/AsyncFileCached.actor.cpp b/fdbrpc/AsyncFileCached.actor.cpp
index 984795c1056..6354e55cd06 100644
--- a/fdbrpc/AsyncFileCached.actor.cpp
+++ b/fdbrpc/AsyncFileCached.actor.cpp
@@ -47,7 +47,7 @@ EvictablePage::~EvictablePage() {
 }
 
 // A map of filename to the file handle for all opened cached files
-std::map<std::string, WeakFutureReference<IAsyncFile>> AsyncFileCached::openFiles;
+std::map<std::string, UnsafeWeakFutureReference<IAsyncFile>> AsyncFileCached::openFiles;
 
 void AsyncFileCached::remove_page(AFCPage* page) {
 	pages.erase(page->pageOffset);
diff --git a/fdbrpc/AsyncFileCached.actor.h b/fdbrpc/AsyncFileCached.actor.h
index 2915b0557c1..84c42f9716a 100644
--- a/fdbrpc/AsyncFileCached.actor.h
+++ b/fdbrpc/AsyncFileCached.actor.h
@@ -146,7 +146,7 @@ class AsyncFileCached final : public IAsyncFile, public ReferenceCounted<AsyncFi
 			if (f.isReady() && f.isError())
 				return f;
 			if (!f.isReady())
-				openFiles[filename] = WeakFutureReference<IAsyncFile>(f);
+				openFiles[filename] = UnsafeWeakFutureReference<IAsyncFile>(f);
 			else
 				return f.get();
 		}
@@ -250,7 +250,7 @@ class AsyncFileCached final : public IAsyncFile, public ReferenceCounted<AsyncFi
 
 private:
 	// A map of filename to the file handle for all opened cached files
-	static std::map<std::string, WeakFutureReference<IAsyncFile>> openFiles;
+	static std::map<std::string, UnsafeWeakFutureReference<IAsyncFile>> openFiles;
 
 	std::string filename;
 	Reference<IAsyncFile> uncached;
diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index f11caa54617..ee735b963aa 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -2465,7 +2465,7 @@ Future<Reference<class IAsyncFile>> Sim2FileSystem::open(const std::string& file
 			                              diskParameters,
 			                              (flags & IAsyncFile::OPEN_NO_AIO) == 0);
 
-			machineCache[actualFilename] = WeakFutureReference<IAsyncFile>(f);
+			machineCache[actualFilename] = UnsafeWeakFutureReference<IAsyncFile>(f);
 		} else {
 			f = itr->second.get();
 		}
diff --git a/fdbrpc/simulator.h b/fdbrpc/simulator.h
index 19bed013f28..f83686f464a 100644
--- a/fdbrpc/simulator.h
+++ b/fdbrpc/simulator.h
@@ -194,7 +194,7 @@ class ISimulator : public INetwork {
 		std::vector<ProcessInfo*> processes;
 
 		// A map from filename to file handle for all open files on a machine
-		std::map<std::string, WeakFutureReference<IAsyncFile>> openFiles;
+		std::map<std::string, UnsafeWeakFutureReference<IAsyncFile>> openFiles;
 
 		std::set<std::string> deletingFiles;
 		std::set<std::string> closingFiles;
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index ba17f8d970e..4be2f5abc6f 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1894,11 +1894,14 @@ Future<U> operator>>(Future<T> const& lhs, Future<U> const& rhs) {
 // A weak reference type to wrap a future Reference<T> object.
 // Once the future is complete, this object holds a pointer to the referenced object but does
 // not contribute to its reference count.
+//
+// WARNING: this class will not be aware when the underlying object is destroyed. It is up to the
+// user to make sure that an UnsafeWeakFutureReference is discarded at the same time the object is.
 template <class T>
-class WeakFutureReference {
+class UnsafeWeakFutureReference {
 public:
-	WeakFutureReference() {}
-	WeakFutureReference(Future<Reference<T>> future) : data(new WeakFutureReferenceData(future)) {}
+	UnsafeWeakFutureReference() {}
+	UnsafeWeakFutureReference(Future<Reference<T>> future) : data(new UnsafeWeakFutureReferenceData(future)) {}
 
 	// Returns a future to obtain a normal reference handle
 	// If the future is ready, this creates a Reference<T> to wrap the object
@@ -1918,17 +1921,19 @@ class WeakFutureReference {
 	Optional<T*> getPtrIfReady() { return data->ptr; }
 
 private:
-	// A class to hold the state for a WeakFutureReference
-	struct WeakFutureReferenceData : public ReferenceCounted<WeakFutureReferenceData>, NonCopyable {
+	// A class to hold the state for an UnsafeWeakFutureReference
+	struct UnsafeWeakFutureReferenceData : public ReferenceCounted<UnsafeWeakFutureReferenceData>, NonCopyable {
 		Optional<T*> ptr;
 		Future<Reference<T>> future;
 		Future<Void> moveResultFuture;
 
-		WeakFutureReferenceData(Future<Reference<T>> future) : future(future) { moveResultFuture = moveResult(this); }
+		UnsafeWeakFutureReferenceData(Future<Reference<T>> future) : future(future) {
+			moveResultFuture = moveResult(this);
+		}
 
 		// Waits for the future to complete and then stores the pointer in local storage
 		// When this completes, we will no longer be counted toward the reference count of the object
-		ACTOR Future<Void> moveResult(WeakFutureReferenceData* self) {
+		ACTOR Future<Void> moveResult(UnsafeWeakFutureReferenceData* self) {
 			Reference<T> result = wait(self->future);
 			self->ptr = result.getPtr();
 			self->future = Future<Reference<T>>();
@@ -1936,7 +1941,7 @@ class WeakFutureReference {
 		}
 	};
 
-	Reference<WeakFutureReferenceData> data;
+	Reference<UnsafeWeakFutureReferenceData> data;
 };
 
 #include "flow/unactorcompiler.h"

From f7a4a4fc6c53fdc8e00026356e4c906964626471 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Thu, 3 Jun 2021 14:14:02 -0700
Subject: [PATCH 207/740] Merge pull request #4900 from
 sfc-gh-ajbeamon/fix-async-file-cached-open-files-handling

Fix: when a file open completes synchronously, it wasn't being stored in the openFiles map
---
 fdbrpc/AsyncFileCached.actor.h | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/fdbrpc/AsyncFileCached.actor.h b/fdbrpc/AsyncFileCached.actor.h
index 84c42f9716a..fd6fe27524e 100644
--- a/fdbrpc/AsyncFileCached.actor.h
+++ b/fdbrpc/AsyncFileCached.actor.h
@@ -141,16 +141,23 @@ class AsyncFileCached final : public IAsyncFile, public ReferenceCounted<AsyncFi
 	// Opens a file that uses the FDB in-memory page cache
 	static Future<Reference<IAsyncFile>> open(std::string filename, int flags, int mode) {
 		//TraceEvent("AsyncFileCachedOpen").detail("Filename", filename);
-		if (openFiles.find(filename) == openFiles.end()) {
+		auto itr = openFiles.find(filename);
+		if (itr == openFiles.end()) {
 			auto f = open_impl(filename, flags, mode);
 			if (f.isReady() && f.isError())
 				return f;
-			if (!f.isReady())
-				openFiles[filename] = UnsafeWeakFutureReference<IAsyncFile>(f);
-			else
-				return f.get();
+
+			auto result = openFiles.try_emplace(filename, f);
+
+			// This should be inserting a new entry
+			ASSERT(result.second);
+			itr = result.first;
+
+			// We return here instead of falling through to the outer scope so that we don't delete all references to
+			// the underlying file before returning
+			return itr->second.get();
 		}
-		return openFiles[filename].get();
+		return itr->second.get();
 	}
 
 	Future<int> read(void* data, int length, int64_t offset) override {

From ea0fcfd7cb02d3ad429ae0b3137ff7faa8883cf3 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Wed, 2 Jun 2021 17:17:27 +0000
Subject: [PATCH 208/740] Not doing timeout check in WriteDuringRead if
 simulation is injecting arbitrary delays

---
 fdbserver/workloads/WriteDuringRead.actor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fdbserver/workloads/WriteDuringRead.actor.cpp b/fdbserver/workloads/WriteDuringRead.actor.cpp
index 80a36b18483..63a5b2eb786 100644
--- a/fdbserver/workloads/WriteDuringRead.actor.cpp
+++ b/fdbserver/workloads/WriteDuringRead.actor.cpp
@@ -734,7 +734,9 @@ ACTOR Future<Void> randomTransaction(Database cx, WriteDuringReadWorkload* self,
 	state bool readAheadDisabled = deterministicRandom()->random01() < 0.5;
 	state bool snapshotRYWDisabled = deterministicRandom()->random01() < 0.5;
 	state bool useBatchPriority = deterministicRandom()->random01() < 0.5;
-	state int64_t timebomb = deterministicRandom()->random01() < 0.01 ? deterministicRandom()->randomInt64(1, 6000) : 0;
+	state int64_t timebomb = (FLOW_KNOBS->MAX_BUGGIFIED_DELAY == 0.0 && deterministicRandom()->random01() < 0.01)
+	                             ? deterministicRandom()->randomInt64(1, 6000)
+	                             : 0; // timebomb check can fail incorrectly if simulation injects delay longer than the timebomb
 	state std::vector<Future<Void>> operations;
 	state ActorCollection commits(false);
 	state std::vector<Future<Void>> watches;

From cdabcba39606784c65afdd090b882d0b6c474143 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Fri, 4 Jun 2021 13:03:42 -0700
Subject: [PATCH 209/740] Merge pull request #4898 from
 sfc-gh-ljoswiak/fixes/global-config-processes-2

Fix global config not triggering changes on server processes (attempt 2)
---
 fdbclient/GlobalConfig.actor.cpp      | 96 +++++++++++++++------------
 fdbclient/GlobalConfig.actor.h        | 45 +++++++++++--
 fdbclient/NativeAPI.actor.cpp         |  6 +-
 fdbclient/SpecialKeySpace.actor.cpp   |  3 +
 fdbclient/Tuple.cpp                   | 29 ++++++++
 fdbclient/Tuple.h                     |  4 +-
 fdbserver/ClusterController.actor.cpp | 10 ++-
 fdbserver/worker.actor.cpp            | 16 +++--
 flow/genericactors.actor.h            | 10 +++
 9 files changed, 159 insertions(+), 60 deletions(-)

diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index 5fa901df0e8..a5b4febdeae 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -34,16 +34,7 @@ const KeyRef fdbClientInfoTxnSizeLimit = LiteralStringRef("config/fdb_client_inf
 const KeyRef transactionTagSampleRate = LiteralStringRef("config/transaction_tag_sample_rate");
 const KeyRef transactionTagSampleCost = LiteralStringRef("config/transaction_tag_sample_cost");
 
-GlobalConfig::GlobalConfig() : lastUpdate(0) {}
-
-void GlobalConfig::create(DatabaseContext* cx, Reference<AsyncVar<ClientDBInfo>> dbInfo) {
-	if (g_network->global(INetwork::enGlobalConfig) == nullptr) {
-		auto config = new GlobalConfig{};
-		config->cx = Database(cx);
-		g_network->setGlobal(INetwork::enGlobalConfig, config);
-		config->_updater = updater(config, dbInfo);
-	}
-}
+GlobalConfig::GlobalConfig(Database& cx) : cx(cx), lastUpdate(0) {}
 
 GlobalConfig& GlobalConfig::globalConfig() {
 	void* res = g_network->global(INetwork::enGlobalConfig);
@@ -77,6 +68,14 @@ Future<Void> GlobalConfig::onInitialized() {
 	return initialized.getFuture();
 }
 
+Future<Void> GlobalConfig::onChange() {
+	return configChanged.onTrigger();
+}
+
+void GlobalConfig::trigger(KeyRef key, std::function<void(std::optional<std::any>)> fn) {
+	callbacks.emplace(key, std::move(fn));
+}
+
 void GlobalConfig::insert(KeyRef key, ValueRef value) {
 	data.erase(key);
 
@@ -89,6 +88,8 @@ void GlobalConfig::insert(KeyRef key, ValueRef value) {
 			any = StringRef(arena, t.getString(0).contents());
 		} else if (t.getType(0) == Tuple::ElementType::INT) {
 			any = t.getInt(0);
+		} else if (t.getType(0) == Tuple::ElementType::BOOL) {
+			any = t.getBool(0);
 		} else if (t.getType(0) == Tuple::ElementType::FLOAT) {
 			any = t.getFloat(0);
 		} else if (t.getType(0) == Tuple::ElementType::DOUBLE) {
@@ -97,19 +98,26 @@ void GlobalConfig::insert(KeyRef key, ValueRef value) {
 			ASSERT(false);
 		}
 		data[stableKey] = makeReference<ConfigValue>(std::move(arena), std::move(any));
+
+		if (callbacks.find(stableKey) != callbacks.end()) {
+			callbacks[stableKey](data[stableKey]->value);
+		}
 	} catch (Error& e) {
-		TraceEvent("GlobalConfigTupleParseError").detail("What", e.what());
+		TraceEvent(SevWarn, "GlobalConfigTupleParseError").detail("What", e.what());
 	}
 }
 
-void GlobalConfig::erase(KeyRef key) {
-	data.erase(key);
+void GlobalConfig::erase(Key key) {
+	erase(KeyRangeRef(key, keyAfter(key)));
 }
 
 void GlobalConfig::erase(KeyRangeRef range) {
 	auto it = data.begin();
 	while (it != data.end()) {
 		if (range.contains(it->first)) {
+			if (callbacks.find(it->first) != callbacks.end()) {
+				callbacks[it->first](std::nullopt);
+			}
 			it = data.erase(it);
 		} else {
 			++it;
@@ -134,36 +142,39 @@ ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
 	state Optional<Value> sampleRate = wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_sample_rate/"_sr)));
 	state Optional<Value> sizeLimit = wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_size_limit/"_sr)));
 
-	loop {
-		try {
-			tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
-			// The value doesn't matter too much, as long as the key is set.
-			tr->set(migratedKey.contents(), "1"_sr);
-			if (sampleRate.present()) {
-				const double sampleRateDbl =
-				    BinaryReader::fromStringRef<double>(sampleRate.get().contents(), Unversioned());
-				Tuple rate = Tuple().appendDouble(sampleRateDbl);
-				tr->set(GlobalConfig::prefixedKey(fdbClientInfoTxnSampleRate), rate.pack());
-			}
-			if (sizeLimit.present()) {
-				const int64_t sizeLimitInt =
-				    BinaryReader::fromStringRef<int64_t>(sizeLimit.get().contents(), Unversioned());
-				Tuple size = Tuple().append(sizeLimitInt);
-				tr->set(GlobalConfig::prefixedKey(fdbClientInfoTxnSizeLimit), size.pack());
-			}
-
-			wait(tr->commit());
-			return Void();
-		} catch (Error& e) {
-			throw;
+	try {
+		tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
+		// The value doesn't matter too much, as long as the key is set.
+		tr->set(migratedKey.contents(), "1"_sr);
+		if (sampleRate.present()) {
+			const double sampleRateDbl =
+			    BinaryReader::fromStringRef<double>(sampleRate.get().contents(), Unversioned());
+			Tuple rate = Tuple().appendDouble(sampleRateDbl);
+			tr->set(GlobalConfig::prefixedKey(fdbClientInfoTxnSampleRate), rate.pack());
 		}
+		if (sizeLimit.present()) {
+			const int64_t sizeLimitInt =
+			    BinaryReader::fromStringRef<int64_t>(sizeLimit.get().contents(), Unversioned());
+			Tuple size = Tuple().append(sizeLimitInt);
+			tr->set(GlobalConfig::prefixedKey(fdbClientInfoTxnSizeLimit), size.pack());
+		}
+
+		wait(tr->commit());
+	} catch (Error& e) {
+		// If multiple fdbserver processes are started at once, they will all
+		// attempt this migration at the same time, sometimes resulting in
+		// aborts due to conflicts. Purposefully avoid retrying, making this
+		// migration best-effort.
+		TraceEvent(SevInfo, "GlobalConfigMigrationError").detail("What", e.what());
 	}
+
+	return Void();
 }
 
 // Updates local copy of global configuration by reading the entire key-range
 // from storage.
 ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
-	self->data.clear();
+	self->erase(KeyRangeRef(""_sr, "\xff"_sr));
 
 	Transaction tr(self->cx);
 	RangeResult result = wait(tr.getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY));
@@ -176,7 +187,8 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 
 // Applies updates to the local copy of the global configuration when this
 // process receives an updated history.
-ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self, Reference<AsyncVar<ClientDBInfo>> dbInfo) {
+ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self, const ClientDBInfo* dbInfo) {
+	wait(self->cx->onConnected());
 	wait(self->migrate(self));
 
 	wait(self->refresh(self));
@@ -184,9 +196,9 @@ ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self, Reference<AsyncVar<
 
 	loop {
 		try {
-			wait(dbInfo->onChange());
+			wait(self->dbInfoChanged.onTrigger());
 
-			auto& history = dbInfo->get().history;
+			auto& history = dbInfo->history;
 			if (history.size() == 0) {
 				continue;
 			}
@@ -196,8 +208,8 @@ ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self, Reference<AsyncVar<
 				// history updates or the protocol version changed, so it
 				// must re-read the entire configuration range.
 				wait(self->refresh(self));
-				if (dbInfo->get().history.size() > 0) {
-					self->lastUpdate = dbInfo->get().history.back().version;
+				if (dbInfo->history.size() > 0) {
+					self->lastUpdate = dbInfo->history.back().version;
 				}
 			} else {
 				// Apply history in order, from lowest version to highest
@@ -222,6 +234,8 @@ ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self, Reference<AsyncVar<
 					self->lastUpdate = vh.version;
 				}
 			}
+
+			self->configChanged.trigger();
 		} catch (Error& e) {
 			throw;
 		}
diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index 5c3693f450e..2d63d8de60f 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -62,10 +62,28 @@ struct ConfigValue : ReferenceCounted<ConfigValue> {
 
 class GlobalConfig : NonCopyable {
 public:
-	// Creates a GlobalConfig singleton, accessed by calling GlobalConfig().
-	// This function should only be called once by each process (however, it is
-	// idempotent and calling it multiple times will have no effect).
-	static void create(DatabaseContext* cx, Reference<AsyncVar<ClientDBInfo>> dbInfo);
+	// Creates a GlobalConfig singleton, accessed by calling
+	// GlobalConfig::globalConfig(). This function requires a database object
+	// to allow global configuration to run transactions on the database, and
+	// an AsyncVar object to watch for changes on. The ClientDBInfo pointer
+	// should point to a ClientDBInfo object which will contain the updated
+	// global configuration history when the given AsyncVar changes. This
+	// function should be called whenever the database object changes, in order
+	// to allow global configuration to run transactions on the latest
+	// database.
+	template <class T>
+	static void create(Database& cx, Reference<AsyncVar<T>> db, const ClientDBInfo* dbInfo) {
+		if (g_network->global(INetwork::enGlobalConfig) == nullptr) {
+			auto config = new GlobalConfig{ cx };
+			g_network->setGlobal(INetwork::enGlobalConfig, config);
+			config->_updater = updater(config, dbInfo);
+			// Bind changes in `db` to the `dbInfoChanged` AsyncTrigger.
+			forward(db, std::addressof(config->dbInfoChanged));
+		} else {
+			GlobalConfig* config = reinterpret_cast<GlobalConfig*>(g_network->global(INetwork::enGlobalConfig));
+			config->cx = cx;
+		}
+	}
 
 	// Returns a reference to the global GlobalConfig object. Clients should
 	// call this function whenever they need to read a value out of the global
@@ -114,8 +132,18 @@ class GlobalConfig : NonCopyable {
 	// been created and is ready.
 	Future<Void> onInitialized();
 
+	// Triggers the returned future when any key-value pair in the global
+	// configuration changes.
+	Future<Void> onChange();
+
+	// Calls \ref fn when the value associated with \ref key is changed. \ref
+	// fn is passed the updated value for the key, or an empty optional if the
+	// key has been cleared. If the value is an allocated object, its memory
+	// remains in the control of the global configuration.
+	void trigger(KeyRef key, std::function<void(std::optional<std::any>)> fn);
+
 private:
-	GlobalConfig();
+	GlobalConfig(Database& cx);
 
 	// The functions below only affect the local copy of the global
 	// configuration keyspace! To insert or remove values across all nodes you
@@ -127,20 +155,23 @@ class GlobalConfig : NonCopyable {
 	void insert(KeyRef key, ValueRef value);
 	// Removes the given key (and associated value) from the local copy of the
 	// global configuration keyspace.
-	void erase(KeyRef key);
+	void erase(Key key);
 	// Removes the given key range (and associated values) from the local copy
 	// of the global configuration keyspace.
 	void erase(KeyRangeRef range);
 
 	ACTOR static Future<Void> migrate(GlobalConfig* self);
 	ACTOR static Future<Void> refresh(GlobalConfig* self);
-	ACTOR static Future<Void> updater(GlobalConfig* self, Reference<AsyncVar<ClientDBInfo>> dbInfo);
+	ACTOR static Future<Void> updater(GlobalConfig* self, const ClientDBInfo* dbInfo);
 
 	Database cx;
+	AsyncTrigger dbInfoChanged;
 	Future<Void> _updater;
 	Promise<Void> initialized;
+	AsyncTrigger configChanged;
 	std::unordered_map<StringRef, Reference<ConfigValue>> data;
 	Version lastUpdate;
+	std::unordered_map<KeyRef, std::function<void(std::optional<std::any>)>> callbacks;
 };
 
 #endif
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 214b8196aca..f9f3ff80107 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -957,8 +957,6 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 	getValueSubmitted.init(LiteralStringRef("NativeAPI.GetValueSubmitted"));
 	getValueCompleted.init(LiteralStringRef("NativeAPI.GetValueCompleted"));
 
-	GlobalConfig::create(this, clientInfo);
-
 	monitorProxiesInfoChange = monitorProxiesChange(clientInfo, &proxiesChangeTrigger);
 	clientStatusUpdater.actor = clientStatusUpdateActor(this);
 	cacheListMonitor = monitorCacheList(this);
@@ -1553,7 +1551,9 @@ Database Database::createDatabase(Reference<ClusterConnectionFile> connFile,
 		                         /*switchable*/ true);
 	}
 
-	return Database(db);
+	auto database = Database(db);
+	GlobalConfig::create(database, clientInfo, std::addressof(clientInfo->get()));
+	return database;
 }
 
 Database Database::createDatabase(std::string connFileName,
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 6b147eaa07a..ffd90d07895 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -1384,6 +1384,9 @@ Future<RangeResult> GlobalConfigImpl::getRange(ReadYourWritesTransaction* ryw, K
 			} else if (config->value.type() == typeid(int64_t)) {
 				result.push_back_deep(result.arena(),
 				                      KeyValueRef(prefixedKey, std::to_string(std::any_cast<int64_t>(config->value))));
+			} else if (config->value.type() == typeid(bool)) {
+				result.push_back_deep(result.arena(),
+				                      KeyValueRef(prefixedKey, std::to_string(std::any_cast<bool>(config->value))));
 			} else if (config->value.type() == typeid(float)) {
 				result.push_back_deep(result.arena(),
 				                      KeyValueRef(prefixedKey, std::to_string(std::any_cast<float>(config->value))));
diff --git a/fdbclient/Tuple.cpp b/fdbclient/Tuple.cpp
index 367a7b80fb9..ab1fcb0314f 100644
--- a/fdbclient/Tuple.cpp
+++ b/fdbclient/Tuple.cpp
@@ -71,6 +71,8 @@ Tuple::Tuple(StringRef const& str, bool exclude_incomplete) {
 			i += sizeof(float) + 1;
 		} else if (data[i] == 0x21) {
 			i += sizeof(double) + 1;
+		} else if (data[i] == 0x26 || data[i] == 0x27) {
+			i += 1;
 		} else if (data[i] == '\x00') {
 			i += 1;
 		} else {
@@ -144,6 +146,16 @@ Tuple& Tuple::append(int64_t value) {
 	return *this;
 }
 
+Tuple& Tuple::appendBool(bool value) {
+	offsets.push_back(data.size());
+	if (value) {
+		data.push_back(data.arena(), 0x27);
+	} else {
+		data.push_back(data.arena(), 0x26);
+	}
+	return *this;
+}
+
 Tuple& Tuple::appendFloat(float value) {
 	offsets.push_back(data.size());
 	float swap = bigEndianFloat(value);
@@ -192,6 +204,8 @@ Tuple::ElementType Tuple::getType(size_t index) const {
 		return ElementType::FLOAT;
 	} else if (code == 0x21) {
 		return ElementType::DOUBLE;
+	} else if (code == 0x26 || code == 0x27) {
+		return ElementType::BOOL;
 	} else {
 		throw invalid_tuple_data_type();
 	}
@@ -287,6 +301,21 @@ int64_t Tuple::getInt(size_t index, bool allow_incomplete) const {
 }
 
 // TODO: Combine with bindings/flow/Tuple.*. This code is copied from there.
+bool Tuple::getBool(size_t index) const {
+	if (index >= offsets.size()) {
+		throw invalid_tuple_index();
+	}
+	ASSERT_LT(offsets[index], data.size());
+	uint8_t code = data[offsets[index]];
+	if (code == 0x26) {
+		return false;
+	} else if (code == 0x27) {
+		return true;
+	} else {
+		throw invalid_tuple_data_type();
+	}
+}
+
 float Tuple::getFloat(size_t index) const {
 	if (index >= offsets.size()) {
 		throw invalid_tuple_index();
diff --git a/fdbclient/Tuple.h b/fdbclient/Tuple.h
index 3dc597f2629..62feba307b1 100644
--- a/fdbclient/Tuple.h
+++ b/fdbclient/Tuple.h
@@ -40,6 +40,7 @@ struct Tuple {
 	Tuple& append(int64_t);
 	// There are some ambiguous append calls in fdbclient, so to make it easier
 	// to add append for floats and doubles, name them differently for now.
+	Tuple& appendBool(bool);
 	Tuple& appendFloat(float);
 	Tuple& appendDouble(double);
 	Tuple& appendNull();
@@ -51,7 +52,7 @@ struct Tuple {
 		return append(t);
 	}
 
-	enum ElementType { NULL_TYPE, INT, BYTES, UTF8, FLOAT, DOUBLE };
+	enum ElementType { NULL_TYPE, INT, BYTES, UTF8, BOOL, FLOAT, DOUBLE };
 
 	// this is number of elements, not length of data
 	size_t size() const { return offsets.size(); }
@@ -59,6 +60,7 @@ struct Tuple {
 	ElementType getType(size_t index) const;
 	Standalone<StringRef> getString(size_t index) const;
 	int64_t getInt(size_t index, bool allow_incomplete = false) const;
+	bool getBool(size_t index) const;
 	float getFloat(size_t index) const;
 	double getDouble(size_t index) const;
 
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index ea02d3f7472..45116d454a3 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -3765,7 +3765,7 @@ ACTOR Future<Void> monitorGlobalConfig(ClusterControllerData::DBInfo* db) {
 				tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 				tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 				state Optional<Value> globalConfigVersion = wait(tr.get(globalConfigVersionKey));
-				state ClientDBInfo clientInfo = db->clientInfo->get();
+				state ClientDBInfo clientInfo = db->serverInfo->get().client;
 
 				if (globalConfigVersion.present()) {
 					// Since the history keys end with versionstamps, they
@@ -3823,6 +3823,14 @@ ACTOR Future<Void> monitorGlobalConfig(ClusterControllerData::DBInfo* db) {
 					}
 
 					clientInfo.id = deterministicRandom()->randomUniqueID();
+					// Update ServerDBInfo so fdbserver processes receive updated history.
+					ServerDBInfo serverInfo = db->serverInfo->get();
+					serverInfo.id = deterministicRandom()->randomUniqueID();
+					serverInfo.infoGeneration = ++db->dbInfoCount;
+					serverInfo.client = clientInfo;
+					db->serverInfo->set(serverInfo);
+
+					// Update ClientDBInfo so client processes receive updated history.
 					db->clientInfo->set(clientInfo);
 				}
 
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 5a568fc96dd..97f22d3c689 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -22,6 +22,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include "fdbrpc/Locality.h"
+#include "fdbclient/GlobalConfig.actor.h"
 #include "fdbclient/StorageServerInterface.h"
 #include "fdbserver/Knobs.h"
 #include "flow/ActorCollection.h"
@@ -139,12 +140,14 @@ Database openDBOnServer(Reference<AsyncVar<ServerDBInfo>> const& db,
                         bool enableLocalityLoadBalance,
                         bool lockAware) {
 	auto info = makeReference<AsyncVar<ClientDBInfo>>();
-	return DatabaseContext::create(info,
-	                               extractClientInfo(db, info),
-	                               enableLocalityLoadBalance ? db->get().myLocality : LocalityData(),
-	                               enableLocalityLoadBalance,
-	                               taskID,
-	                               lockAware);
+	auto cx = DatabaseContext::create(info,
+	                                  extractClientInfo(db, info),
+	                                  enableLocalityLoadBalance ? db->get().myLocality : LocalityData(),
+	                                  enableLocalityLoadBalance,
+	                                  taskID,
+	                                  lockAware);
+	GlobalConfig::create(cx, db, std::addressof(db->get().client));
+	return cx;
 }
 
 struct ErrorInfo {
@@ -1264,7 +1267,6 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 						notUpdated = interf.updateServerDBInfo.getEndpoint();
 					} else if (localInfo.infoGeneration > dbInfo->get().infoGeneration ||
 					           dbInfo->get().clusterInterface != ccInterface->get().get()) {
-
 						TraceEvent("GotServerDBInfoChange")
 						    .detail("ChangeID", localInfo.id)
 						    .detail("MasterID", localInfo.master.id())
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 4be2f5abc6f..a9108ed9f44 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -697,6 +697,16 @@ class AsyncTrigger : NonCopyable {
 	AsyncVar<Void> v;
 };
 
+// Binds an AsyncTrigger object to an AsyncVar, so when the AsyncVar changes
+// the AsyncTrigger is triggered.
+ACTOR template <class T>
+void forward(Reference<AsyncVar<T>> from, AsyncTrigger* to) {
+	loop {
+		wait(from->onChange());
+		to->trigger();
+	}
+}
+
 class Debouncer : NonCopyable {
 public:
 	explicit Debouncer(double delay) { worker = debounceWorker(this, delay); }

From e89434a365f5adf49fa30017a1681c27b1f8e259 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Tue, 25 May 2021 15:51:26 +0000
Subject: [PATCH 210/740] Fixing multiple small redwood test bugs

---
 fdbserver/VersionedBTree.actor.cpp | 37 ++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp
index 1d93b0723be..96905c9db23 100644
--- a/fdbserver/VersionedBTree.actor.cpp
+++ b/fdbserver/VersionedBTree.actor.cpp
@@ -41,6 +41,12 @@
 
 #define REDWOOD_DEBUG 0
 
+// Only print redwood debug statements for a certain address. Useful in simulation with many redwood processes to reduce
+// log size.
+#define REDWOOD_DEBUG_ADDR 0
+// example addr:  "[abcd::4:0:1:4]:1"
+#define REDWOOD_DEBUG_ADDR_VAL "";
+
 #define debug_printf_stream stdout
 #define debug_printf_always(...)                                                                                       \
 	{                                                                                                                  \
@@ -50,11 +56,25 @@
 		fflush(debug_printf_stream);                                                                                   \
 	}
 
+#define debug_printf_addr(...)                                                                                         \
+	{                                                                                                                  \
+		std::string addr = REDWOOD_DEBUG_ADDR_VAL;                                                                     \
+		if (!memcmp(addr.c_str(), g_network->getLocalAddress().toString().c_str(), addr.size())) {                     \
+			std::string prefix =                                                                                       \
+			    format("%s %f %04d ", g_network->getLocalAddress().toString().c_str(), now(), __LINE__);               \
+			std::string msg = format(__VA_ARGS__);                                                                     \
+			writePrefixedLines(debug_printf_stream, prefix, msg);                                                      \
+			fflush(debug_printf_stream);                                                                               \
+		}                                                                                                              \
+	}
+
 #define debug_printf_noop(...)
 
 #if defined(NO_INTELLISENSE)
 #if REDWOOD_DEBUG
 #define debug_printf debug_printf_always
+#elif REDWOOD_DEBUG_ADDR
+#define debug_printf debug_printf_addr
 #else
 #define debug_printf debug_printf_noop
 #endif
@@ -3769,9 +3789,10 @@ class VersionedBTree final : public IVersionedStore {
 	std::unordered_map<LogicalPageID, ParentInfo> parents;
 	ParentInfoMapT childUpdateTracker;
 
-	// MetaKey changes size so allocate space for it to expand into
+	// MetaKey changes size so allocate space for it to expand into. FIXME: Steve is fixing this to be dynamically
+	// sized.
 	union {
-		uint8_t headerSpace[sizeof(MetaKey) + sizeof(LogicalPageID) * 30];
+		uint8_t headerSpace[sizeof(MetaKey) + sizeof(LogicalPageID) * 200];
 		MetaKey m_header;
 	};
 
@@ -7479,7 +7500,11 @@ TEST_CASE("/redwood/correctness/unit/deltaTree/IntIntPair") {
 	std::set<IntIntPair> uniqueItems;
 	while (uniqueItems.size() < N) {
 		IntIntPair p = randomPair();
-		if (uniqueItems.count(p) == 0) {
+		auto nextP = p; // also check if next highest/lowest key is not in set for testLTE/testGTE
+		nextP.v++;
+		auto prevP = p;
+		prevP.v--;
+		if (uniqueItems.count(p) == 0 && uniqueItems.count(nextP) == 0 && uniqueItems.count(prevP) == 0) {
 			uniqueItems.insert(p);
 		}
 	}
@@ -7497,7 +7522,11 @@ TEST_CASE("/redwood/correctness/unit/deltaTree/IntIntPair") {
 	std::vector<IntIntPair> toDelete;
 	while (1) {
 		IntIntPair p = randomPair();
-		if (uniqueItems.count(p) == 0) {
+		auto nextP = p; // also check if next highest/lowest key is not in set for testLTE/testGTE
+		nextP.v++;
+		auto prevP = p;
+		prevP.v--;
+		if (uniqueItems.count(p) == 0 && uniqueItems.count(nextP) == 0 && uniqueItems.count(prevP) == 0) {
 			if (!r.insert(p)) {
 				break;
 			};

From 76b4f1efe91b1b817d9b86c1f342e4e21c0955b2 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Tue, 25 May 2021 20:42:07 +0000
Subject: [PATCH 211/740] Adding comments for clarity

---
 fdbserver/VersionedBTree.actor.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp
index 96905c9db23..6b028fe591c 100644
--- a/fdbserver/VersionedBTree.actor.cpp
+++ b/fdbserver/VersionedBTree.actor.cpp
@@ -7496,11 +7496,11 @@ TEST_CASE("/redwood/correctness/unit/deltaTree/IntIntPair") {
 		    { deterministicRandom()->randomInt(prev.k, next.k), deterministicRandom()->randomInt(prev.v, next.v) });
 	};
 
-	// Build a set of N unique items
+	// Build a set of N unique items, where no consecutive items are in the set, a requirement of the seek behavior tests.
 	std::set<IntIntPair> uniqueItems;
 	while (uniqueItems.size() < N) {
 		IntIntPair p = randomPair();
-		auto nextP = p; // also check if next highest/lowest key is not in set for testLTE/testGTE
+		auto nextP = p; // also check if next highest/lowest key is not in set
 		nextP.v++;
 		auto prevP = p;
 		prevP.v--;
@@ -7522,7 +7522,7 @@ TEST_CASE("/redwood/correctness/unit/deltaTree/IntIntPair") {
 	std::vector<IntIntPair> toDelete;
 	while (1) {
 		IntIntPair p = randomPair();
-		auto nextP = p; // also check if next highest/lowest key is not in set for testLTE/testGTE
+		auto nextP = p; // also check if next highest/lowest key is not in the set
 		nextP.v++;
 		auto prevP = p;
 		prevP.v--;
@@ -7676,6 +7676,7 @@ TEST_CASE("/redwood/correctness/unit/deltaTree/IntIntPair") {
 	}
 
 	// SeekLTE to the next possible int pair value after each element to make sure the base element is found
+	// Assumes no consecutive items are present in the set
 	for (int i = 0; i < items.size(); ++i) {
 		IntIntPair p = items[i];
 		IntIntPair q = p;
@@ -7692,6 +7693,7 @@ TEST_CASE("/redwood/correctness/unit/deltaTree/IntIntPair") {
 	}
 
 	// SeekGTE to the previous possible int pair value after each element to make sure the base element is found
+	// Assumes no consecutive items are present in the set
 	for (int i = 0; i < items.size(); ++i) {
 		IntIntPair p = items[i];
 		IntIntPair q = p;
@@ -7727,6 +7729,7 @@ TEST_CASE("/redwood/correctness/unit/deltaTree/IntIntPair") {
 	}
 
 	// SeekLTE to each element's next possible value, using each element as a hint
+	// Assumes no consecutive items are present in the set
 	for (int i = 0; i < items.size(); ++i) {
 		IntIntPair p = items[i];
 		IntIntPair q = p;

From 4a2d2fa648d075ead623d00188e3defc65a72964 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 13 May 2021 17:38:01 -0700
Subject: [PATCH 212/740] Merge pull request #4822 from
 sfc-gh-anoyes/anoyes/aarch64-fat-jar

Put aarch64 libfdb_java in the right place for fat jar
---
 bindings/java/CMakeLists.txt                  |  8 +++---
 .../main/com/apple/foundationdb/JNIUtil.java  | 26 ++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 2da8639b8df..09012cdf97f 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -141,8 +141,6 @@ endif()
 target_include_directories(fdb_java PRIVATE ${JNI_INCLUDE_DIRS})
 # libfdb_java.so is loaded by fdb-java.jar and doesn't need to depened on jvm shared libraries.
 target_link_libraries(fdb_java PRIVATE fdb_c)
-set_target_properties(fdb_java PROPERTIES
-  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/${SYSTEM_NAME}/amd64/)
 if(APPLE)
   set_target_properties(fdb_java PROPERTIES SUFFIX ".jnilib")
 endif()
@@ -217,7 +215,11 @@ if(NOT OPEN_FOR_IDE)
   elseif(APPLE)
     set(lib_destination "osx/x86_64")
   else()
-    set(lib_destination "linux/amd64")
+   if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
+     set(lib_destination "linux/aarch64")
+   else()
+     set(lib_destination "linux/amd64")
+    endif()
   endif()
 	set(lib_destination "${unpack_dir}/lib/${lib_destination}")
 	set(jni_package "${CMAKE_BINARY_DIR}/packages/lib")
diff --git a/bindings/java/src/main/com/apple/foundationdb/JNIUtil.java b/bindings/java/src/main/com/apple/foundationdb/JNIUtil.java
index 8aa3d9f1383..99c2f8a3229 100644
--- a/bindings/java/src/main/com/apple/foundationdb/JNIUtil.java
+++ b/bindings/java/src/main/com/apple/foundationdb/JNIUtil.java
@@ -36,11 +36,7 @@ class JNIUtil {
 	private static final String TEMPFILE_PREFIX = "fdbjni";
 	private static final String TEMPFILE_SUFFIX = ".library";
 
-	private enum OS {
-		WIN32("windows", "amd64", false),
-		LINUX("linux", "amd64", true),
-		OSX("osx", "x86_64", true);
-
+	private static class OS {
 		private final String name;
 		private final String arch;
 		private final boolean canDeleteEager;
@@ -171,13 +167,19 @@ private static String getLibName(String libName) {
 
 	private static OS getRunningOS() {
 		String osname = System.getProperty("os.name").toLowerCase();
-		if(osname.startsWith("windows"))
-			return OS.WIN32;
-		if(osname.startsWith("linux"))
-			return OS.LINUX;
-		if(osname.startsWith("mac") || osname.startsWith("darwin"))
-			return OS.OSX;
-		throw new IllegalStateException("Unknown or unsupported OS: " + osname);
+		String arch = System.getProperty("os.arch");
+		if (!arch.equals("amd64") && !arch.equals("x86_64") && !arch.equals("aarch64")) {
+			throw new IllegalStateException("Unknown or unsupported arch: " + arch);
+		}
+		if (osname.startsWith("windows")) {
+			return new OS("windows", arch, /* canDeleteEager */ false);
+		} else if (osname.startsWith("linux")) {
+			return new OS("linux", arch, /* canDeleteEager */ true);
+		} else if (osname.startsWith("mac") || osname.startsWith("darwin")) {
+			return new OS("osx", arch, /* canDeleteEager */ true);
+		} else {
+			throw new IllegalStateException("Unknown or unsupported OS: " + osname);
+		}
 	}
 
 	private JNIUtil() {}

From 255549ecf1fdaf8fec6ddccdab43ffe6f609375a Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 7 Jun 2021 08:58:45 -0700
Subject: [PATCH 213/740] Merge pull request #4909 from apple/anoyes/fix-ub

Fix several instances of undefined behavior
---
 fdbclient/FDBTypes.h                        |  4 +++-
 fdbclient/ManagementAPI.actor.cpp           |  8 +++----
 fdbrpc/Stats.h                              | 11 +++++++++-
 fdbserver/DataDistributionTracker.actor.cpp |  4 ++--
 fdbserver/DeltaTree.h                       |  2 +-
 fdbserver/GrvProxyServer.actor.cpp          | 23 +++++++++++++--------
 fdbserver/LogRouter.actor.cpp               |  8 +++----
 fdbserver/RadixTree.h                       |  8 +++++--
 fdbserver/SkipList.cpp                      |  6 ++++--
 fdbserver/VersionedBTree.actor.cpp          |  5 +++--
 fdbserver/sqlite/sqlite3.amalgamation.c     |  2 +-
 fdbserver/storageserver.actor.cpp           |  2 +-
 flow/Arena.h                                | 12 ++++++++++-
 flow/FastAlloc.cpp                          |  2 +-
 flow/Histogram.cpp                          |  3 ++-
 15 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index e2c8b4cd3b1..236841c3bdc 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -483,7 +483,9 @@ inline Key keyAfter(const KeyRef& key) {
 
 	Standalone<StringRef> r;
 	uint8_t* s = new (r.arena()) uint8_t[key.size() + 1];
-	memcpy(s, key.begin(), key.size());
+	if (key.size() > 0) {
+		memcpy(s, key.begin(), key.size());
+	}
 	s[key.size()] = 0;
 	((StringRef&)r) = StringRef(s, key.size() + 1);
 	return r;
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index 90d670e801b..da796313e44 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -1264,7 +1264,7 @@ struct AutoQuorumChange final : IQuorumChange {
 	                                                      vector<NetworkAddress> oldCoordinators,
 	                                                      Reference<ClusterConnectionFile> ccf,
 	                                                      CoordinatorsResult& err) override {
-		return getDesired(this, tr, oldCoordinators, ccf, &err);
+		return getDesired(Reference<AutoQuorumChange>::addRef(this), tr, oldCoordinators, ccf, &err);
 	}
 
 	ACTOR static Future<int> getRedundancy(AutoQuorumChange* self, Transaction* tr) {
@@ -1327,7 +1327,7 @@ struct AutoQuorumChange final : IQuorumChange {
 		return true; // The status quo seems fine
 	}
 
-	ACTOR static Future<vector<NetworkAddress>> getDesired(AutoQuorumChange* self,
+	ACTOR static Future<vector<NetworkAddress>> getDesired(Reference<AutoQuorumChange> self,
 	                                                       Transaction* tr,
 	                                                       vector<NetworkAddress> oldCoordinators,
 	                                                       Reference<ClusterConnectionFile> ccf,
@@ -1335,7 +1335,7 @@ struct AutoQuorumChange final : IQuorumChange {
 		state int desiredCount = self->desired;
 
 		if (desiredCount == -1) {
-			int redundancy = wait(getRedundancy(self, tr));
+			int redundancy = wait(getRedundancy(self.getPtr(), tr));
 			desiredCount = redundancy * 2 - 1;
 		}
 
@@ -1364,7 +1364,7 @@ struct AutoQuorumChange final : IQuorumChange {
 		}
 
 		if (checkAcceptable) {
-			bool ok = wait(isAcceptable(self, tr, oldCoordinators, ccf, desiredCount, &excluded));
+			bool ok = wait(isAcceptable(self.getPtr(), tr, oldCoordinators, ccf, desiredCount, &excluded));
 			if (ok)
 				return oldCoordinators;
 		}
diff --git a/fdbrpc/Stats.h b/fdbrpc/Stats.h
index 7ddcf45fbb8..61576ec0313 100644
--- a/fdbrpc/Stats.h
+++ b/fdbrpc/Stats.h
@@ -20,6 +20,7 @@
 
 #ifndef FDBRPC_STATS_H
 #define FDBRPC_STATS_H
+#include <type_traits>
 #pragma once
 
 // Yet another performance statistics interface
@@ -136,7 +137,15 @@ struct SpecialCounter final : ICounter, FastAllocated<SpecialCounter<F>>, NonCop
 	void remove() override { delete this; }
 
 	std::string const& getName() const override { return name; }
-	int64_t getValue() const override { return f(); }
+	int64_t getValue() const override {
+		auto result = f();
+		// Disallow conversion from floating point to int64_t, since this has
+		// been a source of confusion - e.g. a percentage represented as a
+		// fraction between 0 and 1 is not meaningful after conversion to
+		// int64_t.
+		static_assert(!std::is_floating_point_v<decltype(result)>);
+		return result;
+	}
 
 	void resetInterval() override {}
 
diff --git a/fdbserver/DataDistributionTracker.actor.cpp b/fdbserver/DataDistributionTracker.actor.cpp
index 94f38622f03..40ca28aa08e 100644
--- a/fdbserver/DataDistributionTracker.actor.cpp
+++ b/fdbserver/DataDistributionTracker.actor.cpp
@@ -176,8 +176,8 @@ ShardSizeBounds getShardSizeBounds(KeyRangeRef shard, int64_t maxShardSize) {
 }
 
 int64_t getMaxShardSize(double dbSizeEstimate) {
-	return std::min((SERVER_KNOBS->MIN_SHARD_BYTES +
-	                 (int64_t)std::sqrt(dbSizeEstimate) * SERVER_KNOBS->SHARD_BYTES_PER_SQRT_BYTES) *
+	return std::min((SERVER_KNOBS->MIN_SHARD_BYTES + (int64_t)std::sqrt(std::max<double>(dbSizeEstimate, 0)) *
+	                                                     SERVER_KNOBS->SHARD_BYTES_PER_SQRT_BYTES) *
 	                    SERVER_KNOBS->SHARD_BYTES_RATIO,
 	                (int64_t)SERVER_KNOBS->MAX_SHARD_BYTES);
 }
diff --git a/fdbserver/DeltaTree.h b/fdbserver/DeltaTree.h
index 253c1932252..36679da604f 100644
--- a/fdbserver/DeltaTree.h
+++ b/fdbserver/DeltaTree.h
@@ -832,7 +832,7 @@ struct DeltaTree {
 		int count = end - begin;
 		numItems = count;
 		nodeBytesDeleted = 0;
-		initialHeight = (uint8_t)log2(count) + 1;
+		initialHeight = count ? (uint8_t)log2(count) + 1 : 0;
 		maxHeight = 0;
 
 		// The boundary leading to the new page acts as the last time we branched right
diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp
index aaf9f8b1863..a982bce51af 100644
--- a/fdbserver/GrvProxyServer.actor.cpp
+++ b/fdbserver/GrvProxyServer.actor.cpp
@@ -109,15 +109,18 @@ struct GrvProxyStats {
 	                          SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 	    grvLatencyBands("GRVLatencyMetrics", id, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
 		// The rate at which the limit(budget) is allowed to grow.
-		specialCounter(cc, "SystemAndDefaultTxnRateAllowed", [this]() { return this->transactionRateAllowed; });
-		specialCounter(cc, "BatchTransactionRateAllowed", [this]() { return this->batchTransactionRateAllowed; });
-		specialCounter(cc, "SystemAndDefaultTxnLimit", [this]() { return this->transactionLimit; });
-		specialCounter(cc, "BatchTransactionLimit", [this]() { return this->batchTransactionLimit; });
+		specialCounter(
+		    cc, "SystemAndDefaultTxnRateAllowed", [this]() { return int64_t(this->transactionRateAllowed); });
+		specialCounter(
+		    cc, "BatchTransactionRateAllowed", [this]() { return int64_t(this->batchTransactionRateAllowed); });
+		specialCounter(cc, "SystemAndDefaultTxnLimit", [this]() { return int64_t(this->transactionLimit); });
+		specialCounter(cc, "BatchTransactionLimit", [this]() { return int64_t(this->batchTransactionLimit); });
 		specialCounter(cc, "PercentageOfDefaultGRVQueueProcessed", [this]() {
-			return this->percentageOfDefaultGRVQueueProcessed;
+			return int64_t(100 * this->percentageOfDefaultGRVQueueProcessed);
+		});
+		specialCounter(cc, "PercentageOfBatchGRVQueueProcessed", [this]() {
+			return int64_t(100 * this->percentageOfBatchGRVQueueProcessed);
 		});
-		specialCounter(
-		    cc, "PercentageOfBatchGRVQueueProcessed", [this]() { return this->percentageOfBatchGRVQueueProcessed; });
 
 		logger = traceCounters("GrvProxyMetrics", id, SERVER_KNOBS->WORKER_LOGGING_INTERVAL, &cc, "GrvProxyMetrics");
 		for (int i = 0; i < FLOW_KNOBS->BASIC_LOAD_BALANCE_BUCKETS; i++) {
@@ -831,8 +834,10 @@ ACTOR static Future<Void> transactionStarter(GrvProxyInterface proxy,
 		}
 		span = Span(span.location);
 
-		grvProxyData->stats.percentageOfDefaultGRVQueueProcessed = (double)defaultGRVProcessed / defaultQueueSize;
-		grvProxyData->stats.percentageOfBatchGRVQueueProcessed = (double)batchGRVProcessed / batchQueueSize;
+		grvProxyData->stats.percentageOfDefaultGRVQueueProcessed =
+		    defaultQueueSize ? (double)defaultGRVProcessed / defaultQueueSize : 1;
+		grvProxyData->stats.percentageOfBatchGRVQueueProcessed =
+		    batchQueueSize ? (double)batchGRVProcessed / batchQueueSize : 1;
 	}
 }
 
diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp
index 044b78bec29..ec0ec6a4165 100644
--- a/fdbserver/LogRouter.actor.cpp
+++ b/fdbserver/LogRouter.actor.cpp
@@ -175,22 +175,22 @@ struct LogRouterData {
 		specialCounter(cc, "WaitForVersionMS", [this]() {
 			double val = this->waitForVersionTime;
 			this->waitForVersionTime = 0;
-			return 1000 * val;
+			return int64_t(1000 * val);
 		});
 		specialCounter(cc, "WaitForVersionMaxMS", [this]() {
 			double val = this->maxWaitForVersionTime;
 			this->maxWaitForVersionTime = 0;
-			return 1000 * val;
+			return int64_t(1000 * val);
 		});
 		specialCounter(cc, "GetMoreMS", [this]() {
 			double val = this->getMoreTime;
 			this->getMoreTime = 0;
-			return 1000 * val;
+			return int64_t(1000 * val);
 		});
 		specialCounter(cc, "GetMoreMaxMS", [this]() {
 			double val = this->maxGetMoreTime;
 			this->maxGetMoreTime = 0;
-			return 1000 * val;
+			return int64_t(1000 * val);
 		});
 		specialCounter(cc, "Generation", [this]() { return this->generation; });
 		logger = traceCounters("LogRouterMetrics",
diff --git a/fdbserver/RadixTree.h b/fdbserver/RadixTree.h
index 0c4b9384d62..eabe927c91e 100644
--- a/fdbserver/RadixTree.h
+++ b/fdbserver/RadixTree.h
@@ -54,7 +54,9 @@ StringRef radix_join(const StringRef& key1, const StringRef& key2, Arena& arena)
 	uint8_t* s = new (arena) uint8_t[rsize];
 
 	memcpy(s, key1.begin(), key1.size());
-	memcpy(s + key1.size(), key2.begin(), key2.size());
+	if (key2.size() > 0) {
+		memcpy(s + key1.size(), key2.begin(), key2.size());
+	}
 
 	return StringRef(s, rsize);
 }
@@ -591,7 +593,9 @@ StringRef radix_tree::iterator::getKey(uint8_t* content) const {
 	auto node = m_pointee;
 	uint32_t pos = m_pointee->m_depth;
 	while (true) {
-		memcpy(content + pos, node->getKey().begin(), node->getKeySize());
+		if (node->getKeySize() > 0) {
+			memcpy(content + pos, node->getKey().begin(), node->getKeySize());
+		}
 		node = node->m_parent;
 		if (node == nullptr || pos <= 0)
 			break;
diff --git a/fdbserver/SkipList.cpp b/fdbserver/SkipList.cpp
index 85f098db5d8..a75f11073dc 100644
--- a/fdbserver/SkipList.cpp
+++ b/fdbserver/SkipList.cpp
@@ -355,8 +355,10 @@ class SkipList : NonCopyable {
 		// pre: !finished()
 		force_inline void prefetch() {
 			Node* next = x->getNext(level - 1);
-			_mm_prefetch((const char*)next, _MM_HINT_T0);
-			_mm_prefetch((const char*)next + 64, _MM_HINT_T0);
+			if (next) {
+				_mm_prefetch((const char*)next, _MM_HINT_T0);
+				_mm_prefetch((const char*)next + 64, _MM_HINT_T0);
+			}
 		}
 
 		// pre: !finished()
diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp
index 6b028fe591c..344a077541a 100644
--- a/fdbserver/VersionedBTree.actor.cpp
+++ b/fdbserver/VersionedBTree.actor.cpp
@@ -917,7 +917,7 @@ struct RedwoodMetrics {
 				if (*m.first == '\0') {
 					*s += "\n";
 				} else if (!skipZeroes || m.second != 0) {
-					*s += format("%-15s %-8u %8u/s  ", m.first, m.second, int(m.second / elapsed));
+					*s += format("%-15s %-8u %8" PRId64 "/s  ", m.first, m.second, int64_t(m.second / elapsed));
 				}
 			}
 		}
@@ -2772,7 +2772,8 @@ struct RedwoodRecordRef {
 			case 1:
 				return *(int32_t*)r;
 			case 2:
-				return (((int64_t)((int48_t*)r)->high) << 16) | (((int48_t*)r)->low & 0xFFFF);
+				return ((int64_t) static_cast<uint32_t>(reinterpret_cast<const int48_t*>(r)->high) << 16) |
+				       (((int48_t*)r)->low & 0xFFFF);
 			case 3:
 			default:
 				return *(int64_t*)r;
diff --git a/fdbserver/sqlite/sqlite3.amalgamation.c b/fdbserver/sqlite/sqlite3.amalgamation.c
index adbad64ea16..acde7aa6257 100644
--- a/fdbserver/sqlite/sqlite3.amalgamation.c
+++ b/fdbserver/sqlite/sqlite3.amalgamation.c
@@ -43143,7 +43143,7 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
         p->pFree = sqlite3DbMallocZero(db, nByte);
       }
       zCsr = p->pFree;
-      zEnd = &zCsr[nByte];
+      zEnd = zCsr ? &zCsr[nByte] : NULL;
     }while( nByte && !db->mallocFailed );
 
     p->nCursor = (u16)nCursor;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 67895499444..3f8cb8b8014 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -710,7 +710,7 @@ struct StorageServer {
 			specialCounter(cc, "DurableVersion", [self]() { return self->durableVersion.get(); });
 			specialCounter(cc, "DesiredOldestVersion", [self]() { return self->desiredOldestVersion.get(); });
 			specialCounter(cc, "VersionLag", [self]() { return self->versionLag; });
-			specialCounter(cc, "LocalRate", [self] { return self->currentRate() * 100; });
+			specialCounter(cc, "LocalRate", [self] { return int64_t(self->currentRate() * 100); });
 
 			specialCounter(cc, "BytesReadSampleCount", [self]() { return self->metrics.bytesReadSample.queue.size(); });
 
diff --git a/flow/Arena.h b/flow/Arena.h
index 12c6932ff08..a30a7226250 100644
--- a/flow/Arena.h
+++ b/flow/Arena.h
@@ -433,8 +433,18 @@ class StringRef {
 
 	StringRef substr(int start) const { return StringRef(data + start, length - start); }
 	StringRef substr(int start, int size) const { return StringRef(data + start, size); }
-	bool startsWith(const StringRef& s) const { return size() >= s.size() && !memcmp(begin(), s.begin(), s.size()); }
+	bool startsWith(const StringRef& s) const {
+		// Avoid UB - can't pass nullptr to memcmp
+		if (s.size() == 0) {
+			return true;
+		}
+		return size() >= s.size() && !memcmp(begin(), s.begin(), s.size());
+	}
 	bool endsWith(const StringRef& s) const {
+		// Avoid UB - can't pass nullptr to memcmp
+		if (s.size() == 0) {
+			return true;
+		}
 		return size() >= s.size() && !memcmp(end() - s.size(), s.begin(), s.size());
 	}
 
diff --git a/flow/FastAlloc.cpp b/flow/FastAlloc.cpp
index 7af1b3bf865..03225a991ba 100644
--- a/flow/FastAlloc.cpp
+++ b/flow/FastAlloc.cpp
@@ -119,7 +119,7 @@ void setFastAllocatorThreadInitFunction(ThreadInitFunction f) {
 std::atomic<int64_t> g_hugeArenaMemory(0);
 
 double hugeArenaLastLogged = 0;
-std::map<std::string, std::pair<int, int>> hugeArenaTraces;
+std::map<std::string, std::pair<int, int64_t>> hugeArenaTraces;
 
 void hugeArenaSample(int size) {
 	if (TraceEvent::isNetworkThread()) {
diff --git a/flow/Histogram.cpp b/flow/Histogram.cpp
index 991ad58def1..d229511bfbf 100644
--- a/flow/Histogram.cpp
+++ b/flow/Histogram.cpp
@@ -28,6 +28,7 @@
 // either we pull g_simulator into flow, or flow (and the I/O path) will be unable to log performance
 // metrics.
 #include <fdbrpc/simulator.h>
+#include <limits>
 
 // pull in some global pointers too:  These types are implemented in fdbrpc/sim2.actor.cpp, which is not available here.
 // Yuck. If you're not using the simulator, these will remain null, and all should be well.
@@ -117,7 +118,7 @@ void Histogram::writeToLog() {
 	e.detail("Group", group).detail("Op", op).detail("Unit", UnitToStringMapper.at(unit));
 
 	for (uint32_t i = 0; i < 32; i++) {
-		uint32_t value = ((uint32_t)1) << (i + 1);
+		uint64_t value = uint64_t(1) << (i + 1);
 
 		if (buckets[i]) {
 			switch (unit) {

From 2bb66d3341e43c79368309c97a77a8221218a0b0 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 7 Jun 2021 11:35:56 -0700
Subject: [PATCH 214/740] Merge pull request #4911 from
 sfc-gh-anoyes/anoyes/arm-fdb_c-clang

Fix clang build on Arm
---
 bindings/c/CMakeLists.txt                     |  15 +++
 bindings/c/external_workload.map              |   7 ++
 bindings/c/generate_asm.py                    |  37 +++++-
 .../c/test/unit/unit_tests_version_510.cpp    | 118 ++++++++++++++++++
 bindings/java/CMakeLists.txt                  |   5 +
 5 files changed, 179 insertions(+), 3 deletions(-)
 create mode 100644 bindings/c/external_workload.map
 create mode 100644 bindings/c/test/unit/unit_tests_version_510.cpp

diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
index 0807806f7e2..561ab8d7403 100644
--- a/bindings/c/CMakeLists.txt
+++ b/bindings/c/CMakeLists.txt
@@ -78,6 +78,8 @@ if(NOT WIN32)
     test/unit/fdb_api.cpp
     test/unit/fdb_api.hpp)
 
+  set(UNIT_TEST_VERSION_510_SRCS test/unit/unit_tests_version_510.cpp)
+
   if(OPEN_FOR_IDE)
     add_library(fdb_c_performance_test OBJECT test/performance_test.c test/test.h)
     add_library(fdb_c_ryw_benchmark OBJECT test/ryw_benchmark.c test/test.h)
@@ -85,6 +87,7 @@ if(NOT WIN32)
     add_library(mako OBJECT ${MAKO_SRCS})
     add_library(fdb_c_setup_tests OBJECT test/unit/setup_tests.cpp)
     add_library(fdb_c_unit_tests OBJECT ${UNIT_TEST_SRCS})
+    add_library(fdb_c_unit_tests_version_510 OBJECT ${UNIT_TEST_VERSION_510_SRCS})
   else()
     add_executable(fdb_c_performance_test test/performance_test.c test/test.h)
     add_executable(fdb_c_ryw_benchmark test/ryw_benchmark.c test/test.h)
@@ -92,6 +95,7 @@ if(NOT WIN32)
     add_executable(mako ${MAKO_SRCS})
     add_executable(fdb_c_setup_tests test/unit/setup_tests.cpp)
     add_executable(fdb_c_unit_tests ${UNIT_TEST_SRCS})
+    add_executable(fdb_c_unit_tests_version_510 ${UNIT_TEST_VERSION_510_SRCS})
     strip_debug_symbols(fdb_c_performance_test)
     strip_debug_symbols(fdb_c_ryw_benchmark)
     strip_debug_symbols(fdb_c_txn_size_test)
@@ -104,8 +108,10 @@ if(NOT WIN32)
   add_dependencies(fdb_c_unit_tests doctest)
   target_include_directories(fdb_c_setup_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
   target_include_directories(fdb_c_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
+  target_include_directories(fdb_c_unit_tests_version_510 PUBLIC ${DOCTEST_INCLUDE_DIR})
   target_link_libraries(fdb_c_setup_tests PRIVATE fdb_c Threads::Threads)
   target_link_libraries(fdb_c_unit_tests PRIVATE fdb_c Threads::Threads)
+  target_link_libraries(fdb_c_unit_tests_version_510 PRIVATE fdb_c Threads::Threads)
 
   # do not set RPATH for mako
   set_property(TARGET mako PROPERTY SKIP_BUILD_RPATH TRUE)
@@ -135,6 +141,11 @@ if(NOT WIN32)
     COMMAND $<TARGET_FILE:fdb_c_unit_tests>
             @CLUSTER_FILE@
             fdb)
+  add_fdbclient_test(
+    NAME fdb_c_unit_tests_version_510
+    COMMAND $<TARGET_FILE:fdb_c_unit_tests_version_510>
+            @CLUSTER_FILE@
+            fdb)
   add_fdbclient_test(
     NAME fdb_c_external_client_unit_tests
     COMMAND $<TARGET_FILE:fdb_c_unit_tests>
@@ -158,6 +169,10 @@ set_target_properties(c_workloads PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/share/foundationdb")
 target_link_libraries(c_workloads PUBLIC fdb_c)
 
+if (NOT WIN32 AND NOT APPLE AND NOT OPEN_FOR_IDE)
+  target_link_options(c_workloads PRIVATE "LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/external_workload.map,-z,nodelete")
+endif()
+
 # TODO: re-enable once the old vcxproj-based build system is removed.
 #generate_export_header(fdb_c EXPORT_MACRO_NAME "DLLEXPORT"
 #  EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/foundationdb/fdb_c_export.h)
diff --git a/bindings/c/external_workload.map b/bindings/c/external_workload.map
new file mode 100644
index 00000000000..effca03447c
--- /dev/null
+++ b/bindings/c/external_workload.map
@@ -0,0 +1,7 @@
+{
+  global:
+    workloadFactory;
+  local:
+    *;
+};
+
diff --git a/bindings/c/generate_asm.py b/bindings/c/generate_asm.py
index b23166f2e1c..2f1628fa008 100755
--- a/bindings/c/generate_asm.py
+++ b/bindings/c/generate_asm.py
@@ -74,10 +74,41 @@ def write_unix_asm(asmfile, functions, prefix):
     for f in functions:
         asmfile.write("\n.globl %s%s\n" % (prefix, f))
         asmfile.write("%s%s:\n" % (prefix, f))
+
+        # These assembly implementations of versioned fdb c api functions must have the following properties.
+        #
+        # 1. Don't require dynamic relocation.
+        #
+        # 2. Perform a tail-call to the function pointer that works for a
+        #    function with any number of arguments. For example, since registers x0-x7 are used
+        #    to pass arguments in the Arm calling convention we must not use x0-x7
+        #    here.
+        #
+        # You can compile this example c program to get a rough idea of how to
+        # load the extern symbol and make a tail call.
+        #
+        # $ cat test.c
+        # typedef int (*function)();
+        # extern function f;
+        # int g() { return f(); }
+        # $ cc -S -O3 -fPIC test.c && grep -A 10 '^g:' test.[sS]
+        # g:
+        # .LFB0:
+        # 	.cfi_startproc
+        # 	adrp	x0, :got:f
+        # 	ldr	x0, [x0, #:got_lo12:f]
+        # 	ldr	x0, [x0]
+        # 	br	x0
+        # 	.cfi_endproc
+        # .LFE0:
+        # 	.size	g, .-g
+        # 	.ident	"GCC: (GNU) 8.3.1 20190311 (Red Hat 8.3.1-3)"
+
         if platform == "linux-aarch64":
-            asmfile.write("\tldr x16, =fdb_api_ptr_%s\n" % (f))
-            asmfile.write("\tldr x16, [x16]\n")
-            asmfile.write("\tbr x16\n")
+            asmfile.write("\tadrp x8, :got:fdb_api_ptr_%s\n" % (f))
+            asmfile.write("\tldr x8, [x8, #:got_lo12:fdb_api_ptr_%s]\n" % (f))
+            asmfile.write("\tldr x8, [x8]\n")
+            asmfile.write("\tbr x8\n")
         else:
             asmfile.write(
                 "\tmov r11, qword ptr [%sfdb_api_ptr_%s@GOTPCREL+rip]\n" % (prefix, f))
diff --git a/bindings/c/test/unit/unit_tests_version_510.cpp b/bindings/c/test/unit/unit_tests_version_510.cpp
new file mode 100644
index 00000000000..fbc41430119
--- /dev/null
+++ b/bindings/c/test/unit/unit_tests_version_510.cpp
@@ -0,0 +1,118 @@
+/*
+ * unit_tests_header_510.cpp
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2021 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Unit tests for the FoundationDB C API, at api header version 510
+
+#include "fdb_c_options.g.h"
+#include <thread>
+
+#define FDB_API_VERSION 510
+static_assert(FDB_API_VERSION == 510, "Don't change this! This test intentionally tests an old api header version");
+
+#include <foundationdb/fdb_c.h>
+
+#define DOCTEST_CONFIG_IMPLEMENT
+#include "doctest.h"
+
+#include "flow/config.h"
+
+void fdb_check(fdb_error_t e) {
+	if (e) {
+		std::cerr << fdb_get_error(e) << std::endl;
+		std::abort();
+	}
+}
+
+std::string clusterFilePath;
+std::string prefix;
+
+FDBDatabase* db;
+
+struct Future {
+	FDBFuture* f = nullptr;
+	Future() = default;
+	explicit Future(FDBFuture* f) : f(f) {}
+	~Future() {
+		if (f)
+			fdb_future_destroy(f);
+	}
+};
+
+struct Transaction {
+	FDBTransaction* tr = nullptr;
+	Transaction() = default;
+	explicit Transaction(FDBTransaction* tr) : tr(tr) {}
+	~Transaction() {
+		if (tr)
+			fdb_transaction_destroy(tr);
+	}
+};
+
+// TODO add more tests. The motivation for this test for now is to test the
+// assembly code that handles emulating older api versions, but there's no
+// reason why this shouldn't also test api version 510 specific behavior.
+
+TEST_CASE("GRV") {
+	Transaction tr;
+	fdb_check(fdb_database_create_transaction(db, &tr.tr));
+	Future grv{ fdb_transaction_get_read_version(tr.tr) };
+	fdb_check(fdb_future_block_until_ready(grv.f));
+}
+
+int main(int argc, char** argv) {
+	if (argc < 3) {
+		std::cout << "Unit tests for the FoundationDB C API.\n"
+		          << "Usage: " << argv[0] << " /path/to/cluster_file key_prefix [doctest args]" << std::endl;
+		return 1;
+	}
+	fdb_check(fdb_select_api_version(FDB_API_VERSION));
+
+	doctest::Context context;
+	context.applyCommandLine(argc, argv);
+
+	fdb_check(fdb_setup_network());
+	std::thread network_thread{ &fdb_run_network };
+
+	{
+		FDBCluster* cluster;
+		Future clusterFuture{ fdb_create_cluster(argv[1]) };
+		fdb_check(fdb_future_block_until_ready(clusterFuture.f));
+		fdb_check(fdb_future_get_cluster(clusterFuture.f, &cluster));
+		Future databaseFuture{ fdb_cluster_create_database(cluster, (const uint8_t*)"DB", 2) };
+		fdb_check(fdb_future_block_until_ready(databaseFuture.f));
+		fdb_check(fdb_future_get_database(databaseFuture.f, &db));
+		fdb_cluster_destroy(cluster);
+	}
+
+	clusterFilePath = std::string(argv[1]);
+	prefix = argv[2];
+	int res = context.run();
+	fdb_database_destroy(db);
+
+	if (context.shouldExit()) {
+		fdb_check(fdb_stop_network());
+		network_thread.join();
+		return res;
+	}
+	fdb_check(fdb_stop_network());
+	network_thread.join();
+
+	return res;
+}
diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 2da8639b8df..0b6026a1759 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -138,6 +138,11 @@ else()
   add_library(fdb_java SHARED fdbJNI.cpp)
   add_library(java_workloads SHARED JavaWorkload.cpp)
 endif()
+
+if (NOT WIN32 AND NOT APPLE AND NOT OPEN_FOR_IDE)
+  target_link_options(java_workloads PRIVATE "LINKER:--version-script=${CMAKE_SOURCE_DIR}/bindings/c/external_workload.map,-z,nodelete")
+endif()
+
 target_include_directories(fdb_java PRIVATE ${JNI_INCLUDE_DIRS})
 # libfdb_java.so is loaded by fdb-java.jar and doesn't need to depened on jvm shared libraries.
 target_link_libraries(fdb_java PRIVATE fdb_c)

From 76f36a38f7fea164b08912b5897dea242b5346e9 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Tue, 8 Jun 2021 18:49:09 +0000
Subject: [PATCH 215/740] cherry-pick PR#4877, the transaction should grab
 moveKeysLockOwnerKey and moveKeysLockWriteKey when update data distribution
 related system keys

---
 fdbclient/SpecialKeySpace.actor.cpp           | 15 ++++++--
 .../SpecialKeySpaceCorrectness.actor.cpp      | 36 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index ffd90d07895..d51d27a23ce 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -2061,9 +2061,20 @@ Future<Optional<std::string>> DataDistributionImpl::commit(ReadYourWritesTransac
 				try {
 					int mode = boost::lexical_cast<int>(iter->value().second.get().toString());
 					Value modeVal = BinaryWriter::toValue(mode, Unversioned());
-					if (mode == 0 || mode == 1)
+					if (mode == 0 || mode == 1) {
+						// Whenever configuration changes or DD related system keyspace is changed,
+						// actor must grab the moveKeysLockOwnerKey and update moveKeysLockWriteKey.
+						// This prevents concurrent write to the same system keyspace.
+						// When the owner of the DD related system keyspace changes, DD will reboot
+						BinaryWriter wrMyOwner(Unversioned());
+						wrMyOwner << dataDistributionModeLock;
+						ryw->getTransaction().set(moveKeysLockOwnerKey, wrMyOwner.toValue());
+						BinaryWriter wrLastWrite(Unversioned());
+						wrLastWrite << deterministicRandom()->randomUniqueID();
+						ryw->getTransaction().set(moveKeysLockWriteKey, wrLastWrite.toValue());
+						// set mode
 						ryw->getTransaction().set(dataDistributionModeKey, modeVal);
-					else
+					} else
 						msg = ManagementAPIError::toJsonString(false,
 						                                       "datadistribution",
 						                                       "Please set the value of the data_distribution/mode to "
diff --git a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
index e6a6650de33..da0346531d1 100644
--- a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
+++ b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
@@ -624,7 +624,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 
 	ACTOR Future<Void> managementApiCorrectnessActor(Database cx_, SpecialKeySpaceCorrectnessWorkload* self) {
 		// All management api related tests
-		Database cx = cx_->clone();
+		state Database cx = cx_->clone();
 		state Reference<ReadYourWritesTransaction> tx = makeReference<ReadYourWritesTransaction>(cx);
 		// test ordered option keys
 		{
@@ -1426,6 +1426,40 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 				}
 			}
 		}
+		// make sure when we change dd related special keys, we grab the two system keys,
+		// i.e. moveKeysLockOwnerKey and moveKeysLockWriteKey
+		{
+			state Reference<ReadYourWritesTransaction> tr1(new ReadYourWritesTransaction(cx));
+			state Reference<ReadYourWritesTransaction> tr2(new ReadYourWritesTransaction(cx));
+			loop {
+				try {
+					Version readVersion = wait(tr1->getReadVersion());
+					tr2->setVersion(readVersion);
+					tr1->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
+					tr2->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
+					KeyRef ddPrefix = SpecialKeySpace::getManagementApiCommandPrefix("datadistribution");
+					tr1->set(LiteralStringRef("mode").withPrefix(ddPrefix), LiteralStringRef("1"));
+					wait(tr1->commit());
+					// randomly read the moveKeysLockOwnerKey/moveKeysLockWriteKey
+					// both of them should be grabbed when changing dd mode
+					wait(success(
+					    tr2->get(deterministicRandom()->coinflip() ? moveKeysLockOwnerKey : moveKeysLockWriteKey)));
+					// tr2 shoulde never succeed, just write to a key to make it not a read-only transaction
+					tr2->set(LiteralStringRef("unused_key"), LiteralStringRef(""));
+					wait(tr2->commit());
+					ASSERT(false); // commit should always fail due to conflict
+				} catch (Error& e) {
+					if (e.code() != error_code_not_committed) {
+						// when buggify is enabled, it's possible we get other retriable errors
+						wait(tr2->onError(e));
+						tr1->reset();
+					} else {
+						// loop until we get conflict error
+						break;
+					}
+				}
+			}
+		}
 		return Void();
 	}
 };

From e45e1e7fb69cd01a8daac7b98727e345790f8b47 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Mon, 7 Jun 2021 15:05:30 -0700
Subject: [PATCH 216/740] Add some release notes for 7.0 changes. Fix a bad
 link.

---
 .../sphinx/source/release-notes/release-notes-700.rst      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-700.rst b/documentation/sphinx/source/release-notes/release-notes-700.rst
index ea78b9a10b9..7907466a838 100644
--- a/documentation/sphinx/source/release-notes/release-notes-700.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-700.rst
@@ -17,6 +17,7 @@ Performance
 
 * Increased performance of dr_agent when copying the mutation log. The ``COPY_LOG_BLOCK_SIZE``, ``COPY_LOG_BLOCKS_PER_TASK``, ``COPY_LOG_PREFETCH_BLOCKS``, ``COPY_LOG_READ_AHEAD_BYTES`` and ``COPY_LOG_TASK_DURATION_NANOS`` knobs can be set. `(PR #3436) <https://github.com/apple/foundationdb/pull/3436>`_
 * Reduced the number of connections required by the multi-version client when loading external clients. When connecting to 7.0 clusters, only one connection with version 6.2 or larger will be used. With older clusters, at most two connections with version 6.2 or larger will be used. Clients older than version 6.2 will continue to create an additional connection each. `(PR #4667) <https://github.com/apple/foundationdb/pull/4667>`_
+* Reduce CPU overhead of load balancing on client processes. `(PR #4561) <https://github.com/apple/foundationdb/pull/4561>`_
 
 Reliability
 -----------
@@ -40,10 +41,14 @@ Bindings
 * Python: The function ``get_estimated_range_size_bytes`` will now throw an error if the ``begin_key`` or ``end_key`` is ``None``. `(PR #3394) <https://github.com/apple/foundationdb/pull/3394>`_
 * C: Added a function, ``fdb_database_reboot_worker``, to reboot or suspend the specified process. `(PR #4094) <https://github.com/apple/foundationdb/pull/4094>`_
 * C: Added a function, ``fdb_database_force_recovery_with_data_loss``, to force the database to recover into the given datacenter. `(PR #4420) <https://github.com/apple/foundationdb/pull/4220>`_
-* C: Added a function, ``fdb_database_create_snapshot``, to create a snapshot of the database. `(PR #) <https://github.com/apple/foundationdb/pull/4241/files>`_
+* C: Added a function, ``fdb_database_create_snapshot``, to create a snapshot of the database. `(PR #4241) <https://github.com/apple/foundationdb/pull/4241>`_
+* C: Added ``fdb_database_get_main_thread_busyness`` function to report how busy a client's main thread is. `(PR #4504) <https://github.com/apple/foundationdb/pull/4504>`_
+* Java: Added ``Database.getMainThreadBusyness`` function to report how busy a client's main thread is. `(PR #4564) <https://github.com/apple/foundationdb/pull/4564>`_ 
 
 Other Changes
 -------------
+* When ``fdbmonitor`` dies, all of its child processes are now killed. `(PR #3841) <https://github.com/apple/foundationdb/pull/3841>`_
+* The ``foundationdb`` service installed by the RPM packages will now automatically restart ``fdbmonitor`` after 60 seconds when it fails. `(PR #3841) <https://github.com/apple/foundationdb/pull/3841>`_
 
 Earlier release notes
 ---------------------

From 253587a66b27b7693907ff41d4b5f84bcf7bd298 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Tue, 8 Jun 2021 09:01:54 -0700
Subject: [PATCH 217/740] Add a release note for PR 3759.

---
 documentation/sphinx/source/release-notes/release-notes-700.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-700.rst b/documentation/sphinx/source/release-notes/release-notes-700.rst
index 7907466a838..7b0a24474d3 100644
--- a/documentation/sphinx/source/release-notes/release-notes-700.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-700.rst
@@ -35,6 +35,7 @@ Status
 * Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
+* Added ``seconds_since_last_recovered`` to the ``cluster.recovery_state`` section to report how long it has been since the cluster recovered to the point where it is able to accept requests. `(PR #3759) <https://github.com/apple/foundationdb/pull/3759>`_
 
 Bindings
 --------

From dcbbc9a3157433d3b2877b579674376f2ce0db66 Mon Sep 17 00:00:00 2001
From: Daniel Smith <daniel_b_smith@apple.com>
Date: Wed, 9 Jun 2021 16:15:38 -0400
Subject: [PATCH 218/740] Merge pull request #4922 from
 Daniel-B-Smith/proxies-status-json

Add a backwards-compatible 'proxies' field to status json
---
 .../sphinx/source/mr-status-json-schemas.rst.inc  |  5 +++--
 fdbclient/DatabaseConfiguration.cpp               | 15 +++++++++++++++
 fdbclient/Schemas.cpp                             |  3 ++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index 79793318984..dd4f358c602 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -530,7 +530,7 @@
                "hz":0.0,
                "counter":0,
                "roughness":0.0
-            }, 
+            },
              "low_priority_reads":{ // measures number of incoming low priority read requests
                "hz":0.0,
                "counter":0,
@@ -692,7 +692,8 @@
          "auto_resolvers":1,
          "auto_logs":3,
          "backup_worker_enabled":1,
-         "commit_proxies":5 // this field will be absent if a value has not been explicitly set
+         "commit_proxies":5, // this field will be absent if a value has not been explicitly set
+         "proxies":6 // this field will be absent if a value has not been explicitly set
       },
       "data":{
          "least_operating_space_bytes_log_server":0,
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index 4da069b775b..94994e909d9 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -317,14 +317,26 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const {
 		result["regions"] = getRegionJSON();
 	}
 
+	// Add to the `proxies` count for backwards compatibility with tools built before 7.0.
+	int32_t proxyCount = -1;
 	if (desiredTLogCount != -1 || isOverridden("logs")) {
 		result["logs"] = desiredTLogCount;
 	}
 	if (commitProxyCount != -1 || isOverridden("commit_proxies")) {
 		result["commit_proxies"] = commitProxyCount;
+		if (proxyCount != -1) {
+			proxyCount += commitProxyCount;
+		} else {
+			proxyCount = commitProxyCount;
+		}
 	}
 	if (grvProxyCount != -1 || isOverridden("grv_proxies")) {
 		result["grv_proxies"] = grvProxyCount;
+		if (proxyCount != -1) {
+			proxyCount += grvProxyCount;
+		} else {
+			proxyCount = grvProxyCount;
+		}
 	}
 	if (resolverCount != -1 || isOverridden("resolvers")) {
 		result["resolvers"] = resolverCount;
@@ -350,6 +362,9 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const {
 	if (autoDesiredTLogCount != CLIENT_KNOBS->DEFAULT_AUTO_LOGS || isOverridden("auto_logs")) {
 		result["auto_logs"] = autoDesiredTLogCount;
 	}
+	if (proxyCount != -1) {
+		result["proxies"] = proxyCount;
+	}
 
 	result["backup_worker_enabled"] = (int32_t)backupWorkerEnabled;
 
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 5fef5fb6eb1..383a61904fb 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -741,7 +741,8 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
          "auto_logs":3,
          "commit_proxies":5,
          "grv_proxies":1,
-         "backup_worker_enabled":1
+         "backup_worker_enabled":1,
+         "proxies":6
       },
       "data":{
          "least_operating_space_bytes_log_server":0,

From 84695482a25546aa73dd8bfe58bdac3d4f0c99f4 Mon Sep 17 00:00:00 2001
From: RenxuanW <renxuan@apple.com>
Date: Wed, 9 Jun 2021 22:05:01 -0700
Subject: [PATCH 219/740] Fix batch txn throttling.

---
 fdbserver/GrvProxyServer.actor.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp
index a982bce51af..341b42c1ef4 100644
--- a/fdbserver/GrvProxyServer.actor.cpp
+++ b/fdbserver/GrvProxyServer.actor.cpp
@@ -189,8 +189,8 @@ struct GrvTransactionRateInfo {
 
 	void disable() {
 		disabled = true;
-		rate = 0;
-		smoothRate.reset(0);
+		// Use smoothRate.setTotal(0) instead of setting rate to 0 so txns will not be throttled immediately.
+		smoothRate.setTotal(0);
 	}
 
 	void setRate(double rate) {
@@ -389,13 +389,15 @@ ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>>
 					                             TaskPriority::ProxyGRVTimer));
 				}
 
-				++stats->txnRequestIn;
-				stats->txnStartIn += req.transactionCount;
 				if (req.priority >= TransactionPriority::IMMEDIATE) {
+					++stats->txnRequestIn;
+					stats->txnStartIn += req.transactionCount;
 					stats->txnSystemPriorityStartIn += req.transactionCount;
 					systemQueue->push_back(req);
 					systemQueue->span.addParent(req.spanContext);
 				} else if (req.priority >= TransactionPriority::DEFAULT) {
+					++stats->txnRequestIn;
+					stats->txnStartIn += req.transactionCount;
 					stats->txnDefaultPriorityStartIn += req.transactionCount;
 					defaultQueue->push_back(req);
 					defaultQueue->span.addParent(req.spanContext);
@@ -405,12 +407,13 @@ ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>>
 					if (batchRateInfo->rate <= (1.0 / proxiesCount)) {
 						req.reply.sendError(batch_transaction_throttled());
 						stats->txnThrottled += req.transactionCount;
-						continue;
+					} else {
+						++stats->txnRequestIn;
+						stats->txnStartIn += req.transactionCount;
+						stats->txnBatchPriorityStartIn += req.transactionCount;
+						batchQueue->push_back(req);
+						batchQueue->span.addParent(req.spanContext);
 					}
-
-					stats->txnBatchPriorityStartIn += req.transactionCount;
-					batchQueue->push_back(req);
-					batchQueue->span.addParent(req.spanContext);
 				}
 			}
 		}

From d28d3797c5a3b319a11b2899786ed00b5dc1edfc Mon Sep 17 00:00:00 2001
From: Meng Xu <42559636+xumengpanda@users.noreply.github.com>
Date: Wed, 9 Jun 2021 16:34:57 -0700
Subject: [PATCH 220/740] Merge pull request #4899 from
 Daniel-B-Smith/aws-in-docker

Add AWS CLI tool for downloading from s3
---
 packaging/docker/Dockerfile.eks | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packaging/docker/Dockerfile.eks b/packaging/docker/Dockerfile.eks
index e9a1185dc95..440906e8ff5 100644
--- a/packaging/docker/Dockerfile.eks
+++ b/packaging/docker/Dockerfile.eks
@@ -16,10 +16,14 @@ RUN yum install -y \
   traceroute \
   telnet \
   tcpdump \
+  unzip \
   vim
 
 #todo: nload, iperf, numademo
 
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.0.30.zip" -o "awscliv2.zip" \
+    &&  unzip awscliv2.zip && ./aws/install && rm -rf aws
+
 COPY misc/tini-amd64.sha256sum /tmp/
 # Adding tini as PID 1 https://github.com/krallin/tini
 ARG TINI_VERSION=v0.19.0

From 817b9ad1b7a029a1286bff393cd2e1ec31c5e006 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Thu, 10 Jun 2021 11:17:01 -0700
Subject: [PATCH 221/740] Merge pull request #4945 from
 apple/anoyes/increase-test-duration

150 was too short and we were seeing false positives
---
 tests/slow/DifferentClustersSameRV.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/slow/DifferentClustersSameRV.toml b/tests/slow/DifferentClustersSameRV.toml
index 4cda3eaea47..bb8225f6a6f 100644
--- a/tests/slow/DifferentClustersSameRV.toml
+++ b/tests/slow/DifferentClustersSameRV.toml
@@ -6,7 +6,7 @@ clearAfterTest = false
 
     [[test.workload]]
     testName = 'DifferentClustersSameRV'
-    testDuration = 150
+    testDuration = 500
     switchAfter = 50
     keyToRead = 'someKey'
     keyToWatch = 'anotherKey'

From 2fae33dde4e8f8477688a3a7a95ff458d8352510 Mon Sep 17 00:00:00 2001
From: Zhe Wang <zhewang@Zhes-MacBook-Pro.local>
Date: Wed, 9 Jun 2021 19:14:36 -0500
Subject: [PATCH 222/740] add epoch info to trace events when tLog begins

---
 fdbserver/OldTLogServer_6_2.actor.cpp | 7 +++++--
 fdbserver/TLogServer.actor.cpp        | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fdbserver/OldTLogServer_6_2.actor.cpp b/fdbserver/OldTLogServer_6_2.actor.cpp
index a305b27f3ad..ca94ba70188 100644
--- a/fdbserver/OldTLogServer_6_2.actor.cpp
+++ b/fdbserver/OldTLogServer_6_2.actor.cpp
@@ -2813,7 +2813,10 @@ ACTOR Future<Void> restorePersistentState(TLogData* self,
 		removed.push_back(errorOr(logData->removed));
 		logsByVersion.emplace_back(ver, id1);
 
-		TraceEvent("TLogPersistentStateRestore", self->dbgid).detail("LogId", logData->logId).detail("Ver", ver);
+		TraceEvent("TLogPersistentStateRestore", self->dbgid)
+			.detail("LogId", logData->logId)
+			.detail("Ver", ver)
+			.detail("RecoveryCount", logData->recoveryCount);
 		// Restore popped keys.  Pop operations that took place after the last (committed) updatePersistentDataVersion
 		// might be lost, but that is fine because we will get the corresponding data back, too.
 		tagKeys = prefixRange(rawId.withPrefix(persistTagPoppedKeys.begin));
@@ -3050,7 +3053,7 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	self->popOrder.push_back(recruited.id());
 	self->spillOrder.push_back(recruited.id());
 
-	TraceEvent("TLogStart", logData->logId);
+	TraceEvent("TLogStart", logData->logId).detail("RecoveryCount", logData->recoveryCount);
 
 	state Future<Void> updater;
 	state bool pulledRecoveryVersions = false;
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 76d4bf3bf21..9b1291ec5c8 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -2884,7 +2884,10 @@ ACTOR Future<Void> restorePersistentState(TLogData* self,
 		removed.push_back(errorOr(logData->removed));
 		logsByVersion.emplace_back(ver, id1);
 
-		TraceEvent("TLogPersistentStateRestore", self->dbgid).detail("LogId", logData->logId).detail("Ver", ver);
+		TraceEvent("TLogPersistentStateRestore", self->dbgid)
+			.detail("LogId", logData->logId)
+			.detail("Ver", ver)
+			.detail("RecoveryCount", logData->recoveryCount);
 		// Restore popped keys.  Pop operations that took place after the last (committed) updatePersistentDataVersion
 		// might be lost, but that is fine because we will get the corresponding data back, too.
 		tagKeys = prefixRange(rawId.withPrefix(persistTagPoppedKeys.begin));
@@ -3129,7 +3132,7 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	self->popOrder.push_back(recruited.id());
 	self->spillOrder.push_back(recruited.id());
 
-	TraceEvent("TLogStart", logData->logId);
+	TraceEvent("TLogStart", logData->logId).detail("RecoveryCount", logData->recoveryCount);
 
 	state Future<Void> updater;
 	state bool pulledRecoveryVersions = false;

From f99bc13dc7644a22ed34c41c3a76f848efd3eddb Mon Sep 17 00:00:00 2001
From: Daniel Smith <daniel_b_smith@apple.com>
Date: Fri, 11 Jun 2021 17:21:49 -0400
Subject: [PATCH 223/740] Merge pull request #4956 from
 Daniel-B-Smith/rocksdb-used-fix

[RocksDB] Estimate live SST file size and not live data size
---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 625d5ce6c6e..7377a6d5cf6 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -455,7 +455,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 
 	StorageBytes getStorageBytes() const override {
 		uint64_t live = 0;
-		ASSERT(db->GetIntProperty(rocksdb::DB::Properties::kEstimateLiveDataSize, &live));
+		ASSERT(db->GetIntProperty(rocksdb::DB::Properties::kLiveSstFilesSize, &live));
 
 		int64_t free;
 		int64_t total;

From 50b692bd16b9010a56bd16361d68cf68c54c47c3 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Fri, 11 Jun 2021 17:55:40 -0700
Subject: [PATCH 224/740] Add 7.0 release notes for PRs by sfc-gh-tclinkenbeard

---
 .../source/release-notes/release-notes-700.rst      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-700.rst b/documentation/sphinx/source/release-notes/release-notes-700.rst
index ea78b9a10b9..7422adcf4c6 100644
--- a/documentation/sphinx/source/release-notes/release-notes-700.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-700.rst
@@ -10,12 +10,14 @@ Release Notes
 Features
 --------
 * Added a new API in all bindings that can be used to get a list of split points that will split the given range into (roughly) equally sized chunks. `(PR #3394) <https://github.com/apple/foundationdb/pull/3394>`_
-
+* Added support for writing backup files directly to Azure blob storage. This is not yet performance tested on large-scale clusters. `(PR #3961) <https://github.com/apple/foundationdb/pull/3961>`_
 
 Performance
 -----------
-
+* Improved Deque copy performance. `(PR #3197) <https://github.com/apple/foundationdb/pull/3197>`_
 * Increased performance of dr_agent when copying the mutation log. The ``COPY_LOG_BLOCK_SIZE``, ``COPY_LOG_BLOCKS_PER_TASK``, ``COPY_LOG_PREFETCH_BLOCKS``, ``COPY_LOG_READ_AHEAD_BYTES`` and ``COPY_LOG_TASK_DURATION_NANOS`` knobs can be set. `(PR #3436) <https://github.com/apple/foundationdb/pull/3436>`_
+* Added multiple new microbenchmarks for PromiseStream, Reference, IRandom, and timer, as well as support for benchmarking actors. `(PR #3590) <https://github.com/apple/foundationdb/pull/3590>`_
+* Use xxhash3 for SQLite page checksums. `(PR #4075) <https://github.com/apple/foundationdb/pull/4075>`_
 * Reduced the number of connections required by the multi-version client when loading external clients. When connecting to 7.0 clusters, only one connection with version 6.2 or larger will be used. With older clusters, at most two connections with version 6.2 or larger will be used. Clients older than version 6.2 will continue to create an additional connection each. `(PR #4667) <https://github.com/apple/foundationdb/pull/4667>`_
 
 Reliability
@@ -30,6 +32,7 @@ Fixes
 
 Status
 ------
+* Added limiting metrics (limiting_storage_durability_lag and limiting_storage_queue) to health metrics. `(PR #4067) <https://github.com/apple/foundationdb/pull/4067>`_
 * Added ``commit_batching_window_size`` to the proxy roles section of status to record statistics about commit batching window size on each proxy. `(PR #4735) <https://github.com/apple/foundationdb/pull/4735>`_
 * Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
@@ -39,11 +42,13 @@ Bindings
 --------
 * Python: The function ``get_estimated_range_size_bytes`` will now throw an error if the ``begin_key`` or ``end_key`` is ``None``. `(PR #3394) <https://github.com/apple/foundationdb/pull/3394>`_
 * C: Added a function, ``fdb_database_reboot_worker``, to reboot or suspend the specified process. `(PR #4094) <https://github.com/apple/foundationdb/pull/4094>`_
-* C: Added a function, ``fdb_database_force_recovery_with_data_loss``, to force the database to recover into the given datacenter. `(PR #4420) <https://github.com/apple/foundationdb/pull/4220>`_
-* C: Added a function, ``fdb_database_create_snapshot``, to create a snapshot of the database. `(PR #) <https://github.com/apple/foundationdb/pull/4241/files>`_
+* C: Added a function, ``fdb_database_force_recovery_with_data_loss``, to force the database to recover into the given datacenter. `(PR #4220) <https://github.com/apple/foundationdb/pull/4220>`_
+* C: Added a function, ``fdb_database_create_snapshot``, to create a snapshot of the database. `(PR #4241) <https://github.com/apple/foundationdb/pull/4241/files>`_
 
 Other Changes
 -------------
+* Capture output of forked snapshot processes in trace events. `(PR #4254) <https://github.com/apple/foundationdb/pull/4254/files>`_
+* Add ErrorKind field to Severity 40 trace events. `(PR #4741) <https://github.com/apple/foundationdb/pull/4741/files>`_
 
 Earlier release notes
 ---------------------

From 7ac1371c36fc5f632647af29deee2b8960bc7d80 Mon Sep 17 00:00:00 2001
From: Russell Sears <russell_sears@apple.com>
Date: Fri, 7 May 2021 11:24:47 -0700
Subject: [PATCH 225/740] Add perl + flamegraph to EKS docker images

---
 packaging/docker/Dockerfile.eks            | 9 +++++++++
 packaging/docker/misc/flamegraph.sha256sum | 2 ++
 2 files changed, 11 insertions(+)
 create mode 100644 packaging/docker/misc/flamegraph.sha256sum

diff --git a/packaging/docker/Dockerfile.eks b/packaging/docker/Dockerfile.eks
index 440906e8ff5..9df153280f6 100644
--- a/packaging/docker/Dockerfile.eks
+++ b/packaging/docker/Dockerfile.eks
@@ -9,6 +9,7 @@ RUN yum install -y \
   nc \
   net-tools \
   perf \
+  perl \
   python38 \
   python3-pip \
   strace \
@@ -25,6 +26,7 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.0.30.zip" -o "a
     &&  unzip awscliv2.zip && ./aws/install && rm -rf aws
 
 COPY misc/tini-amd64.sha256sum /tmp/
+COPY misc/flamegraph.sha256sum /tmp/
 # Adding tini as PID 1 https://github.com/krallin/tini
 ARG TINI_VERSION=v0.19.0
 RUN curl -sLO https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-amd64 && \
@@ -35,6 +37,13 @@ RUN curl -sLO https://github.com/krallin/tini/releases/download/${TINI_VERSION}/
 COPY sidecar/requirements.txt /tmp
 RUN pip3 install -r /tmp/requirements.txt
 
+# Install flamegraph
+RUN curl -sLO https://raw.githubusercontent.com/brendangregg/FlameGraph/90533539b75400297092f973163b8a7b067c66d3/stackcollapse-perf.pl && \
+  curl -sLO https://raw.githubusercontent.com/brendangregg/FlameGraph/90533539b75400297092f973163b8a7b067c66d3/flamegraph.pl && \
+  sha256sum -c /tmp/flamegraph.sha256sum && \
+  chmod +x stackcollapse-perf.pl flamegraph.pl && \
+  mv stackcollapse-perf.pl flamegraph.pl /usr/bin
+
 # TODO: Only used by sidecar
 RUN groupadd --gid 4059 fdb && \
 	useradd --gid 4059 --uid 4059 --no-create-home --shell /bin/bash fdb
diff --git a/packaging/docker/misc/flamegraph.sha256sum b/packaging/docker/misc/flamegraph.sha256sum
new file mode 100644
index 00000000000..bb435ced8bd
--- /dev/null
+++ b/packaging/docker/misc/flamegraph.sha256sum
@@ -0,0 +1,2 @@
+a682ac46497d6fdbf9904d1e405d3aea3ad255fcb156f6b2b1a541324628dfc0  flamegraph.pl
+5bcfb73ff2c2ab7bf2ad2b851125064780b58c51cc602335ec0001bec92679a5  stackcollapse-perf.pl

From 3f26acd29be741216cfb4c5115b57fcff34efddc Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Thu, 10 Jun 2021 15:24:42 -0700
Subject: [PATCH 226/740] Fix some documentation rendering issues around the
 estimated range size bytes and similar functions.

---
 documentation/sphinx/source/api-c.rst      |  4 ++++
 documentation/sphinx/source/api-python.rst | 11 ++++-------
 documentation/sphinx/source/api-ruby.rst   |  3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/documentation/sphinx/source/api-c.rst b/documentation/sphinx/source/api-c.rst
index 0d02dc18dd8..05f2dd42f1b 100644
--- a/documentation/sphinx/source/api-c.rst
+++ b/documentation/sphinx/source/api-c.rst
@@ -541,13 +541,17 @@ Applications must provide error handling and an appropriate retry loop around th
       |snapshot|
 
 .. function:: FDBFuture* fdb_transaction_get_estimated_range_size_bytes( FDBTransaction* tr, uint8_t const* begin_key_name, int begin_key_name_length, uint8_t const* end_key_name, int end_key_name_length)
+
    Returns an estimated byte size of the key range.
+
    .. note:: The estimated size is calculated based on the sampling done by FDB server. The sampling algorithm works roughly in this way: the larger the key-value pair is, the more likely it would be sampled and the more accurate its sampled size would be. And due to that reason it is recommended to use this API to query against large ranges for accuracy considerations. For a rough reference, if the returned size is larger than 3MB, one can consider the size to be accurate.
 
    |future-return0| the estimated size of the key range given. |future-return1| call :func:`fdb_future_get_int64()` to extract the size, |future-return2|
 
 .. function:: FDBFuture* fdb_transaction_get_range_split_points( FDBTransaction* tr, uint8_t const* begin_key_name, int begin_key_name_length, uint8_t const* end_key_name, int end_key_name_length, int64_t chunk_size)
+
    Returns a list of keys that can split the given range into (roughly) equally sized chunks based on ``chunk_size``.
+
    .. note:: The returned split points contain the start key and end key of the given range
 
    |future-return0| the list of split points. |future-return1| call :func:`fdb_future_get_key_array()` to extract the array, |future-return2|
diff --git a/documentation/sphinx/source/api-python.rst b/documentation/sphinx/source/api-python.rst
index 59b82406e00..65b17cd978c 100644
--- a/documentation/sphinx/source/api-python.rst
+++ b/documentation/sphinx/source/api-python.rst
@@ -800,6 +800,7 @@ Transaction misc functions
 .. method:: Transaction.get_estimated_range_size_bytes(begin_key, end_key)
 
     Gets the estimated byte size of the given key range. Returns a :class:`FutureInt64`.
+
     .. note:: The estimated size is calculated based on the sampling done by FDB server. The sampling algorithm works roughly in this way: the larger the key-value pair is, the more likely it would be sampled and the more accurate its sampled size would be. And due to that reason it is recommended to use this API to query against large ranges for accuracy considerations. For a rough reference, if the returned size is larger than 3MB, one can consider the size to be accurate.
 
 .. method:: Transaction.get_range_split_points(self, begin_key, end_key, chunk_size)
@@ -807,15 +808,11 @@ Transaction misc functions
     Gets a list of keys that can split the given range into (roughly) equally sized chunks based on ``chunk_size``. Returns a :class:`FutureKeyArray`.
     .. note:: The returned split points contain the start key and end key of the given range
 
-
-.. _api-python-transaction-options:
-
-Transaction misc functions
---------------------------
-
 .. method:: Transaction.get_approximate_size()
 
-    |transaction-get-approximate-size-blurb|. Returns a :class:`FutureInt64`.
+    |transaction-get-approximate-size-blurb| Returns a :class:`FutureInt64`.
+
+.. _api-python-transaction-options:
 
 Transaction options
 -------------------
diff --git a/documentation/sphinx/source/api-ruby.rst b/documentation/sphinx/source/api-ruby.rst
index 7c707f445be..d311bbc4796 100644
--- a/documentation/sphinx/source/api-ruby.rst
+++ b/documentation/sphinx/source/api-ruby.rst
@@ -744,6 +744,7 @@ Transaction misc functions
 .. method:: Transaction.get_estimated_range_size_bytes(begin_key, end_key) -> Int64Future
 
     Gets the estimated byte size of the given key range. Returns a :class:`Int64Future`.
+
     .. note:: The estimated size is calculated based on the sampling done by FDB server. The sampling algorithm works roughly in this way: the larger the key-value pair is, the more likely it would be sampled and the more accurate its sampled size would be. And due to that reason it is recommended to use this API to query against large ranges for accuracy considerations. For a rough reference, if the returned size is larger than 3MB, one can consider the size to be accurate.
 
 .. method:: Transaction.get_range_split_points(begin_key, end_key, chunk_size) -> FutureKeyArray
@@ -753,7 +754,7 @@ Transaction misc functions
 
 .. method:: Transaction.get_approximate_size() -> Int64Future
 
-    |transaction-get-approximate-size-blurb|. Returns a :class:`Int64Future`.
+    |transaction-get-approximate-size-blurb| Returns a :class:`Int64Future`.
 
 Transaction options
 -------------------

From 1d6e22415e588557d48d437c47a6dd2339a65f79 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Mon, 7 Jun 2021 16:32:31 -0700
Subject: [PATCH 227/740] Remove unneeded use of the word "master"

---
 documentation/sphinx/source/administration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/administration.rst b/documentation/sphinx/source/administration.rst
index 7053a78ca08..553375c979d 100644
--- a/documentation/sphinx/source/administration.rst
+++ b/documentation/sphinx/source/administration.rst
@@ -59,7 +59,7 @@ It can be stopped and prevented from starting at boot as follows::
 Start, stop and restart behavior
 =================================
 
-These commands above start and stop the master ``fdbmonitor`` process, which in turn starts ``fdbserver`` and ``backup-agent`` processes.  See :ref:`administration_fdbmonitor` for details.
+These commands above start and stop the ``fdbmonitor`` process, which in turn starts ``fdbserver`` and ``backup-agent`` processes.  See :ref:`administration_fdbmonitor` for details.
 
 After any child process has terminated by any reason, ``fdbmonitor`` tries to restart it. See :ref:`restarting parameters <configuration-restarting>`.
 

From eb6fbf88b5d12bbb46255694f2cb1466f7306dff Mon Sep 17 00:00:00 2001
From: RenxuanW <renxuan@apple.com>
Date: Fri, 11 Jun 2021 23:01:23 -0700
Subject: [PATCH 228/740] Bug fix: grvLatencyBands should take
 "GRVLatencyBands" as name.

---
 fdbserver/GrvProxyServer.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp
index 341b42c1ef4..d2389c2b2df 100644
--- a/fdbserver/GrvProxyServer.actor.cpp
+++ b/fdbserver/GrvProxyServer.actor.cpp
@@ -107,7 +107,7 @@ struct GrvProxyStats {
 	                          id,
 	                          SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 	                          SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
-	    grvLatencyBands("GRVLatencyMetrics", id, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
+	    grvLatencyBands("GRVLatencyBands", id, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
 		// The rate at which the limit(budget) is allowed to grow.
 		specialCounter(
 		    cc, "SystemAndDefaultTxnRateAllowed", [this]() { return int64_t(this->transactionRateAllowed); });

From 8f1b40dcd82134dd14ea69a162aab598e8e66a21 Mon Sep 17 00:00:00 2001
From: RenxuanW <renxuan@apple.com>
Date: Tue, 15 Jun 2021 13:38:14 -0700
Subject: [PATCH 229/740] Replace lower priority txn request when limit is hit.

---
 fdbserver/GrvProxyServer.actor.cpp | 50 +++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp
index d2389c2b2df..04bc8dec960 100644
--- a/fdbserver/GrvProxyServer.actor.cpp
+++ b/fdbserver/GrvProxyServer.actor.cpp
@@ -346,6 +346,26 @@ ACTOR Future<Void> getRate(UID myID,
 	}
 }
 
+// Respond with an error to the GetReadVersion request when the GRV limit is hit.
+void proxyGRVThresholdExceeded(const GetReadVersionRequest* req, GrvProxyStats* stats) {
+	++stats->txnRequestErrors;
+	req->reply.sendError(proxy_memory_limit_exceeded());
+	if (req->priority == TransactionPriority::IMMEDIATE) {
+		TraceEvent(SevWarnAlways, "ProxyGRVThresholdExceededSystem").suppressFor(60);
+	} else if (req->priority == TransactionPriority::DEFAULT) {
+		TraceEvent(SevWarnAlways, "ProxyGRVThresholdExceededDefault").suppressFor(60);
+	} else {
+		TraceEvent(SevWarnAlways, "ProxyGRVThresholdExceededBatch").suppressFor(60);
+	}
+}
+
+// Drop a GetReadVersion request from a queue, by responding an error to the request.
+void dropRequestFromQueue(Deque<GetReadVersionRequest>* queue, GrvProxyStats* stats) {
+	proxyGRVThresholdExceeded(&queue->front(), stats);
+	queue->pop_front();
+}
+
+// Put a GetReadVersion request into the queue corresponding to its priority.
 ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>> db,
                                                SpannedDeque<GetReadVersionRequest>* systemQueue,
                                                SpannedDeque<GetReadVersionRequest>* defaultQueue,
@@ -361,16 +381,30 @@ ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>>
 	loop choose {
 		when(GetReadVersionRequest req = waitNext(readVersionRequests)) {
 			// WARNING: this code is run at a high priority, so it needs to do as little work as possible
+			bool canBeQueued = true;
 			if (stats->txnRequestIn.getValue() - stats->txnRequestOut.getValue() >
 			    SERVER_KNOBS->START_TRANSACTION_MAX_QUEUE_SIZE) {
-				++stats->txnRequestErrors;
-				// FIXME: send an error instead of giving an unreadable version when the client can support the error:
-				// req.reply.sendError(proxy_memory_limit_exceeded());
-				GetReadVersionReply rep;
-				rep.version = 1;
-				rep.locked = true;
-				req.reply.send(rep);
-				TraceEvent(SevWarnAlways, "ProxyGRVThresholdExceeded").suppressFor(60);
+				// When the limit is hit, try to drop requests from the lower priority queues.
+				if (req.priority == TransactionPriority::BATCH) {
+					canBeQueued = false;
+				} else if (req.priority == TransactionPriority::DEFAULT) {
+					if (!batchQueue->empty()) {
+						dropRequestFromQueue(batchQueue, stats);
+					} else {
+						canBeQueued = false;
+					}
+				} else {
+					if (!batchQueue->empty()) {
+						dropRequestFromQueue(batchQueue, stats);
+					} else if (!defaultQueue->empty()) {
+						dropRequestFromQueue(defaultQueue, stats);
+					} else {
+						canBeQueued = false;
+					}
+				}
+			}
+			if (!canBeQueued) {
+				proxyGRVThresholdExceeded(&req, stats);
 			} else {
 				stats->addRequest(req.transactionCount);
 				// TODO: check whether this is reasonable to do in the fast path

From 2155d37f9af1eed14474a48070bcb9c04863651a Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Tue, 15 Jun 2021 15:36:08 -0700
Subject: [PATCH 230/740] Merge pull request #4930 from
 apple/anoyes/external-clients-in-fdb-java

Add exportLibrary for exporting external clients from jar
---
 .../main/com/apple/foundationdb/JNIUtil.java  | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/bindings/java/src/main/com/apple/foundationdb/JNIUtil.java b/bindings/java/src/main/com/apple/foundationdb/JNIUtil.java
index 99c2f8a3229..a3811bd029c 100644
--- a/bindings/java/src/main/com/apple/foundationdb/JNIUtil.java
+++ b/bindings/java/src/main/com/apple/foundationdb/JNIUtil.java
@@ -30,7 +30,7 @@
  * Utility for loading a dynamic library from the classpath.
  *
  */
-class JNIUtil {
+public class JNIUtil {
 	private static final String SEPARATOR = "/";
 	private static final String LOADABLE_PREFIX = "FDB_LIBRARY_PATH_";
 	private static final String TEMPFILE_PREFIX = "fdbjni";
@@ -92,7 +92,7 @@ static void loadLibrary(String libName) throws UnsatisfiedLinkError {
 		File exported;
 
 		try {
-			exported = exportResource(path);
+			exported = exportResource(path, libName);
 		}
 		catch (IOException e) {
 			throw new UnsatisfiedLinkError(e.getMessage());
@@ -109,6 +109,19 @@ static void loadLibrary(String libName) throws UnsatisfiedLinkError {
 		}
 	}
 
+	/**
+	 * Export a library from classpath resources to a temporary file.
+	 *
+	 * @param libName the name of the library to attempt to export. This name should be
+	 *  undecorated with file extensions and, in the case of *nix, "lib" prefixes.
+	 * @return the exported temporary file
+	 */
+	public static File exportLibrary(String libName) throws IOException {
+		OS os = getRunningOS();
+		String path = getPath(os, libName);
+		return exportResource(path, libName);
+	}
+
 	/**
 	 * Gets a relative path for a library. The path will be of the form:
 	 *  {@code {os}/{arch}/{name}}.
@@ -127,20 +140,21 @@ private static String getPath(OS os, String libName) {
 	 * Export a resource from the classpath to a temporary file.
 	 *
 	 * @param path the relative path of the file to load from the classpath
+	 * @param name an optional descriptive name to include in the temporary file's path
 	 *
 	 * @return the absolute path to the exported file
 	 * @throws IOException
 	 */
-	private static File exportResource(String path) throws IOException {
+	private static File exportResource(String path, String name) throws IOException {
 		InputStream resource = JNIUtil.class.getResourceAsStream(path);
 		if(resource == null)
 			throw new IllegalStateException("Embedded library jar:" + path + " not found");
-		File f = saveStreamAsTempFile(resource);
+		File f = saveStreamAsTempFile(resource, name);
 		return f;
 	}
 
-	private static File saveStreamAsTempFile(InputStream resource) throws IOException {
-		File f = File.createTempFile(TEMPFILE_PREFIX, TEMPFILE_SUFFIX);
+	private static File saveStreamAsTempFile(InputStream resource, String name) throws IOException {
+		File f = File.createTempFile(name.length() > 0 ? name : TEMPFILE_PREFIX, TEMPFILE_SUFFIX);
 		FileOutputStream outputStream = new FileOutputStream(f);
 		copyStream(resource, outputStream);
 		outputStream.flush();

From d8c1c6d7c88f4f418a8a152a6ab596fc5f854c22 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 5 Mar 2021 19:28:15 +0000
Subject: [PATCH 231/740] Testing Storage Server implementation

---
 .../source/mr-status-json-schemas.rst.inc     |  10 +
 fdbcli/fdbcli.actor.cpp                       |  16 +-
 fdbclient/BackupAgentBase.actor.cpp           |  18 +-
 fdbclient/CMakeLists.txt                      |   1 +
 fdbclient/CommitProxyInterface.h              |  15 +-
 fdbclient/DatabaseConfiguration.cpp           |  27 +-
 fdbclient/DatabaseConfiguration.h             |   4 +
 fdbclient/DatabaseContext.h                   |   9 +
 fdbclient/ManagementAPI.actor.cpp             |  39 +-
 fdbclient/NativeAPI.actor.cpp                 | 261 +++++++-
 fdbclient/Schemas.cpp                         |  17 +-
 fdbclient/StorageServerInterface.cpp          | 465 ++++++++++++++
 fdbclient/StorageServerInterface.h            |  19 +-
 fdbclient/SystemData.cpp                      |  85 ++-
 fdbclient/SystemData.h                        |   5 +
 fdbrpc/CMakeLists.txt                         |   3 +-
 fdbrpc/LoadBalance.actor.h                    | 106 +++-
 fdbrpc/QueueModel.cpp                         |  35 ++
 fdbrpc/QueueModel.h                           |  24 +-
 fdbrpc/TSSComparison.h                        |  78 +++
 fdbrpc/fdbrpc.h                               |   2 +
 fdbrpc/simulator.h                            |   6 +-
 fdbserver/ApplyMetadataMutation.cpp           |   7 +
 fdbserver/ClusterController.actor.cpp         | 143 ++++-
 fdbserver/CommitProxyServer.actor.cpp         |   3 +
 fdbserver/DataDistribution.actor.cpp          | 569 +++++++++++++++---
 fdbserver/DataDistributionTracker.actor.cpp   |  14 +-
 fdbserver/Knobs.cpp                           |   1 +
 fdbserver/Knobs.h                             |   1 +
 fdbserver/MoveKeys.actor.cpp                  | 470 +++++++++++----
 fdbserver/MoveKeys.actor.h                    |   3 +-
 fdbserver/MutationTracking.cpp                |   3 +
 fdbserver/QuietDatabase.actor.cpp             |  16 +-
 fdbserver/Ratekeeper.actor.cpp                |   8 +-
 fdbserver/SimulatedCluster.actor.cpp          |  44 ++
 fdbserver/Status.actor.cpp                    |  16 +-
 fdbserver/TLogServer.actor.cpp                |   5 +
 fdbserver/WorkerInterface.actor.h             |  11 +-
 fdbserver/masterserver.actor.cpp              |   6 +
 fdbserver/storageserver.actor.cpp             | 562 +++++++++++++++--
 fdbserver/tester.actor.cpp                    |  20 +
 fdbserver/worker.actor.cpp                    |  60 +-
 .../workloads/ConsistencyCheck.actor.cpp      | 194 +++++-
 fdbserver/workloads/RandomMoveKeys.actor.cpp  |   3 +-
 fdbserver/workloads/workloads.actor.h         |   6 +-
 flow/ProtocolVersion.h                        |   4 +-
 flow/genericactors.actor.h                    |   2 +
 flow/serialize.h                              |   9 +
 tests/CMakeLists.txt                          |   2 +
 tests/StorageServerInterface.txt              |   7 +
 tests/SystemData.txt                          |   7 +
 51 files changed, 3124 insertions(+), 317 deletions(-)
 create mode 100644 fdbclient/StorageServerInterface.cpp
 create mode 100644 fdbrpc/TSSComparison.h
 create mode 100644 tests/StorageServerInterface.txt
 create mode 100644 tests/SystemData.txt

diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index dd4f358c602..db6d2470208 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -682,6 +682,16 @@
              "ssd-rocksdb-experimental",
              "memory"
          ]},
+         "tss_count":1,
+         "tss_storage_engine":{
+         "$enum":[
+             "ssd",
+             "ssd-1",
+             "ssd-2",
+             "ssd-redwood-experimental",
+             "ssd-rocksdb-experimental",
+             "memory"
+         ]},
          "coordinators_count":1,
          "excluded_servers":[
             {
diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index a3578a95d4b..126104c792a 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -496,7 +496,10 @@ void initHelp() {
 	    "change the database configuration",
 	    "The `new' option, if present, initializes a new database with the given configuration rather than changing "
 	    "the configuration of an existing one. When used, both a redundancy mode and a storage engine must be "
-	    "specified.\n\nRedundancy mode:\n  single - one copy of the data.  Not fault tolerant.\n  double - two copies "
+	    "specified.\n\ntss: when enabled, configures the testing storage server for the cluster instead."
+	    "When used with new to set up tss for the first time, it requires both a count and a storage engine."
+	    "To disable the testing storage server, run \"configure tss count=0\"\n\n"
+	    "Redundancy mode:\n  single - one copy of the data.  Not fault tolerant.\n  double - two copies "
 	    "of data (survive one failure).\n  triple - three copies of data (survive two failures).\n  three_data_hall - "
 	    "See the Admin Guide.\n  three_datacenter - See the Admin Guide.\n\nStorage engine:\n  ssd - B-Tree storage "
 	    "engine optimized for solid state disks.\n  memory - Durable in-memory storage engine for small "
@@ -1133,6 +1136,17 @@ void printStatus(StatusObjectReader statusObj,
 				if (statusObjConfig.get("log_routers", intVal))
 					outputString += format("\n  Desired Log Routers    - %d", intVal);
 
+				if (statusObjConfig.get("tss_count", intVal) && intVal > 0) {
+					int activeTss = 0;
+					if (statusObjCluster.has("active_tss_count")) {
+						statusObjCluster.get("active_tss_count", activeTss);
+					}
+					outputString += format("\n  TSS                    - %d/%d", activeTss, intVal);
+
+					if (statusObjConfig.get("tss_storage_engine", strVal))
+						outputString += format("\n  TSS Storage Engine     - %s", strVal.c_str());
+				}
+
 				outputString += "\n  Usable Regions         - ";
 				if (statusObjConfig.get("usable_regions", intVal)) {
 					outputString += std::to_string(intVal);
diff --git a/fdbclient/BackupAgentBase.actor.cpp b/fdbclient/BackupAgentBase.actor.cpp
index fba2e699546..cc861f310a3 100644
--- a/fdbclient/BackupAgentBase.actor.cpp
+++ b/fdbclient/BackupAgentBase.actor.cpp
@@ -404,8 +404,14 @@ ACTOR Future<Void> readCommitted(Database cx,
 			state RangeResult values = wait(tr.getRange(begin, end, limits));
 
 			// When this buggify line is enabled, if there are more than 1 result then use half of the results
+			// Copy the data instead of messing with the results directly to avoid TSS issues.
 			if (values.size() > 1 && BUGGIFY) {
-				values.resize(values.arena(), values.size() / 2);
+				Standalone<RangeResultRef> copy;
+				// only copy first half of values into copy
+				for (int i = 0; i < values.size() / 2; i++) {
+					copy.push_back_deep(copy.arena(), values[i]);
+				}
+				values = copy;
 				values.more = true;
 				// Half of the time wait for this tr to expire so that the next read is at a different version
 				if (deterministicRandom()->random01() < 0.5)
@@ -469,9 +475,15 @@ ACTOR Future<Void> readCommitted(Database cx,
 
 			state RangeResult rangevalue = wait(tr.getRange(nextKey, end, limits));
 
-			// When this buggify line is enabled, if there are more than 1 result then use half of the results
+			// When this buggify line is enabled, if there are more than 1 result then use half of the results.
+			// Copy the data instead of messing with the results directly to avoid TSS issues.
 			if (rangevalue.size() > 1 && BUGGIFY) {
-				rangevalue.resize(rangevalue.arena(), rangevalue.size() / 2);
+				Standalone<RangeResultRef> copy;
+				// only copy first half of rangevalue into copy
+				for (int i = 0; i < rangevalue.size() / 2; i++) {
+					copy.push_back_deep(copy.arena(), rangevalue[i]);
+				}
+				rangevalue = copy;
 				rangevalue.more = true;
 				// Half of the time wait for this tr to expire so that the next read is at a different version
 				if (deterministicRandom()->random01() < 0.5)
diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index bd14ef7b528..75b9fd5a0a8 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -68,6 +68,7 @@ set(FDBCLIENT_SRCS
   Status.h
   StatusClient.actor.cpp
   StatusClient.h
+  StorageServerInterface.cpp
   StorageServerInterface.h
   Subspace.cpp
   Subspace.h
diff --git a/fdbclient/CommitProxyInterface.h b/fdbclient/CommitProxyInterface.h
index 794b88ceaad..16f6695a031 100644
--- a/fdbclient/CommitProxyInterface.h
+++ b/fdbclient/CommitProxyInterface.h
@@ -116,18 +116,31 @@ struct ClientDBInfo {
 	    firstCommitProxy; // not serialized, used for commitOnFirstProxy when the commit proxies vector has been shrunk
 	Optional<Value> forward;
 	vector<VersionHistory> history;
+	vector<std::pair<UID, StorageServerInterface>>
+	    tssMapping; // logically map<ssid, tss interface> for all active TSS pairs
 
 	ClientDBInfo() {}
 
 	bool operator==(ClientDBInfo const& r) const { return id == r.id; }
 	bool operator!=(ClientDBInfo const& r) const { return id != r.id; }
 
+	// convenience method to treat tss mapping like a map
+	// TODO can serializer handle maps? could just change it
+	Optional<StorageServerInterface> getTssPair(UID storageServerID) const {
+		for (auto& it : tssMapping) {
+			if (it.first == storageServerID) {
+				return Optional<StorageServerInterface>(it.second);
+			}
+		}
+		return Optional<StorageServerInterface>();
+	}
+
 	template <class Archive>
 	void serialize(Archive& ar) {
 		if constexpr (!is_fb_function<Archive>) {
 			ASSERT(ar.protocolVersion().isValid());
 		}
-		serializer(ar, grvProxies, commitProxies, id, forward, history);
+		serializer(ar, grvProxies, commitProxies, id, forward, history, tssMapping);
 	}
 };
 
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index 94994e909d9..f3bca22ec83 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -31,7 +31,8 @@ void DatabaseConfiguration::resetInternal() {
 	commitProxyCount = grvProxyCount = resolverCount = desiredTLogCount = tLogWriteAntiQuorum = tLogReplicationFactor =
 	    storageTeamSize = desiredLogRouterCount = -1;
 	tLogVersion = TLogVersion::DEFAULT;
-	tLogDataStoreType = storageServerStoreType = KeyValueStoreType::END;
+	tLogDataStoreType = storageServerStoreType = testingStorageServerStoreType = KeyValueStoreType::END;
+	desiredTSSCount = 0;
 	tLogSpillType = TLogSpillType::DEFAULT;
 	autoCommitProxyCount = CLIENT_KNOBS->DEFAULT_AUTO_COMMIT_PROXIES;
 	autoGrvProxyCount = CLIENT_KNOBS->DEFAULT_AUTO_GRV_PROXIES;
@@ -298,6 +299,25 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const {
 		result["storage_engine"] = "custom";
 	}
 
+	if (desiredTSSCount > 0) {
+		result["tss_count"] = desiredTSSCount;
+		if (testingStorageServerStoreType == KeyValueStoreType::SSD_BTREE_V1) {
+			result["tss_storage_engine"] = "ssd-1";
+		} else if (testingStorageServerStoreType == KeyValueStoreType::SSD_BTREE_V2) {
+			result["tss_storage_engine"] = "ssd-2";
+		} else if (testingStorageServerStoreType == KeyValueStoreType::SSD_REDWOOD_V1) {
+			result["tss_storage_engine"] = "ssd-redwood-experimental";
+		} else if (testingStorageServerStoreType == KeyValueStoreType::SSD_ROCKSDB_V1) {
+			result["tss_storage_engine"] = "ssd-rocksdb-experimental";
+		} else if (testingStorageServerStoreType == KeyValueStoreType::MEMORY_RADIXTREE) {
+			result["tss_storage_engine"] = "memory-radixtree-beta";
+		} else if (testingStorageServerStoreType == KeyValueStoreType::MEMORY) {
+			result["tss_storage_engine"] = "memory-2";
+		} else {
+			result["tss_storage_engine"] = "custom";
+		}
+	}
+
 	result["log_spill"] = (int)tLogSpillType;
 
 	if (remoteTLogReplicationFactor == 1) {
@@ -463,6 +483,8 @@ bool DatabaseConfiguration::setInternal(KeyRef key, ValueRef value) {
 		}
 	} else if (ck == LiteralStringRef("storage_replicas")) {
 		parse(&storageTeamSize, value);
+	} else if (ck == LiteralStringRef("tss_count")) {
+		parse(&desiredTSSCount, value);
 	} else if (ck == LiteralStringRef("log_version")) {
 		parse((&type), value);
 		type = std::max((int)TLogVersion::MIN_RECRUITABLE, type);
@@ -485,6 +507,9 @@ bool DatabaseConfiguration::setInternal(KeyRef key, ValueRef value) {
 	} else if (ck == LiteralStringRef("storage_engine")) {
 		parse((&type), value);
 		storageServerStoreType = (KeyValueStoreType::StoreType)type;
+	} else if (ck == LiteralStringRef("tss_storage_engine")) {
+		parse((&type), value);
+		testingStorageServerStoreType = (KeyValueStoreType::StoreType)type;
 	} else if (ck == LiteralStringRef("auto_commit_proxies")) {
 		parse(&autoCommitProxyCount, value);
 	} else if (ck == LiteralStringRef("auto_grv_proxies")) {
diff --git a/fdbclient/DatabaseConfiguration.h b/fdbclient/DatabaseConfiguration.h
index bc64a6c9c55..fb3064f7000 100644
--- a/fdbclient/DatabaseConfiguration.h
+++ b/fdbclient/DatabaseConfiguration.h
@@ -225,6 +225,10 @@ struct DatabaseConfiguration {
 	int32_t storageTeamSize;
 	KeyValueStoreType storageServerStoreType;
 
+	// Testing StorageServers
+	int32_t desiredTSSCount;
+	KeyValueStoreType testingStorageServerStoreType;
+
 	// Remote TLogs
 	int32_t desiredLogRouterCount;
 	int32_t remoteDesiredTLogCount;
diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index ae1a5a741bc..b1dee87f189 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -273,6 +273,9 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	Reference<AsyncVar<Reference<ClusterConnectionFile>>> connectionFile;
 	AsyncTrigger proxiesChangeTrigger;
 	Future<Void> monitorProxiesInfoChange;
+	Future<Void> monitorTssInfoChange;
+	Future<Void> tssMismatchHandler;
+	PromiseStream<UID> tssMismatchStream;
 	Reference<CommitProxyInfo> commitProxies;
 	Reference<GrvProxyInfo> grvProxies;
 	bool proxyProvisional; // Provisional commit proxy and grv proxy are used at the same time.
@@ -320,6 +323,8 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 
 	std::map<UID, StorageServerInfo*> server_interf;
 
+	std::map<UID, Reference<TSSMetrics>> tssMetrics;
+
 	UID dbId;
 	bool internal; // Only contexts created through the C client and fdbcli are non-internal
 
@@ -419,6 +424,10 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	static bool debugUseTags;
 	static const std::vector<std::string> debugTransactionTagChoices;
 	std::unordered_map<KeyRef, Reference<WatchMetadata>> watchMap;
+
+	// TODO should this be private?
+	void maybeAddTssMapping(StorageServerInterface const& ssi);
+	void addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi);
 };
 
 #endif
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index da796313e44..acba598657c 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -60,6 +60,13 @@ std::map<std::string, std::string> configForToken(std::string const& mode) {
 		return out;
 	}
 
+	if (mode == "tss") {
+		// Set temporary marker in config map to mark that this is a tss configuration and not a normal storage/log
+		// configuration. A bit of a hack but reuses the parsing code nicely.
+		out[p + "istss"] = "1";
+		return out;
+	}
+
 	if (mode == "locked") {
 		// Setting this key is interpreted as an instruction to use the normal version-stamp-based mechanism for locking
 		// the database.
@@ -119,7 +126,7 @@ std::map<std::string, std::string> configForToken(std::string const& mode) {
 
 		if ((key == "logs" || key == "commit_proxies" || key == "grv_proxies" || key == "resolvers" ||
 		     key == "remote_logs" || key == "log_routers" || key == "usable_regions" ||
-		     key == "repopulate_anti_quorum") &&
+		     key == "repopulate_anti_quorum" || key == "count") &&
 		    isInteger(value)) {
 			out[p + key] = value;
 		}
@@ -326,6 +333,36 @@ ConfigurationResult buildConfiguration(std::vector<StringRef> const& modeTokens,
 		serializeReplicationPolicy(policyWriter, logPolicy);
 		outConf[p + "log_replication_policy"] = policyWriter.toValue().toString();
 	}
+	if (outConf.count(p + "istss")) {
+		// redo config parameters to be tss config instead of normal config
+
+		// save param values from parsing as a normal config
+		bool isNew = outConf.count(p + "initialized");
+		Optional<std::string> count;
+		Optional<std::string> storageEngine;
+		if (outConf.count(p + "count")) {
+			count = Optional<std::string>(outConf[p + "count"]);
+		}
+		if (outConf.count(p + "storage_engine")) {
+			storageEngine = Optional<std::string>(outConf[p + "storage_engine"]);
+		}
+
+		// A new tss setup must have count + storage engine. An adjustment must have at least one.
+		if ((isNew && (!count.present() || !storageEngine.present())) ||
+		    (!isNew && !count.present() && !storageEngine.present())) {
+			// TODO is this the right error type? And should we log something?
+			return ConfigurationResult::INCOMPLETE_CONFIGURATION;
+		}
+
+		// clear map and only reset tss parameters
+		outConf.clear();
+		if (count.present()) {
+			outConf[p + "tss_count"] = count.get();
+		}
+		if (storageEngine.present()) {
+			outConf[p + "tss_storage_engine"] = storageEngine.get();
+		}
+	}
 	return ConfigurationResult::SUCCESS;
 }
 
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index f9f3ff80107..fa7eed074ba 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -38,6 +38,7 @@
 #include "fdbclient/DatabaseContext.h"
 #include "fdbclient/GlobalConfig.actor.h"
 #include "fdbclient/JsonBuilder.h"
+#include "fdbclient/KeyBackedTypes.h"
 #include "fdbclient/KeyRangeMap.h"
 #include "fdbclient/Knobs.h"
 #include "fdbclient/ManagementAPI.actor.h"
@@ -121,6 +122,52 @@ NetworkOptions::NetworkOptions()
 static const Key CLIENT_LATENCY_INFO_PREFIX = LiteralStringRef("client_latency/");
 static const Key CLIENT_LATENCY_INFO_CTR_PREFIX = LiteralStringRef("client_latency_counter/");
 
+// TODO make tss function here
+void DatabaseContext::maybeAddTssMapping(StorageServerInterface const& ssi) {
+	// add tss mapping if server is new
+
+	Optional<StorageServerInterface> tssPair = clientInfo->get().getTssPair(ssi.id());
+	if (tssPair.present()) {
+		addTssMapping(ssi, tssPair.get());
+	}
+}
+
+// calling getInterface potentially recursively is weird, but since this function is only called when an entry is
+// created/changed, the recursive call should never recurse itself.
+void DatabaseContext::addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi) {
+	// TODO get both with a getInterface call which will create the tss endpoint and/or update both endpoints if there
+	// was a change in endpoint tokens
+
+	// the order of these is important because it hits the "different token same locality" issue, so we always want to
+	// request the tss first so the ss request overrides it.
+	// TODO this shouldn't be necessary after i stop doing the same server hack
+	Reference<StorageServerInfo> tssInfo = StorageServerInfo::getInterface(this, tssi, clientLocality);
+	Reference<StorageServerInfo> ssInfo = StorageServerInfo::getInterface(this, ssi, clientLocality);
+
+	// add new tss metrics object to queue
+	Reference<TSSMetrics> metrics = makeReference<TSSMetrics>();
+	tssMetrics[tssi.id()] = metrics;
+
+	// TODO any other requests it makes sense to duplicate?
+	// add each read data request interface to map (getValue, getKey, getKeyValues, watchValue)
+	queueModel.updateTssEndpoint(
+	    ssInfo->interf.getValue.getEndpoint().token.first(),
+	    TSSEndpointData(tssi.id(), tssInfo->interf.getValue.getEndpoint(), metrics, clientInfo->get().id));
+	queueModel.updateTssEndpoint(
+	    ssInfo->interf.getKey.getEndpoint().token.first(),
+	    TSSEndpointData(tssi.id(), tssInfo->interf.getKey.getEndpoint(), metrics, clientInfo->get().id));
+	queueModel.updateTssEndpoint(
+	    ssInfo->interf.getKeyValues.getEndpoint().token.first(),
+	    TSSEndpointData(tssi.id(), tssInfo->interf.getKeyValues.getEndpoint(), metrics, clientInfo->get().id));
+	queueModel.updateTssEndpoint(
+	    ssInfo->interf.watchValue.getEndpoint().token.first(),
+	    TSSEndpointData(tssi.id(), tssInfo->interf.watchValue.getEndpoint(), metrics, clientInfo->get().id));
+
+	// TODO REMOVE
+	printf(
+	    "added tss endpoints to queue for mapping %s=%s\n", ssi.id().toString().c_str(), tssi.id().toString().c_str());
+}
+
 Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx,
                                                              StorageServerInterface const& ssi,
                                                              LocalityData const& locality) {
@@ -133,11 +180,19 @@ Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx
 				//       pointing to. This is technically correct, but is very unnatural. We may want to refactor load
 				//       balance to take an AsyncVar<Reference<Interface>> so that it is notified when the interface
 				//       changes.
+
 				it->second->interf = ssi;
+
+				// TODO remove print
+				printf("maybeAddTss same locality %s\n", ssi.id().toString().c_str());
+				cx->maybeAddTssMapping(ssi);
 			} else {
 				it->second->notifyContextDestroyed();
 				Reference<StorageServerInfo> loc(new StorageServerInfo(cx, ssi, locality));
 				cx->server_interf[ssi.id()] = loc.getPtr();
+				// TODO REMOVE print
+				printf("maybeAddTss different locality %s\n", ssi.id().toString().c_str());
+				cx->maybeAddTssMapping(ssi);
 				return loc;
 			}
 		}
@@ -147,6 +202,9 @@ Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx
 
 	Reference<StorageServerInfo> loc(new StorageServerInfo(cx, ssi, locality));
 	cx->server_interf[ssi.id()] = loc.getPtr();
+	// TODO REMOVE print
+	// printf("maybeAddTss new ssi %s\n", ssi.id().toString().c_str());
+	cx->maybeAddTssMapping(ssi);
 	return loc;
 }
 
@@ -327,6 +385,55 @@ ACTOR Future<Void> databaseLogger(DatabaseContext* cx) {
 		cx->mutationsPerCommit.clear();
 		cx->bytesPerCommit.clear();
 
+		for (const auto& it : cx->tssMetrics) {
+			// TODO could skip this tss if request counter is zero? would potentially complicate elapsed calculation
+			// though
+			if (it.second->mismatches.getIntervalDelta()) {
+				printf("Found tss %s with %d mismatches!!\n",
+				       it.first.toString().c_str(),
+				       it.second->mismatches.getIntervalDelta());
+				cx->tssMismatchStream.send(it.first);
+			}
+			TraceEvent tssEv("TSSClientMetrics", cx->dbId);
+			tssEv.detail("TSSID", it.first)
+			    .detail("Elapsed", (lastLogged == 0) ? 0 : now() - lastLogged)
+			    .detail("Internal", cx->internal);
+
+			it.second->cc.logToTraceEvent(tssEv);
+
+			tssEv.detail("MeanSSGetValueLatency", it.second->SSgetValueLatency.mean())
+			    .detail("MedianSSGetValueLatency", it.second->SSgetValueLatency.median())
+			    .detail("SSGetValueLatency90", it.second->SSgetValueLatency.percentile(0.90))
+			    .detail("SSGetValueLatency99", it.second->SSgetValueLatency.percentile(0.99));
+
+			tssEv.detail("MeanTSSGetValueLatency", it.second->TSSgetValueLatency.mean())
+			    .detail("MedianTSSGetValueLatency", it.second->TSSgetValueLatency.median())
+			    .detail("TSSGetValueLatency90", it.second->TSSgetValueLatency.percentile(0.90))
+			    .detail("TSSGetValueLatencyDiff99", it.second->TSSgetValueLatency.percentile(0.99));
+
+			tssEv.detail("MeanSSGetKeyLatency", it.second->SSgetKeyLatency.mean())
+			    .detail("MedianSSGetKeyLatency", it.second->SSgetKeyLatency.median())
+			    .detail("SSGetKeyLatency90", it.second->SSgetKeyLatency.percentile(0.90))
+			    .detail("SSGetKeyLatency99", it.second->SSgetKeyLatency.percentile(0.99));
+
+			tssEv.detail("MeanTSSGetKeyLatency", it.second->TSSgetKeyLatency.mean())
+			    .detail("MedianTSSGetKeyLatency", it.second->TSSgetKeyLatency.median())
+			    .detail("TSSGetKeyLatency90", it.second->TSSgetKeyLatency.percentile(0.90))
+			    .detail("TSSGetKeyLatencyDiff99", it.second->TSSgetKeyLatency.percentile(0.99));
+
+			tssEv.detail("MeanSSGetKeyValuesLatency", it.second->SSgetKeyLatency.mean())
+			    .detail("MedianSSGetKeyValuesLatency", it.second->SSgetKeyLatency.median())
+			    .detail("SSGetKeyValuesLatency90", it.second->SSgetKeyLatency.percentile(0.90))
+			    .detail("SSGetKeyValuesLatency99", it.second->SSgetKeyLatency.percentile(0.99));
+
+			tssEv.detail("MeanTSSGetKeyValuesLatency", it.second->TSSgetKeyValuesLatency.mean())
+			    .detail("MedianTSSGetKeyValuesLatency", it.second->TSSgetKeyValuesLatency.median())
+			    .detail("TSSGetKeyValuesLatency90", it.second->TSSgetKeyValuesLatency.percentile(0.90))
+			    .detail("TSSGetKeyValuesLatencyDiff99", it.second->TSSgetKeyValuesLatency.percentile(0.99));
+
+			it.second->clear();
+		}
+
 		lastLogged = now();
 	}
 }
@@ -711,6 +818,110 @@ ACTOR Future<Void> monitorCacheList(DatabaseContext* self) {
 	}
 }
 
+// updates tss mapping when set of tss servers changes
+ACTOR static Future<Void> monitorTssChange(DatabaseContext* cx) {
+	state vector<std::pair<UID, StorageServerInterface>> curTssMapping;
+	curTssMapping = cx->clientInfo->get().tssMapping;
+
+	loop {
+		wait(cx->clientInfo->onChange());
+		if (cx->clientInfo->get().tssMapping != curTssMapping) {
+			// TODO maybe re-read this from system keys instead if it changes
+			ClientDBInfo clientInfo = cx->clientInfo->get();
+			curTssMapping = clientInfo.tssMapping;
+
+			// TODO REMOVE print
+			// printf("gonna do tss stuff with %d tss's\n", curTssMapping.size());
+
+			std::unordered_set<UID> seenTssIds;
+
+			if (curTssMapping.size()) {
+				for (const auto& it : curTssMapping) {
+					seenTssIds.insert(it.second.id());
+
+					if (cx->server_interf.count(it.first)) {
+						// TODO REMOVE
+						printf("found new tss mapping %s -> %s\n",
+						       it.first.toString().c_str(),
+						       it.second.id().toString().c_str());
+						cx->addTssMapping(cx->server_interf[it.first]->interf, it.second);
+					} else {
+						// TODO REMOVE case and print
+						// printf("server %s with tss pair %s not in server_interf, skipping for now\n",
+						// it.first.toString().c_str(), it.second.id().toString().c_str());
+					}
+				}
+			}
+
+			for (auto it = cx->tssMetrics.begin(); it != cx->tssMetrics.end();) {
+				if (seenTssIds.count(it->first)) {
+					it++;
+				} else {
+					// TODO REMOVE
+					printf("Erasing tss %s from tss_metrics\n", it->first.toString().c_str());
+					it = cx->tssMetrics.erase(it);
+				}
+			}
+
+			cx->queueModel.removeOldTssData(clientInfo.id);
+		}
+	}
+}
+
+ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
+	state Reference<ReadYourWritesTransaction> tr;
+	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+	loop {
+		state UID tssID = waitNext(cx->tssMismatchStream.getFuture());
+		// find ss pair id so we can remove it from the mapping
+		state UID tssPairID;
+		bool found = false;
+		for (const auto& it : cx->clientInfo->get().tssMapping) {
+			if (it.second.id() == tssID) {
+				tssPairID = it.first;
+				found = true;
+				break;
+			}
+		}
+		// TODO maybe instead of assert, do a trace event because it's possible that by the time we checked the mismatch
+		// the tss is gone?
+		if (found) {
+			// TODO add trace event
+			TEST(true); // killing TSS because it got mismatch
+			printf("KILLING TSS %s (partner=%s) BECAUSE OF TSS MISMATCH\n",
+			       tssID.toString().c_str(),
+			       tssPairID.toString().c_str());
+
+			// TODO we could write something to the system keyspace and then have DD listen to that keyspace and then DD
+			// do exactly this, so why not just cut out the middle man (or the middle system keys, as it were)
+			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(cx)));
+			loop {
+				try {
+					tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+					tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+
+					tr->clear(serverTagKeyFor(tssID));
+					tssMapDB.erase(tr, tssPairID);
+
+					tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
+					wait(tr->commit());
+
+					break;
+				} catch (Error& e) {
+					printf("Kill Mismatch TSS Transaction got error %d\n", e.code());
+					wait(tr->onError(e));
+				}
+			}
+			tr = makeReference<ReadYourWritesTransaction>(); // clear out txn so that the extra ref gets decref'd and we
+			                                                 // can free cx
+
+		} else {
+			TEST(true); // Not killing TSS with mismatch because it's already gone
+			printf("Not killing TSS %s because of tss mismatch, must be already removed\n", tssID.toString().c_str());
+		}
+	}
+}
+
 ACTOR static Future<HealthMetrics> getHealthMetricsActor(DatabaseContext* cx, bool detailed) {
 	if (now() - cx->healthMetricsLastUpdated < CLIENT_KNOBS->AGGREGATE_HEALTH_METRICS_MAX_STALENESS) {
 		if (detailed) {
@@ -958,6 +1169,8 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 	getValueCompleted.init(LiteralStringRef("NativeAPI.GetValueCompleted"));
 
 	monitorProxiesInfoChange = monitorProxiesChange(clientInfo, &proxiesChangeTrigger);
+	monitorTssInfoChange = monitorTssChange(this);
+	tssMismatchHandler = handleTssMismatches(this);
 	clientStatusUpdater.actor = clientStatusUpdateActor(this);
 	cacheListMonitor = monitorCacheList(this);
 
@@ -1197,6 +1410,8 @@ Database DatabaseContext::create(Reference<AsyncVar<ClientDBInfo>> clientInfo,
 DatabaseContext::~DatabaseContext() {
 	cacheListMonitor.cancel();
 	monitorProxiesInfoChange.cancel();
+	monitorTssInfoChange.cancel();
+	tssMismatchHandler.cancel();
 	for (auto it = server_interf.begin(); it != server_interf.end(); it = server_interf.erase(it))
 		it->second->notifyContextDestroyed();
 	ASSERT_ABORT(server_interf.empty());
@@ -2345,6 +2560,11 @@ ACTOR Future<Key> getKey(Database cx, KeySelector k, Future<Version> version, Tr
 				    "NativeAPI.getKey.Before"); //.detail("StartKey",
 				                                // k.getKey()).detail("Offset",k.offset).detail("OrEqual",k.orEqual);
 			++cx->transactionPhysicalReads;
+
+			GetKeyRequest req(
+			    span.context, k, version.get(), cx->sampleReadTags() ? tags : Optional<TagSet>(), getKeyID);
+			req.arena.dependsOn(k.arena());
+
 			state GetKeyReply reply;
 			try {
 				choose {
@@ -2353,11 +2573,7 @@ ACTOR Future<Key> getKey(Database cx, KeySelector k, Future<Version> version, Tr
 					         wait(loadBalance(cx.getPtr(),
 					                          ssi.second,
 					                          &StorageServerInterface::getKey,
-					                          GetKeyRequest(span.context,
-					                                        k,
-					                                        version.get(),
-					                                        cx->sampleReadTags() ? tags : Optional<TagSet>(),
-					                                        getKeyID),
+					                          req,
 					                          TaskPriority::DefaultPromiseEndpoint,
 					                          false,
 					                          cx->enableLocalityLoadBalance ? &cx->queueModel : nullptr))) {
@@ -2718,6 +2934,9 @@ ACTOR Future<RangeResult> getExactRange(Database cx,
 			req.end = firstGreaterOrEqual(range.end);
 			req.spanContext = span.context;
 
+			// keep shard's arena around in case of async tss comparison
+			req.arena.dependsOn(locations[shard].first.arena());
+
 			transformRangeLimits(limits, reverse, req);
 			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
 
@@ -3034,6 +3253,9 @@ ACTOR Future<RangeResult> getRange(Database cx,
 			req.isFetchKeys = (info.taskID == TaskPriority::FetchKeys);
 			req.version = readVersion;
 
+			// In case of async tss comparison, also make req arena depend on begin, end, and/or shard's arena depending
+			// on which  is used
+			bool dependOnShard = false;
 			if (reverse && (begin - 1).isDefinitelyLess(shard.begin) &&
 			    (!begin.isFirstGreaterOrEqual() ||
 			     begin.getKey() != shard.begin)) { // In this case we would be setting modifiedSelectors to true, but
@@ -3041,14 +3263,23 @@ ACTOR Future<RangeResult> getRange(Database cx,
 
 				req.begin = firstGreaterOrEqual(shard.begin);
 				modifiedSelectors = true;
-			} else
+				req.arena.dependsOn(shard.arena());
+				dependOnShard = true;
+			} else {
 				req.begin = begin;
+				req.arena.dependsOn(begin.arena());
+			}
 
 			if (!reverse && end.isDefinitelyGreater(shard.end)) {
 				req.end = firstGreaterOrEqual(shard.end);
 				modifiedSelectors = true;
-			} else
+				if (!dependOnShard) {
+					req.arena.dependsOn(shard.arena());
+				}
+			} else {
 				req.end = end;
+				req.arena.dependsOn(end.arena());
+			}
 
 			transformRangeLimits(limits, reverse, req);
 			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
@@ -3133,10 +3364,18 @@ ACTOR Future<RangeResult> getRange(Database cx,
 					output.readThroughEnd = readThroughEnd;
 
 					if (BUGGIFY && limits.hasByteLimit() && output.size() > std::max(1, originalLimits.minRows)) {
+						printf("Buggify resizing in nativeapi\n");
+						// Copy instead of resizing because TSS maybe be using output's arena for comparison. This only
+						// happens in simulation so it's fine
+						Standalone<RangeResultRef> copy;
+						int newSize =
+						    deterministicRandom()->randomInt(std::max(1, originalLimits.minRows), output.size());
+						for (int i = 0; i < newSize; i++) {
+							copy.push_back_deep(copy.arena(), output[i]);
+						}
+						output = copy;
 						output.more = true;
-						output.resize(
-						    output.arena(),
-						    deterministicRandom()->randomInt(std::max(1, originalLimits.minRows), output.size()));
+
 						getRangeFinished(cx,
 						                 trLogInfo,
 						                 startTime,
@@ -4180,6 +4419,8 @@ ACTOR static Future<Void> tryCommit(Database cx,
 		choose {
 			when(wait(cx->onProxiesChanged())) {
 				reply.cancel();
+				// TODO REMOVE
+				printf("tryCommit proxies changed ERROR!\n");
 				throw request_maybe_delivered();
 			}
 			when(CommitID ci = wait(reply)) {
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 383a61904fb..492d8b00059 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -431,6 +431,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
          "seconds" : 1.0,
          "versions" : 1000000
       },
+      "active_tss_count":0,
       "degraded_processes":0,
       "database_available":true,
       "database_lock_state": {
@@ -729,6 +730,19 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
              "memory-2",
              "memory-radixtree-beta"
          ]},
+         "tss_count":1,
+         "tss_storage_engine":{
+         "$enum":[
+             "ssd",
+             "ssd-1",
+             "ssd-2",
+             "ssd-redwood-experimental",
+             "ssd-rocksdb-experimental",
+             "memory",
+             "memory-1",
+             "memory-2",
+             "memory-radixtree-beta"
+         ]},
          "coordinators_count":1,
          "excluded_servers":[
             {
@@ -802,7 +816,8 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
                 }
             }
          ],
-         "least_operating_space_bytes_storage_server":0
+         "least_operating_space_bytes_storage_server":0,
+         "max_machine_failures_without_losing_data":0
       },
       "machines":{
          "$map":{
diff --git a/fdbclient/StorageServerInterface.cpp b/fdbclient/StorageServerInterface.cpp
new file mode 100644
index 00000000000..180d1b814cd
--- /dev/null
+++ b/fdbclient/StorageServerInterface.cpp
@@ -0,0 +1,465 @@
+/*
+ * StorageServerInterface.cpp
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fdbclient/StorageServerInterface.h"
+#include "flow/crc32c.h" // for crc32c_append, to checksum values in tss trace events
+
+// Includes template specializations for all tss operations on storage server types.
+// New StorageServerInterface reply types must be added here or it won't compile.
+
+// if size + hex of checksum is shorter than value, record that instead of actual value. break-even point is 12
+// characters
+std::string traceChecksumValue(ValueRef s) {
+	return s.size() > 12 ? format("(%d)%08x", s.size(), crc32c_append(0, s.begin(), s.size())) : s.toString();
+}
+
+template <>
+bool TSS_doCompare(const GetValueRequest& req,
+                   const GetValueReply& src,
+                   const GetValueReply& tss,
+                   Severity traceSeverity,
+                   UID tssId) {
+	if (src.value.present() != tss.value.present() || (src.value.present() && src.value.get() != tss.value.get())) {
+		printf("GetValue %s @ %lld mismatch: src=%s, tss=%s\n",
+		       req.key.printable().c_str(),
+		       req.version,
+		       src.value.present() ? traceChecksumValue(src.value.get()).c_str() : "missing",
+		       tss.value.present() ? traceChecksumValue(tss.value.get()).c_str() : "missing");
+		TraceEvent(traceSeverity, "TSSMismatchGetValue")
+		    .suppressFor(1.0)
+		    .detail("TSSID", tssId)
+		    .detail("Key", req.key.printable())
+		    .detail("Version", req.version)
+		    .detail("SSReply", src.value.present() ? traceChecksumValue(src.value.get()) : "missing")
+		    .detail("TSSReply", tss.value.present() ? traceChecksumValue(tss.value.get()) : "missing");
+
+		return false;
+	}
+	// printf("tss GetValueReply matched! src=%s, tss=%s\n", src.value.present() ? src.value.get().toString().c_str() :
+	// "missing", tss.value.present() ? tss.value.get().toString().c_str() : "missing");
+	return true;
+}
+
+template <>
+bool TSS_doCompare(const GetKeyRequest& req,
+                   const GetKeyReply& src,
+                   const GetKeyReply& tss,
+                   Severity traceSeverity,
+                   UID tssId) {
+	// This process is a bit complicated. Since the tss and ss can return different results if neighboring shards to
+	// req.sel.key are currently being moved, We validate that the results are the same IF the returned key selectors
+	// are final. Otherwise, we only mark the request as a mismatch if the difference between the two returned key
+	// selectors could ONLY be because of different results from the storage engines. We can afford to only partially
+	// check key selectors that start in a TSS shard and end in a non-TSS shard because the other read queries and the
+	// consistency check will eventually catch a misbehaving storage engine.
+	bool matches = true;
+	// printf("GetKey %s:<%s:%d @ %lld start:\n",
+	//		req.sel.getKey().toString().c_str(), req.sel.orEqual ? "=" : "", req.sel.offset, req.version);
+	if (src.sel.orEqual == tss.sel.orEqual && src.sel.offset == tss.sel.offset) {
+		// full matching case
+		if (src.sel.offset == 0 && src.sel.orEqual) {
+			// found exact key, should be identical
+			matches = src.sel.getKey() == tss.sel.getKey();
+		}
+		// if the query doesn't return the final key, there is an edge case where the ss and tss have different shard
+		// boundaries, so they pass different shard boundary keys back for the same offset
+	} else if (src.sel.getKey() == tss.sel.getKey()) {
+		// There is one case with a positive offset where the shard boundary the incomplete query stopped at is the next
+		// key in the shard that the complete query returned. This is not possible with a negative offset because the
+		// shard boundary is exclusive backwards
+		if (src.sel.offset == 0 && src.sel.orEqual && tss.sel.offset == 1 && !tss.sel.orEqual) {
+			// case where ss was complete and tss was incomplete
+		} else if (tss.sel.offset == 0 && tss.sel.orEqual && src.sel.offset == 1 && !src.sel.orEqual) {
+			// case where tss was complete and ss was incomplete
+		} else {
+			matches = false;
+		}
+	} else {
+		// ss/tss returned different keys, and different offsets and/or orEqual
+		// here we just validate that ordering of the keys matches the ordering of the offsets
+		bool tssKeyLarger = src.sel.getKey() < tss.sel.getKey();
+		// the only case offsets are equal and orEqual aren't equal is the case with a negative offset,
+		// where one response has <=0 with the actual result and the other has <0 with the shard upper boundary.
+		// So whichever one has the actual result should have the lower key.
+		bool tssOffsetLarger = (src.sel.offset == tss.sel.offset) ? tss.sel.orEqual : src.sel.offset < tss.sel.offset;
+		// printf("  partial comparison: tssLarger=%s, tssOffsetLarger=%s, matches=%s\n", tssKeyLarger ? "T" : "F",
+		// tssOffsetLarger ? "T": "F", matches ? "T" : "F");
+		matches = tssKeyLarger != tssOffsetLarger;
+	}
+	if (!matches) {
+		// TODO REMOVE print
+		printf("GetKey %s:<%s:%d @ %lld mismatch: src=%s:<%s:%d, tss=%s:<%s:%d\n",
+		       req.sel.getKey().printable().c_str(),
+		       req.sel.orEqual ? "=" : "",
+		       req.sel.offset,
+		       req.version,
+		       src.sel.getKey().printable().c_str(),
+		       src.sel.orEqual ? "=" : "",
+		       src.sel.offset,
+		       tss.sel.getKey().printable().c_str(),
+		       tss.sel.orEqual ? "=" : "",
+		       tss.sel.offset);
+		TraceEvent(traceSeverity, "TSSMismatchGetKey")
+		    .suppressFor(1.0)
+		    .detail("TSSID", tssId)
+		    .detail("KeySelector",
+		            format("%s%s:%d", req.sel.orEqual ? "=" : "", req.sel.getKey().printable().c_str(), req.sel.offset))
+		    .detail("Version", req.version)
+		    .detail("SSReply",
+		            format("%s%s:%d", src.sel.orEqual ? "=" : "", src.sel.getKey().printable().c_str(), src.sel.offset))
+		    .detail(
+		        "TSSReply",
+		        format("%s%s:%d", tss.sel.orEqual ? "=" : "", tss.sel.getKey().printable().c_str(), tss.sel.offset));
+	}
+	return matches;
+}
+
+template <>
+bool TSS_doCompare(const GetKeyValuesRequest& req,
+                   const GetKeyValuesReply& src,
+                   const GetKeyValuesReply& tss,
+                   Severity traceSeverity,
+                   UID tssId) {
+	if (src.more != tss.more || src.data != tss.data) {
+		// TODO REMOVE debugging prints
+		printf("GetKeyValues [%s:<%s:%d - %s:<%s:%d) @ %lld (lim=%d limB=%d) mismatch:\n",
+		       req.begin.getKey().printable().c_str(),
+		       req.begin.orEqual ? "=" : "",
+		       req.begin.offset,
+		       req.end.getKey().printable().c_str(),
+		       req.end.orEqual ? "=" : "",
+		       req.end.offset,
+		       req.version,
+		       req.limit,
+		       req.limitBytes);
+
+		std::string ssResultsString = format("(%d)%s:\n", src.data.size(), src.more ? "+" : "");
+		printf("src= (%d)%s:", src.data.size(), src.more ? "+" : "");
+		for (auto& it : src.data) {
+			printf("    %s=%s\n", it.key.printable().c_str(), it.value.printable().c_str());
+			ssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
+		}
+
+		std::string tssResultsString = format("(%d)%s:\n", tss.data.size(), tss.more ? "+" : "");
+		printf("tss= (%d)%s:", tss.data.size(), tss.more ? "+" : "");
+		for (auto& it : tss.data) {
+			printf("    %s=%s\n", it.key.printable().c_str(), it.value.printable().c_str());
+			tssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
+		}
+		printf("\n");
+
+		TraceEvent(traceSeverity, "TSSMismatchGetKeyValues")
+		    .suppressFor(1.0)
+		    .detail("TSSID", tssId)
+		    .detail(
+		        "Begin",
+		        format(
+		            "%s%s:%d", req.begin.orEqual ? "=" : "", req.begin.getKey().printable().c_str(), req.begin.offset))
+		    .detail("End",
+		            format("%s%s:%d", req.end.orEqual ? "=" : "", req.end.getKey().printable().c_str(), req.end.offset))
+		    .detail("Version", req.version)
+		    .detail("Limit", req.limit)
+		    .detail("LimitBytes", req.limitBytes)
+		    .detail("SSReply", ssResultsString)
+		    .detail("TSSReply", tssResultsString);
+
+		return false;
+	}
+	/*printf("tss GetKeyValues [%s:<%s:%d - %s:<%s:%d) matched! %d=%d\n",
+	        req.begin.getKey().printable().c_str(), req.begin.orEqual ? "=" : "", req.begin.offset,
+	        req.end.getKey().printable().c_str(), req.end.orEqual ? "=" : "", req.end.offset,
+	        src.data.size(), tss.data.size());*/
+	return true;
+}
+
+template <>
+bool TSS_doCompare(const WatchValueRequest& req,
+                   const WatchValueReply& src,
+                   const WatchValueReply& tss,
+                   Severity traceSeverity,
+                   UID tssId) {
+	// TODO should this check that both returned the same version? We mainly want to duplicate watches just for load
+	return true;
+}
+
+// no-op template specializations for metrics replies
+template <>
+bool TSS_doCompare(const WaitMetricsRequest& req,
+                   const StorageMetrics& src,
+                   const StorageMetrics& tss,
+                   Severity traceSeverity,
+                   UID tssId) {
+	return true;
+}
+
+template <>
+bool TSS_doCompare(const SplitMetricsRequest& req,
+                   const SplitMetricsReply& src,
+                   const SplitMetricsReply& tss,
+                   Severity traceSeverity,
+                   UID tssId) {
+	return true;
+}
+
+template <>
+bool TSS_doCompare(const ReadHotSubRangeRequest& req,
+                   const ReadHotSubRangeReply& src,
+                   const ReadHotSubRangeReply& tss,
+                   Severity traceSeverity,
+                   UID tssId) {
+	return true;
+}
+
+template <>
+bool TSS_doCompare(const SplitRangeRequest& req,
+                   const SplitRangeReply& src,
+                   const SplitRangeReply& tss,
+                   Severity traceSeverity,
+                   UID tssId) {
+	// TODO in theory this should return the same response from both right?
+	return true;
+}
+
+// don't duplicate \xff reads or fetchKeys (avoid adding load to servers)
+template <>
+bool TSS_shouldDuplicateRequest(const GetValueRequest& req) {
+	return req.key.size() == 0 || req.key[0] != 0xff;
+}
+
+template <>
+bool TSS_shouldDuplicateRequest(const GetKeyRequest& req) {
+	return req.sel.getKey().size() == 0 || req.sel.getKey()[0] != 0xff;
+}
+
+template <>
+bool TSS_shouldDuplicateRequest(const GetKeyValuesRequest& req) {
+	return (req.begin.getKey().size() == 0 || req.begin.getKey()[0] != 0xff || req.end.getKey().size() == 0 ||
+	        req.end.getKey()[0] != 0xff) &&
+	       !req.isFetchKeys;
+}
+
+template <>
+bool TSS_shouldDuplicateRequest(const WatchValueRequest& req) {
+	return req.key.size() == 0 || req.key[0] != 0xff;
+}
+
+template <>
+bool TSS_shouldDuplicateRequest(const WaitMetricsRequest& req) {
+	return false;
+}
+
+template <>
+bool TSS_shouldDuplicateRequest(const SplitMetricsRequest& req) {
+	return false;
+}
+
+template <>
+bool TSS_shouldDuplicateRequest(const ReadHotSubRangeRequest& req) {
+	return false;
+}
+
+template <>
+bool TSS_shouldDuplicateRequest(const SplitRangeRequest& req) {
+	return false;
+}
+
+// only record metrics for data reads
+
+template <>
+void TSSMetrics::recordLatency(const GetValueRequest& req, double ssLatency, double tssLatency) {
+	SSgetValueLatency.addSample(ssLatency);
+	TSSgetValueLatency.addSample(tssLatency);
+}
+
+template <>
+void TSSMetrics::recordLatency(const GetKeyRequest& req, double ssLatency, double tssLatency) {
+	SSgetKeyLatency.addSample(ssLatency);
+	TSSgetKeyLatency.addSample(tssLatency);
+}
+
+template <>
+void TSSMetrics::recordLatency(const GetKeyValuesRequest& req, double ssLatency, double tssLatency) {
+	SSgetKeyValuesLatency.addSample(ssLatency);
+	TSSgetKeyValuesLatency.addSample(tssLatency);
+}
+
+template <>
+void TSSMetrics::recordLatency(const WatchValueRequest& req, double ssLatency, double tssLatency) {}
+
+template <>
+void TSSMetrics::recordLatency(const WaitMetricsRequest& req, double ssLatency, double tssLatency) {}
+
+template <>
+void TSSMetrics::recordLatency(const SplitMetricsRequest& req, double ssLatency, double tssLatency) {}
+
+template <>
+void TSSMetrics::recordLatency(const ReadHotSubRangeRequest& req, double ssLatency, double tssLatency) {}
+
+template <>
+void TSSMetrics::recordLatency(const SplitRangeRequest& req, double ssLatency, double tssLatency) {}
+
+// -------------------
+
+// TODO ADD UNIT TESTS for compare methods, especially GetKey!!
+TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
+	printf("testing tss comparisons\n");
+
+	// test getValue
+	GetValueRequest gvReq;
+	gvReq.key = StringRef("a");
+	gvReq.version = 5;
+
+	UID tssId;
+
+	GetValueReply gvReplyMissing;
+	GetValueReply gvReplyA(Optional<Value>(StringRef("a")), false);
+	GetValueReply gvReplyB(Optional<Value>(StringRef("b")), false);
+	ASSERT(TSS_doCompare(gvReq, gvReplyMissing, gvReplyMissing, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gvReq, gvReplyA, gvReplyA, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gvReq, gvReplyB, gvReplyB, SevInfo, tssId));
+
+	ASSERT(!TSS_doCompare(gvReq, gvReplyMissing, gvReplyA, SevInfo, tssId));
+	ASSERT(!TSS_doCompare(gvReq, gvReplyA, gvReplyB, SevInfo, tssId));
+
+	// test GetKeyValues
+	Arena a; // for all of the refs. ASAN complains if this isn't done. Could also make them all standalone i guess
+	GetKeyValuesRequest gkvReq;
+	gkvReq.begin = firstGreaterOrEqual(StringRef(a, "A"));
+	gkvReq.end = firstGreaterOrEqual(StringRef(a, "C"));
+	gkvReq.version = 5;
+
+	GetKeyValuesReply gkvReplyEmpty;
+	GetKeyValuesReply gkvReplyOne;
+	KeyValueRef v;
+	v.key = StringRef(a, "a");
+	v.value = StringRef(a, "1");
+	gkvReplyOne.data.push_back_deep(gkvReplyOne.arena, v);
+	GetKeyValuesReply gkvReplyOneMore;
+	gkvReplyOneMore.data.push_back_deep(gkvReplyOneMore.arena, v);
+	gkvReplyOneMore.more = true;
+
+	ASSERT(TSS_doCompare(gkvReq, gkvReplyEmpty, gkvReplyEmpty, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkvReq, gkvReplyOne, gkvReplyOne, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkvReq, gkvReplyOneMore, gkvReplyOneMore, SevInfo, tssId));
+	ASSERT(!TSS_doCompare(gkvReq, gkvReplyEmpty, gkvReplyOne, SevInfo, tssId));
+	ASSERT(!TSS_doCompare(gkvReq, gkvReplyOne, gkvReplyOneMore, SevInfo, tssId));
+
+	// test GetKey
+	GetKeyRequest gkReq;
+	gkReq.sel = KeySelectorRef(StringRef(a, "Z"), false, 1);
+	gkReq.version = 5;
+
+	GetKeyReply gkReplyA(KeySelectorRef(StringRef(a, "A"), false, 20), false);
+	GetKeyReply gkReplyB(KeySelectorRef(StringRef(a, "B"), false, 10), false);
+	GetKeyReply gkReplyC(KeySelectorRef(StringRef(a, "C"), true, 0), false);
+	GetKeyReply gkReplyD(KeySelectorRef(StringRef(a, "D"), false, -10), false);
+	GetKeyReply gkReplyE(KeySelectorRef(StringRef(a, "E"), false, -20), false);
+
+	// identical cases
+	ASSERT(TSS_doCompare(gkReq, gkReplyA, gkReplyA, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyB, gkReplyB, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyC, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyD, gkReplyD, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyE, gkReplyE, SevInfo, tssId));
+
+	// relative offset cases
+	ASSERT(TSS_doCompare(gkReq, gkReplyA, gkReplyB, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyB, gkReplyA, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyA, gkReplyC, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyA, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyB, gkReplyC, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyB, SevInfo, tssId));
+
+	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyD, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyD, gkReplyC, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyE, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyE, gkReplyC, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyD, gkReplyE, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReq, gkReplyE, gkReplyD, SevInfo, tssId));
+
+	// test same offset/orEqual wrong key
+	ASSERT(!TSS_doCompare(gkReq,
+	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), true, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef("B"), true, 0), false),
+	                      SevInfo,
+	                      tssId));
+	// this could be from different shard boundaries, so don't say it's a mismatch
+	ASSERT(TSS_doCompare(gkReq,
+	                     GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, 10), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, "B"), false, 10), false),
+	                     SevInfo,
+	                     tssId));
+
+	// test offsets and key difference don't match
+	ASSERT(!TSS_doCompare(gkReq,
+	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef("B"), false, 10), false),
+	                      SevInfo,
+	                      tssId));
+	ASSERT(!TSS_doCompare(gkReq,
+	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, -10), false),
+	                      GetKeyReply(KeySelectorRef(StringRef("B"), false, 0), false),
+	                      SevInfo,
+	                      tssId));
+
+	// test key is next over in one shard, one found it and other didn't
+	// positive
+	// one that didn't find is +1
+	ASSERT(TSS_doCompare(gkReq,
+	                     GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, 1), false),
+	                     GetKeyReply(KeySelectorRef(StringRef("B"), true, 0), false),
+	                     SevInfo,
+	                     tssId));
+	ASSERT(!TSS_doCompare(gkReq,
+	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), true, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef("B"), false, 1), false),
+	                      SevInfo,
+	                      tssId));
+
+	// negative will have zero offset but not equal set
+	ASSERT(TSS_doCompare(gkReq,
+	                     GetKeyReply(KeySelectorRef(StringRef(a, "A"), true, 0), false),
+	                     GetKeyReply(KeySelectorRef(StringRef("B"), false, 0), false),
+	                     SevInfo,
+	                     tssId));
+	ASSERT(!TSS_doCompare(gkReq,
+	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef("B"), true, 0), false),
+	                      SevInfo,
+	                      tssId));
+
+	// test shard boundary key returned by incomplete query is the same as the key found by the other (only possible in
+	// positive direction)
+	ASSERT(TSS_doCompare(gkReq,
+	                     GetKeyReply(KeySelectorRef(StringRef(a, "A"), true, 0), false),
+	                     GetKeyReply(KeySelectorRef(StringRef("A"), false, 1), false),
+	                     SevInfo,
+	                     tssId));
+
+	// explictly test checksum function
+	std::string s = "A";
+	std::string s12 = "ABCDEFGHIJKL";
+	std::string s13 = "ABCDEFGHIJKLO";
+	std::string checksumStart13 = "(13)";
+	ASSERT(s == traceChecksumValue(StringRef(s)));
+	ASSERT(s12 == traceChecksumValue(StringRef(s12)));
+	ASSERT(checksumStart13 == traceChecksumValue(StringRef(s13)).substr(0, 4));
+	return Void();
+}
\ No newline at end of file
diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index 84971f040bb..9a514a447eb 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -29,7 +29,9 @@
 #include "fdbrpc/LoadBalance.actor.h"
 #include "fdbrpc/Stats.h"
 #include "fdbrpc/TimedRequest.h"
+#include "fdbrpc/TSSComparison.h"
 #include "fdbclient/TagThrottle.h"
+#include "flow/UnitTest.h"
 
 // Dead code, removed in the next protocol version
 struct VersionReply {
@@ -54,6 +56,10 @@ struct StorageServerInterface {
 
 	LocalityData locality;
 	UID uniqueID;
+	// TODO get rid of explicit mapping?
+	// Effectively implements Optional<UID> but serializer didn't like Optional
+	bool isTss;
+	UID tssPairID;
 
 	RequestStream<struct GetValueRequest> getValue;
 	RequestStream<struct GetKeyRequest> getKey;
@@ -74,8 +80,8 @@ struct StorageServerInterface {
 	RequestStream<struct ReadHotSubRangeRequest> getReadHotRanges;
 	RequestStream<struct SplitRangeRequest> getRangeSplitPoints;
 
-	explicit StorageServerInterface(UID uid) : uniqueID(uid) {}
-	StorageServerInterface() : uniqueID(deterministicRandom()->randomUniqueID()) {}
+	explicit StorageServerInterface(UID uid) : uniqueID(uid), isTss(false) {}
+	StorageServerInterface() : uniqueID(deterministicRandom()->randomUniqueID()), isTss(false) {}
 	NetworkAddress address() const { return getValue.getEndpoint().getPrimaryAddress(); }
 	NetworkAddress stableAddress() const { return getValue.getEndpoint().getStableAddress(); }
 	Optional<NetworkAddress> secondaryAddress() const { return getValue.getEndpoint().addresses.secondaryAddress; }
@@ -88,7 +94,11 @@ struct StorageServerInterface {
 		// considered
 
 		if (ar.protocolVersion().hasSmallEndpoints()) {
-			serializer(ar, uniqueID, locality, getValue);
+			if (ar.protocolVersion().hasTSS()) {
+				serializer(ar, uniqueID, locality, getValue, isTss, tssPairID);
+			} else {
+				serializer(ar, uniqueID, locality, getValue);
+			}
 			if (Ar::isDeserializing) {
 				getKey = RequestStream<struct GetKeyRequest>(getValue.getEndpoint().getAdjustedEndpoint(1));
 				getKeyValues = RequestStream<struct GetKeyValuesRequest>(getValue.getEndpoint().getAdjustedEndpoint(2));
@@ -127,8 +137,9 @@ struct StorageServerInterface {
 			           waitFailure,
 			           getQueuingMetrics,
 			           getKeyValueStoreType);
-			if (ar.protocolVersion().hasWatches())
+			if (ar.protocolVersion().hasWatches()) {
 				serializer(ar, watchValue);
+			}
 		}
 	}
 	bool operator==(StorageServerInterface const& s) const { return uniqueID == s.uniqueID; }
diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index 314df8930b4..5f345fe705d 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -25,6 +25,7 @@
 #include "flow/Arena.h"
 #include "flow/TDMetric.actor.h"
 #include "flow/serialize.h"
+#include "flow/UnitTest.h"
 
 const KeyRef systemKeysPrefix = LiteralStringRef("\xff");
 const KeyRangeRef normalKeys(KeyRef(), systemKeysPrefix);
@@ -345,7 +346,11 @@ uint16_t cacheChangeKeyDecodeIndex(const KeyRef& key) {
 	return idx;
 }
 
+const KeyRef tssMappingChangeKey = LiteralStringRef("\xff\x02/tssMappingChangeKey");
+const KeyRangeRef tssMappingKeys(LiteralStringRef("\xff/tss/"), LiteralStringRef("\xff/tss0"));
+
 const KeyRangeRef serverTagKeys(LiteralStringRef("\xff/serverTag/"), LiteralStringRef("\xff/serverTag0"));
+
 const KeyRef serverTagPrefix = serverTagKeys.begin;
 const KeyRangeRef serverTagConflictKeys(LiteralStringRef("\xff/serverTagConflict/"),
                                         LiteralStringRef("\xff/serverTagConflict0"));
@@ -532,6 +537,7 @@ const Key serverListKeyFor(UID serverID) {
 	return wr.toValue();
 }
 
+// TODO use flatbuffers depending on version
 const Value serverListValue(StorageServerInterface const& server) {
 	BinaryWriter wr(IncludeVersion(ProtocolVersion::withServerListValue()));
 	wr << server;
@@ -550,6 +556,18 @@ StorageServerInterface decodeServerListValue(ValueRef const& value) {
 	return s;
 }
 
+// TODO merge this with above stuff or something
+const Value serverListValueFB(StorageServerInterface const& server) {
+	return ObjectWriter::toValue(server, IncludeVersion());
+}
+
+StorageServerInterface decodeServerListValueFB(ValueRef const& value) {
+	StorageServerInterface s;
+	ObjectReader reader(value.begin(), IncludeVersion());
+	reader.deserialize(s);
+	return s;
+}
+
 // processClassKeys.contains(k) iff k.startsWith( processClassKeys.begin ) because '/'+1 == '0'
 const KeyRangeRef processClassKeys(LiteralStringRef("\xff/processClass/"), LiteralStringRef("\xff/processClass0"));
 const KeyRef processClassPrefix = processClassKeys.begin;
@@ -633,15 +651,17 @@ std::string encodeFailedServersKey(AddressExclusion const& addr) {
 // const KeyRangeRef globalConfigKeys( LiteralStringRef("\xff/globalConfig/"), LiteralStringRef("\xff/globalConfig0") );
 // const KeyRef globalConfigPrefix = globalConfigKeys.begin;
 
-const KeyRangeRef globalConfigDataKeys( LiteralStringRef("\xff/globalConfig/k/"), LiteralStringRef("\xff/globalConfig/k0") );
+const KeyRangeRef globalConfigDataKeys(LiteralStringRef("\xff/globalConfig/k/"),
+                                       LiteralStringRef("\xff/globalConfig/k0"));
 const KeyRef globalConfigKeysPrefix = globalConfigDataKeys.begin;
 
-const KeyRangeRef globalConfigHistoryKeys( LiteralStringRef("\xff/globalConfig/h/"), LiteralStringRef("\xff/globalConfig/h0") );
+const KeyRangeRef globalConfigHistoryKeys(LiteralStringRef("\xff/globalConfig/h/"),
+                                          LiteralStringRef("\xff/globalConfig/h0"));
 const KeyRef globalConfigHistoryPrefix = globalConfigHistoryKeys.begin;
 
 const KeyRef globalConfigVersionKey = LiteralStringRef("\xff/globalConfig/v");
 
-const KeyRangeRef workerListKeys( LiteralStringRef("\xff/worker/"), LiteralStringRef("\xff/worker0") );
+const KeyRangeRef workerListKeys(LiteralStringRef("\xff/worker/"), LiteralStringRef("\xff/worker0"));
 const KeyRef workerListPrefix = workerListKeys.begin;
 
 const Key workerListKeyFor(StringRef processID) {
@@ -1082,3 +1102,62 @@ const KeyRangeRef testOnlyTxnStateStorePrefixRange(LiteralStringRef("\xff/TESTON
 const KeyRef writeRecoveryKey = LiteralStringRef("\xff/writeRecovery");
 const ValueRef writeRecoveryKeyTrue = LiteralStringRef("1");
 const KeyRef snapshotEndVersionKey = LiteralStringRef("\xff/snapshotEndVersion");
+
+// for tests
+void testSSISerdes(StorageServerInterface const& ssi, bool useFB) {
+	printf("ssi=\nid=%s\nlocality=%s\nisTss=%s\ntssId=%s\naddress=%s\ngetValue=%s\n\n\n",
+	       ssi.id().toString().c_str(),
+	       ssi.locality.toString().c_str(),
+	       ssi.isTss ? "true" : "false",
+	       ssi.isTss ? ssi.tssPairID.toString().c_str() : "",
+	       ssi.address().toString().c_str(),
+	       ssi.getValue.getEndpoint().token.toString().c_str());
+
+	StorageServerInterface ssi2 =
+	    (useFB) ? decodeServerListValueFB(serverListValueFB(ssi)) : decodeServerListValue(serverListValue(ssi));
+
+	printf("ssi2=\nid=%s\nlocality=%s\nisTss=%s\ntssId=%s\naddress=%s\ngetValue=%s\n\n\n",
+	       ssi2.id().toString().c_str(),
+	       ssi2.locality.toString().c_str(),
+	       ssi2.isTss ? "true" : "false",
+	       ssi2.isTss ? ssi2.tssPairID.toString().c_str() : "",
+	       ssi2.address().toString().c_str(),
+	       ssi2.getValue.getEndpoint().token.toString().c_str());
+
+	ASSERT(ssi.id() == ssi2.id());
+	ASSERT(ssi.locality == ssi2.locality);
+	ASSERT(ssi.isTss == ssi2.isTss);
+	if (ssi.isTss) {
+		ASSERT(ssi2.tssPairID == ssi2.tssPairID);
+	}
+	ASSERT(ssi.address() == ssi2.address());
+	ASSERT(ssi.getValue.getEndpoint().token == ssi2.getValue.getEndpoint().token);
+}
+
+// unit test for serialization since tss stuff had bugs
+TEST_CASE("/SystemData/SerDes/SSI") {
+	printf("testing ssi serdes\n");
+	LocalityData localityData(Optional<Standalone<StringRef>>(),
+	                          Standalone<StringRef>(deterministicRandom()->randomUniqueID().toString()),
+	                          Standalone<StringRef>(deterministicRandom()->randomUniqueID().toString()),
+	                          Optional<Standalone<StringRef>>());
+
+	// non-tss
+	StorageServerInterface ssi;
+	ssi.uniqueID = UID(0x1234123412341234, 0x5678567856785678);
+	ssi.locality = localityData;
+	ssi.isTss = false;
+	ssi.initEndpoints();
+
+	testSSISerdes(ssi, false);
+	testSSISerdes(ssi, true);
+
+	ssi.isTss = true;
+	ssi.tssPairID = UID(0x2345234523452345, 0x1238123812381238);
+
+	testSSISerdes(ssi, false);
+	testSSISerdes(ssi, true);
+	printf("ssi serdes test complete\n");
+
+	return Void();
+}
\ No newline at end of file
diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h
index e7a54e632cb..39f6e4d79b1 100644
--- a/fdbclient/SystemData.h
+++ b/fdbclient/SystemData.h
@@ -115,6 +115,11 @@ extern const KeyRef cacheChangePrefix;
 const Key cacheChangeKeyFor(uint16_t idx);
 uint16_t cacheChangeKeyDecodeIndex(const KeyRef& key);
 
+//    "\xff/tss/[[serverId]]" := "[[tssId]]"
+extern const KeyRef tssMappingChangeKey;
+extern const KeyRangeRef tssMappingKeys;
+extern const KeyRef tssMappingPrefix;
+
 // "\xff/serverTag/[[serverID]]" = "[[Tag]]"
 //	Provides the Tag for the given serverID. Used to access a
 //	storage server's corresponding TLog in order to apply mutations.
diff --git a/fdbrpc/CMakeLists.txt b/fdbrpc/CMakeLists.txt
index 055e4970346..89ec859e8f3 100644
--- a/fdbrpc/CMakeLists.txt
+++ b/fdbrpc/CMakeLists.txt
@@ -29,7 +29,8 @@ set(FDBRPC_SRCS
   sim2.actor.cpp
   sim_validation.cpp
   TimedRequest.h
-  TraceFileIO.cpp)
+  TraceFileIO.cpp
+  TSSComparison.h)
 
 set(COMPILE_EIO OFF)
 
diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 393c3c0ee25..2f1ee375bf5 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -31,11 +31,16 @@
 #include "flow/flow.h"
 #include "flow/Knobs.h"
 
+// TODO REMOVE?
+#include <cinttypes>
+
 #include "fdbrpc/FailureMonitor.h"
 #include "fdbrpc/fdbrpc.h"
 #include "fdbrpc/Locality.h"
 #include "fdbrpc/QueueModel.h"
 #include "fdbrpc/MultiInterface.h"
+#include "fdbrpc/simulator.h" // for checking tss simulation mode
+#include "fdbrpc/TSSComparison.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 using std::vector;
@@ -75,6 +80,82 @@ struct LoadBalancedReply {
 Optional<LoadBalancedReply> getLoadBalancedReply(const LoadBalancedReply* reply);
 Optional<LoadBalancedReply> getLoadBalancedReply(const void*);
 
+ACTOR template <class Req, class Resp>
+Future<Void> tssComparison(Req req,
+                           Future<ErrorOr<Resp>> fSource,
+                           Future<ErrorOr<Resp>> fTss,
+                           TSSEndpointData tssData) {
+	// TODO add timeout and time requests
+	state double startTime = now();
+	state Future<Optional<ErrorOr<Resp>>> fTssWithTimeout = timeout(fTss, 5.0 /*TODO knob?*/);
+	state int finished = 0;
+	state double srcEndTime;
+	state double tssEndTime;
+
+	loop {
+		choose {
+			when(state ErrorOr<Resp> src = wait(fSource)) {
+				srcEndTime = now();
+				fSource = Never();
+				finished++;
+				if (finished == 2) {
+					break;
+				}
+			}
+			when(state Optional<ErrorOr<Resp>> tss = wait(fTssWithTimeout)) {
+				tssEndTime = now();
+				fTssWithTimeout = Never();
+				finished++;
+				if (finished == 2) {
+					break;
+				}
+			}
+		}
+	}
+
+	++tssData.metrics->requests;
+
+	if (src.isError()) {
+		++tssData.metrics->ssErrors;
+	}
+	if (!tss.present()) {
+		++tssData.metrics->tssTimeouts;
+	} else if (tss.get().isError()) {
+		++tssData.metrics->tssErrors;
+		printf("Tss got error %d\n", tss.get().getError().code());
+	}
+	if (!src.isError() && tss.present() && !tss.get().isError()) {
+		Optional<LoadBalancedReply> srcLB = getLoadBalancedReply(&src.get());
+		Optional<LoadBalancedReply> tssLB = getLoadBalancedReply(&tss.get().get());
+		ASSERT(srcLB.present() ==
+		       tssLB.present()); // getLoadBalancedReply returned different responses for same templated type
+
+		// if Resp is a LoadBalancedReply, only compare if both replies are non-error
+		if (!srcLB.present() || (!srcLB.get().error.present() && !tssLB.get().error.present())) {
+			// only record latency difference if both requests actually succeeded, so that we're comparing apples to
+			// apples
+			tssData.metrics->recordLatency(req, srcEndTime - startTime, tssEndTime - startTime);
+
+			// expect mismatches in drop mutations mode.
+			Severity traceSeverity =
+			    (g_network->isSimulated() && g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations)
+			        ? SevWarnAlways
+			        : SevError;
+
+			if (!TSS_doCompare(req, src.get(), tss.get().get(), traceSeverity, tssData.tssId)) {
+				++tssData.metrics->mismatches;
+			}
+		} else if (tssLB.present() && tssLB.get().error.present()) {
+			++tssData.metrics->tssErrors;
+			printf("Tss got LB error %d\n", tssLB.get().error.get().code());
+		} else if (srcLB.present() && srcLB.get().error.present()) {
+			++tssData.metrics->ssErrors;
+		}
+	}
+
+	return Void();
+}
+
 // Stores state for a request made by the load balancer
 template <class Request>
 struct RequestData : NonCopyable {
@@ -91,6 +172,26 @@ struct RequestData : NonCopyable {
 	// This is true once setupRequest is called, even though at that point the response is Never().
 	bool isValid() { return response.isValid(); }
 
+	void maybeDuplicateTSSRequest(RequestStream<Request> const* stream,
+	                              Request const& request,
+	                              QueueModel* model,
+								  Future<Reply> ssResponse) {
+		if (model) {
+			// Send parallel request to TSS pair, if it exists
+			Optional<TSSEndpointData> tssData = model->getTssData(stream->getEndpoint().token.first());
+
+			if (tssData.present() && TSS_shouldDuplicateRequest(request)) {
+				resetReply(request);
+
+				// TODO add timeout from knob to tss request?
+				// FIXME: optimize to avoid creating new netNotifiedQueue for each message
+				RequestStream<Request> tssRequestStream(tssData.get().endpoint);
+				Future<ErrorOr<REPLY_TYPE(Request)>> fTssResult = tssRequestStream.tryGetReply(request);
+				model->addActor.send(tssComparison(request, fResult, fTssResult, tssData.get()));
+			}
+		}
+	}
+
 	// Initializes the request state and starts it, possibly after a backoff delay
 	void startRequest(double backoff,
 	                  bool triedAllOptions,
@@ -105,12 +206,15 @@ struct RequestData : NonCopyable {
 			    delay(backoff), [this, stream, &request, model](Void _) {
 				    requestStarted = true;
 				    modelHolder = Reference<ModelHolder>(new ModelHolder(model, stream->getEndpoint().token.first()));
-				    return stream->tryGetReply(request);
+				    Future<Reply> resp = stream->tryGetReply(request);
+					maybeDuplicateTSSRequest(stream, request, model, resp);
+					return resp;
 			    });
 		} else {
 			requestStarted = true;
 			modelHolder = Reference<ModelHolder>(new ModelHolder(model, stream->getEndpoint().token.first()));
 			response = stream->tryGetReply(request);
+			maybeDuplicateTSSRequest(stream, request, model, response);
 		}
 
 		requestProcessed = false;
diff --git a/fdbrpc/QueueModel.cpp b/fdbrpc/QueueModel.cpp
index fa458d6738b..2cb5687b612 100644
--- a/fdbrpc/QueueModel.cpp
+++ b/fdbrpc/QueueModel.cpp
@@ -18,6 +18,8 @@
  * limitations under the License.
  */
 
+#include <cinttypes>
+
 #include "fdbrpc/QueueModel.h"
 #include "fdbrpc/LoadBalance.h"
 
@@ -60,6 +62,39 @@ double QueueModel::addRequest(uint64_t id) {
 	return d.penalty;
 }
 
+void QueueModel::updateTssEndpoint(uint64_t endpointId, TSSEndpointData tssData) {
+	auto& d = data[endpointId];
+	if (!d.tssData.present()) {
+		tssCount++;
+	}
+
+	d.tssData = Optional<TSSEndpointData>(tssData);
+	// TODO REMOVE print
+	printf("Setting tss endpoint for %" PRIx64 " = %s\n", endpointId, tssData.endpoint.token.toString().c_str());
+}
+
+void QueueModel::removeOldTssData(UID currentGeneration) {
+	if (tssCount > 0) {
+		// expire old tss mappings that aren't present in new mapping
+		for (auto& it : data) {
+			if (it.second.tssData.present() && it.second.tssData.get().generation != currentGeneration) {
+				// TODO REMOVE print
+				printf("Removing tss endpoint for %" PRIx64
+				       " because its generation %s doesn't match the current one %s\n",
+				       it.first,
+				       it.second.tssData.get().generation.toString().c_str(),
+				       currentGeneration.toString().c_str());
+				it.second.tssData = Optional<TSSEndpointData>();
+				tssCount--;
+			}
+		}
+	}
+}
+
+Optional<TSSEndpointData> QueueModel::getTssData(uint64_t id) {
+	return data[id].tssData;
+}
+
 Optional<LoadBalancedReply> getLoadBalancedReply(const LoadBalancedReply* reply) {
 	return *reply;
 }
diff --git a/fdbrpc/QueueModel.h b/fdbrpc/QueueModel.h
index 3ff07a80e97..f8592fa9a55 100644
--- a/fdbrpc/QueueModel.h
+++ b/fdbrpc/QueueModel.h
@@ -26,6 +26,19 @@
 #include "fdbrpc/Smoother.h"
 #include "flow/Knobs.h"
 #include "flow/ActorCollection.h"
+#include "fdbrpc/TSSComparison.h" // For TSS Metrics
+#include "fdbrpc/FlowTransport.h" // For Endpoint
+
+struct TSSEndpointData {
+	UID tssId;
+	Endpoint endpoint;
+	Reference<TSSMetrics> metrics;
+	UID generation; // TODO this isn't exactly like a generation since it's not ordered, i'll try to think of a better
+	                // name
+
+	TSSEndpointData(UID tssId, Endpoint endpoint, Reference<TSSMetrics> metrics, UID generation)
+	  : tssId(tssId), endpoint(endpoint), metrics(metrics), generation(generation) {}
+};
 
 // The data structure used for the client-side load balancing algorithm to
 // decide which storage server to read data from. Conceptually, it tracks the
@@ -59,6 +72,10 @@ struct QueueData {
 	// hasn't returned a valid result, increase above `futureVersionBackoff`
 	// to increase the future backoff amount.
 	double increaseBackoffTime;
+
+	// a bit of a hack to store this here, but it's the only centralized place for per-endpoint tracking
+	Optional<TSSEndpointData> tssData;
+
 	QueueData()
 	  : latency(0.001), penalty(1.0), smoothOutstanding(FLOW_KNOBS->QUEUE_MODEL_SMOOTHING_AMOUNT), failedUntil(0),
 	    futureVersionBackoff(FLOW_KNOBS->FUTURE_VERSION_INITIAL_BACKOFF), increaseBackoffTime(0) {}
@@ -91,7 +108,11 @@ class QueueModel {
 	Future<Void> laggingRequests; // requests for which a different recipient already answered
 	int laggingRequestCount;
 
-	QueueModel() : secondMultiplier(1.0), secondBudget(0), laggingRequestCount(0) {
+	void updateTssEndpoint(uint64_t endpointId, TSSEndpointData endpointData);
+	void removeOldTssData(UID currentGeneration);
+	Optional<TSSEndpointData> getTssData(uint64_t endpointId);
+
+	QueueModel() : secondMultiplier(1.0), secondBudget(0), laggingRequestCount(0), tssCount(0) {
 		laggingRequests = actorCollection(addActor.getFuture(), &laggingRequestCount);
 	}
 
@@ -99,6 +120,7 @@ class QueueModel {
 
 private:
 	std::unordered_map<uint64_t, QueueData> data;
+	uint32_t tssCount;
 };
 
 /* old queue model
diff --git a/fdbrpc/TSSComparison.h b/fdbrpc/TSSComparison.h
new file mode 100644
index 00000000000..6724e3dae73
--- /dev/null
+++ b/fdbrpc/TSSComparison.h
@@ -0,0 +1,78 @@
+/*
+ * TSSComparison.h
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * This header is to declare the tss comparison function that LoadBalance.Actor.h needs to be aware of to call,
+ * But StorageServerInterface.h needs to implement on the types defined in SSI.h.
+ */
+#ifndef FDBRPC_TSS_COMPARISON_H
+#define FDBRPC_TSS_COMPARISON_H
+
+#include "fdbrpc/ContinuousSample.h"
+#include "fdbrpc/Stats.h"
+
+// refcounted + noncopyable because both DatabaseContext and individual endpoints share ownership
+struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
+	CounterCollection cc;
+	Counter requests;
+	Counter ssErrors;
+	Counter tssErrors;
+	Counter tssTimeouts;
+	Counter mismatches;
+
+	// TODO we could probably just ignore getKey as it's seldom used?
+	ContinuousSample<double> SSgetValueLatency;
+	ContinuousSample<double> SSgetKeyLatency;
+	ContinuousSample<double> SSgetKeyValuesLatency;
+
+	ContinuousSample<double> TSSgetValueLatency;
+	ContinuousSample<double> TSSgetKeyLatency;
+	ContinuousSample<double> TSSgetKeyValuesLatency;
+
+	template <class Req>
+	void recordLatency(const Req& req, double ssLatency, double tssLatency);
+
+	void clear() {
+		SSgetValueLatency.clear();
+		SSgetKeyLatency.clear();
+		SSgetKeyValuesLatency.clear();
+
+		TSSgetValueLatency.clear();
+		TSSgetKeyLatency.clear();
+		TSSgetKeyValuesLatency.clear();
+	}
+
+	TSSMetrics()
+	  : cc("TSSClientMetrics"), requests("Requests", cc), ssErrors("SSErrors", cc), tssErrors("TSSErrors", cc),
+	    tssTimeouts("TSSTimeouts", cc), mismatches("Mismatches", cc), SSgetValueLatency(1000), SSgetKeyLatency(1000),
+	    SSgetKeyValuesLatency(1000), TSSgetValueLatency(1000), TSSgetKeyLatency(1000), TSSgetKeyValuesLatency(1000) {}
+};
+
+// global static functions
+
+template <class Req>
+bool TSS_shouldDuplicateRequest(const Req& req);
+
+// part of the contract of this function is that if there is a mismatch, the implementation needs to record a trace
+// event with the specified severity and tssId in the event.
+template <class Req, class Rep>
+bool TSS_doCompare(const Req& req, const Rep& src, const Rep& tss, Severity traceSeverity, UID tssId);
+
+#endif
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index a2a6af5af62..e15e0126a16 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -335,6 +335,7 @@ class RequestStream {
 			Future<Void> disc =
 			    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint(taskID));
 			if (disc.isReady()) {
+				printf("got disconnect or failure 1 :O\n");
 				return ErrorOr<REPLY_TYPE(X)>(request_maybe_delivered());
 			}
 			Reference<Peer> peer =
@@ -353,6 +354,7 @@ class RequestStream {
 			Future<Void> disc =
 			    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint());
 			if (disc.isReady()) {
+				printf("got disconnect or failure 2 :O\n");
 				return ErrorOr<REPLY_TYPE(X)>(request_maybe_delivered());
 			}
 			Reference<Peer> peer =
diff --git a/fdbrpc/simulator.h b/fdbrpc/simulator.h
index f83686f464a..6404eafc178 100644
--- a/fdbrpc/simulator.h
+++ b/fdbrpc/simulator.h
@@ -41,7 +41,7 @@ class ISimulator : public INetwork {
 	  : desiredCoordinators(1), physicalDatacenters(1), processesPerMachine(0), listenersPerProcess(1),
 	    isStopped(false), lastConnectionFailure(0), connectionFailuresDisableDuration(0), speedUpSimulation(false),
 	    allSwapsDisabled(false), backupAgents(BackupAgentType::WaitForType), drAgents(BackupAgentType::WaitForType),
-	    extraDB(nullptr), allowLogSetKills(true), usableRegions(1) {}
+	    extraDB(nullptr), allowLogSetKills(true), usableRegions(1), tssMode(TSSMode::Disabled) {}
 
 	// Order matters!
 	enum KillType {
@@ -55,6 +55,9 @@ class ISimulator : public INetwork {
 		None
 	};
 
+	// Order matters! all modes >= 2 are fault injection modes
+	enum TSSMode { Disabled, EnabledNormal, EnabledAddDelay, EnabledDropMutations };
+
 	enum class BackupAgentType { NoBackupAgents, WaitForType, BackupToFile, BackupToDB };
 
 	// Subclasses may subclass ProcessInfo as well
@@ -405,6 +408,7 @@ class ISimulator : public INetwork {
 	int32_t satelliteTLogWriteAntiQuorumFallback;
 	std::vector<Optional<Standalone<StringRef>>> primarySatelliteDcIds;
 	std::vector<Optional<Standalone<StringRef>>> remoteSatelliteDcIds;
+	TSSMode tssMode;
 
 	// Used by workloads that perform reconfigurations
 	int testerCount;
diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index 125344d7215..87044f49b70 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -95,12 +95,14 @@ void applyMetadataMutations(SpanID const& spanContext,
 
 						for (const auto& id : src) {
 							auto storageInfo = getStorageInfo(id, storageCache, txnStateStore);
+							ASSERT(!storageInfo->interf.isTss);
 							ASSERT(storageInfo->tag != invalidTag);
 							info.tags.push_back(storageInfo->tag);
 							info.src_info.push_back(storageInfo);
 						}
 						for (const auto& id : dest) {
 							auto storageInfo = getStorageInfo(id, storageCache, txnStateStore);
+							ASSERT(!storageInfo->interf.isTss);
 							ASSERT(storageInfo->tag != invalidTag);
 							info.tags.push_back(storageInfo->tag);
 							info.dest_info.push_back(storageInfo);
@@ -113,6 +115,11 @@ void applyMetadataMutations(SpanID const& spanContext,
 					txnStateStore->set(KeyValueRef(m.param1, m.param2));
 			} else if (m.param1.startsWith(serverKeysPrefix)) {
 				if (toCommit) {
+					Optional<Value> t =
+					    txnStateStore->readValue(serverTagKeyFor(serverKeysDecodeServer(m.param1))).get();
+					// printf("got SetValue for serverKeysPrefix/%s, tag=%s\n",
+					// serverKeysDecodeServer(m.param1).toString().c_str(), t.present() ?
+					// decodeServerTagValue(t.get()).toString().c_str() : "");
 					MutationRef privatized = m;
 					privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
 					TraceEvent(SevDebug, "SendingPrivateMutation", dbgid)
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 45116d454a3..fc66d46fc3a 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -1,3 +1,4 @@
+
 /*
  * ClusterController.actor.cpp
  *
@@ -3080,9 +3081,9 @@ ACTOR Future<Void> workerAvailabilityWatch(WorkerInterface worker,
 					checkOutstandingRequests(cluster);
 				}
 			}
+
 			when(wait(failed)) { // remove workers that have failed
 				WorkerInfo& failedWorkerInfo = cluster->id_worker[worker.locality.processId()];
-
 				if (!failedWorkerInfo.reply.isSet()) {
 					failedWorkerInfo.reply.send(
 					    RegisterWorkerReply(failedWorkerInfo.details.processClass, failedWorkerInfo.priorityInfo));
@@ -3269,14 +3270,22 @@ void clusterRegisterMaster(ClusterControllerData* self, RegisterMasterRequest co
 		isChanged = true;
 	}
 
+	// TODO remove debugging
+	printf("CC:\ntss_count=%d\ntss_storage_engine=%d|%s\n",
+	       db->config.desiredTSSCount,
+	       db->config.testingStorageServerStoreType,
+	       db->config.testingStorageServerStoreType.toString().c_str());
+
 	// Construct the client information
 	if (db->clientInfo->get().commitProxies != req.commitProxies ||
 	    db->clientInfo->get().grvProxies != req.grvProxies) {
 		isChanged = true;
+		// TODO why construct a new one and not just copy the old one and change proxies + id?
 		ClientDBInfo clientInfo;
 		clientInfo.id = deterministicRandom()->randomUniqueID();
 		clientInfo.commitProxies = req.commitProxies;
 		clientInfo.grvProxies = req.grvProxies;
+		clientInfo.tssMapping = db->clientInfo->get().tssMapping;
 		db->clientInfo->set(clientInfo);
 		dbInfo.client = db->clientInfo->get();
 	}
@@ -3752,6 +3761,136 @@ ACTOR Future<Void> monitorServerInfoConfig(ClusterControllerData::DBInfo* db) {
 	}
 }
 
+// Monitors the tss mapping change key for changes,
+// and broadcasts the new tss mapping to the rest of the cluster in ClientDBInfo.
+ACTOR Future<Void> monitorTSSMapping(ClusterControllerData* self) {
+	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+	loop {
+		state Reference<ReadYourWritesTransaction> tr =
+		    Reference<ReadYourWritesTransaction>(new ReadYourWritesTransaction(self->db.db));
+		loop {
+			try {
+				tr->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
+				tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+				tr->setOption(FDBTransactionOptions::READ_LOCK_AWARE);
+
+				std::vector<std::pair<UID, UID>> tssResults =
+				    wait(tssMapDB.getRange(tr, UID(), Optional<UID>(), CLIENT_KNOBS->TOO_MANY));
+				ASSERT(tssResults.size() < CLIENT_KNOBS->TOO_MANY);
+
+				state std::unordered_map<UID, UID> tssIdMap;
+				std::set<UID> seenTssIds;
+
+				for (auto& it : tssResults) {
+					tssIdMap[it.first] = it.second;
+					// ensure two storage servers don't map to same TSS
+					ASSERT(seenTssIds.insert(it.second).second);
+				}
+
+				// TODO REMOVE print
+				printf("tss mapping of size %d\n", tssIdMap.size());
+
+				// TODO is copying storage server interfaces bad?
+				state std::vector<std::pair<UID, StorageServerInterface>> newMapping;
+				state std::map<UID, StorageServerInterface> oldMapping;
+				state bool mappingChanged = false;
+
+				state ClientDBInfo clientInfo = self->db.clientInfo->get();
+
+				for (auto& it : clientInfo.tssMapping) {
+					oldMapping[it.first] = it.second;
+					if (!tssIdMap.count(it.first)) {
+						// TODO add trace event
+						printf("tss mapping removed: %s=%s\n",
+						       it.first.toString().c_str(),
+						       it.second.id().toString().c_str());
+						TraceEvent("TSS_MappingRemoved", self->id)
+						    .detail("SSID", it.first)
+						    .detail("TSSID", it.second.id());
+						mappingChanged = true;
+					}
+				}
+
+				for (auto& it : tssIdMap) {
+					bool ssAlreadyPaired = oldMapping.count(it.first);
+
+					state Optional<UID> oldTssId;
+					state Optional<UID> oldGetValueEndpoint;
+
+					if (ssAlreadyPaired) {
+						auto interf = oldMapping[it.first];
+						// check if this SS maps to a new TSS
+						oldTssId = Optional<UID>(interf.id());
+						oldGetValueEndpoint = Optional<UID>(interf.getValue.getEndpoint().token);
+						if (interf.id() != it.second) {
+							TraceEvent("TSS_MappingChanged", self->id)
+							    .detail("SSID", it.first)
+							    .detail("TSSID", it.second)
+							    .detail("OldTSSID", interf.id());
+							printf("tss mapping updated: %s=%s\n",
+							       it.first.toString().c_str(),
+							       it.second.toString().c_str());
+							mappingChanged = true;
+						}
+					} else {
+						// TODO add trace event
+						TraceEvent("TSS_MappingAdded", self->id).detail("SSID", it.first).detail("TSSID", it.second);
+						printf("tss mapping added: %s=%s\n", it.first.toString().c_str(), it.second.toString().c_str());
+						mappingChanged = true;
+					}
+
+					state UID ssid = it.first;
+					state UID tssid = it.second;
+					// request storage server interface for tssid, add it to results
+					// TODO could issue all of these futures and then process then after as an optimization
+					Optional<Value> tssiVal = wait(tr->get(serverListKeyFor(it.second)));
+
+					// because we read the tss mapping in the same transaction, there can be no races with tss removal
+					// and the tss interface must exist
+					ASSERT(tssiVal.present());
+
+					StorageServerInterface tssi = decodeServerListValue(tssiVal.get());
+					if (oldTssId.present() && tssi.id() == oldTssId.get() && oldGetValueEndpoint.present() &&
+					    oldGetValueEndpoint.get() != tssi.getValue.getEndpoint().token) {
+						// TODO REMOVE print
+						printf("tss %s restarted, getValue %s -> %s\n",
+						       tssi.id().toString().c_str(),
+						       oldGetValueEndpoint.get().toString().c_str(),
+						       tssi.getValue.getEndpoint().token.toString().c_str());
+						mappingChanged = true;
+					}
+					newMapping.push_back(std::pair<UID, StorageServerInterface>(ssid, tssi));
+				}
+
+				// if nothing changed, skip updating
+				if (mappingChanged) {
+					// TODO REMOVE print
+					printf("CC updating tss client and server info\n");
+					clientInfo.id = deterministicRandom()->randomUniqueID();
+					clientInfo.tssMapping = newMapping;
+					self->db.clientInfo->set(clientInfo);
+
+					ServerDBInfo serverInfo = self->db.serverInfo->get();
+					// also change server db info so workers get new mapping
+					serverInfo.id = deterministicRandom()->randomUniqueID();
+					serverInfo.infoGeneration = ++self->db.dbInfoCount;
+					serverInfo.client = clientInfo;
+					self->db.serverInfo->set(serverInfo);
+				}
+
+				state Future<Void> tssChangeFuture = tr->watch(tssMappingChangeKey);
+
+				wait(tr->commit());
+				wait(tssChangeFuture);
+
+				break;
+			} catch (Error& e) {
+				wait(tr->onError(e));
+			}
+		}
+	}
+}
+
 // Monitors the global configuration version key for changes. When changes are
 // made, the global configuration history is read and any updates are sent to
 // all processes in the system by updating the ClientDBInfo object. The
@@ -4310,6 +4449,7 @@ ACTOR Future<Void> clusterControllerCore(ClusterControllerFullInterface interf,
 	self.addActor.send(handleForcedRecoveries(&self, interf));
 	self.addActor.send(monitorDataDistributor(&self));
 	self.addActor.send(monitorRatekeeper(&self));
+	self.addActor.send(monitorTSSMapping(&self));
 	self.addActor.send(dbInfoUpdater(&self));
 	self.addActor.send(traceCounters("ClusterControllerMetrics",
 	                                 self.id,
@@ -4351,6 +4491,7 @@ ACTOR Future<Void> clusterControllerCore(ClusterControllerFullInterface interf,
 		when(GetWorkersRequest req = waitNext(interf.getWorkers.getFuture())) {
 			++self.getWorkersRequests;
 			vector<WorkerDetails> workers;
+			// printf("CC got GetWorkersRequest\n");
 
 			for (auto& it : self.id_worker) {
 				if ((req.flags & GetWorkersRequest::NON_EXCLUDED_PROCESSES_ONLY) &&
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index d1469c0d3b1..3fc1ed02c3f 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1507,6 +1507,7 @@ ACTOR static Future<Void> rejoinServer(CommitProxyInterface proxy, ProxyCommitDa
 
 	loop {
 		GetStorageServerRejoinInfoRequest req = waitNext(proxy.getStorageServerRejoinInfo.getFuture());
+		printf("Proxy got Rejoin req for %s\n", req.id.toString().c_str());
 		if (commitData->txnStateStore->readValue(serverListKeyFor(req.id)).get().present()) {
 			GetStorageServerRejoinInfoReply rep;
 			rep.version = commitData->version;
@@ -1567,8 +1568,10 @@ ACTOR static Future<Void> rejoinServer(CommitProxyInterface proxy, ProxyCommitDa
 				}
 				rep.newTag = Tag(maxTagLocality + 1, 0);
 			}
+			printf("Proxy sent Rejoin response for %s\n", req.id.toString().c_str());
 			req.reply.send(rep);
 		} else {
+			printf("Proxy notifying %s it can't rejoin because it was removed.\n", req.id.toString().c_str());
 			req.reply.sendError(worker_removed());
 		}
 	}
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index d1762fc7cbb..cbb03641787 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -66,6 +66,7 @@ struct TCServerInfo : public ReferenceCounted<TCServerInfo> {
 	Future<std::pair<StorageServerInterface, ProcessClass>> onInterfaceChanged;
 	Promise<Void> removed;
 	Future<Void> onRemoved;
+	Future<Void> onTSSPairRemoved;
 	Promise<Void> wakeUpTracker;
 	bool inDesiredDC;
 	LocalityEntry localityEntry;
@@ -83,8 +84,10 @@ struct TCServerInfo : public ReferenceCounted<TCServerInfo> {
 	             Reference<LocalitySet> storageServerSet)
 	  : id(ssi.id()), collection(collection), lastKnownInterface(ssi), lastKnownClass(processClass),
 	    dataInFlightToServer(0), onInterfaceChanged(interfaceChanged.getFuture()), onRemoved(removed.getFuture()),
-	    inDesiredDC(inDesiredDC), storeType(KeyValueStoreType::END) {
-		localityEntry = ((LocalityMap<UID>*)storageServerSet.getPtr())->add(ssi.locality, &id);
+	    inDesiredDC(inDesiredDC), storeType(KeyValueStoreType::END), onTSSPairRemoved(Never()) {
+		if (!ssi.isTss) {
+			localityEntry = ((LocalityMap<UID>*)storageServerSet.getPtr())->add(ssi.locality, &id);
+		}
 	}
 
 	bool isCorrectStoreType(KeyValueStoreType configStoreType) {
@@ -398,6 +401,7 @@ ACTOR Future<Reference<InitialDataDistribution>> getInitialDataDistribution(Data
 
 	state std::map<UID, Optional<Key>> server_dc;
 	state std::map<vector<UID>, std::pair<vector<UID>, vector<UID>>> team_cache;
+	state std::vector<std::pair<StorageServerInterface, ProcessClass>> tss_servers;
 
 	// Get the server list in its own try/catch block since it modifies result.  We don't want a subsequent failure
 	// causing entries to be duplicated
@@ -447,12 +451,19 @@ ACTOR Future<Reference<InitialDataDistribution>> getInitialDataDistribution(Data
 
 			for (int i = 0; i < serverList.get().size(); i++) {
 				auto ssi = decodeServerListValue(serverList.get()[i].value);
-				result->allServers.push_back(std::make_pair(ssi, id_data[ssi.locality.processId()].processClass));
-				server_dc[ssi.id()] = ssi.locality.dcId();
+				if (!ssi.isTss) {
+					printf("DD adding SS %s on init\n", ssi.id().toString().c_str());
+					result->allServers.push_back(std::make_pair(ssi, id_data[ssi.locality.processId()].processClass));
+					server_dc[ssi.id()] = ssi.locality.dcId();
+				} else {
+					printf("DD ignoring TSS %s on init until after team building\n", ssi.id().toString().c_str());
+					tss_servers.push_back(std::make_pair(ssi, id_data[ssi.locality.processId()].processClass));
+				}
 			}
 
 			break;
 		} catch (Error& e) {
+			printf("get initial DD failed %d\n", e.code());
 			wait(tr.onError(e));
 
 			ASSERT(!succeeded); // We shouldn't be retrying if we have already started modifying result in this loop
@@ -546,6 +557,7 @@ ACTOR Future<Reference<InitialDataDistribution>> getInitialDataDistribution(Data
 				beginKey = keyServers.end()[-1].key;
 				break;
 			} catch (Error& e) {
+				printf("GetInitialTeams got error %d\n", e.code());
 				TraceEvent("GetInitialTeamsKeyServersRetry", distributorId).error(e);
 
 				wait(tr.onError(e));
@@ -559,6 +571,12 @@ ACTOR Future<Reference<InitialDataDistribution>> getInitialDataDistribution(Data
 	// a dummy shard at the end with no keys or servers makes life easier for trackInitialShards()
 	result->shards.push_back(DDShardInfo(allKeys.end));
 
+	// add tss to server list AFTER teams are built
+	for (auto& it : tss_servers) {
+		printf("DD adding TSS %s on init\n", it.first.id().toString().c_str());
+		result->allServers.push_back(it);
+	}
+
 	return result;
 }
 
@@ -567,7 +585,8 @@ ACTOR Future<Void> storageServerTracker(struct DDTeamCollection* self,
                                         TCServerInfo* server,
                                         Promise<Void> errorOut,
                                         Version addedVersion,
-                                        const DDEnabledState* ddEnabledState);
+                                        const DDEnabledState* ddEnabledState,
+                                        bool isTss);
 
 Future<Void> teamTracker(struct DDTeamCollection* const& self,
                          Reference<TCTeamInfo> const& team,
@@ -598,6 +617,8 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	int64_t unhealthyServers;
 	std::map<int,int> priority_teams;
 	std::map<UID, Reference<TCServerInfo>> server_info;
+	std::map<UID, Reference<TCServerInfo>> tss_info_by_pair;
+	std::map<UID, Reference<TCServerInfo>> server_and_tss_info; // TODO could replace this with an efficient way to do a read-only concatenation of 2 data structures? 
 	std::map<Key, int> lagging_zones; // zone to number of storage servers lagging
 	AsyncVar<bool> disableFailingLaggingServers;
 
@@ -610,6 +631,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	vector<Reference<TCTeamInfo>> badTeams;
 	Reference<ShardsAffectedByTeamFailure> shardsAffectedByTeamFailure;
 	PromiseStream<UID> removedServers;
+	PromiseStream<UID> removedTSS;
 	std::set<UID> recruitingIds; // The IDs of the SS which are being recruited
 	std::set<NetworkAddress> recruitingLocalities;
 	Future<Void> initialFailureReactionDelay;
@@ -624,6 +646,8 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	int optimalTeamCount;
 	AsyncVar<bool> zeroOptimalTeams;
 
+	bool isTssRecruiting; // If tss recruiting is waiting on a pair, don't consider DD recruiting for the purposes of QuietDB
+
 	// EXCLUDED if an address is in the excluded list in the database.
 	// FAILED if an address is permanently failed.
 	// NONE by default.  Updated asynchronously (eventually)
@@ -709,7 +733,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	    initializationDoneActor(logOnCompletion(readyToStart && initialFailureReactionDelay, this)),
 	    optimalTeamCount(0), recruitingStream(0), restartRecruiting(SERVER_KNOBS->DEBOUNCE_RECRUITING_DELAY),
 	    unhealthyServers(0), includedDCs(includedDCs), otherTrackedDCs(otherTrackedDCs),
-	    zeroHealthyTeams(zeroHealthyTeams), zeroOptimalTeams(true), primary(primary),
+	    zeroHealthyTeams(zeroHealthyTeams), zeroOptimalTeams(true), primary(primary), isTssRecruiting(false),
 	    medianAvailableSpace(SERVER_KNOBS->MIN_AVAILABLE_SPACE_RATIO), lastMedianAvailableSpaceUpdate(0),
 	    processingUnhealthy(processingUnhealthy), lowestUtilizationTeam(0), highestUtilizationTeam(0),
 	    getShardMetrics(getShardMetrics), removeFailedServer(removeFailedServer) {
@@ -758,10 +782,11 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		// The following makes sure that, even if a reference to a team is held in the DD Queue, the tracker will be
 		// stopped
 		//  before the server_status map to which it has a pointer, is destroyed.
-		for (auto& [_, info] : server_info) {
+		for (auto& [_, info] : server_and_tss_info) {
 			info->tracker.cancel();
 			info->collection = nullptr;
 		}
+
 		// TraceEvent("DDTeamCollectionDestructed", distributorId)
 		//    .detail("Primary", primary)
 		//    .detail("ServerTrackerDestroyed", server_info.size());
@@ -1128,6 +1153,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		self->healthyZone.set(initTeams->initHealthyZoneValue);
 		// SOMEDAY: If some servers have teams and not others (or some servers have more data than others) and there is
 		// an address/locality collision, should we preferentially mark the least used server as undesirable?
+
 		for (auto i = initTeams->allServers.begin(); i != initTeams->allServers.end(); ++i) {
 			if (self->shouldHandleServer(i->first)) {
 				if (!self->isValidLocality(self->configuration.storagePolicy, i->first.locality)) {
@@ -1141,6 +1167,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 						self->addActor.send(self->checkInvalidLocalities);
 					}
 				}
+				printf("%p init adding %s\n", (void*)self, i->first.toString().c_str());
 				self->addServer(i->first, i->second, self->serverTrackerErrorOut, 0, ddEnabledState);
 			}
 		}
@@ -2419,14 +2446,25 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		if (!shouldHandleServer(newServer)) {
 			return;
 		}
-		allServers.push_back(newServer.id());
 
-		TraceEvent("AddedStorageServer", distributorId)
+		// printf("addServer(%s)\n", newServer.id().toString().c_str());
+
+		if (!newServer.isTss) {
+			allServers.push_back(newServer.id());
+		}
+
+		TraceEvent(newServer.isTss ? "AddedTSS" : "AddedStorageServer", distributorId)
 		    .detail("ServerID", newServer.id())
 		    .detail("ProcessClass", processClass.toString())
 		    .detail("WaitFailureToken", newServer.waitFailure.getEndpoint().token)
 		    .detail("Address", newServer.waitFailure.getEndpoint().getPrimaryAddress());
-		auto& r = server_info[newServer.id()] = makeReference<TCServerInfo>(
+
+		// TODO how to do this?
+		/*if (newServer.isTss) {
+		    tr.detail("TSSPairID", newServer.tssPairID);
+		}*/
+
+		auto& r = server_and_tss_info[newServer.id()] = makeReference<TCServerInfo>(
 		    newServer,
 		    this,
 		    processClass,
@@ -2434,12 +2472,33 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		        std::find(includedDCs.begin(), includedDCs.end(), newServer.locality.dcId()) != includedDCs.end(),
 		    storageServerSet);
 
-		// Establish the relation between server and machine
-		checkAndCreateMachine(r);
+		if (newServer.isTss) {
+			tss_info_by_pair[newServer.tssPairID] = r;
 
-		r->tracker = storageServerTracker(this, cx, r.getPtr(), errorOut, addedVersion, ddEnabledState);
-		doBuildTeams = true; // Adding a new server triggers to build new teams
-		restartTeamBuilder.trigger();
+			if (server_info.count(newServer.tssPairID)) {
+				r->onTSSPairRemoved = server_info[newServer.tssPairID]->onRemoved;
+			}
+		} else {
+			server_info[newServer.id()] = r;
+			// Establish the relation between server and machine
+			checkAndCreateMachine(r);
+		}
+
+		r->tracker =
+		    storageServerTracker(this, cx, r.getPtr(), errorOut, addedVersion, ddEnabledState, newServer.isTss);
+
+		if (!newServer.isTss) {
+			// link and wake up tss' tracker so it knows when this server gets removed
+			if (tss_info_by_pair.count(newServer.id())) {
+				tss_info_by_pair[newServer.id()]->onTSSPairRemoved = r->onRemoved;
+				if (tss_info_by_pair[newServer.id()]->wakeUpTracker.canBeSet()) {
+					tss_info_by_pair[newServer.id()]->wakeUpTracker.send(Void());
+				}
+			}
+
+			doBuildTeams = true; // Adding a new server triggers to build new teams
+			restartTeamBuilder.trigger();
+		}
 	}
 
 	bool removeTeam(Reference<TCTeamInfo> team) {
@@ -2605,7 +2664,21 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		return foundMachineTeam;
 	}
 
+	void removeTSS(UID removedServer) {
+		// much simpler than remove server. tss isn't in any teams, so just remove it from data structures
+		TEST(true); // Remove a TSS frm the cluster
+		printf("Removing tss %s\n", removedServer.toString().c_str());
+		TraceEvent("RemovedTSS", distributorId).detail("ServerID", removedServer);
+		Reference<TCServerInfo> removedServerInfo = server_and_tss_info[removedServer];
+
+		tss_info_by_pair.erase(removedServerInfo->lastKnownInterface.tssPairID);
+		server_and_tss_info.erase(removedServer);
+
+		server_status.clear(removedServer);
+	}
+
 	void removeServer(UID removedServer) {
+		printf("Removing ss %s\n", removedServer.toString().c_str());
 		TraceEvent("RemovedStorageServer", distributorId).detail("ServerID", removedServer);
 
 		// ASSERT( !shardsAffectedByTeamFailure->getServersForTeam( t ) for all t in teams that contain removedServer )
@@ -2703,6 +2776,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 			}
 		}
 		server_info.erase(removedServer);
+		server_and_tss_info.erase(removedServer);
 
 		if (server_status.get(removedServer).initialized && server_status.get(removedServer).isUnhealthy()) {
 			unhealthyServers--;
@@ -2726,7 +2800,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 };
 
 TCServerInfo::~TCServerInfo() {
-	if (collection && ssVersionTooFarBehind.get()) {
+	if (collection && ssVersionTooFarBehind.get() && !lastKnownInterface.isTss) {
 		collection->removeLaggingStorageServer(lastKnownInterface.locality.zoneId().get());
 	}
 }
@@ -3359,6 +3433,7 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 				    .detail("IsReady", self->initialFailureReactionDelay.isReady());
 				self->traceTeamCollectionInfo();
 			}
+
 			// Check if the number of degraded machines has changed
 			state vector<Future<Void>> change;
 			bool anyUndesired = false;
@@ -3400,18 +3475,20 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 			bool containsFailed = teamContainsFailedServer(self, team);
 			bool recheck = !healthy && (lastReady != self->initialFailureReactionDelay.isReady() ||
 			                            (lastZeroHealthy && !self->zeroHealthyTeams->get()) || containsFailed);
-			// TraceEvent("TeamHealthChangeDetected", self->distributorId)
-			//     .detail("Team", team->getDesc())
-			//     .detail("ServersLeft", serversLeft)
-			//     .detail("LastServersLeft", lastServersLeft)
-			//     .detail("AnyUndesired", anyUndesired)
-			//     .detail("LastAnyUndesired", lastAnyUndesired)
-			//     .detail("AnyWrongConfiguration", anyWrongConfiguration)
-			//     .detail("LastWrongConfiguration", lastWrongConfiguration)
-			//     .detail("Recheck", recheck)
-			//     .detail("BadTeam", badTeam)
-			//     .detail("LastZeroHealthy", lastZeroHealthy)
-			//     .detail("ZeroHealthyTeam", self->zeroHealthyTeams->get());
+
+			// TODO recomment
+			TraceEvent("TeamHealthChangeDetected", self->distributorId)
+			    .detail("Team", team->getDesc())
+			    .detail("ServersLeft", serversLeft)
+			    .detail("LastServersLeft", lastServersLeft)
+			    .detail("AnyUndesired", anyUndesired)
+			    .detail("LastAnyUndesired", lastAnyUndesired)
+			    .detail("AnyWrongConfiguration", anyWrongConfiguration)
+			    .detail("LastWrongConfiguration", lastWrongConfiguration)
+			    .detail("Recheck", recheck)
+			    .detail("BadTeam", badTeam)
+			    .detail("LastZeroHealthy", lastZeroHealthy)
+			    .detail("ZeroHealthyTeam", self->zeroHealthyTeams->get());
 
 			lastReady = self->initialFailureReactionDelay.isReady();
 			lastZeroHealthy = self->zeroHealthyTeams->get();
@@ -3764,8 +3841,8 @@ ACTOR Future<Void> waitServerListChange(DDTeamCollection* self,
 						ProcessClass const& processClass = results[i].second;
 						if (!self->shouldHandleServer(ssi)) {
 							continue;
-						} else if (self->server_info.count(serverId)) {
-							auto& serverInfo = self->server_info[serverId];
+						} else if (self->server_and_tss_info.count(serverId)) {
+							auto& serverInfo = self->server_and_tss_info[serverId];
 							if (ssi.getValue.getEndpoint() != serverInfo->lastKnownInterface.getValue.getEndpoint() ||
 							    processClass != serverInfo->lastKnownClass.classType()) {
 								Promise<std::pair<StorageServerInterface, ProcessClass>> currentInterfaceChanged =
@@ -3783,7 +3860,9 @@ ACTOR Future<Void> waitServerListChange(DDTeamCollection* self,
 							                self->serverTrackerErrorOut,
 							                tr.getReadVersion().get(),
 							                ddEnabledState);
-							self->doBuildTeams = true;
+							if (!ssi.isTss) {
+								self->doBuildTeams = true;
+							}
 						}
 					}
 
@@ -3798,6 +3877,7 @@ ACTOR Future<Void> waitServerListChange(DDTeamCollection* self,
 				}
 			}
 		} catch (Error& e) {
+			printf("WaitServerListChange got error %d\n", e.code());
 			wait(tr.onError(e));
 			serverListAndProcessClasses = Never();
 			isFetchingResults = false;
@@ -3886,16 +3966,18 @@ ACTOR Future<Void> keyValueStoreTypeTracker(DDTeamCollection* self, TCServerInfo
 }
 
 ACTOR Future<Void> waitForAllDataRemoved(Database cx, UID serverID, Version addedVersion, DDTeamCollection* teams) {
-	state Transaction tr(cx);
+	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);
+	printf("Waiting for data to be removed from %s\n", serverID.toString().c_str());
 	loop {
 		try {
-			tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
-			Version ver = wait(tr.getReadVersion());
+			tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+			Version ver = wait(tr->getReadVersion());
 
 			// we cannot remove a server immediately after adding it, because a perfectly timed master recovery could
 			// cause us to not store the mutations sent to the short lived storage server.
 			if (ver > addedVersion + SERVER_KNOBS->MAX_READ_TRANSACTION_LIFE_VERSIONS) {
-				bool canRemove = wait(canRemoveStorageServer(&tr, serverID));
+				bool canRemove = wait(canRemoveStorageServer(tr, serverID));
 				// TraceEvent("WaitForAllDataRemoved")
 				//     .detail("Server", serverID)
 				//     .detail("CanRemove", canRemove)
@@ -3908,9 +3990,9 @@ ACTOR Future<Void> waitForAllDataRemoved(Database cx, UID serverID, Version adde
 
 			// Wait for any change to the serverKeys for this server
 			wait(delay(SERVER_KNOBS->ALL_DATA_REMOVED_DELAY, TaskPriority::DataDistribution));
-			tr.reset();
+			tr->reset();
 		} catch (Error& e) {
-			wait(tr.onError(e));
+			wait(tr->onError(e));
 		}
 	}
 }
@@ -3923,6 +4005,10 @@ ACTOR Future<Void> storageServerFailureTracker(DDTeamCollection* self,
 	state StorageServerInterface interf = server->lastKnownInterface;
 	state int targetTeamNumPerServer =
 	    (SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER * (self->configuration.storageTeamSize + 1)) / 2;
+
+	printf("Starting failure tracker for %sSS %s\n",
+	       server->lastKnownInterface.isTss ? "T" : "",
+	       server->lastKnownInterface.id().toString().c_str());
 	loop {
 		state bool inHealthyZone = false; // healthChanged actor will be Never() if this flag is true
 		if (self->healthyZone.get().present()) {
@@ -3941,16 +4027,18 @@ ACTOR Future<Void> storageServerFailureTracker(DDTeamCollection* self,
 			}
 		}
 
-		if (self->server_status.get(interf.id()).initialized) {
-			bool unhealthy = self->server_status.get(interf.id()).isUnhealthy();
-			if (unhealthy && !status->isUnhealthy()) {
-				self->unhealthyServers--;
-			}
-			if (!unhealthy && status->isUnhealthy()) {
+		if (!interf.isTss) {
+			if (self->server_status.get(interf.id()).initialized) {
+				bool unhealthy = self->server_status.get(interf.id()).isUnhealthy();
+				if (unhealthy && !status->isUnhealthy()) {
+					self->unhealthyServers--;
+				}
+				if (!unhealthy && status->isUnhealthy()) {
+					self->unhealthyServers++;
+				}
+			} else if (status->isUnhealthy()) {
 				self->unhealthyServers++;
 			}
-		} else if (status->isUnhealthy()) {
-			self->unhealthyServers++;
 		}
 
 		self->server_status.set(interf.id(), *status);
@@ -3971,7 +4059,7 @@ ACTOR Future<Void> storageServerFailureTracker(DDTeamCollection* self,
 		choose {
 			when(wait(healthChanged)) {
 				status->isFailed = !status->isFailed;
-				if (!status->isFailed &&
+				if (!status->isFailed && !server->lastKnownInterface.isTss &&
 				    (server->teams.size() < targetTeamNumPerServer || self->lastBuildTeamsFailed)) {
 					self->doBuildTeams = true;
 				}
@@ -4014,7 +4102,9 @@ ACTOR Future<Void> storageServerTracker(
     TCServerInfo* server, // This actor is owned by this TCServerInfo, point to server_info[id]
     Promise<Void> errorOut,
     Version addedVersion,
-    const DDEnabledState* ddEnabledState) {
+    const DDEnabledState* ddEnabledState,
+    bool isTss) {
+
 	state Future<Void> failureTracker;
 	state ServerStatus status(false, false, server->lastKnownInterface.locality);
 	state bool lastIsUnhealthy = false;
@@ -4022,13 +4112,16 @@ ACTOR Future<Void> storageServerTracker(
 
 	state Future<std::pair<StorageServerInterface, ProcessClass>> interfaceChanged = server->onInterfaceChanged;
 
-	state Future<Void> storeTypeTracker = keyValueStoreTypeTracker(self, server);
+	state Future<Void> storeTypeTracker = (isTss) ? Never() : keyValueStoreTypeTracker(self, server);
 	state bool hasWrongDC = !isCorrectDC(self, server);
 	state bool hasInvalidLocality =
 	    !self->isValidLocality(self->configuration.storagePolicy, server->lastKnownInterface.locality);
 	state int targetTeamNumPerServer =
 	    (SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER * (self->configuration.storageTeamSize + 1)) / 2;
 
+	// TODO REMOVE
+	printf("Started %sSS tracker for %s\n", isTss ? "T" : "", server->id.toString().c_str());
+
 	try {
 		loop {
 			status.isUndesired = !self->disableFailingLaggingServers.get() && server->ssVersionTooFarBehind.get();
@@ -4042,7 +4135,7 @@ ACTOR Future<Void> storageServerTracker(
 			// dcLocation, interface) is changed.
 			state std::vector<Future<Void>> otherChanges;
 			std::vector<Promise<Void>> wakeUpTrackers;
-			for (const auto& i : self->server_info) {
+			for (const auto& i : self->server_and_tss_info) {
 				if (i.second.getPtr() != server &&
 				    i.second->lastKnownInterface.address() == server->lastKnownInterface.address()) {
 					auto& statusInfo = self->server_status.get(i.first);
@@ -4144,11 +4237,11 @@ ACTOR Future<Void> storageServerTracker(
 				    .detail("Excluded", worstAddr.toString());
 				status.isUndesired = true;
 				status.isWrongConfiguration = true;
-				if (worstStatus == DDTeamCollection::Status::FAILED) {
+				if (worstStatus == DDTeamCollection::Status::FAILED && !isTss) {
 					TraceEvent(SevWarn, "FailedServerRemoveKeys", self->distributorId)
 					    .detail("Server", server->id)
 					    .detail("Excluded", worstAddr.toString());
-					wait(delay(0.0)); //Do not throw an error while still inside trackExcludedServers
+					wait(delay(0.0)); // Do not throw an error while still inside trackExcludedServers
 					while (!ddEnabledState->isDDEnabled()) {
 						wait(delay(1.0));
 					}
@@ -4165,7 +4258,7 @@ ACTOR Future<Void> storageServerTracker(
 				self->restartRecruiting.trigger();
 			}
 
-			if (lastIsUnhealthy && !status.isUnhealthy() &&
+			if (lastIsUnhealthy && !status.isUnhealthy() && !isTss &&
 			    (server->teams.size() < targetTeamNumPerServer || self->lastBuildTeamsFailed)) {
 				self->doBuildTeams = true;
 				self->restartTeamBuilder.trigger(); // This does not trigger building teams if there exist healthy teams
@@ -4174,7 +4267,9 @@ ACTOR Future<Void> storageServerTracker(
 
 			state bool recordTeamCollectionInfo = false;
 			choose {
-				when(wait(failureTracker)) {
+				when(wait(failureTracker || server->onTSSPairRemoved)) {
+					printf("Server %s getting removed\n", server->id.toString().c_str());
+
 					// The server is failed AND all data has been removed from it, so permanently remove it.
 					TraceEvent("StatusMapChange", self->distributorId)
 					    .detail("ServerID", server->id)
@@ -4185,7 +4280,9 @@ ACTOR Future<Void> storageServerTracker(
 					}
 
 					// Remove server from FF/serverList
-					wait(removeStorageServer(cx, server->id, self->lock, ddEnabledState));
+					Optional<UID> tssPairID =
+					    server->lastKnownInterface.isTss ? server->lastKnownInterface.tssPairID : Optional<UID>();
+					wait(removeStorageServer(cx, server->id, tssPairID, self->lock, ddEnabledState));
 
 					TraceEvent("StatusMapChange", self->distributorId)
 					    .detail("ServerID", server->id)
@@ -4193,7 +4290,11 @@ ACTOR Future<Void> storageServerTracker(
 					// Sets removeSignal (alerting dataDistributionTeamCollection to remove the storage server from its
 					// own data structures)
 					server->removed.send(Void());
-					self->removedServers.send(server->id);
+					if (isTss) {
+						self->removedTSS.send(server->id);
+					} else {
+						self->removedServers.send(server->id);
+					}
 					return Void();
 				}
 				when(std::pair<StorageServerInterface, ProcessClass> newInterface = wait(interfaceChanged)) {
@@ -4211,7 +4312,7 @@ ACTOR Future<Void> storageServerTracker(
 
 					server->lastKnownInterface = newInterface.first;
 					server->lastKnownClass = newInterface.second;
-					if (localityChanged) {
+					if (localityChanged && !isTss) {
 						TEST(true); // Server locality changed
 
 						// The locality change of a server will affect machine teams related to the server if
@@ -4303,7 +4404,7 @@ ACTOR Future<Void> storageServerTracker(
 					recordTeamCollectionInfo = true;
 					// Restart the storeTracker for the new interface. This will cancel the previous
 					// keyValueStoreTypeTracker
-					storeTypeTracker = keyValueStoreTypeTracker(self, server);
+					storeTypeTracker = (isTss) ? Never() : keyValueStoreTypeTracker(self, server);
 					hasWrongDC = !isCorrectDC(self, server);
 					hasInvalidLocality =
 					    !self->isValidLocality(self->configuration.storagePolicy, server->lastKnownInterface.locality);
@@ -4350,6 +4451,7 @@ ACTOR Future<Void> storageServerTracker(
 // Monitor whether or not storage servers are being recruited.  If so, then a database cannot be considered quiet
 ACTOR Future<Void> monitorStorageServerRecruitment(DDTeamCollection* self) {
 	state bool recruiting = false;
+	state bool lastIsTss = false;
 	TraceEvent("StorageServerRecruitment", self->distributorId)
 	    .detail("State", "Idle")
 	    .trackLatest("StorageServerRecruitment_" + self->distributorId.toString());
@@ -4360,12 +4462,22 @@ ACTOR Future<Void> monitorStorageServerRecruitment(DDTeamCollection* self) {
 			}
 			TraceEvent("StorageServerRecruitment", self->distributorId)
 			    .detail("State", "Recruiting")
+			    .detail("IsTSS", self->isTssRecruiting ? "True" : "False")
 			    .trackLatest("StorageServerRecruitment_" + self->distributorId.toString());
 			recruiting = true;
+			lastIsTss = self->isTssRecruiting;
 		} else {
 			loop {
 				choose {
-					when(wait(self->recruitingStream.onChange())) {}
+					when(wait(self->recruitingStream.onChange())) {
+						if (lastIsTss != self->isTssRecruiting) {
+							TraceEvent("StorageServerRecruitment", self->distributorId)
+							    .detail("State", "Recruiting")
+							    .detail("IsTSS", self->isTssRecruiting ? "True" : "False")
+							    .trackLatest("StorageServerRecruitment_" + self->distributorId.toString());
+							lastIsTss = self->isTssRecruiting;
+						}
+					}
 					when(wait(self->recruitingStream.get() == 0
 					              ? delay(SERVER_KNOBS->RECRUITMENT_IDLE_DELAY, TaskPriority::DataDistribution)
 					              : Future<Void>(Never()))) {
@@ -4444,8 +4556,9 @@ ACTOR Future<Void> checkAndRemoveInvalidLocalityAddr(DDTeamCollection* self) {
 }
 
 int numExistingSSOnAddr(DDTeamCollection* self, const AddressExclusion& addr) {
+	// TODO add tss?
 	int numExistingSS = 0;
-	for (auto& server : self->server_info) {
+	for (auto& server : self->server_and_tss_info) {
 		const NetworkAddress& netAddr = server.second->lastKnownInterface.stableAddress();
 		AddressExclusion usedAddr(netAddr.ip, netAddr.port);
 		if (usedAddr == addr) {
@@ -4456,9 +4569,75 @@ int numExistingSSOnAddr(DDTeamCollection* self, const AddressExclusion& addr) {
 	return numExistingSS;
 }
 
+// All state that represents an ongoing tss pair recruitment
+struct TSSRecruitmentState : ReferenceCounted<TSSRecruitmentState>, NonCopyable {
+	Promise<Optional<std::pair<UID, Version>>>
+	    ssPairInfo; // if set, for ss to pass its id to tss pair once it is successfully recruited
+	Promise<bool> tssPairDone; // if set, for tss to pass ss that it was successfully recruited
+	Optional<Key> dcId; // dc
+	bool active;
+
+	TSSRecruitmentState() : active(false) {}
+
+	TSSRecruitmentState(Optional<Key> dcId) : active(true), dcId(dcId) {}
+
+	void cancel() {
+		// only cancel if both haven't been set, otherwise one half of pair could think it was successful but the other
+		// half would think it failed
+		if (active && ssPairInfo.canBeSet() && tssPairDone.canBeSet()) {
+			ssPairInfo.send(Optional<std::pair<UID, Version>>());
+			// callback of ssPairInfo could have cancelled tssPairDone already, so double check before cancelling
+			if (tssPairDone.canBeSet()) {
+				tssPairDone.send(false);
+			}
+		}
+	}
+
+	bool tssRecruitSuccess() {
+		if (active && tssPairDone.canBeSet()) {
+			tssPairDone.send(true);
+			return true;
+		}
+		return false;
+	}
+
+	bool tssRecruitFailed() {
+		if (active && tssPairDone.canBeSet()) {
+			printf("tssPair: %p\n", &tssPairDone);
+			tssPairDone.send(false);
+			return true;
+		}
+		return false;
+	}
+
+	bool ssRecruitSuccess(std::pair<UID, Version> ssInfo) {
+		if (active && ssPairInfo.canBeSet()) {
+			ssPairInfo.send(Optional<std::pair<UID, Version>>(ssInfo));
+			return true;
+		}
+		return false;
+	}
+
+	bool ssRecruitFailed() {
+		if (active && ssPairInfo.canBeSet()) {
+			ssPairInfo.send(Optional<std::pair<UID, Version>>());
+			return true;
+		}
+		return false;
+	}
+
+	Future<Optional<std::pair<UID, Version>>> waitOnSS() { return ssPairInfo.getFuture(); }
+
+	Future<bool> waitOnTSS() { return tssPairDone.getFuture(); }
+};
+
+// TODO switch recruitment order(ish) - grab tss but don't init it, wait for it to actually grab an ss, then the ss
+// signals here to start, then when done this signals the ss to add server
 ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
                                      RecruitStorageReply candidateWorker,
-                                     const DDEnabledState* ddEnabledState) {
+                                     const DDEnabledState* ddEnabledState,
+                                     bool recruitTss,
+                                     Reference<TSSRecruitmentState> tssState) {
 	// SOMEDAY: Cluster controller waits for availability, retry quickly if a server's Locality changes
 	self->recruitingStream.set(self->recruitingStream.get() + 1);
 
@@ -4470,11 +4649,61 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 		// too many storage server on the same address (i.e., process) can cause OOM.
 		// Ask the candidateWorker to initialize a SS only if the worker does not have a pending request
 		state UID interfaceId = deterministicRandom()->randomUniqueID();
-		InitializeStorageRequest isr;
-		isr.storeType = self->configuration.storageServerStoreType;
+
+		state InitializeStorageRequest isr;
+		isr.storeType =
+		    recruitTss ? self->configuration.testingStorageServerStoreType : self->configuration.storageServerStoreType;
 		isr.seedTag = invalidTag;
 		isr.reqId = deterministicRandom()->randomUniqueID();
 		isr.interfaceId = interfaceId;
+		isr.isTss = recruitTss;
+
+		printf("InitStorage %s on %sSS %s\n",
+		       interfaceId.toString().c_str(),
+		       recruitTss ? "T" : "",
+		       candidateWorker.worker.address().toString().c_str());
+
+		self->recruitingIds.insert(interfaceId);
+		self->recruitingLocalities.insert(candidateWorker.worker.stableAddress());
+
+		// if tss, wait for pair ss to finish and add its id to isr. If pair fails, don't recruit tss
+		state bool doRecruit = true;
+		if (recruitTss) {
+			TraceEvent("TSS_Recruit", self->distributorId)
+			    .detail("TSSID", interfaceId)
+			    .detail("Stage", "TSSWaitingPair")
+			    .detail("Addr", candidateWorker.worker.address())
+			    .detail("Locality", candidateWorker.worker.locality.toString());
+
+			printf("TSS %s waiting for partner uid\n", interfaceId.toString().c_str());
+			Optional<std::pair<UID, Version>> ssPairInfoResult = wait(tssState->waitOnSS());
+			if (ssPairInfoResult.present()) {
+				printf("TSS %s got pair of %s @ %lld\n",
+				       interfaceId.toString().c_str(),
+				       ssPairInfoResult.get().first.toString().c_str(),
+				       ssPairInfoResult.get().second);
+				isr.tssPairID = ssPairInfoResult.get().first;
+				isr.tssPairVersion = ssPairInfoResult.get().second;
+
+				TraceEvent("TSS_Recruit", self->distributorId)
+				    .detail("SSID", isr.tssPairID)
+				    .detail("TSSID", interfaceId)
+				    .detail("Stage", "TSSWaitingPair")
+				    .detail("Addr", candidateWorker.worker.address())
+				    .detail("Locality", candidateWorker.worker.locality.toString());
+			} else {
+				printf("TSS %s didn't get partner, partner recruitment must have failed, abandoning\n",
+				       interfaceId.toString().c_str());
+				isr.isTss = false;
+				doRecruit = false;
+
+				TraceEvent(SevWarn, "TSS_RecruitError", self->distributorId)
+				    .detail("TSSID", interfaceId)
+				    .detail("Reason", "SS recruitment failed for some reason")
+				    .detail("Addr", candidateWorker.worker.address())
+				    .detail("Locality", candidateWorker.worker.locality.toString());
+			}
+		}
 
 		TraceEvent("DDRecruiting")
 		    .detail("Primary", self->primary)
@@ -4483,19 +4712,64 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 		    .detail("WorkerLocality", candidateWorker.worker.locality.toString())
 		    .detail("Interf", interfaceId)
 		    .detail("Addr", candidateWorker.worker.address())
+		    .detail("TSS", recruitTss ? "true" : "false")
 		    .detail("RecruitingStream", self->recruitingStream.get());
 
-		self->recruitingIds.insert(interfaceId);
-		self->recruitingLocalities.insert(candidateWorker.worker.stableAddress());
-		state ErrorOr<InitializeStorageReply> newServer =
-		    wait(candidateWorker.worker.storage.tryGetReply(isr, TaskPriority::DataDistribution));
-		if (newServer.isError()) {
+		Future<ErrorOr<InitializeStorageReply>> fRecruit =
+		    doRecruit ? candidateWorker.worker.storage.tryGetReply(isr, TaskPriority::DataDistribution)
+		              : Future<ErrorOr<InitializeStorageReply>>(ErrorOr<InitializeStorageReply>(recruitment_failed()));
+
+		state ErrorOr<InitializeStorageReply> newServer = wait(fRecruit);
+
+		if (doRecruit && newServer.isError()) {
 			TraceEvent(SevWarn, "DDRecruitmentError").error(newServer.getError());
 			if (!newServer.isError(error_code_recruitment_failed) &&
 			    !newServer.isError(error_code_request_maybe_delivered))
 				throw newServer.getError();
 			wait(delay(SERVER_KNOBS->STORAGE_RECRUITMENT_DELAY, TaskPriority::DataDistribution));
 		}
+
+		if (!recruitTss && newServer.present() &&
+		    tssState->ssRecruitSuccess(std::pair(interfaceId, newServer.get().addedVersion))) {
+			printf("ss %s signalling tss pair with version %lld\n",
+			       interfaceId.toString().c_str(),
+			       newServer.get().addedVersion);
+			// ss has a tss pair. send it this id, but wait for add server until tss is recruited
+
+			TraceEvent("TSS_Recruit", self->distributorId)
+			    .detail("SSID", interfaceId)
+			    .detail("Stage", "SSSignaling")
+			    .detail("Addr", candidateWorker.worker.address())
+			    .detail("Locality", candidateWorker.worker.locality.toString());
+
+			// wait for timeout, and give up if no TSS pair recruited
+			Optional<bool> tssSuccessful = wait(timeout(tssState->waitOnTSS(), SERVER_KNOBS->TSS_RECRUITMENT_TIMEOUT));
+
+			// TODO if unsuccessful, fail out tss so it doesn't cause a mismatch error?
+			if (tssSuccessful.present() && tssSuccessful.get()) {
+				TraceEvent("TSS_Recruit", self->distributorId)
+				    .detail("SSID", interfaceId)
+				    .detail("Stage", "SSGotPair")
+				    .detail("Addr", candidateWorker.worker.address())
+				    .detail("Locality", candidateWorker.worker.locality.toString());
+			} else {
+				TraceEvent(SevWarn, "TSS_RecruitError", self->distributorId)
+				    .detail("SSID", interfaceId)
+				    .detail("Reason",
+				            tssSuccessful.present() ? "TSS recruitment failed for some reason"
+				                                    : "TSS recruitment timed out")
+				    .detail("Addr", candidateWorker.worker.address())
+				    .detail("Locality", candidateWorker.worker.locality.toString());
+
+				// TODO need to remove that tss here!!
+			}
+
+			// TODO trace event, change sev and message if timeout or if unsuccessful
+			printf("ss %s %ssuccessfully got tss pair!\n",
+			       interfaceId.toString().c_str(),
+			       (tssSuccessful.present() && tssSuccessful.get()) ? "" : "un");
+		}
+
 		self->recruitingIds.erase(interfaceId);
 		self->recruitingLocalities.erase(candidateWorker.worker.stableAddress());
 
@@ -4509,26 +4783,46 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 		    .detail("RecruitingStream", self->recruitingStream.get());
 
 		if (newServer.present()) {
-			if (!self->server_info.count(newServer.get().interf.id()))
-				self->addServer(newServer.get().interf,
-				                candidateWorker.processClass,
-				                self->serverTrackerErrorOut,
-				                newServer.get().addedVersion,
-				                ddEnabledState);
-			else
-				TraceEvent(SevWarn, "DDRecruitmentError").detail("Reason", "Server ID already recruited");
-
-			self->doBuildTeams = true;
+			UID id = newServer.get().interf.id();
+			if (!self->server_and_tss_info.count(id)) {
+				if (!recruitTss || tssState->tssRecruitSuccess()) {
+					self->addServer(newServer.get().interf,
+					                candidateWorker.processClass,
+					                self->serverTrackerErrorOut,
+					                newServer.get().addedVersion,
+					                ddEnabledState);
+				} else {
+					// TODO tss recruitment was cancelled since it failed to send a response to the ss, kill it
+					printf("TSS recruitment was cancelled, stop\n");
+				}
+			} else {
+				TraceEvent(SevWarn, "DDRecruitmentError")
+				    .detail("Reason", "Server ID already recruited")
+				    .detail("ServerID", id);
+			}
+			if (!recruitTss) {
+				self->doBuildTeams = true;
+			}
 		}
 	}
 
+	if (recruitTss && tssState->tssRecruitFailed()) {
+		TEST(true); // TSS recruitment failed for some reason
+		// if tss wasn't already marked as done, it was unsuccessful in recruitment
+		printf("tss recruitment failed for some reason, signalling ss.\n");
+	}
+	if (!recruitTss && tssState->ssRecruitFailed()) {
+		TEST(true); // SS with pair TSS recruitment failed for some reason
+		// if ss didn't already send its pair id to tss, it was unsuccessful in recruitment
+		printf("ss recruitment failed for some reason, signalling tss.\n");
+	}
+
 	self->recruitingStream.set(self->recruitingStream.get() - 1);
 	self->restartRecruiting.trigger();
 
 	return Void();
 }
 
-// Recruit a worker as a storage server
 ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
                                     Reference<AsyncVar<struct ServerDBInfo>> db,
                                     const DDEnabledState* ddEnabledState) {
@@ -4536,13 +4830,24 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 	state RecruitStorageRequest lastRequest;
 	state bool hasHealthyTeam;
 	state std::map<AddressExclusion, int> numSSPerAddr;
+
+	// tss-specific recruitment state
+	state uint32_t tssToRecruit = self->configuration.desiredTSSCount - db->get().client.tssMapping.size();
+	state Reference<TSSRecruitmentState> tssState = makeReference<TSSRecruitmentState>();
+
+	printf("DD setting tssToRecruit=%d (%d - %d)\n",
+	       tssToRecruit,
+	       self->configuration.desiredTSSCount,
+	       db->get().client.tssMapping.size());
+	TraceEvent(SevDebug, "TSS_RecruitUpdated", self->distributorId).detail("Count", tssToRecruit);
+
 	loop {
 		try {
 			numSSPerAddr.clear();
 			hasHealthyTeam = (self->healthyTeamCount != 0);
 			RecruitStorageRequest rsr;
 			std::set<AddressExclusion> exclusions;
-			for (auto s = self->server_info.begin(); s != self->server_info.end(); ++s) {
+			for (auto s = self->server_and_tss_info.begin(); s != self->server_and_tss_info.end(); ++s) {
 				auto serverStatus = self->server_status.get(s->second->lastKnownInterface.id());
 				if (serverStatus.excludeOnRecruit()) {
 					TraceEvent(SevDebug, "DDRecruitExcl1")
@@ -4574,7 +4879,7 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 				exclusions.insert(addr);
 			}
 
-			rsr.criticalRecruitment = self->healthyTeamCount == 0;
+			rsr.criticalRecruitment = !hasHealthyTeam;
 			for (auto it : exclusions) {
 				rsr.excludeAddresses.push_back(it);
 			}
@@ -4611,10 +4916,96 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						    .detail("Addr", candidateSSAddr.toString())
 						    .detail("NumExistingSS", numExistingSS);
 					}
-					self->addActor.send(initializeStorage(self, candidateWorker, ddEnabledState));
+
+					if (hasHealthyTeam && !tssState->active && tssToRecruit > 0) {
+						TraceEvent("TSS_Recruit", self->distributorId)
+						    .detail("Stage", "HoldTSS")
+						    .detail("Addr", candidateSSAddr.toString())
+						    .detail("Locality", candidateWorker.worker.locality.toString());
+
+						TEST(true); // Starting TSS recruitment
+						printf("starting recruitment of tss\n");
+						self->isTssRecruiting = true;
+						tssState = makeReference<TSSRecruitmentState>(candidateWorker.worker.locality.dcId());
+
+						self->addActor.send(initializeStorage(self, candidateWorker, ddEnabledState, true, tssState));
+					} else {
+						if (tssState->active && candidateWorker.worker.locality.dcId() == tssState->dcId) {
+							TEST(true); // TSS recruits pair in same dc
+							self->isTssRecruiting = false;
+							TraceEvent("TSS_Recruit", self->distributorId)
+							    .detail("Stage", "PairSS")
+							    .detail("Addr", candidateSSAddr.toString())
+							    .detail("Locality", candidateWorker.worker.locality.toString());
+							printf("starting recruitment of ss with eventual tss pair in dc \'%s\'\n",
+							       tssState->dcId.present() ? tssState->dcId.get().toString().c_str() : "");
+							self->addActor.send(
+							    initializeStorage(self, candidateWorker, ddEnabledState, false, tssState));
+							// successfully started recruitment of pair, reset tss recruitment state
+							tssState = makeReference<TSSRecruitmentState>();
+							tssToRecruit--;
+							if (tssToRecruit > 0) {
+								printf("%d tss pairs left to recruit\n", tssToRecruit);
+							}
+						} else {
+							if (tssState->active) {
+								TEST(true); // TSS recruitment skipped potential pair because it's in a different dc
+								printf("Recruiting normal ss (no tss) b/c new ss is in different dc \'%s\' than tss "
+								       "\'%s\'\n",
+								       candidateWorker.worker.locality.dcId().present()
+								           ? candidateWorker.worker.locality.dcId().get().toString().c_str()
+								           : "",
+								       tssState->dcId.present() ? tssState->dcId.get().toString().c_str() : "");
+							} else {
+								printf("recruiting normal ss (no tss)\n");
+							}
+							self->addActor.send(initializeStorage(
+							    self, candidateWorker, ddEnabledState, false, makeReference<TSSRecruitmentState>()));
+						}
+					}
 				}
-				when(wait(db->onChange())) { // SOMEDAY: only if clusterInterface changes?
+				when(wait(db->onChange())) { // SOMEDAY: only if clusterInterface or tss changes?
 					fCandidateWorker = Future<RecruitStorageReply>();
+					// TODO REMOVE print
+					int newTssToRecruit = self->configuration.desiredTSSCount - db->get().client.tssMapping.size();
+					if (newTssToRecruit != tssToRecruit) {
+						TraceEvent("TSS_RecruitUpdated", self->distributorId).detail("Count", newTssToRecruit);
+						tssToRecruit = newTssToRecruit;
+					}
+
+					// TODO HANDLE HERE if count is more than desired tss?
+
+					printf("DD updated tssToRecruit=%d (%d - %d)\n",
+					       tssToRecruit,
+					       self->configuration.desiredTSSCount,
+					       db->get().client.tssMapping.size());
+
+					if (self->isTssRecruiting && (tssToRecruit == 0 || self->zeroHealthyTeams->get())) {
+						TEST(tssToRecruit == 0); // tss recruitment cancelled due to too many TSS
+						TEST(self->zeroHealthyTeams->get()); // tss recruitment cancelled due zero healthy teams
+						TraceEvent(SevWarn, "TSS_RecruitCancelled", self->distributorId)
+						    .detail("Reason", tssToRecruit == 0 ? "ConfigChange" : "ZeroHealthyTeams");
+						printf("Cancelling tss recruitment! tssToRecruit: %d, zeroHealthyTeams: %s\n",
+						       tssToRecruit,
+						       self->zeroHealthyTeams->get() ? "T" : "F");
+						tssState->cancel();
+						tssState = makeReference<TSSRecruitmentState>();
+						self->isTssRecruiting = false;
+					}
+				}
+				when(wait(self->zeroHealthyTeams->onChange())) {
+					// TODO refactor?
+					if (self->isTssRecruiting && self->zeroHealthyTeams->get()) {
+						TEST(self->zeroHealthyTeams->get()); // tss recruitment cancelled due zero healthy teams 2
+						TraceEvent(SevWarn, "TSS_RecruitCancelled", self->distributorId)
+						    .detail("Reason", "ZeroHealthyTeams");
+						printf("Cancelling tss recruitment!! tssToRecruit: %d, zeroHealthyTeams: %s\n",
+						       tssToRecruit,
+						       self->zeroHealthyTeams->get() ? "T" : "F");
+						tssState->cancel();
+						tssState = makeReference<TSSRecruitmentState>();
+						self->isTssRecruiting = false;
+					}
 				}
 				when(wait(self->restartRecruiting.onTrigger())) {}
 			}
@@ -4760,6 +5151,13 @@ ACTOR Future<Void> dataDistributionTeamCollection(Reference<DDTeamCollection> te
 
 				self->restartRecruiting.trigger();
 			}
+			when(UID removedTSS = waitNext(self->removedTSS.getFuture())) {
+				TEST(true); // TSS removed from database
+				self->removeTSS(removedTSS);
+				serverRemoved.send(Void());
+
+				self->restartRecruiting.trigger();
+			}
 			when(wait(self->zeroHealthyTeams->onChange())) {
 				if (self->zeroHealthyTeams->get()) {
 					self->restartRecruiting.trigger();
@@ -5254,6 +5652,8 @@ ACTOR Future<Void> dataDistribution(Reference<DataDistributorData> self,
 			wait(waitForAll(actors));
 			return Void();
 		} catch (Error& e) {
+			// TODO REMOVE
+			printf("DD got error! %d\n", e.code());
 			trackerCancelled = true;
 			state Error err = e;
 			TraceEvent("DataDistributorDestroyTeamCollections").error(e);
@@ -5265,7 +5665,8 @@ ACTOR Future<Void> dataDistribution(Reference<DataDistributorData> self,
 			if (removeFailedServer.getFuture().isReady() && !removeFailedServer.getFuture().isError()) {
 				TraceEvent("RemoveFailedServer", removeFailedServer.getFuture().get()).error(err);
 				wait(removeKeysFromFailedServer(cx, removeFailedServer.getFuture().get(), lock, ddEnabledState));
-				wait(removeStorageServer(cx, removeFailedServer.getFuture().get(), lock, ddEnabledState));
+				Optional<UID> tssPairID;
+				wait(removeStorageServer(cx, removeFailedServer.getFuture().get(), tssPairID, lock, ddEnabledState));
 			} else {
 				if (err.code() != error_code_movekeys_conflict) {
 					throw err;
@@ -5921,3 +6322,5 @@ TEST_CASE("/DataDistribution/AddTeamsBestOf/NotEnoughServers") {
 
 	return Void();
 }
+
+// TODO add unit test for TSS recruitment?
diff --git a/fdbserver/DataDistributionTracker.actor.cpp b/fdbserver/DataDistributionTracker.actor.cpp
index 40ca28aa08e..c774ae10f58 100644
--- a/fdbserver/DataDistributionTracker.actor.cpp
+++ b/fdbserver/DataDistributionTracker.actor.cpp
@@ -497,14 +497,22 @@ ACTOR Future<Void> shardSplitter(DataDistributionTracker* self,
 		    .detail("MaxBytes", shardBounds.max.bytes)
 		    .detail("MetricsBytes", metrics.bytes)
 		    .detail("Bandwidth",
-		            bandwidthStatus == BandwidthStatusHigh     ? "High"
-		            : bandwidthStatus == BandwidthStatusNormal ? "Normal"
-		                                                       : "Low")
+		            bandwidthStatus == BandwidthStatusHigh
+		                ? "High"
+		                : bandwidthStatus == BandwidthStatusNormal ? "Normal" : "Low")
 		    .detail("BytesPerKSec", metrics.bytesPerKSecond)
 		    .detail("NumShards", numShards);
 	}
 
 	if (numShards > 1) {
+		// TODO REMOVE
+		printf("Splitting [%s - %s) into %d shards:\n",
+		       splitKeys[0].toString().c_str(),
+		       splitKeys[numShards].toString().c_str(),
+		       numShards);
+		for (int i = 0; i < numShards; i++) {
+			printf("    [%s - %s)\n", splitKeys[i].toString().c_str(), splitKeys[i + 1].toString().c_str());
+		}
 		int skipRange = deterministicRandom()->randomInt(0, numShards);
 		// The queue can't deal with RelocateShard requests which split an existing shard into three pieces, so
 		// we have to send the unskipped ranges in this order (nibbling in from the edges of the old range)
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index aee36e39f17..18b76a3f44e 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -217,6 +217,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( SERVER_LIST_DELAY,                                     1.0 );
 	init( RECRUITMENT_IDLE_DELAY,                                1.0 );
 	init( STORAGE_RECRUITMENT_DELAY,                            10.0 );
+	init( TSS_RECRUITMENT_TIMEOUT,       3*STORAGE_RECRUITMENT_DELAY ); if (randomize && BUGGIFY ) TSS_RECRUITMENT_TIMEOUT = 1.0; //Super low timeout should cause tss recruitments to fail
 	init( DATA_DISTRIBUTION_LOGGING_INTERVAL,                    5.0 );
 	init( DD_ENABLED_CHECK_DELAY,                                1.0 );
 	init( DD_STALL_CHECK_DELAY,                                  0.4 ); //Must be larger than 2*MAX_BUGGIFIED_DELAY
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 1c7c273a7b1..447867e99ea 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -167,6 +167,7 @@ class ServerKnobs : public Knobs {
 	double SERVER_LIST_DELAY;
 	double RECRUITMENT_IDLE_DELAY;
 	double STORAGE_RECRUITMENT_DELAY;
+	double TSS_RECRUITMENT_TIMEOUT;
 	double DATA_DISTRIBUTION_LOGGING_INTERVAL;
 	double DD_ENABLED_CHECK_DELAY;
 	double DD_STALL_CHECK_DELAY;
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index 1f2e3a9780c..927a7af00bd 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -20,6 +20,8 @@
 
 #include "flow/Util.h"
 #include "fdbrpc/FailureMonitor.h"
+#include "fdbclient/DatabaseContext.h" // for tss mapping
+#include "fdbclient/KeyBackedTypes.h"
 #include "fdbclient/SystemData.h"
 #include "fdbserver/MoveKeys.actor.h"
 #include "fdbserver/Knobs.h"
@@ -99,6 +101,7 @@ ACTOR static Future<Void> checkMoveKeysLock(Transaction* tr,
                                             bool isWrite = true) {
 	if (!ddEnabledState->isDDEnabled()) {
 		TraceEvent(SevDebug, "DDDisabledByInMemoryCheck");
+		printf("MK: DD disabled\n");
 		throw movekeys_conflict();
 	}
 	Optional<Value> readVal = wait(tr->get(moveKeysLockOwnerKey));
@@ -110,6 +113,7 @@ ACTOR static Future<Void> checkMoveKeysLock(Transaction* tr,
 		UID lastWrite = readVal.present() ? BinaryReader::fromStringRef<UID>(readVal.get(), Unversioned()) : UID();
 		if (lastWrite != lock.prevWrite) {
 			TEST(true); // checkMoveKeysLock: Conflict with previous owner
+			printf("MK: conflict with previous owner\n");
 			throw movekeys_conflict();
 		}
 
@@ -143,6 +147,7 @@ ACTOR static Future<Void> checkMoveKeysLock(Transaction* tr,
 		return Void();
 	} else {
 		TEST(true); // checkMoveKeysLock: Conflict with new owner
+		printf("MK: conflict %s with new owner %s\n", currentOwner.toString().c_str(), lock.myOwner.toString().c_str());
 		throw movekeys_conflict();
 	}
 }
@@ -158,7 +163,7 @@ ACTOR Future<Optional<UID>> checkReadWrite(Future<ErrorOr<GetShardStateReply>> f
 	return Optional<UID>(uid);
 }
 
-Future<Void> removeOldDestinations(Transaction* tr,
+Future<Void> removeOldDestinations(Reference<ReadYourWritesTransaction> tr,
                                    UID oldDest,
                                    VectorRef<KeyRangeRef> shards,
                                    KeyRangeRef currentKeys) {
@@ -235,7 +240,7 @@ ACTOR Future<vector<UID>> addReadWriteDestinations(KeyRangeRef shard,
 }
 
 ACTOR Future<vector<vector<UID>>> additionalSources(RangeResult shards,
-                                                    Transaction* tr,
+                                                    Reference<ReadYourWritesTransaction> tr,
                                                     int desiredHealthy,
                                                     int maxServers) {
 	state RangeResult UIDtoTagMap = wait(tr->getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY));
@@ -325,6 +330,12 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 	state Future<Void> warningLogger = logWarningAfter("StartMoveKeysTooLong", 600, servers);
 	// state TraceInterval waitInterval("");
 
+	// TODO REMOVE
+	printf("starting move keys for [%s, %s): to %s\n",
+	       keys.begin.toString().c_str(),
+	       keys.end.toString().c_str(),
+	       servers[0].toString().c_str());
+
 	wait(startMoveKeysLock->take(TaskPriority::DataDistributionLaunch));
 	state FlowLock::Releaser releaser(*startMoveKeysLock);
 
@@ -343,7 +354,8 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 			TEST(begin > keys.begin); // Multi-transactional startMoveKeys
 			batches++;
 
-			state Transaction tr(occ);
+			// RYW to optimize re-reading the same key ranges
+			state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(occ);
 			state int retries = 0;
 
 			loop {
@@ -356,15 +368,16 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 					// Keep track of shards for all src servers so that we can preserve their values in serverKeys
 					state Map<UID, VectorRef<KeyRangeRef>> shardMap;
 
-					tr.info.taskID = TaskPriority::MoveKeys;
-					tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+					tr->getTransaction().info.taskID = TaskPriority::MoveKeys;
+					tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+					tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 
-					wait(checkMoveKeysLock(&tr, lock, ddEnabledState));
+					wait(checkMoveKeysLock(&(tr->getTransaction()), lock, ddEnabledState));
 
 					vector<Future<Optional<Value>>> serverListEntries;
 					serverListEntries.reserve(servers.size());
 					for (int s = 0; s < servers.size(); s++)
-						serverListEntries.push_back(tr.get(serverListKeyFor(servers[s])));
+						serverListEntries.push_back(tr->get(serverListKeyFor(servers[s])));
 					state vector<Optional<Value>> serverListValues = wait(getAll(serverListEntries));
 
 					for (int s = 0; s < serverListValues.size(); s++) {
@@ -380,11 +393,12 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 					// Get all existing shards overlapping keys (exclude any that have been processed in a previous
 					// iteration of the outer loop)
 					state KeyRange currentKeys = KeyRangeRef(begin, keys.end);
-					state RangeResult old = wait(krmGetRanges(&tr,
-					                                          keyServersPrefix,
-					                                          currentKeys,
-					                                          SERVER_KNOBS->MOVE_KEYS_KRM_LIMIT,
-					                                          SERVER_KNOBS->MOVE_KEYS_KRM_LIMIT_BYTES));
+
+					state RangeResult old = wait(krmGetRanges(tr,
+					                                                         keyServersPrefix,
+					                                                         currentKeys,
+					                                                         SERVER_KNOBS->MOVE_KEYS_KRM_LIMIT,
+					                                                         SERVER_KNOBS->MOVE_KEYS_KRM_LIMIT_BYTES));
 
 					// Determine the last processed key (which will be the beginning for the next iteration)
 					state Key endKey = old.end()[-1].key;
@@ -399,10 +413,10 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 					// 	printf("'%s': '%s'\n", old[i].key.toString().c_str(), old[i].value.toString().c_str());
 
 					// Check that enough servers for each shard are in the correct state
-					state RangeResult UIDtoTagMap = wait(tr.getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY));
+					state RangeResult UIDtoTagMap = wait(tr->getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY));
 					ASSERT(!UIDtoTagMap.more && UIDtoTagMap.size() < CLIENT_KNOBS->TOO_MANY);
 					vector<vector<UID>> addAsSource = wait(additionalSources(
-					    old, &tr, servers.size(), SERVER_KNOBS->MAX_ADDED_SOURCES_MULTIPLIER * servers.size()));
+					    old, tr, servers.size(), SERVER_KNOBS->MAX_ADDED_SOURCES_MULTIPLIER * servers.size()));
 
 					// For each intersecting range, update keyServers[range] dest to be servers and clear existing dest
 					// servers from serverKeys
@@ -417,7 +431,7 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 						//     .detail("KeyEnd", rangeIntersectKeys.end.toString())
 						//     .detail("OldSrc", describe(src))
 						//     .detail("OldDest", describe(dest))
-						//     .detail("ReadVersion", tr.getReadVersion().get());
+						//     .detail("ReadVersion", tr->getReadVersion().get());
 
 						for (auto& uid : addAsSource[i]) {
 							src.push_back(uid);
@@ -425,7 +439,7 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 						uniquify(src);
 
 						// Update dest servers for this range to be equal to servers
-						krmSetPreviouslyEmptyRange(&tr,
+						krmSetPreviouslyEmptyRange(&(tr->getTransaction()),
 						                           keyServersPrefix,
 						                           rangeIntersectKeys,
 						                           keyServersValue(UIDtoTagMap, src, servers),
@@ -455,7 +469,7 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 					vector<Future<Void>> actors;
 					for (oldDest = oldDests.begin(); oldDest != oldDests.end(); ++oldDest)
 						if (std::find(servers.begin(), servers.end(), *oldDest) == servers.end())
-							actors.push_back(removeOldDestinations(&tr, *oldDest, shardMap[*oldDest], currentKeys));
+							actors.push_back(removeOldDestinations(tr, *oldDest, shardMap[*oldDest], currentKeys));
 
 					// Update serverKeys to include keys (or the currently processed subset of keys) for each SS in
 					// servers
@@ -464,12 +478,12 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 						// to have the same shard boundaries If that invariant was important, we would have to move this
 						// inside the loop above and also set it for the src servers
 						actors.push_back(krmSetRangeCoalescing(
-						    &tr, serverKeysPrefixFor(servers[i]), currentKeys, allKeys, serverKeysTrue));
+						    tr, serverKeysPrefixFor(servers[i]), currentKeys, allKeys, serverKeysTrue));
 					}
 
 					wait(waitForAll(actors));
 
-					wait(tr.commit());
+					wait(tr->commit());
 
 					/*TraceEvent("StartMoveKeysCommitDone", relocationIntervalId)
 					    .detail("CommitVersion", tr.getCommittedVersion())
@@ -481,7 +495,7 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 					state Error err = e;
 					if (err.code() == error_code_move_to_removed_server)
 						throw;
-					wait(tr.onError(e));
+					wait(tr->onError(e));
 
 					if (retries % 10 == 0) {
 						TraceEvent(
@@ -500,7 +514,7 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 		}
 
 		// printf("Committed moving '%s'-'%s' (version %lld)\n", keys.begin.toString().c_str(),
-		// keys.end.toString().c_str(), tr.getCommittedVersion());
+		// keys.end.toString().c_str(), tr->getCommittedVersion());
 		TraceEvent(SevDebug, interval.end(), relocationIntervalId)
 		    .detail("Batches", batches)
 		    .detail("Shards", shards)
@@ -517,15 +531,37 @@ ACTOR Future<Void> waitForShardReady(StorageServerInterface server,
                                      KeyRange keys,
                                      Version minVersion,
                                      GetShardStateRequest::waitMode mode) {
+	// TODO REMOVE
+	printf("waiting for shard [%s, %s) in state %d from %sss %s @ %lld\n",
+	       keys.begin.toString().c_str(),
+	       keys.end.toString().c_str(),
+	       mode,
+	       server.isTss ? "t" : "",
+	       server.id().toString().c_str(),
+	       minVersion);
 	loop {
 		try {
 			GetShardStateReply rep =
 			    wait(server.getShardState.getReply(GetShardStateRequest(keys, mode), TaskPriority::MoveKeys));
 			if (rep.first >= minVersion) {
+				// TODO REMOVE
+				printf("shard [%s, %s) is in state %d from %sss %s @ %lld >= %lld\n",
+				       keys.begin.toString().c_str(),
+				       keys.end.toString().c_str(),
+				       mode,
+				       server.isTss ? "t" : "",
+				       server.id().toString().c_str(),
+				       rep.first,
+				       minVersion);
 				return Void();
 			}
 			wait(delayJittered(SERVER_KNOBS->SHARD_READY_DELAY, TaskPriority::MoveKeys));
 		} catch (Error& e) {
+			printf("Waiting for shard from %sss %s getValue=%s got error! %d\n",
+			       server.isTss ? "t" : "",
+			       server.id().toString().c_str(),
+			       server.getValue.getEndpoint().token.toString().c_str(),
+			       e.code());
 			if (e.code() != error_code_timed_out) {
 				if (e.code() != error_code_broken_promise)
 					throw e;
@@ -536,6 +572,8 @@ ACTOR Future<Void> waitForShardReady(StorageServerInterface server,
 	}
 }
 
+// best effort to also wait for TSS on data move
+
 ACTOR Future<Void> checkFetchingState(Database cx,
                                       vector<UID> dest,
                                       KeyRange keys,
@@ -557,6 +595,8 @@ ACTOR Future<Void> checkFetchingState(Database cx,
 				serverListEntries.push_back(tr.get(serverListKeyFor(dest[s])));
 			state vector<Optional<Value>> serverListValues = wait(getAll(serverListEntries));
 			vector<Future<Void>> requests;
+			state vector<Future<Void>> tssRequests;
+			ClientDBInfo clientInfo = cx->clientInfo->get();
 			for (int s = 0; s < serverListValues.size(); s++) {
 				if (!serverListValues[s].present()) {
 					// FIXME: Is this the right behavior?  dataMovementComplete will never be sent!
@@ -567,10 +607,25 @@ ACTOR Future<Void> checkFetchingState(Database cx,
 				ASSERT(si.id() == dest[s]);
 				requests.push_back(
 				    waitForShardReady(si, keys, tr.getReadVersion().get(), GetShardStateRequest::FETCHING));
+
+				Optional<StorageServerInterface> tssPair = clientInfo.getTssPair(si.id());
+				if (tssPair.present()) {
+					tssRequests.push_back(waitForShardReady(
+					    tssPair.get(), keys, tr.getReadVersion().get(), GetShardStateRequest::FETCHING));
+				}
 			}
 
 			wait(timeoutError(waitForAll(requests), SERVER_KNOBS->SERVER_READY_QUORUM_TIMEOUT, TaskPriority::MoveKeys));
 
+			// If normal servers return normally, give TSS data movement a bit of a chance, but don't block on it, and
+			// ignore errors in tss requests
+			if (tssRequests.size()) {
+				wait(timeout(waitForAllReady(tssRequests),
+				             SERVER_KNOBS->SERVER_READY_QUORUM_TIMEOUT / 2,
+				             Void(),
+				             TaskPriority::MoveKeys));
+			}
+
 			dataMovementComplete.send(Void());
 			return Void();
 		} catch (Error& e) {
@@ -601,9 +656,18 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 	state Key endKey;
 	state int retries = 0;
 	state FlowLock::Releaser releaser;
+	state int waitForTSSCounter =
+	    2; // try waiting for tss for a 2 loops, give up if they're stuck to not affect the rest of the cluster
+
+	// for killing tss if any get stuck during movekeys
+	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+	state std::vector<StorageServerInterface> tssToKill;
+	state std::set<UID> tssToIgnore;
 
 	ASSERT(!destinationTeam.empty());
 
+	printf("finishing move keys for [%s, %s)\n", keys.begin.toString().c_str(), keys.end.toString().c_str());
+
 	try {
 		TraceEvent(SevDebug, interval.begin(), relocationIntervalId)
 		    .detail("KeyBegin", keys.begin)
@@ -616,9 +680,53 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 
 			state Transaction tr(occ);
 
-			// printf("finishMoveKeys( '%s'-'%s' )\n", keys.begin.toString().c_str(), keys.end.toString().c_str());
+			// TODO re-comment and change back
+			printf("finishMoveKeys( '%s'-'%s' )\n", begin.toString().c_str(), keys.end.toString().c_str());
 			loop {
 				try {
+					if (tssToKill.size()) {
+						// TODO could move this to helper method?
+						// TODO add trace event
+						TEST(true); // killing TSS because they were unavailable for movekeys
+						printf("KILLING %d TSS BECAUSE THEY TIMED OUT IN MOVEKEYS\n", tssToKill.size());
+
+						// kill tss BEFORE committing main txn so that client requests don't make it to the tss when it
+						// has a different shard set than its pair use a different RYW transaction since i'm too lazy
+						// (and don't want to add bugs) by changing whole method to RYW. also using a different
+						// transaction makes it commit earlier which we may need to guarantee causality of tss getting
+						// removed before client sends a request to this key range on the new ss
+						state Reference<ReadYourWritesTransaction> tssTr =
+						    makeReference<ReadYourWritesTransaction>(occ);
+						loop {
+							try {
+								tssTr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+								tssTr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+								for (auto& tss : tssToKill) {
+									// DO NOT remove server list key - that'll break a bunch of stuff. DD will
+									// eventually call removeStorageServer tssTr->clear(serverListKeyFor(tss.id()));
+									tssTr->clear(serverTagKeyFor(tss.id()));
+									// tssTr->clear(serverTagHistoryRangeFor(tss.id()));
+									tssMapDB.erase(tssTr, tss.tssPairID);
+								}
+								tssTr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
+								wait(tssTr->commit());
+
+								for (auto& tss : tssToKill) {
+									// TODO ADD trace event (sev30?)
+									printf("Successfully removed TSS %s in finishMoveKeys\n",
+									       tss.id().toString().c_str());
+									tssToIgnore.insert(tss.id());
+								}
+								tssToKill.clear();
+
+								break;
+							} catch (Error& e) {
+								printf("MoveKeys TSS Removal Transaction got error %d\n", e.code());
+								wait(tssTr->onError(e));
+							}
+						}
+					}
+
 					tr.info.taskID = TaskPriority::MoveKeys;
 					tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 
@@ -763,6 +871,8 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 					// between
 					//   now and when this transaction commits.
 					state vector<Future<Void>> serverReady; // only for count below
+					state vector<Future<Void>> tssReady; // for waiting in parallel with tss
+					state vector<StorageServerInterface> tssReadyInterfs;
 					state vector<UID> newDestinations;
 					std::set<UID> completeSrcSet(completeSrc.begin(), completeSrc.end());
 					for (auto& it : dest) {
@@ -789,22 +899,104 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 						storageServerInterfaces.push_back(si);
 					}
 
+					// update client info in case tss mapping changed or server got updated
+
+					// Use most up to date version of tss mapping
+					ClientDBInfo clientInfo = occ->clientInfo->get();
+
 					// Wait for new destination servers to fetch the keys
+
 					serverReady.reserve(storageServerInterfaces.size());
-					for (int s = 0; s < storageServerInterfaces.size(); s++)
+					tssReady.reserve(storageServerInterfaces.size());
+					tssReadyInterfs.reserve(storageServerInterfaces.size());
+					for (int s = 0; s < storageServerInterfaces.size(); s++) {
 						serverReady.push_back(waitForShardReady(storageServerInterfaces[s],
 						                                        keys,
 						                                        tr.getReadVersion().get(),
 						                                        GetShardStateRequest::READABLE));
-					wait(timeout(waitForAll(serverReady),
+
+						Optional<StorageServerInterface> tssPair =
+						    clientInfo.getTssPair(storageServerInterfaces[s].id());
+
+						if (tssPair.present() && waitForTSSCounter > 0 && !tssToIgnore.count(tssPair.get().id())) {
+							tssReadyInterfs.push_back(tssPair.get());
+							tssReady.push_back(waitForShardReady(
+							    tssPair.get(), keys, tr.getReadVersion().get(), GetShardStateRequest::READABLE));
+						}
+					}
+
+					// Wait for all storage server moves, and explicitly swallow errors for tss ones with
+					// waitForAllReady If this takes too long the transaction will time out and retry, which is ok
+					wait(timeout(waitForAll(serverReady) && waitForAllReady(tssReady),
 					             SERVER_KNOBS->SERVER_READY_QUORUM_TIMEOUT,
 					             Void(),
 					             TaskPriority::MoveKeys));
+
+					// Check to see if we're waiting only on tss. If so, decrement the waiting counter.
+					// If the waiting counter is zero, kill the slow/non-responsive tss processes before finalizing the
+					// data move.
+					if (tssReady.size()) {
+						bool allSSDone = true;
+						for (auto& f : serverReady) {
+							allSSDone &= f.isReady() && !f.isError();
+							if (!allSSDone) {
+								break;
+							}
+						}
+
+						if (allSSDone) {
+							bool anyTssNotDone = false;
+
+							for (auto& f : tssReady) {
+								if (!f.isReady() || f.isError()) {
+									anyTssNotDone = true;
+									printf("MK: [%s - %s) waiting on tss!\n",
+									       begin.toString().c_str(),
+									       keys.end.toString().c_str());
+									waitForTSSCounter--;
+									break;
+								}
+							}
+
+							if (anyTssNotDone && waitForTSSCounter == 0) {
+								for (int i = 0; i < tssReady.size(); i++) {
+									if (!tssReady[i].isReady() || tssReady[i].isError()) {
+										// TODO trace event!!
+										printf("TSS NOT DONE %s with move keys, killing!!\n",
+										       tssReadyInterfs[i].id().toString().c_str());
+										tssToKill.push_back(tssReadyInterfs[i]);
+									}
+								}
+								// repeat loop and go back to start to kill tss' before continuing on
+								continue;
+							}
+						}
+					}
+
 					int count = dest.size() - newDestinations.size();
 					for (int s = 0; s < serverReady.size(); s++)
 						count += serverReady[s].isReady() && !serverReady[s].isError();
 
-					// printf("  fMK: moved data to %d/%d servers\n", count, serverReady.size());
+					int tssCount = 0;
+					for (int s = 0; s < tssReady.size(); s++)
+						tssCount += tssReady[s].isReady() && !tssReady[s].isError();
+
+					// TODO re-comment
+					if (tssReady.size()) {
+						printf("  fMK: [%s - %s) moved data to %d/%d servers and %d/%d tss\n",
+						       begin.toString().c_str(),
+						       keys.end.toString().c_str(),
+						       count,
+						       serverReady.size(),
+						       tssCount,
+						       tssReady.size());
+					} else {
+						printf("  fMK: [%s - %s) moved data to %d/%d servers\n",
+						       begin.toString().c_str(),
+						       keys.end.toString().c_str(),
+						       count,
+						       serverReady.size());
+					}
 					TraceEvent(SevDebug, waitInterval.end(), relocationIntervalId).detail("ReadyServers", count);
 
 					if (count == dest.size()) {
@@ -834,6 +1026,7 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 					}
 					tr.reset();
 				} catch (Error& error) {
+					printf("   fMK: error %d\n", error.code());
 					if (error.code() == error_code_actor_cancelled)
 						throw;
 					state Error err = error;
@@ -862,43 +1055,50 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 }
 
 ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServerInterface server) {
-	state Transaction tr(cx);
+	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);
+	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
 	state int maxSkipTags = 1;
+
+	printf("%sSS %s adding itself\n", server.isTss ? "T" : "", server.id().toString().c_str());
 	loop {
 		try {
-			state Future<RangeResult> fTagLocalities = tr.getRange(tagLocalityListKeys, CLIENT_KNOBS->TOO_MANY);
-			state Future<Optional<Value>> fv = tr.get(serverListKeyFor(server.id()));
+			// TODO should also set priority system immediate? also why is this needed?
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 
-			state Future<Optional<Value>> fExclProc = tr.get(
+			// TODO don't fetch tag localities, all tags, and history tags if tss. Just fetch pair's tag
+			state Future<RangeResult> fTagLocalities = tr->getRange(tagLocalityListKeys, CLIENT_KNOBS->TOO_MANY);
+			state Future<Optional<Value>> fv = tr->get(serverListKeyFor(server.id()));
+
+			state Future<Optional<Value>> fExclProc = tr->get(
 			    StringRef(encodeExcludedServersKey(AddressExclusion(server.address().ip, server.address().port))));
 			state Future<Optional<Value>> fExclIP =
-			    tr.get(StringRef(encodeExcludedServersKey(AddressExclusion(server.address().ip))));
-			state Future<Optional<Value>> fFailProc =
-			    tr.get(StringRef(encodeFailedServersKey(AddressExclusion(server.address().ip, server.address().port))));
+			    tr->get(StringRef(encodeExcludedServersKey(AddressExclusion(server.address().ip))));
+			state Future<Optional<Value>> fFailProc = tr->get(
+			    StringRef(encodeFailedServersKey(AddressExclusion(server.address().ip, server.address().port))));
 			state Future<Optional<Value>> fFailIP =
-			    tr.get(StringRef(encodeFailedServersKey(AddressExclusion(server.address().ip))));
+			    tr->get(StringRef(encodeFailedServersKey(AddressExclusion(server.address().ip))));
 
 			state Future<Optional<Value>> fExclProc2 =
 			    server.secondaryAddress().present()
-			        ? tr.get(StringRef(encodeExcludedServersKey(
+			        ? tr->get(StringRef(encodeExcludedServersKey(
 			              AddressExclusion(server.secondaryAddress().get().ip, server.secondaryAddress().get().port))))
 			        : Future<Optional<Value>>(Optional<Value>());
 			state Future<Optional<Value>> fExclIP2 =
 			    server.secondaryAddress().present()
-			        ? tr.get(StringRef(encodeExcludedServersKey(AddressExclusion(server.secondaryAddress().get().ip))))
+			        ? tr->get(StringRef(encodeExcludedServersKey(AddressExclusion(server.secondaryAddress().get().ip))))
 			        : Future<Optional<Value>>(Optional<Value>());
 			state Future<Optional<Value>> fFailProc2 =
 			    server.secondaryAddress().present()
-			        ? tr.get(StringRef(encodeFailedServersKey(
+			        ? tr->get(StringRef(encodeFailedServersKey(
 			              AddressExclusion(server.secondaryAddress().get().ip, server.secondaryAddress().get().port))))
 			        : Future<Optional<Value>>(Optional<Value>());
 			state Future<Optional<Value>> fFailIP2 =
 			    server.secondaryAddress().present()
-			        ? tr.get(StringRef(encodeFailedServersKey(AddressExclusion(server.secondaryAddress().get().ip))))
+			        ? tr->get(StringRef(encodeFailedServersKey(AddressExclusion(server.secondaryAddress().get().ip))))
 			        : Future<Optional<Value>>(Optional<Value>());
 
-			state Future<RangeResult> fTags = tr.getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY, true);
-			state Future<RangeResult> fHistoryTags = tr.getRange(serverTagHistoryKeys, CLIENT_KNOBS->TOO_MANY, true);
+			state Future<RangeResult> fTags = tr->getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY, true);
+			state Future<RangeResult> fHistoryTags = tr->getRange(serverTagHistoryKeys, CLIENT_KNOBS->TOO_MANY, true);
 
 			wait(success(fTagLocalities) && success(fv) && success(fTags) && success(fHistoryTags) &&
 			     success(fExclProc) && success(fExclIP) && success(fFailProc) && success(fFailIP) &&
@@ -908,70 +1108,109 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 			if (fExclProc.get().present() || fExclIP.get().present() || fFailProc.get().present() ||
 			    fFailIP.get().present() || fExclProc2.get().present() || fExclIP2.get().present() ||
 			    fFailProc2.get().present() || fFailIP2.get().present()) {
+				printf("%sSS %s failing to recruit because of exclusion\n",
+				       server.isTss ? "T" : "",
+				       server.id().toString().c_str());
 				throw recruitment_failed();
 			}
 
 			if (fTagLocalities.get().more || fTags.get().more || fHistoryTags.get().more)
 				ASSERT(false);
 
-			int8_t maxTagLocality = 0;
-			state int8_t locality = -1;
-			for (auto& kv : fTagLocalities.get()) {
-				int8_t loc = decodeTagLocalityListValue(kv.value);
-				if (decodeTagLocalityListKey(kv.key) == server.locality.dcId()) {
-					locality = loc;
-					break;
+			state Tag tag;
+			if (server.isTss) {
+				bool foundTag = false;
+				for (auto& it : fTags.get()) {
+					UID key = decodeServerTagKey(it.key);
+					if (key == server.tssPairID) {
+						tag = decodeServerTagValue(it.value);
+						foundTag = true;
+						break;
+					}
 				}
-				maxTagLocality = std::max(maxTagLocality, loc);
-			}
-
-			if (locality == -1) {
-				locality = maxTagLocality + 1;
-				if (locality < 0)
+				if (!foundTag) {
 					throw recruitment_failed();
-				tr.set(tagLocalityListKeyFor(server.locality.dcId()), tagLocalityListValue(locality));
-			}
+				}
+				// ASSERT(foundTag); // TSS's pair was removed before TSS could register. Should never happen, since the
+				// SS shouldn't be tracked by DD until this completes.
+				printf("TSS %s found tag %s for pair %s\n",
+				       server.id().toString().c_str(),
+				       tag.toString().c_str(),
+				       server.tssPairID.toString().c_str());
+				tssMapDB.set(tr, server.tssPairID, server.id());
+				tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
+
+			} else {
+				int8_t maxTagLocality = 0;
+				state int8_t locality = -1;
+				// TODO i think tss can ignore this part?
+				for (auto& kv : fTagLocalities.get()) {
+					int8_t loc = decodeTagLocalityListValue(kv.value);
+					if (decodeTagLocalityListKey(kv.key) == server.locality.dcId()) {
+						locality = loc;
+						break;
+					}
+					maxTagLocality = std::max(maxTagLocality, loc);
+				}
+
+				if (locality == -1) {
+					locality = maxTagLocality + 1;
+					if (locality < 0) {
+						throw recruitment_failed();
+					}
+					tr->set(tagLocalityListKeyFor(server.locality.dcId()), tagLocalityListValue(locality));
+				}
 
-			int skipTags = deterministicRandom()->randomInt(0, maxSkipTags);
+				int skipTags = deterministicRandom()->randomInt(0, maxSkipTags);
 
-			state uint16_t tagId = 0;
-			std::vector<uint16_t> usedTags;
-			for (auto& it : fTags.get()) {
-				Tag t = decodeServerTagValue(it.value);
-				if (t.locality == locality) {
-					usedTags.push_back(t.id);
+				state uint16_t tagId = 0;
+				std::vector<uint16_t> usedTags;
+				for (auto& it : fTags.get()) {
+					Tag t = decodeServerTagValue(it.value);
+					if (t.locality == locality) {
+						usedTags.push_back(t.id);
+					}
 				}
-			}
-			for (auto& it : fHistoryTags.get()) {
-				Tag t = decodeServerTagValue(it.value);
-				if (t.locality == locality) {
-					usedTags.push_back(t.id);
+				for (auto& it : fHistoryTags.get()) {
+					Tag t = decodeServerTagValue(it.value);
+					if (t.locality == locality) {
+						usedTags.push_back(t.id);
+					}
 				}
-			}
-			std::sort(usedTags.begin(), usedTags.end());
+				std::sort(usedTags.begin(), usedTags.end());
 
-			int usedIdx = 0;
-			for (; usedTags.size() > 0 && tagId <= usedTags.end()[-1]; tagId++) {
-				if (tagId < usedTags[usedIdx]) {
-					if (skipTags == 0)
-						break;
-					skipTags--;
-				} else {
-					usedIdx++;
+				int usedIdx = 0;
+				for (; usedTags.size() > 0 && tagId <= usedTags.end()[-1]; tagId++) {
+					if (tagId < usedTags[usedIdx]) {
+						if (skipTags == 0)
+							break;
+						skipTags--;
+					} else {
+						usedIdx++;
+					}
 				}
-			}
-			tagId += skipTags;
+				tagId += skipTags;
 
-			state Tag tag(locality, tagId);
-			tr.set(serverTagKeyFor(server.id()), serverTagValue(tag));
-			tr.set(serverListKeyFor(server.id()), serverListValue(server));
-			KeyRange conflictRange = singleKeyRange(serverTagConflictKeyFor(tag));
-			tr.addReadConflictRange(conflictRange);
-			tr.addWriteConflictRange(conflictRange);
+				tag = Tag(locality, tagId);
 
-			wait(tr.commit());
-			return std::make_pair(tr.getCommittedVersion(), tag);
+				tr->set(serverTagKeyFor(server.id()), serverTagValue(tag));
+				KeyRange conflictRange = singleKeyRange(serverTagConflictKeyFor(tag));
+				tr->addReadConflictRange(conflictRange);
+				tr->addWriteConflictRange(conflictRange);
+			}
+
+			tr->set(serverListKeyFor(server.id()), serverListValue(server));
+			wait(tr->commit());
+			printf("%sSS %s successfully added itself @ %lld\n",
+			       server.isTss ? "T" : "",
+			       server.id().toString().c_str(),
+			       tr->getCommittedVersion());
+			return std::make_pair(tr->getCommittedVersion(), tag);
 		} catch (Error& e) {
+			printf("%sSS %s got error adding itself: %d!!\n",
+			       server.isTss ? "T" : "",
+			       server.id().toString().c_str(),
+			       e.code());
 			if (e.code() == error_code_commit_unknown_result)
 				throw recruitment_failed(); // There is a remote possibility that we successfully added ourselves and
 				                            // then someone removed us, so we have to fail
@@ -980,12 +1219,12 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 				maxSkipTags = SERVER_KNOBS->MAX_SKIP_TAGS;
 			}
 
-			wait(tr.onError(e));
+			wait(tr->onError(e));
 		}
 	}
 }
 // A SS can be removed only if all data (shards) on the SS have been moved away from the SS.
-ACTOR Future<bool> canRemoveStorageServer(Transaction* tr, UID serverID) {
+ACTOR Future<bool> canRemoveStorageServer(Reference<ReadYourWritesTransaction> tr, UID serverID) {
 	RangeResult keys = wait(krmGetRanges(tr, serverKeysPrefixFor(serverID), allKeys, 2));
 
 	ASSERT(keys.size() >= 2);
@@ -1005,34 +1244,39 @@ ACTOR Future<bool> canRemoveStorageServer(Transaction* tr, UID serverID) {
 
 ACTOR Future<Void> removeStorageServer(Database cx,
                                        UID serverID,
+                                       Optional<UID> tssPairID,
                                        MoveKeysLock lock,
                                        const DDEnabledState* ddEnabledState) {
-	state Transaction tr(cx);
+	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);
 	state bool retry = false;
 	state int noCanRemoveCount = 0;
+
+	printf("Removing storage server %s\n", serverID.toString().c_str());
+
 	loop {
 		try {
-			tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
-			wait(checkMoveKeysLock(&tr, lock, ddEnabledState));
+			tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+			wait(checkMoveKeysLock(&(tr->getTransaction()), lock, ddEnabledState));
 			TraceEvent("RemoveStorageServerLocked")
 			    .detail("ServerID", serverID)
-			    .detail("Version", tr.getReadVersion().get());
+			    .detail("Version", tr->getReadVersion().get());
 
-			state bool canRemove = wait(canRemoveStorageServer(&tr, serverID));
+			state bool canRemove = wait(canRemoveStorageServer(tr, serverID));
 			if (!canRemove) {
 				TEST(true); // The caller had a transaction in flight that assigned keys to the server.  Wait for it to
 				            // reverse its mistake.
 				TraceEvent(SevWarn, "NoCanRemove").detail("Count", noCanRemoveCount++).detail("ServerID", serverID);
 				wait(delayJittered(SERVER_KNOBS->REMOVE_RETRY_DELAY, TaskPriority::DataDistributionLaunch));
-				tr.reset();
+				tr->reset();
 				TraceEvent("RemoveStorageServerRetrying").detail("CanRemove", canRemove);
 			} else {
-
-				state Future<Optional<Value>> fListKey = tr.get(serverListKeyFor(serverID));
-				state Future<RangeResult> fTags = tr.getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY);
-				state Future<RangeResult> fHistoryTags = tr.getRange(serverTagHistoryKeys, CLIENT_KNOBS->TOO_MANY);
-				state Future<RangeResult> fTagLocalities = tr.getRange(tagLocalityListKeys, CLIENT_KNOBS->TOO_MANY);
-				state Future<RangeResult> fTLogDatacenters = tr.getRange(tLogDatacentersKeys, CLIENT_KNOBS->TOO_MANY);
+				state Future<Optional<Value>> fListKey = tr->get(serverListKeyFor(serverID));
+				state Future<RangeResult> fTags = tr->getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY);
+				state Future<RangeResult> fHistoryTags = tr->getRange(serverTagHistoryKeys, CLIENT_KNOBS->TOO_MANY);
+				state Future<RangeResult> fTagLocalities = tr->getRange(tagLocalityListKeys, CLIENT_KNOBS->TOO_MANY);
+				state Future<RangeResult> fTLogDatacenters = tr->getRange(tLogDatacentersKeys, CLIENT_KNOBS->TOO_MANY);
 
 				wait(success(fListKey) && success(fTags) && success(fHistoryTags) && success(fTagLocalities) &&
 				     success(fTLogDatacenters));
@@ -1072,22 +1316,33 @@ ACTOR Future<Void> removeStorageServer(Database cx,
 				if (locality >= 0 && !allLocalities.count(locality)) {
 					for (auto& it : fTagLocalities.get()) {
 						if (locality == decodeTagLocalityListValue(it.value)) {
-							tr.clear(it.key);
+							tr->clear(it.key);
 							break;
 						}
 					}
 				}
 
-				tr.clear(serverListKeyFor(serverID));
-				tr.clear(serverTagKeyFor(serverID));
-				tr.clear(serverTagHistoryRangeFor(serverID));
+				tr->clear(serverListKeyFor(serverID));
+				tr->clear(serverTagKeyFor(serverID)); // the tss uses this to communicate shutdown but it never has a
+				                                      // server tag key set in the first place
+				tr->clear(serverTagHistoryRangeFor(serverID));
+
+				// TODO a small optimization would be to only erase and trigger tss mapping if this is a tss or an  ss
+				// with a tss pair, instead of always
+				if (tssPairID.present()) {
+					tssMapDB.erase(tr, tssPairID.get());
+				} else {
+					tssMapDB.erase(tr, serverID);
+				}
+				tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
+
 				retry = true;
-				wait(tr.commit());
+				wait(tr->commit());
 				return Void();
 			}
 		} catch (Error& e) {
 			state Error err = e;
-			wait(tr.onError(e));
+			wait(tr->onError(e));
 			TraceEvent("RemoveStorageServerRetrying").error(err);
 		}
 	}
@@ -1099,6 +1354,7 @@ ACTOR Future<Void> removeKeysFromFailedServer(Database cx,
                                               MoveKeysLock lock,
                                               const DDEnabledState* ddEnabledState) {
 	state Key begin = allKeys.begin;
+	printf("Removing keys from failed server %s\n", serverID.toString().c_str());
 	// Multi-transactional removal in case of large number of shards, concern in violating 5s transaction limit
 	while (begin < allKeys.end) {
 		state Transaction tr(cx);
@@ -1200,6 +1456,8 @@ ACTOR Future<Void> moveKeys(Database cx,
 	if (!dataMovementComplete.isSet())
 		dataMovementComplete.send(Void());
 
+	printf("move keys done for [%s, %s)\n", keys.begin.toString().c_str(), keys.end.toString().c_str());
+
 	return Void();
 }
 
diff --git a/fdbserver/MoveKeys.actor.h b/fdbserver/MoveKeys.actor.h
index e8ae6918787..c8092bbcdd9 100644
--- a/fdbserver/MoveKeys.actor.h
+++ b/fdbserver/MoveKeys.actor.h
@@ -89,13 +89,14 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 
 ACTOR Future<Void> removeStorageServer(Database cx,
                                        UID serverID,
+                                       Optional<UID> tssPairID, // if serverID is a tss, set to its ss pair id
                                        MoveKeysLock lock,
                                        const DDEnabledState* ddEnabledState);
 // Removes the given storage server permanently from the database.  It must already
 // have no shards assigned to it.  The storage server MUST NOT be added again after this
 // (though a new storage server with a new unique ID may be recruited from the same fdbserver).
 
-ACTOR Future<bool> canRemoveStorageServer(Transaction* tr, UID serverID);
+ACTOR Future<bool> canRemoveStorageServer(Reference<ReadYourWritesTransaction> tr, UID serverID);
 // Returns true if the given storage server has no keys assigned to it and may be safely removed
 // Obviously that could change later!
 ACTOR Future<Void> removeKeysFromFailedServer(Database cx,
diff --git a/fdbserver/MutationTracking.cpp b/fdbserver/MutationTracking.cpp
index 16a17a0f108..b0e7215fb8f 100644
--- a/fdbserver/MutationTracking.cpp
+++ b/fdbserver/MutationTracking.cpp
@@ -30,6 +30,9 @@
 // Track up to 2 keys in simulation via enabling MUTATION_TRACKING_ENABLED and setting the keys here.
 StringRef debugKey = LiteralStringRef("");
 StringRef debugKey2 = LiteralStringRef("\xff\xff\xff\xff");
+// StringRef debugKey = LiteralStringRef("\x00\x00\x02\xff\x00\x00\x04\xc1\x00\x00\x00\x01\x00\x00\x00\x02"); // missing
+// from ss StringRef debugKey2 = LiteralStringRef("\x00\x00\x02\xff\x00\x00\x01\x89\x00\x00\x00\x04\x00\x00\x00\x02");
+// // missing from tss
 
 TraceEvent debugMutationEnabled(const char* context, Version version, MutationRef const& mutation) {
 	if ((mutation.type == mutation.ClearRange || mutation.type == mutation.DebugKeyRange) &&
diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index 98f14d545e4..40f731aed66 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -294,6 +294,11 @@ ACTOR Future<int64_t> getMaxStorageServerQueueSize(Database cx, Reference<AsyncV
 	state std::vector<StorageServerInterface> servers = wait(serversFuture);
 	state std::vector<WorkerDetails> workers = wait(workersFuture);
 
+	/*printf("Found %d storage servers:\n", servers.size());
+	for (auto& it : servers) {
+	    printf("    %s\n", it.id().toString().c_str());
+	}*/
+
 	std::map<NetworkAddress, WorkerInterface> workersMap;
 	for (auto worker : workers) {
 		workersMap[worker.interf.address()] = worker.interf;
@@ -323,6 +328,7 @@ ACTOR Future<int64_t> getMaxStorageServerQueueSize(Database cx, Reference<AsyncV
 		try {
 			maxQueueSize = std::max(maxQueueSize, getQueueSize(messages[i].get()));
 		} catch (Error& e) {
+			printf("Error getting max storage server queue size: %d\n", e.code());
 			TraceEvent("QuietDatabaseFailure")
 			    .detail("Reason", "Failed to extract MaxStorageServerQueue")
 			    .detail("SS", servers[i].id());
@@ -516,7 +522,15 @@ ACTOR Future<bool> getStorageServersRecruiting(Database cx, WorkerInterface dist
 		                      1.0));
 
 		TraceEvent("StorageServersRecruiting").detail("Message", recruitingMessage.toString());
-		return recruitingMessage.getValue("State") == "Recruiting";
+
+		if (recruitingMessage.getValue("State") == "Recruiting") {
+			std::string tssValue;
+			// if we're tss recruiting, that's fine because that can block indefinitely if only 1 free storage process
+			if (!recruitingMessage.tryGetValue("IsTSS", tssValue) || tssValue == "False") {
+				return true;
+			}
+		}
+		return false;
 	} catch (Error& e) {
 		TraceEvent("QuietDatabaseFailure", distributorWorker.id())
 		    .detail("Reason", "Failed to extract StorageServersRecruiting")
diff --git a/fdbserver/Ratekeeper.actor.cpp b/fdbserver/Ratekeeper.actor.cpp
index 71d3056489d..83894c12016 100644
--- a/fdbserver/Ratekeeper.actor.cpp
+++ b/fdbserver/Ratekeeper.actor.cpp
@@ -719,9 +719,11 @@ ACTOR Future<Void> trackEachStorageServer(
 		when(state std::pair<UID, Optional<StorageServerInterface>> change = waitNext(serverChanges)) {
 			wait(delay(0)); // prevent storageServerTracker from getting cancelled while on the call stack
 			if (change.second.present()) {
-				auto& a = actors[change.first];
-				a = Future<Void>();
-				a = splitError(trackStorageServerQueueInfo(self, change.second.get()), err);
+				if (!change.second.get().isTss) { // TODO is this all we need to do to get ratekeeper to ignore tss?
+					auto& a = actors[change.first];
+					a = Future<Void>();
+					a = splitError(trackStorageServerQueueInfo(self, change.second.get()), err);
+				}
 			} else
 				actors.erase(change.first);
 		}
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index a5068150c3c..f6c8ba8e1f8 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -910,6 +910,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	                 storage_engine_type) != testConfig.storageEngineExcludeTypes.end()) {
 		storage_engine_type = deterministicRandom()->randomInt(0, 4);
 	}
+
 	switch (storage_engine_type) {
 	case 0: {
 		TEST(true); // Simulated cluster using ssd storage engine
@@ -934,6 +935,17 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	default:
 		ASSERT(false); // Programmer forgot to adjust cases.
 	}
+
+	int tssCount = 0;
+	// if (!testConfig.simpleConfig && deterministicRandom()->random01() < 0.25) {
+	if (true) {
+		// if (false) {
+		// tss
+		// 1 or 2 tss
+		tssCount = deterministicRandom()->randomInt(1, 3);
+		printf("Initial tss count to %d\n", tssCount);
+	}
+
 	//	if (deterministicRandom()->random01() < 0.5) {
 	//		set_config("ssd");
 	//	} else {
@@ -1252,6 +1264,29 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	} else {
 		processes_per_machine = deterministicRandom()->randomInt(1, (extraDB ? 14 : 28) / machine_count + 2);
 	}
+
+	// reduce tss to half of extra non-seed servers that can be recruited in usable regions.
+	tssCount =
+	    std::max(0, std::min(tssCount, (db.usableRegions * (machine_count / datacenters) - replication_type) / 2));
+	printf("Adjusted tss count to %d\n", tssCount);
+
+	if (tssCount > 0) {
+		std::string confStr = format("tss_count:=%d tss_storage_engine:=%d", tssCount, db.storageServerStoreType);
+		set_config(confStr);
+		double tssRandom = deterministicRandom()->random01();
+		if (tssRandom > 0.5) {
+			// normal tss mode
+			g_simulator.tssMode = ISimulator::TSSMode::EnabledNormal;
+			printf("normal tss mode\n");
+		} else if (tssRandom < 0.25) {
+			// delay injection
+			g_simulator.tssMode = ISimulator::TSSMode::EnabledAddDelay;
+		} else {
+			// fault injection
+			g_simulator.tssMode = ISimulator::TSSMode::EnabledDropMutations;
+		}
+		printf("enabling tss for simulation in mode %d: %s\n", g_simulator.tssMode, confStr.c_str());
+	}
 }
 
 // Configures the system according to the given specifications in order to run
@@ -1275,6 +1310,9 @@ void setupSimulatedSystem(vector<Future<Void>>* systemActors,
 		startingConfigString += " locked";
 	}
 	for (auto kv : startingConfigJSON) {
+		if ("tss_storage_engine" == kv.first) {
+			continue;
+		}
 		startingConfigString += " ";
 		if (kv.second.type() == json_spirit::int_type) {
 			startingConfigString += kv.first + ":=" + format("%d", kv.second.get_int());
@@ -1289,6 +1327,12 @@ void setupSimulatedSystem(vector<Future<Void>>* systemActors,
 		}
 	}
 
+	// handle tss_storage_engine separately because the passthrough needs the enum ordinal, but it's serialized to json
+	// as the string name
+	if (simconfig.db.desiredTSSCount > 0) {
+		startingConfigString += format(" tss_storage_engine:=%d", simconfig.db.testingStorageServerStoreType);
+	}
+
 	if (g_simulator.originalRegions != "") {
 		simconfig.set_config(g_simulator.originalRegions);
 		g_simulator.startingDisabledConfiguration = startingConfigString + " " + g_simulator.disableRemote;
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 271f87d939f..ce3e4850cb9 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -1885,10 +1885,10 @@ ACTOR static Future<vector<std::pair<CommitProxyInterface, EventMap>>> getCommit
 ACTOR static Future<vector<std::pair<GrvProxyInterface, EventMap>>> getGrvProxiesAndMetrics(
     Reference<AsyncVar<ServerDBInfo>> db,
     std::unordered_map<NetworkAddress, WorkerInterface> address_workers) {
-	vector<std::pair<GrvProxyInterface, EventMap>> results =
-	    wait(getServerMetrics(db->get().client.grvProxies,
-	                          address_workers,
-	                          std::vector<std::string>{ "GRVLatencyMetrics", "GRVLatencyBands", "GRVBatchLatencyMetrics" }));
+	vector<std::pair<GrvProxyInterface, EventMap>> results = wait(
+	    getServerMetrics(db->get().client.grvProxies,
+	                     address_workers,
+	                     std::vector<std::string>{ "GRVLatencyMetrics", "GRVLatencyBands", "GRVBatchLatencyMetrics" }));
 	return results;
 }
 
@@ -3010,6 +3010,14 @@ ACTOR Future<StatusReply> clusterGetStatus(
 		statusObj["incompatible_connections"] = incompatibleConnectionsArray;
 		statusObj["datacenter_lag"] = getLagObject(datacenterVersionDifference);
 
+		int activeTSSCount = 0;
+		for (auto& it : storageServers) {
+			if (it.first.isTss) {
+				activeTSSCount++;
+			}
+		}
+		statusObj["active_tss_count"] = activeTSSCount;
+
 		int totalDegraded = 0;
 		for (auto& it : workers) {
 			if (it.degraded) {
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 9b1291ec5c8..bce4ba05f3e 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -1671,6 +1671,11 @@ ACTOR Future<Void> tLogPeekMessages(TLogData* self, TLogPeekRequest req, Referen
 
 	Version poppedVer = poppedVersion(logData, req.tag);
 	if (poppedVer > req.begin) {
+		printf("tag %s - %s tried to peek popped data!!: %lld > %lld\n",
+		       req.tag.toString().c_str(),
+		       peekId.toString().c_str(),
+		       poppedVer,
+		       req.begin);
 		TLogPeekReply rep;
 		rep.maxKnownVersion = logData->version.get();
 		rep.minKnownCommittedVersion = logData->minKnownCommittedVersion;
diff --git a/fdbserver/WorkerInterface.actor.h b/fdbserver/WorkerInterface.actor.h
index 3446b3a7b8f..48a4d9ce075 100644
--- a/fdbserver/WorkerInterface.actor.h
+++ b/fdbserver/WorkerInterface.actor.h
@@ -614,11 +614,18 @@ struct InitializeStorageRequest {
 	UID reqId;
 	UID interfaceId;
 	KeyValueStoreType storeType;
+	bool isTss;
+	UID tssPairID;
+	Version tssPairVersion;
 	ReplyPromise<InitializeStorageReply> reply;
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, seedTag, reqId, interfaceId, storeType, reply);
+		if (ar.protocolVersion().hasTSS()) {
+			serializer(ar, seedTag, reqId, interfaceId, storeType, reply, isTss, tssPairID, tssPairVersion);
+		} else {
+			serializer(ar, seedTag, reqId, interfaceId, storeType, reply);
+		}
 	}
 };
 
@@ -770,6 +777,7 @@ struct DiskStoreRequest {
 struct Role {
 	static const Role WORKER;
 	static const Role STORAGE_SERVER;
+	static const Role TESTING_STORAGE_SERVER;
 	static const Role TRANSACTION_LOG;
 	static const Role SHARED_TRANSACTION_LOG;
 	static const Role COMMIT_PROXY;
@@ -840,6 +848,7 @@ class IDiskQueue;
 ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
                                  StorageServerInterface ssi,
                                  Tag seedTag,
+                                 Version tssSeedVersion,
                                  ReplyPromise<InitializeStorageReply> recruitReply,
                                  Reference<AsyncVar<ServerDBInfo>> db,
                                  std::string folder);
diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index 97953ce1a3b..c0dee606821 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -417,11 +417,14 @@ ACTOR Future<Void> newTLogServers(Reference<MasterData> self,
 ACTOR Future<Void> newSeedServers(Reference<MasterData> self,
                                   RecruitFromConfigurationReply recruits,
                                   vector<StorageServerInterface>* servers) {
+	printf("Seeding initial %d storage servers\n", recruits.storageServers.size());
 	// This is only necessary if the database is at version 0
 	servers->clear();
 	if (self->lastEpochEnd)
 		return Void();
 
+	// TODO might need to make this handle TSS recruitment (or make RecruitFromConfiguration handle it?) for simulation
+
 	state int idx = 0;
 	state std::map<Optional<Value>, Tag> dcId_tags;
 	state int8_t nextLocality = 0;
@@ -434,6 +437,7 @@ ACTOR Future<Void> newSeedServers(Reference<MasterData> self,
 		                  ? dcId_tags[recruits.storageServers[idx].locality.dcId()]
 		                  : Tag(nextLocality, 0);
 		isr.storeType = self->configuration.storageServerStoreType;
+		isr.isTss = false;
 		isr.reqId = deterministicRandom()->randomUniqueID();
 		isr.interfaceId = deterministicRandom()->randomUniqueID();
 
@@ -469,6 +473,8 @@ ACTOR Future<Void> newSeedServers(Reference<MasterData> self,
 	    .detail("TargetCount", self->configuration.storageTeamSize)
 	    .detail("Servers", describe(*servers));
 
+	printf("Seed servers sees %d desired tss\n", self->configuration.desiredTSSCount);
+
 	return Void();
 }
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 3f8cb8b8014..5f9c7133f5d 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -38,6 +38,7 @@
 #include "fdbclient/DatabaseContext.h"
 #include "fdbclient/KeyRangeMap.h"
 #include "fdbclient/CommitProxyInterface.h"
+#include "fdbclient/KeyBackedTypes.h"
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/Notified.h"
 #include "fdbclient/StatusClient.h"
@@ -463,7 +464,7 @@ struct StorageServer {
 	void byteSampleApplyClear(KeyRangeRef range, Version ver);
 
 	void popVersion(Version v, bool popAllTags = false) {
-		if (logSystem) {
+		if (logSystem && !isTss()) {
 			if (v > poppedAllAfter) {
 				popAllTags = true;
 				poppedAllAfter = std::numeric_limits<Version>::max();
@@ -510,6 +511,25 @@ struct StorageServer {
 		return mLV.push_back_deep(mLV.arena(), m);
 	}
 
+	void setTssPair(UID pairId) {
+		tssPairID = Optional<UID>(pairId);
+
+		// Set up tss fault injection here, only if we are in simulated mode and with fault injection.
+		// With fault injection enabled, the tss will start acting normal for a bit, then after the specified delay
+		// start behaving incorrectly.
+		if (g_network->isSimulated() && !g_simulator.speedUpSimulation &&
+		    g_simulator.tssMode >= ISimulator::TSSMode::EnabledAddDelay) {
+			tssFaultInjectTime = now() + deterministicRandom()->randomInt(60, 300);
+			TraceEvent(SevWarnAlways, "TSSInjectFaultEnabled", thisServerID)
+			    .detail("Mode", g_simulator.tssMode)
+			    .detail("At", tssFaultInjectTime.get());
+			printf("ENABLING FAULT INJECTION FOR TSS %s at time %.4f in mode %d\n",
+			       thisServerID.toString().c_str(),
+			       tssFaultInjectTime.get(),
+			       g_simulator.tssMode);
+		}
+	}
+
 	StorageServerDisk storage;
 
 	KeyRangeMap<Reference<ShardInfo>> shards;
@@ -552,6 +572,9 @@ struct StorageServer {
 	Reference<ILogSystem::IPeekCursor> logCursor;
 
 	UID thisServerID;
+	Optional<UID> tssPairID; // if this server is a tss, this is the id of its (ss) pair
+	Optional<UID> ssPairID; // if this server is an ss, this is the id of its (tss) pair
+	Optional<double> tssFaultInjectTime;
 	Key sk;
 	Reference<AsyncVar<ServerDBInfo>> db;
 	Database cx;
@@ -785,6 +808,14 @@ struct StorageServer {
 		mutableData().forgetVersionsBefore(ver);
 	}
 
+	bool isTss() const { return tssPairID.present(); }
+
+	bool isSSWithTSSPair() const { return ssPairID.present(); }
+
+	void setSSWithTssPair(UID idOfTSS) { ssPairID = Optional<UID>(idOfTSS); }
+
+	void clearSSWithTssPair() { ssPairID = Optional<UID>(); }
+
 	// This is the maximum version that might be read from storage (the minimum version is durableVersion)
 	Version storageVersion() const { return oldestVersion.get(); }
 
@@ -1046,12 +1077,24 @@ void updateProcessStats(StorageServer* self) {
 
 ACTOR Future<Version> waitForVersionActor(StorageServer* data, Version version, SpanID spanContext) {
 	state Span span("SS.WaitForVersion"_loc, { spanContext });
+	/*if (172218491 == version) {
+	    printf("%sSS %s starting waitForVersionActor @ %lld\n", data->tssPairID.present() ? "T" : "",
+	data->thisServerID.toString().c_str(), version);
+	}*/
 	choose {
 		when(wait(data->version.whenAtLeast(version))) {
 			// FIXME: A bunch of these can block with or without the following delay 0.
 			// wait( delay(0) );  // don't do a whole bunch of these at once
+			/*if (172218491 == version) {
+			    printf("%sSS %s waitForVersionActor @ %lld - at least version\n", data->tssPairID.present() ? "T" : "",
+			data->thisServerID.toString().c_str(), version);
+			}*/
 			if (version < data->oldestVersion.get())
 				throw transaction_too_old(); // just in case
+			/*if (172218491 == version) {
+			    printf("%sSS %s waitForVersionActor @ %lld - not too old\n", data->tssPairID.present() ? "T" : "",
+			data->thisServerID.toString().c_str(), version);
+			}*/
 			return version;
 		}
 		when(wait(delay(SERVER_KNOBS->FUTURE_VERSION_DELAY))) {
@@ -1060,23 +1103,39 @@ ACTOR Future<Version> waitForVersionActor(StorageServer* data, Version version,
 				    .detail("Version", version)
 				    .detail("MyVersion", data->version.get())
 				    .detail("ServerID", data->thisServerID);
+			/*if (172218491 == version) {
+			    printf("%sSS %s waitForVersionActor @ %lld - future version\n", data->tssPairID.present() ? "T" : "",
+			data->thisServerID.toString().c_str(), version);
+			}*/
 			throw future_version();
 		}
 	}
 }
 
 Future<Version> waitForVersion(StorageServer* data, Version version, SpanID spanContext) {
+	/*if (172218491 == version) {
+	    printf("%sSS %s started waitForVersion @ %lld\n", data->tssPairID.present() ? "T" : "",
+	data->thisServerID.toString().c_str(), version);
+	}*/
 	if (version == latestVersion) {
 		version = std::max(Version(1), data->version.get());
 	}
 
 	if (version < data->oldestVersion.get() || version <= 0) {
+		/*if (172218491 == version) {
+		    printf("%sSS %s waitForVersion @ %lld - transaction too old\n", data->tssPairID.present() ? "T" : "",
+		data->thisServerID.toString().c_str(), version);
+		}*/
 		return transaction_too_old();
 	} else if (version <= data->version.get()) {
 		return version;
 	}
 
 	if ((data->behind || data->versionBehind) && version > data->version.get()) {
+		/*if (172218491 == version) {
+		    printf("%sSS %s waitForVersion @ %lld - process_behind\n", data->tssPairID.present() ? "T" : "",
+		data->thisServerID.toString().c_str(), version);
+		}*/
 		return process_behind();
 	}
 
@@ -1110,6 +1169,11 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 	Span span("SS:getValue"_loc, { req.spanContext });
 	span.addTag("key"_sr, req.key);
 
+	/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+	    printf("%sSS %s started getValueQ for %s @ %lld\n", data->tssPairID.present() ? "T" : "",
+	data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
+	}*/
+
 	try {
 		++data->counters.getValueQueries;
 		++data->counters.allQueries;
@@ -1121,6 +1185,11 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 		// so we need to downgrade here
 		wait(data->getQueryDelay());
 
+		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+		    printf("%sSS %s  getValueQ for %s @ %lld - got query delay\n", data->tssPairID.present() ? "T" : "",
+		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
+		}*/
+
 		if (req.debugID.present())
 			g_traceBatch.addEvent("GetValueDebug",
 			                      req.debugID.get().first(),
@@ -1135,8 +1204,17 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 
 		state uint64_t changeCounter = data->shardChangeCounter;
 
+		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+		    printf("%sSS %s  getValueQ for %s @ %lld - waited for version\n", data->tssPairID.present() ? "T" : "",
+		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
+		}*/
+
 		if (!data->shards[req.key]->isReadable()) {
 			//TraceEvent("WrongShardServer", data->thisServerID).detail("Key", req.key).detail("Version", version).detail("In", "getValueQ");
+			/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+			    printf("%sSS %s started getValueQ for %s @ %lld got wrong shard server\n", data->tssPairID.present() ?
+			"T" : "", data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
+			}*/
 			throw wrong_shard_server();
 		}
 
@@ -1145,6 +1223,10 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 		if (i && i->isValue() && i.key() == req.key) {
 			v = (Value)i->getValue();
 			path = 1;
+			/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+			    printf("%sSS %s  getValueQ for %s @ %lld - got from memory\n", data->tssPairID.present() ? "T" : "",
+			data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
+			}*/
 		} else if (!i || !i->isClearTo() || i->getEndKey() <= req.key) {
 			path = 2;
 			Optional<Value> vv = wait(data->storage.readValue(req.key, req.debugID));
@@ -1155,18 +1237,21 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 			}
 			data->checkChangeCounter(changeCounter, req.key);
 			v = vv;
+			/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+			    printf("%sSS %s  getValueQ for %s @ %lld - got from storage\n", data->tssPairID.present() ? "T" : "",
+			data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
+			}*/
 		}
 
 		DEBUG_MUTATION("ShardGetValue",
 		               version,
 		               MutationRef(MutationRef::DebugKey, req.key, v.present() ? v.get() : LiteralStringRef("<null>")));
-		DEBUG_MUTATION("ShardGetPath",
-		               version,
-		               MutationRef(MutationRef::DebugKey,
-		                           req.key,
-		                           path == 0   ? LiteralStringRef("0")
-		                           : path == 1 ? LiteralStringRef("1")
-		                                       : LiteralStringRef("2")));
+		DEBUG_MUTATION(
+		    "ShardGetPath",
+		    version,
+		    MutationRef(MutationRef::DebugKey,
+		                req.key,
+		                path == 0 ? LiteralStringRef("0") : path == 1 ? LiteralStringRef("1") : LiteralStringRef("2")));
 
 		/*
 		StorageMetrics m;
@@ -1183,6 +1268,12 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 			++data->counters.emptyQueries;
 		}
 
+		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+		    printf("%sSS %s getValueQ for %s @ %lld = %s\n", data->tssPairID.present() ? "T" : "",
+		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version, v.present() ?
+		v.get().toString().c_str() : "");
+		}*/
+
 		if (SERVER_KNOBS->READ_SAMPLING_ENABLED) {
 			// If the read yields no value, randomly sample the empty read.
 			int64_t bytesReadPerKSecond =
@@ -1205,8 +1296,16 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 		reply.penalty = data->getPenalty();
 		req.reply.send(reply);
 	} catch (Error& e) {
+		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+		    printf("%sSS %s getValueQ for %s @ %lld = ERROR: %d\n", data->tssPairID.present() ? "T" : "",
+		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version, e.code());
+		}*/
 		if (!canReplyWith(e))
 			throw;
+		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
+		    printf("%sSS %s getValueQ for %s @ %lld = replying with error: %d\n", data->tssPairID.present() ? "T" : "",
+		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version, e.code());
+		}*/
 		data->sendErrorWithPenalty(req.reply, e, data->getPenalty());
 	}
 
@@ -1717,13 +1816,21 @@ ACTOR Future<Key> findKey(StorageServer* data,
 	state int distance = forward ? sel.offset : 1 - sel.offset;
 	state Span span("SS.findKey"_loc, { parentSpan });
 
+	/*if (version == 166817893 && sel.offset == 80) {
+	    printf("%sSS %s FindKey request %s:<%s:%d @ %lld: with key range [%s - %s):\n", data->isTss() ? "t" : "",
+	data->thisServerID.toString().c_str(), sel.getKey().printable().c_str(), sel.orEqual ? "=" : "", sel.offset,
+	version, range.begin.toString().c_str(), range.end.toString().c_str());
+	}*/
+
 	// Don't limit the number of bytes if this is a trivial key selector (there will be at most two items returned from
 	// the read range in this case)
 	state int maxBytes;
 	if (sel.offset <= 1 && sel.offset >= 0)
 		maxBytes = std::numeric_limits<int>::max();
 	else
-		maxBytes = BUGGIFY ? SERVER_KNOBS->BUGGIFY_LIMIT_BYTES : SERVER_KNOBS->STORAGE_LIMIT_BYTES;
+		maxBytes = (g_network->isSimulated() && g_simulator.tssMode == ISimulator::TSSMode::Disabled && BUGGIFY)
+		               ? SERVER_KNOBS->BUGGIFY_LIMIT_BYTES
+		               : SERVER_KNOBS->STORAGE_LIMIT_BYTES;
 
 	state GetKeyValuesReply rep = wait(
 	    readRange(data,
@@ -1734,6 +1841,13 @@ ACTOR Future<Key> findKey(StorageServer* data,
 	              span.context));
 	state bool more = rep.more && rep.data.size() != distance + skipEqualKey;
 
+	/*if (version == 166817893 && sel.offset == 80) {
+	    printf("%sSS %s FindKey request %s:<%s:%d @ %lld: readRange with limBytes=%d got %d:\n", data->isTss() ? "t" :
+	"", data->thisServerID.toString().c_str(), sel.getKey().printable().c_str(), sel.orEqual ? "=" : "", sel.offset,
+	version, maxBytes, rep.data.size()); for (auto& it : rep.data) { printf("    %s\n", it.key.toString().c_str());
+	    }
+	}*/
+
 	// If we get only one result in the reverse direction as a result of the data being too large, we could get stuck in
 	// a loop
 	if (more && !forward && rep.data.size() == 1) {
@@ -1781,9 +1895,20 @@ ACTOR Future<Key> findKey(StorageServer* data,
 			// query SOMEDAY: graceful handling of exceptionally sized values
 			ASSERT(returnKey != sel.getKey());
 
+			/*if (version == 166817893 && sel.offset == 80) {
+			    printf("%sSS %s FindKey request %s:<%s:%d @ %lld: moving same shard\n", data->isTss() ? "t" : "",
+			data->thisServerID.toString().c_str(), sel.getKey().printable().c_str(), sel.orEqual ? "=" : "", sel.offset,
+			version);
+			}*/
 			return returnKey;
-		} else
+		} else {
+			/*if (version == 166817893 && sel.offset == 80) {
+			    printf("%sSS %s FindKey request %s:<%s:%d @ %lld: moving shard boundary\n", data->isTss() ? "t" : "",
+			data->thisServerID.toString().c_str(), sel.getKey().printable().c_str(), sel.orEqual ? "=" : "", sel.offset,
+			version);
+			}*/
 			return forward ? range.end : range.begin;
+		}
 	}
 }
 
@@ -1806,6 +1931,15 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 	state Span span("SS:getKeyValues"_loc, { req.spanContext });
 	state int64_t resultSize = 0;
 
+	if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" && req.version == 107157353) {
+		printf("%sSS %s starting query [%s - %s) @ %lld\n",
+		       data->isTss() ? "T" : "",
+		       data->thisServerID.toString().c_str(),
+		       req.begin.getKey().printable().c_str(),
+		       req.end.getKey().printable().c_str(),
+		       req.version);
+	}
+
 	++data->counters.getRangeQueries;
 	++data->counters.allQueries;
 	++data->readQueueSizeMetric;
@@ -1820,6 +1954,15 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 		wait(data->getQueryDelay());
 	}
 
+	if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" && req.version == 107157353) {
+		printf("%sSS %s downgraded [%s - %s) @ %lld\n",
+		       data->isTss() ? "T" : "",
+		       data->thisServerID.toString().c_str(),
+		       req.begin.getKey().printable().c_str(),
+		       req.end.getKey().printable().c_str(),
+		       req.version);
+	}
+
 	try {
 		if (req.debugID.present())
 			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Before");
@@ -1844,6 +1987,15 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 			throw wrong_shard_server();
 		}
 
+		if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" && req.version == 107157353) {
+			printf("%sSS %s validated shard [%s - %s) @ %lld\n",
+			       data->isTss() ? "T" : "",
+			       data->thisServerID.toString().c_str(),
+			       req.begin.getKey().printable().c_str(),
+			       req.end.getKey().printable().c_str(),
+			       req.version);
+		}
+
 		state int offset1;
 		state int offset2;
 		state Future<Key> fBegin = req.begin.isFirstGreaterOrEqual()
@@ -1854,6 +2006,7 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 		                             : findKey(data, req.end, version, shard, &offset2, span.context);
 		state Key begin = wait(fBegin);
 		state Key end = wait(fEnd);
+
 		if (req.debugID.present())
 			g_traceBatch.addEvent(
 			    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterKeys");
@@ -1873,6 +2026,25 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 			throw wrong_shard_server();
 		}
 
+		if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" && req.version == 107157353) {
+			printf("%sSS %s resolved begin and end [%s - %s) @ %lld\n",
+			       data->isTss() ? "T" : "",
+			       data->thisServerID.toString().c_str(),
+			       req.begin.getKey().printable().c_str(),
+			       req.end.getKey().printable().c_str(),
+			       req.version);
+			printf("    %s:<%s:%d @ -> %s\n",
+			       req.begin.getKey().printable().c_str(),
+			       req.begin.orEqual ? "=" : "",
+			       req.begin.offset,
+			       req.begin.getKey().printable().c_str());
+			printf("    %s:<%s:%d @ -> %s\n",
+			       req.end.getKey().printable().c_str(),
+			       req.end.orEqual ? "=" : "",
+			       req.end.offset,
+			       req.end.getKey().printable().c_str());
+		}
+
 		if (begin >= end) {
 			if (req.debugID.present())
 				g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Send");
@@ -1890,10 +2062,28 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 		} else {
 			state int remainingLimitBytes = req.limitBytes;
 
+			/*if (req.begin.getKey().toString() == "m3fc7" && req.end.getKey().toString() == "s" && req.version ==
+			133421369) { printf("%sSS %s beginning readRange [%s - %s) @ %lld\n", data->isTss() ? "T" : "",
+			data->thisServerID.toString().c_str(), req.begin.getKey().printable().c_str(),
+			req.end.getKey().printable().c_str(), req.version);
+			}*/
+
 			GetKeyValuesReply _r =
 			    wait(readRange(data, version, KeyRangeRef(begin, end), req.limit, &remainingLimitBytes, span.context));
 			GetKeyValuesReply r = _r;
 
+			if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" &&
+			    req.version == 107157353) {
+				printf("%sSS %s completed readRange (%d)%s: \n",
+				       data->isTss() ? "T" : "",
+				       data->thisServerID.toString().c_str(),
+				       r.data.size(),
+				       r.more ? "+" : "");
+				/*for (auto& it : r.data) {
+				    printf("    %s=%s\n", it.key.printable().c_str(), it.value.printable().c_str());
+				}*/
+			}
+
 			if (req.debugID.present())
 				g_traceBatch.addEvent(
 				    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");
@@ -1926,6 +2116,14 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 				data->metrics.notifyBytesReadPerKSecond(r.data[r.data.size() - 1].key, bytesReadPerKSecond);
 			}
 
+			if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" &&
+			    req.version == 107157353) {
+				printf("%sSS %s replying to %s\n",
+				       data->isTss() ? "T" : "",
+				       data->thisServerID.toString().c_str(),
+				       req.reply.getEndpoint().token.toString().c_str());
+			}
+
 			r.penalty = data->getPenalty();
 			req.reply.send(r);
 
@@ -1976,14 +2174,33 @@ ACTOR Future<Void> getKeyQ(StorageServer* data, GetKeyRequest req) {
 	// so we need to downgrade here
 	wait(data->getQueryDelay());
 
+	/*if (req.version == 166817893 && req.sel.offset == 80) {
+	    printf("%sSS %s GetKey request %s:<%s:%d @ %lld\n", data->isTss() ? "t" : "",
+	data->thisServerID.toString().c_str(), req.sel.getKey().printable().c_str(), req.sel.orEqual ? "=" : "",
+	req.sel.offset, req.version);
+	}*/
+
 	try {
 		state Version version = wait(waitForVersion(data, req.version, req.spanContext));
+
+		/*if (req.version == 166817893 && req.sel.offset == 80) {
+		    printf("%sSS %s GetKey request %s:<%s:%d @ %lld: waited for version\n", data->isTss() ? "t" : "",
+		data->thisServerID.toString().c_str(), req.sel.getKey().printable().c_str(), req.sel.orEqual ? "=" : "",
+		req.sel.offset, req.version);
+		}*/
+
 		state uint64_t changeCounter = data->shardChangeCounter;
 		state KeyRange shard = getShardKeyRange(data, req.sel);
 
 		state int offset;
 		Key k = wait(findKey(data, req.sel, version, shard, &offset, req.spanContext));
 
+		/*if (req.version == 166817893 && req.sel.offset == 80) {
+		    printf("%sSS %s GetKey request %s:<%s:%d @ %lld: found key: %s\n", data->isTss() ? "t" : "",
+		data->thisServerID.toString().c_str(), req.sel.getKey().printable().c_str(), req.sel.orEqual ? "=" : "",
+		req.sel.offset, req.version, k.toString().c_str());
+		}*/
+
 		data->checkChangeCounter(
 		    changeCounter, KeyRangeRef(std::min<KeyRef>(req.sel.getKey(), k), std::max<KeyRef>(req.sel.getKey(), k)));
 
@@ -1998,6 +2215,12 @@ ACTOR Future<Void> getKeyQ(StorageServer* data, GetKeyRequest req) {
 		else
 			updated = KeySelectorRef(k, true, 0); // found
 
+		/*if (req.version == 166817893 && req.sel.offset == 80) {
+		    printf("%sSS %s GetKey request %s:<%s:%d @ %lld: updated: %s:<%s:%d\n", data->isTss() ? "t" : "",
+		data->thisServerID.toString().c_str(), req.sel.getKey().printable().c_str(), req.sel.orEqual ? "=" : "",
+		req.sel.offset, req.version, updated.getKey().printable().c_str(), updated.orEqual ? "=" : "", updated.offset);
+		}*/
+
 		resultSize = k.size();
 		data->counters.bytesQueried += resultSize;
 		++data->counters.rowsQueried;
@@ -2322,6 +2545,14 @@ void removeDataRange(StorageServer* ss,
 	// disk when this latest version becomes durable mLV is also modified if necessary to ensure that split clears can
 	// be forgotten
 
+	// TODO REMOVE print
+	printf("%sss %s removing data range [%s - %s) @ %lld\n",
+	       ss->isTss() ? "t" : "",
+	       ss->thisServerID.toString().c_str(),
+	       range.begin.toString().c_str(),
+	       range.end.toString().c_str(),
+	       mLV.version);
+
 	MutationRef clearRange(MutationRef::ClearRange, range.begin, range.end);
 	clearRange = ss->addMutationToMutationLog(mLV, clearRange);
 
@@ -2352,6 +2583,13 @@ void removeDataRange(StorageServer* ss,
 	}
 
 	data.erase(range.begin, range.end);
+
+	printf("%sss %s removed data range [%s - %s) @ %lld\n",
+	       ss->isTss() ? "t" : "",
+	       ss->thisServerID.toString().c_str(),
+	       range.begin.toString().c_str(),
+	       range.end.toString().c_str(),
+	       mLV.version);
 }
 
 void setAvailableStatus(StorageServer* self, KeyRangeRef keys, bool available);
@@ -2932,32 +3170,30 @@ void changeServerKeys(StorageServer* data,
                       ChangeServerKeysContext context) {
 	ASSERT(!keys.empty());
 
-	//TraceEvent("ChangeServerKeys", data->thisServerID)
-	//	.detail("KeyBegin", keys.begin)
-	//	.detail("KeyEnd", keys.end)
-	//	.detail("NowAssigned", nowAssigned)
-	//	.detail("Version", version)
-	//	.detail("Context", changeServerKeysContextName[(int)context]);
+	TraceEvent("ChangeServerKeys", data->thisServerID)
+	    .detail("KeyBegin", keys.begin)
+	    .detail("KeyEnd", keys.end)
+	    .detail("NowAssigned", nowAssigned)
+	    .detail("Version", version)
+	    .detail("Context", changeServerKeysContextName[(int)context]);
 	validate(data);
 
 	// TODO(alexmiller): Figure out how to selectively enable spammy data distribution events.
-	// DEBUG_KEY_RANGE( nowAssigned ? "KeysAssigned" : "KeysUnassigned", version, keys );
+	DEBUG_KEY_RANGE(nowAssigned ? "KeysAssigned" : "KeysUnassigned", version, keys);
 
 	bool isDifferent = false;
 	auto existingShards = data->shards.intersectingRanges(keys);
 	for (auto it = existingShards.begin(); it != existingShards.end(); ++it) {
 		if (nowAssigned != it->value()->assigned()) {
 			isDifferent = true;
-			/*TraceEvent("CSKRangeDifferent", data->thisServerID)
-			  .detail("KeyBegin", it->range().begin)
-			  .detail("KeyEnd", it->range().end);*/
+			TraceEvent("CSKRangeDifferent", data->thisServerID)
+			    .detail("KeyBegin", it->range().begin)
+			    .detail("KeyEnd", it->range().end);
 			break;
 		}
 	}
 	if (!isDifferent) {
-		//TraceEvent("CSKShortCircuit", data->thisServerID)
-		//	.detail("KeyBegin", keys.begin)
-		//	.detail("KeyEnd", keys.end);
+		TraceEvent("CSKShortCircuit", data->thisServerID).detail("KeyBegin", keys.begin).detail("KeyEnd", keys.end);
 		return;
 	}
 
@@ -2995,13 +3231,13 @@ void changeServerKeys(StorageServer* data,
 	for (auto r = vr.begin(); r != vr.end(); ++r) {
 		KeyRangeRef range = keys & r->range();
 		bool dataAvailable = r->value() == latestVersion || r->value() >= version;
-		/*TraceEvent("CSKRange", data->thisServerID)
+		TraceEvent("CSKRange", data->thisServerID)
 		    .detail("KeyBegin", range.begin)
 		    .detail("KeyEnd", range.end)
 		    .detail("Available", dataAvailable)
 		    .detail("NowAssigned", nowAssigned)
 		    .detail("NewestAvailable", r->value())
-		    .detail("ShardState0", data->shards[range.begin]->debugDescribeState());*/
+		    .detail("ShardState0", data->shards[range.begin]->debugDescribeState());
 		if (!nowAssigned) {
 			if (dataAvailable) {
 				ASSERT(r->value() ==
@@ -3043,8 +3279,14 @@ void changeServerKeys(StorageServer* data,
 	oldShards.clear();
 	ranges.clear();
 	for (auto r = removeRanges.begin(); r != removeRanges.end(); ++r) {
+		// TODO should we do this at the passed in version? (or the passed in version + 1?)
 		removeDataRange(data, data->addVersionToMutationLog(data->data().getLatestVersion()), data->shards, *r);
 		setAvailableStatus(data, *r, false);
+		printf("%sss %s set data range unavailable [%s - %s)\n",
+		       data->isTss() ? "t" : "",
+		       data->thisServerID.toString().c_str(),
+		       keys.begin.toString().c_str(),
+		       keys.end.toString().c_str());
 	}
 	validate(data);
 }
@@ -3103,6 +3345,7 @@ static const KeyValueRef persistFormat(LiteralStringRef(PERSIST_PREFIX "Format")
 static const KeyRangeRef persistFormatReadableRange(LiteralStringRef("FoundationDB/StorageServer/1/2"),
                                                     LiteralStringRef("FoundationDB/StorageServer/1/5"));
 static const KeyRef persistID = LiteralStringRef(PERSIST_PREFIX "ID");
+static const KeyRef persistTssPairID = LiteralStringRef(PERSIST_PREFIX "tssPairID");
 
 // (Potentially) change with the durable version or when fetchKeys completes
 static const KeyRef persistVersion = LiteralStringRef(PERSIST_PREFIX "Version");
@@ -3215,15 +3458,26 @@ class StorageUpdater {
 
 			data->recoveryVersionSkips.emplace_back(rollbackVersion, currentVersion - rollbackVersion);
 		} else if (m.type == MutationRef::SetValue && m.param1 == killStoragePrivateKey) {
+			printf("worked removed kill storage: %s\n", data->thisServerID.toString().c_str());
 			throw worker_removed();
 		} else if ((m.type == MutationRef::SetValue || m.type == MutationRef::ClearRange) &&
 		           m.param1.substr(1).startsWith(serverTagPrefix)) {
-			bool matchesThisServer = decodeServerTagKey(m.param1.substr(1)) == data->thisServerID;
-			if ((m.type == MutationRef::SetValue && !matchesThisServer) ||
-			    (m.type == MutationRef::ClearRange && matchesThisServer))
+			UID serverTagKey = decodeServerTagKey(m.param1.substr(1));
+			// bool matchesThisServer = (!data->isTss() && serverTagKey == data->thisServerID) || (data->isTss() &&
+			// serverTagKey == data->tssPairID.get());
+			bool matchesThisServer = serverTagKey == data->thisServerID;
+			bool matchesTssPair = data->isTss() ? serverTagKey == data->tssPairID.get() : false;
+			if ((m.type == MutationRef::SetValue && !data->isTss() && !matchesThisServer) ||
+			    (m.type == MutationRef::ClearRange && (matchesThisServer || (data->isTss() && matchesTssPair)))) {
+				printf("%sSS %s removed b/c tag mutation: %s\n",
+				       data->isTss() ? "T" : "",
+				       data->thisServerID.toString().c_str(),
+				       m.toString().c_str());
 				throw worker_removed();
+			}
 		} else if (m.type == MutationRef::SetValue && m.param1 == rebootWhenDurablePrivateKey) {
 			data->rebootAfterDurableVersion = currentVersion;
+			printf("%s got reboot after durable @ %lld\n", data->thisServerID.toString().c_str(), currentVersion);
 			TraceEvent("RebootWhenDurableSet", data->thisServerID)
 			    .detail("DurableVersion", data->durableVersion.get())
 			    .detail("RebootAfterDurableVersion", data->rebootAfterDurableVersion);
@@ -3288,6 +3542,24 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 			wait(delayJittered(.005, TaskPriority::TLogPeekReply));
 		}
 
+		// TODO REMOVE!! just for testing what happens when TSS gets behind
+		if (g_network->isSimulated() && data->isTss() && g_simulator.tssMode == ISimulator::TSSMode::EnabledAddDelay &&
+		    data->tssFaultInjectTime.present() && data->tssFaultInjectTime.get() < now()) {
+			if (deterministicRandom()->random01() < 0.01) {
+				TraceEvent(SevWarnAlways, "TSSInjectDelayForever", data->thisServerID);
+				printf("TSS %s INJECTING DELAY FOREVER!!\n", data->thisServerID.toString().c_str());
+				// small random chance to just completely get stuck here, each tss should eventually hit this in this
+				// mode
+				wait(Never());
+			} else {
+				// otherwise pause for part of a second
+				double delayTime = deterministicRandom()->random01();
+				TraceEvent(SevWarnAlways, "TSSInjectDelay", data->thisServerID).detail("Delay", delayTime);
+				printf("TSS %s INJECTING DELAY for %.4f!!\n", data->thisServerID.toString().c_str(), delayTime);
+				wait(delay(delayTime));
+			}
+		}
+
 		while (data->byteSampleClearsTooLarge.get()) {
 			wait(data->byteSampleClearsTooLarge.onChange());
 		}
@@ -3300,8 +3572,11 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 				break;
 			}
 		}
-		if (cursor->popped() > 0)
+		if (cursor->popped() > 0) {
+			printf(
+			    "Worker removed because of popped=%d: %s\n", cursor->popped(), data->thisServerID.toString().c_str());
 			throw worker_removed();
+		}
 
 		++data->counters.updateBatches;
 		data->lastTLogVersion = cursor->getMaxKnownVersion();
@@ -3352,7 +3627,7 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 				} else {
 					MutationRef msg;
 					cloneReader >> msg;
-					//TraceEvent(SevDebug, "SSReadingLog", data->thisServerID).detail("Mutation", msg.toString());
+					// TraceEvent(SevDebug, "SSReadingLog", data->thisServerID).detail("Mutation", msg.toString());
 
 					if (firstMutation && msg.param1.startsWith(systemKeys.end))
 						hasPrivateData = true;
@@ -3460,7 +3735,15 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 				Span span("SS:update"_loc, { spanContext });
 				span.addTag("key"_sr, msg.param1);
 
-				if (ver != invalidVersion) { // This change belongs to a version < minVersion
+				if (g_network->isSimulated() && data->isTss() &&
+				    g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations &&
+				    data->tssFaultInjectTime.present() && data->tssFaultInjectTime.get() < now() &&
+				    (msg.type == MutationRef::SetValue || msg.type == MutationRef::ClearRange) && msg.param1.size() &&
+				    msg.param1[0] != 0xff && deterministicRandom()->random01() < 0.05) {
+					TraceEvent(SevWarnAlways, "TSSInjectDropMutation", data->thisServerID)
+					    .detail("Mutation", msg.toString())
+					    .detail("Version", cloneCursor2->version().toString());
+				} else if (ver != invalidVersion) { // This change belongs to a version < minVersion
 					DEBUG_MUTATION("SSPeek", ver, msg).detail("ServerID", data->thisServerID);
 					if (ver == 1) {
 						TraceEvent("SSPeekMutation", data->thisServerID);
@@ -3699,8 +3982,14 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
 #endif
 
 void StorageServerDisk::makeNewStorageServerDurable() {
+	// TODO REMOVE print
+	printf(
+	    "%sSS %s saving durable state\n", data->tssPairID.present() ? "T" : "", data->thisServerID.toString().c_str());
 	storage->set(persistFormat);
 	storage->set(KeyValueRef(persistID, BinaryWriter::toValue(data->thisServerID, Unversioned())));
+	if (data->tssPairID.present()) {
+		storage->set(KeyValueRef(persistTssPairID, BinaryWriter::toValue(data->tssPairID.get(), Unversioned())));
+	}
 	storage->set(KeyValueRef(persistVersion, BinaryWriter::toValue(data->version.get(), Unversioned())));
 	storage->set(KeyValueRef(persistShardAssignedKeys.begin.toString(), LiteralStringRef("0")));
 	storage->set(KeyValueRef(persistShardAvailableKeys.begin.toString(), LiteralStringRef("0")));
@@ -3929,6 +4218,7 @@ ACTOR Future<Void> restoreByteSample(StorageServer* data,
 ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* storage) {
 	state Future<Optional<Value>> fFormat = storage->readValue(persistFormat.key);
 	state Future<Optional<Value>> fID = storage->readValue(persistID);
+	state Future<Optional<Value>> ftssPairID = storage->readValue(persistTssPairID);
 	state Future<Optional<Value>> fVersion = storage->readValue(persistVersion);
 	state Future<Optional<Value>> fLogProtocol = storage->readValue(persistLogProtocol);
 	state Future<Optional<Value>> fPrimaryLocality = storage->readValue(persistPrimaryLocality);
@@ -3941,7 +4231,7 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 	    restoreByteSample(data, storage, byteSampleSampleRecovered, startByteSampleRestore.getFuture());
 
 	TraceEvent("ReadingDurableState", data->thisServerID);
-	wait(waitForAll(std::vector{ fFormat, fID, fVersion, fLogProtocol, fPrimaryLocality }));
+	wait(waitForAll(std::vector{ fFormat, fID, ftssPairID, fVersion, fLogProtocol, fPrimaryLocality }));
 	wait(waitForAll(std::vector{ fShardAssigned, fShardAvailable }));
 	wait(byteSampleSampleRecovered.getFuture());
 	TraceEvent("RestoringDurableState", data->thisServerID);
@@ -3961,7 +4251,12 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 		throw worker_recovery_failed();
 	}
 	data->thisServerID = BinaryReader::fromStringRef<UID>(fID.get().get(), Unversioned());
-	data->sk = serverKeysPrefixFor(data->thisServerID).withPrefix(systemKeys.begin); // FFFF/serverKeys/[this server]/
+	if (ftssPairID.get().present()) {
+		data->setTssPair(BinaryReader::fromStringRef<UID>(ftssPairID.get().get(), Unversioned()));
+	}
+
+	data->sk = serverKeysPrefixFor((data->tssPairID.present()) ? data->tssPairID.get() : data->thisServerID)
+	               .withPrefix(systemKeys.begin); // FFFF/serverKeys/[this server]/
 
 	if (fLogProtocol.get().present())
 		data->logProtocol = BinaryReader::fromStringRef<ProtocolVersion>(fLogProtocol.get().get(), Unversioned());
@@ -3973,6 +4268,17 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 	debug_checkRestoredVersion(data->thisServerID, version, "StorageServer");
 	data->setInitialVersion(version);
 
+	// TODO REMOVE print
+	printf("%sSS %s restored durable state @ %lld\n",
+	       data->tssPairID.present() ? "T" : "",
+	       data->thisServerID.toString().c_str(),
+	       version);
+	if (data->tssPairID.present()) {
+		printf("TSS %s recovered pairing to SS %s\n",
+		       data->thisServerID.toString().c_str(),
+		       data->tssPairID.get().toString().c_str());
+	}
+
 	state RangeResult available = fShardAvailable.get();
 	state int availableLoc;
 	for (availableLoc = 0; availableLoc < available.size(); availableLoc++) {
@@ -4006,6 +4312,7 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 		wait(yield());
 	}
 
+	// TODO why is this seemingly random delay here?
 	wait(delay(0.0001));
 
 	{
@@ -4253,20 +4560,30 @@ ACTOR Future<Void> metricsCore(StorageServer* self, StorageServerInterface ssi)
 
 	wait(self->byteSampleRecovery);
 
-	Tag tag = self->tag;
 	self->actors.add(traceCounters("StorageMetrics",
 	                               self->thisServerID,
 	                               SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                               &self->counters.cc,
 	                               self->thisServerID.toString() + "/StorageMetrics",
-	                               [tag, self=self](TraceEvent& te) {
-		                               te.detail("Tag", tag.toString());
-		                               StorageBytes sb = self->storage.getStorageBytes();
+	                               [self=self](TraceEvent& te) {
+		                               te.detail("Tag", self->tag.toString());
+									   StorageBytes sb = self->storage.getStorageBytes();
 		                               te.detail("KvstoreBytesUsed", sb.used);
 		                               te.detail("KvstoreBytesFree", sb.free);
 		                               te.detail("KvstoreBytesAvailable", sb.available);
 		                               te.detail("KvstoreBytesTotal", sb.total);
 		                               te.detail("KvstoreBytesTemp", sb.temp);
+		                               if (self->isTss()) {
+			                               te.detail("TSSPairID", self->tssPairID);
+			                               te.detail("TSSJointID",
+			                                         UID(self->thisServerID.first() ^ self->tssPairID.get().first(),
+			                                             self->thisServerID.second() ^ self->tssPairID.get().second()));
+		                               } else if (self->isSSWithTSSPair()) {
+			                               te.detail("SSPairID", self->ssPairID);
+			                               te.detail("TSSJointID",
+			                                         UID(self->thisServerID.first() ^ self->ssPairID.get().first(),
+			                                             self->thisServerID.second() ^ self->ssPairID.get().second()));
+		                               }
 	                               }));
 
 	loop {
@@ -4370,6 +4687,20 @@ ACTOR Future<Void> serveGetValueRequests(StorageServer* self, FutureStream<GetVa
 ACTOR Future<Void> serveGetKeyValuesRequests(StorageServer* self, FutureStream<GetKeyValuesRequest> getKeyValues) {
 	loop {
 		GetKeyValuesRequest req = waitNext(getKeyValues);
+
+		if (req.begin.getKey().toString() == "m3fc7" && req.end.getKey().toString() == "s" &&
+		    req.version == 133421369) {
+			printf("%sSS %s got range read [%s - %s) @ %lld\n",
+			       self->isTss() ? "T" : "",
+			       self->thisServerID.toString().c_str(),
+			       req.begin.getKey().printable().c_str(),
+			       req.end.getKey().printable().c_str(),
+			       req.version);
+		}
+
+		// A TSS should never be the source for fetch keys
+		ASSERT(!self->tssPairID.present() || !req.isFetchKeys);
+
 		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
 		// before doing real work
 		self->actors.add(self->readGuard(req, getKeyValuesQ));
@@ -4601,6 +4932,28 @@ ACTOR Future<Void> storageServerCore(StorageServer* self, StorageServerInterface
 						}
 					}
 				}
+				// SS monitors tss mapping here to see if it has a tss pair.
+				// This information is only used for ss/tss pair metrics reporting so it's ok to be eventually
+				// consistent.
+				if (!self->isTss()) {
+					ClientDBInfo clientInfo = self->db->get().client;
+					Optional<StorageServerInterface> myTssPair = clientInfo.getTssPair(self->thisServerID);
+					if (myTssPair.present()) {
+						// TODO REMOVE print, just for debugging
+						if (!self->ssPairID.present()) {
+							printf("SS %s found tss pair %s\n",
+							       self->thisServerID.toString().c_str(),
+							       myTssPair.get().id().toString().c_str());
+						}
+						self->setSSWithTssPair(myTssPair.get().id());
+					} else {
+						// TODO REMOVE print, just for debugging
+						if (self->ssPairID.present()) {
+							printf("SS %s lost tss pair\n", self->thisServerID.toString().c_str());
+						}
+						self->clearSSWithTssPair();
+					}
+				}
 			}
 			when(GetShardStateRequest req = waitNext(ssi.getShardState.getFuture())) {
 				if (req.mode == GetShardStateRequest::NO_WAIT) {
@@ -4667,18 +5020,19 @@ ACTOR Future<Void> memoryStoreRecover(IKeyValueStore* store, Reference<ClusterCo
 	// create a temp client connect to DB
 	Database cx = Database::createDatabase(connFile, Database::API_VERSION_LATEST);
 
-	state Transaction tr(cx);
+	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);
 	state int noCanRemoveCount = 0;
 	loop {
 		try {
-			tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+			tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 
-			state bool canRemove = wait(canRemoveStorageServer(&tr, id));
+			state bool canRemove = wait(canRemoveStorageServer(tr, id));
 			if (!canRemove) {
 				TEST(true); // it's possible that the caller had a transaction in flight that assigned keys to the
 				            // server. Wait for it to reverse its mistake.
 				wait(delayJittered(SERVER_KNOBS->REMOVE_RETRY_DELAY, TaskPriority::UpdateStorage));
-				tr.reset();
+				tr->reset();
 				TraceEvent("RemoveStorageServerRetrying")
 				    .detail("Count", noCanRemoveCount++)
 				    .detail("ServerID", id)
@@ -4688,21 +5042,34 @@ ACTOR Future<Void> memoryStoreRecover(IKeyValueStore* store, Reference<ClusterCo
 			}
 		} catch (Error& e) {
 			state Error err = e;
-			wait(tr.onError(e));
+			wait(tr->onError(e));
 			TraceEvent("RemoveStorageServerRetrying").error(err);
 		}
 	}
 }
 
+// for creating a new storage server
 ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
                                  StorageServerInterface ssi,
                                  Tag seedTag,
+                                 Version tssSeedVersion,
                                  ReplyPromise<InitializeStorageReply> recruitReply,
                                  Reference<AsyncVar<ServerDBInfo>> db,
                                  std::string folder) {
 	state StorageServer self(persistentData, db, ssi);
+	if (ssi.isTss) {
+		self.setTssPair(ssi.tssPairID);
+		ASSERT(self.isTss());
+	}
 
-	self.sk = serverKeysPrefixFor(self.thisServerID).withPrefix(systemKeys.begin); // FFFF/serverKeys/[this server]/
+	// TODO REMOVE
+	printf("initializing %sstorage %s with tag %s and tss pair=%s\n",
+	       ssi.isTss ? "testing " : "",
+	       ssi.id().toString().c_str(),
+	       seedTag.toString().c_str(),
+	       self.tssPairID.present() ? self.tssPairID.get().toString().c_str() : "");
+	self.sk = serverKeysPrefixFor(self.tssPairID.present() ? self.tssPairID.get() : self.thisServerID)
+	              .withPrefix(systemKeys.begin); // FFFF/serverKeys/[this server]/
 	self.folder = folder;
 
 	try {
@@ -4713,7 +5080,16 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 			std::pair<Version, Tag> verAndTag = wait(addStorageServer(
 			    self.cx, ssi)); // Might throw recruitment_failed in case of simultaneous master failure
 			self.tag = verAndTag.second;
-			self.setInitialVersion(verAndTag.first - 1);
+			// self.setInitialVersion(ssi.isTss ? 0 : verAndTag.first - 1);
+			if (ssi.isTss) {
+				printf("TSS %s overriding initial version from %lld to %lld\n",
+				       ssi.id().toString().c_str(),
+				       verAndTag.first - 1,
+				       tssSeedVersion);
+				self.setInitialVersion(tssSeedVersion);
+			} else {
+				self.setInitialVersion(verAndTag.first - 1);
+			}
 		} else {
 			self.tag = seedTag;
 		}
@@ -4723,7 +5099,8 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 
 		TraceEvent("StorageServerInit", ssi.id())
 		    .detail("Version", self.version.get())
-		    .detail("SeedTag", seedTag.toString());
+		    .detail("SeedTag", seedTag.toString())
+		    .detail("TssPair", ssi.isTss ? ssi.tssPairID.toString() : "");
 		InitializeStorageReply rep;
 		rep.interf = ssi;
 		rep.addedVersion = self.version.get();
@@ -4744,6 +5121,10 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 }
 
 ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface ssi) {
+	printf("SS %s replacing interface\ngetValue=%s\n",
+	       ssi.id().toString().c_str(),
+	       ssi.getValue.getEndpoint().token.toString().c_str());
+	ASSERT(!ssi.isTss);
 	state Transaction tr(self->cx);
 
 	loop {
@@ -4758,8 +5139,17 @@ ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface
 			                                     GetStorageServerRejoinInfoRequest(ssi.id(), ssi.locality.dcId()))
 			                  : Never())) {
 				state GetStorageServerRejoinInfoReply rep = _rep;
+
+				printf("SS %s got rejoin reply:\nversion: %" PRIu64 "\ntag: %s\nnewTag: %s\nnewLocality: %s\n",
+				       ssi.id().toString().c_str(),
+				       rep.version,
+				       rep.tag.toString().c_str(),
+				       rep.newTag.present() ? rep.newTag.get().toString().c_str() : "",
+				       rep.newLocality ? "true" : "false");
+
 				try {
 					tr.reset();
+					// TODO why doesn't this need ACCESS_SYSTEM_KEYS?
 					tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 					tr.setVersion(rep.version);
 
@@ -4776,6 +5166,7 @@ ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface
 						       tagLocalityListValue(rep.newTag.get().locality));
 					}
 
+					// this only should happen if SS moved datacenters
 					if (rep.newTag.present()) {
 						KeyRange conflictRange = singleKeyRange(serverTagConflictKeyFor(rep.newTag.get()));
 						tr.addReadConflictRange(conflictRange);
@@ -4793,6 +5184,7 @@ ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface
 
 					choose {
 						when(wait(tr.commit())) {
+							printf("SS committed rejoin txn\n");
 							self->history = rep.history;
 
 							if (rep.newTag.present()) {
@@ -4821,6 +5213,7 @@ ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface
 						when(wait(infoChanged)) {}
 					}
 				} catch (Error& e) {
+					printf("rejoin txn got error: %d!!\n", e.code());
 					wait(tr.onError(e));
 				}
 			}
@@ -4831,6 +5224,64 @@ ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface
 	return Void();
 }
 
+ACTOR Future<Void> replaceTSSInterface(StorageServer* self, StorageServerInterface ssi) {
+	// RYW for KeyBackedMap
+	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(self->cx);
+	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+
+	ASSERT(ssi.isTss);
+
+	printf("TSS %s replacing interface:\ngetValue=%s\n",
+	       ssi.id().toString().c_str(),
+	       ssi.getValue.getEndpoint().token.toString().c_str());
+
+	// TODO should this loop until successful? it should never have conflicts, in theory
+
+	loop {
+		try {
+			state Tag myTag;
+
+			tr->reset();
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS); // TODO is this needed?
+			tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+
+			Optional<Value> pairTagValue = wait(tr->get(serverTagKeyFor(self->tssPairID.get())));
+
+			if (!pairTagValue.present()) {
+				TEST(true); // Race where tss was down, pair was removed, tss starts back up
+				throw worker_removed();
+			}
+
+			myTag = decodeServerTagValue(pairTagValue.get());
+
+			tr->addReadConflictRange(singleKeyRange(serverListKeyFor(ssi.id())));
+			tr->set(serverListKeyFor(ssi.id()), serverListValue(ssi));
+
+			// add itself back to tss mapping
+			// tr->set(tssMappingKeyFor(self->tssPairID.get()), tssMappingValueFor(ssi.id()));
+			tssMapDB.set(tr, self->tssPairID.get(), ssi.id());
+			tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
+
+			wait(tr->commit());
+
+			// TODO trace event instead
+			printf("tss %s added itself back, got tag %s for partner %s\n",
+			       self->thisServerID.toString().c_str(),
+			       self->tag.toString().c_str(),
+			       self->tssPairID.get().toString().c_str());
+			self->tag = myTag;
+
+			break;
+		} catch (Error& e) {
+			printf("tss replace interface got error %d!!\n", e.code());
+			wait(tr->onError(e));
+		}
+	}
+
+	return Void();
+}
+
+// for recovering an existing storage server
 ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
                                  StorageServerInterface ssi,
                                  Reference<AsyncVar<ServerDBInfo>> db,
@@ -4839,7 +5290,7 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
                                  Reference<ClusterConnectionFile> connFile) {
 	state StorageServer self(persistentData, db, ssi);
 	self.folder = folder;
-	self.sk = serverKeysPrefixFor(self.thisServerID).withPrefix(systemKeys.begin); // FFFF/serverKeys/[this server]/
+
 	try {
 		state double start = now();
 		TraceEvent("StorageServerRebootStart", self.thisServerID);
@@ -4864,13 +5315,30 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 		}
 		TraceEvent("SSTimeRestoreDurableState", self.thisServerID).detail("TimeTaken", now() - start);
 
+		// if this is a tss storage file, use that as source of truth for this server being a tss instead of the
+		// presence of the tss pair key in the storage engine
+		if (ssi.isTss) {
+			ASSERT(self.isTss());
+			ssi.tssPairID = self.tssPairID.get();
+		} else {
+			ASSERT(!self.isTss());
+		}
+
 		ASSERT(self.thisServerID == ssi.id());
+
+		self.sk = serverKeysPrefixFor(self.tssPairID.present() ? self.tssPairID.get() : self.thisServerID)
+		              .withPrefix(systemKeys.begin); // FFFF/serverKeys/[this server]/
+
 		TraceEvent("StorageServerReboot", self.thisServerID).detail("Version", self.version.get());
 
 		if (recovered.canBeSet())
 			recovered.send(Void());
 
-		wait(replaceInterface(&self, ssi));
+		if (self.isTss()) {
+			wait(replaceTSSInterface(&self, ssi));
+		} else {
+			wait(replaceInterface(&self, ssi));
+		}
 
 		TraceEvent("StorageServerStartingCore", self.thisServerID).detail("TimeTaken", now() - start);
 
diff --git a/fdbserver/tester.actor.cpp b/fdbserver/tester.actor.cpp
index fa18a376a41..66cfea0747d 100644
--- a/fdbserver/tester.actor.cpp
+++ b/fdbserver/tester.actor.cpp
@@ -869,6 +869,7 @@ ACTOR Future<Void> checkConsistency(Database cx,
                                     std::vector<TesterInterface> testers,
                                     bool doQuiescentCheck,
                                     bool doCacheCheck,
+                                    bool doTSSCheck,
                                     double quiescentWaitTimeout,
                                     double softTimeLimit,
                                     double databasePingDelay,
@@ -885,12 +886,16 @@ ACTOR Future<Void> checkConsistency(Database cx,
 	Standalone<VectorRef<KeyValueRef>> options;
 	StringRef performQuiescent = LiteralStringRef("false");
 	StringRef performCacheCheck = LiteralStringRef("false");
+	StringRef performTSSCheck = LiteralStringRef("false");
 	if (doQuiescentCheck) {
 		performQuiescent = LiteralStringRef("true");
 	}
 	if (doCacheCheck) {
 		performCacheCheck = LiteralStringRef("true");
 	}
+	if (doTSSCheck) {
+		performTSSCheck = LiteralStringRef("true");
+	}
 	spec.title = LiteralStringRef("ConsistencyCheck");
 	spec.databasePingDelay = databasePingDelay;
 	spec.timeout = 32000;
@@ -898,6 +903,7 @@ ACTOR Future<Void> checkConsistency(Database cx,
 	                       KeyValueRef(LiteralStringRef("testName"), LiteralStringRef("ConsistencyCheck")));
 	options.push_back_deep(options.arena(), KeyValueRef(LiteralStringRef("performQuiescentChecks"), performQuiescent));
 	options.push_back_deep(options.arena(), KeyValueRef(LiteralStringRef("performCacheCheck"), performCacheCheck));
+	options.push_back_deep(options.arena(), KeyValueRef(LiteralStringRef("performTSSCheck"), performTSSCheck));
 	options.push_back_deep(options.arena(),
 	                       KeyValueRef(LiteralStringRef("quiescentWaitTimeout"),
 	                                   ValueRef(options.arena(), format("%f", quiescentWaitTimeout))));
@@ -973,6 +979,8 @@ ACTOR Future<bool> runTest(Database cx,
 				                                   testers,
 				                                   quiescent,
 				                                   spec.runConsistencyCheckOnCache,
+				                                   // spec.runConsistencyCheckOnTSS, // TODO override with true to test
+				                                   true,
 				                                   10000.0,
 				                                   18000,
 				                                   spec.databasePingDelay,
@@ -1108,6 +1116,11 @@ std::map<std::string, std::function<void(const std::string& value, TestSpec* spe
 	      spec->runConsistencyCheckOnCache = (value == "true");
 	      TraceEvent("TestParserTest").detail("ParsedRunConsistencyCheckOnCache", spec->runConsistencyCheckOnCache);
 	  } },
+	{ "runConsistencyCheckOnTSS",
+	  [](const std::string& value, TestSpec* spec) {
+	      spec->runConsistencyCheckOnTSS = (value == "true");
+	      TraceEvent("TestParserTest").detail("ParsedRunConsistencyCheckOnTSS", spec->runConsistencyCheckOnTSS);
+	  } },
 	{ "waitForQuiescence",
 	  [](const std::string& value, TestSpec* spec) {
 	      bool toWait = value == "true";
@@ -1430,14 +1443,19 @@ ACTOR Future<Void> runTests(Reference<AsyncVar<Optional<struct ClusterController
 	if (useDB && startingConfiguration != StringRef()) {
 		try {
 			wait(timeoutError(changeConfiguration(cx, testers, startingConfiguration), 2000.0));
+			printf("starting config changed\n");
 			if (g_network->isSimulated() && enableDD) {
+				printf("waiting for DD\n");
 				wait(success(setDDMode(cx, 1)));
+				printf("done waiting for DD\n");
 			}
 		} catch (Error& e) {
 			TraceEvent(SevError, "TestFailure").error(e).detail("Reason", "Unable to set starting configuration");
 		}
 	}
 
+	printf("starting configuration set, moving on\n");
+
 	if (useDB && waitForQuiescenceBegin) {
 		TraceEvent("TesterStartingPreTestChecks")
 		    .detail("DatabasePingDelay", databasePingDelay)
@@ -1453,6 +1471,8 @@ ACTOR Future<Void> runTests(Reference<AsyncVar<Optional<struct ClusterController
 		}
 	}
 
+	printf("database quiesced, starting tests.\n");
+
 	TraceEvent("TestsExpectedToPass").detail("Count", tests.size());
 	state int idx = 0;
 	for (; idx < tests.size(); idx++) {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 97f22d3c689..0ec4ce458fb 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -275,6 +275,7 @@ ACTOR Future<Void> loadedPonger(FutureStream<LoadedPingRequest> pings) {
 }
 
 StringRef fileStoragePrefix = LiteralStringRef("storage-");
+StringRef testingStoragePrefix = LiteralStringRef("testingstorage-");
 StringRef fileLogDataPrefix = LiteralStringRef("log-");
 StringRef fileVersionedLogDataPrefix = LiteralStringRef("log2-");
 StringRef fileLogQueuePrefix = LiteralStringRef("logqueue-");
@@ -318,6 +319,7 @@ std::string filenameFromSample(KeyValueStoreType storeType, std::string folder,
 }
 
 std::string filenameFromId(KeyValueStoreType storeType, std::string folder, std::string prefix, UID id) {
+
 	if (storeType == KeyValueStoreType::SSD_BTREE_V1)
 		return joinPath(folder, prefix + id.toString() + ".fdb");
 	else if (storeType == KeyValueStoreType::SSD_BTREE_V2)
@@ -329,6 +331,7 @@ std::string filenameFromId(KeyValueStoreType storeType, std::string folder, std:
 	else if (storeType == KeyValueStoreType::SSD_ROCKSDB_V1)
 		return joinPath(folder, prefix + id.toString() + ".rocksdb");
 
+	printf("UNKNOWN storeType %s\n", storeType.toString().c_str());
 	UNREACHABLE();
 }
 
@@ -447,6 +450,9 @@ std::vector<DiskStore> getDiskStores(std::string folder,
 		if (filename.startsWith(fileStoragePrefix)) {
 			store.storedComponent = DiskStore::Storage;
 			prefix = fileStoragePrefix;
+		} else if (filename.startsWith(testingStoragePrefix)) {
+			store.storedComponent = DiskStore::Storage;
+			prefix = testingStoragePrefix;
 		} else if (filename.startsWith(fileVersionedLogDataPrefix)) {
 			store.storedComponent = DiskStore::TLogData;
 			// Use the option string that's in the file rather than tLogOptions.toPrefix(),
@@ -738,6 +744,7 @@ ACTOR Future<Void> storageServerRollbackRebooter(Future<Void> prevStorageServer,
                                                  std::string filename,
                                                  UID id,
                                                  LocalityData locality,
+                                                 bool isTss,
                                                  Reference<AsyncVar<ServerDBInfo>> db,
                                                  std::string folder,
                                                  ActorCollection* filesClosed,
@@ -755,6 +762,7 @@ ACTOR Future<Void> storageServerRollbackRebooter(Future<Void> prevStorageServer,
 		StorageServerInterface recruited;
 		recruited.uniqueID = id;
 		recruited.locality = locality;
+		recruited.isTss = isTss;
 		recruited.initEndpoints();
 
 		DUMPTOKEN(recruited.getValue);
@@ -1096,14 +1104,26 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				Future<Void> kvClosed = kv->onClosed();
 				filesClosed.add(kvClosed);
 
+				// std::string doesn't have startsWith
+				std::string tssPrefix = testingStoragePrefix.toString();
+				// TODO might be more efficient to mark a boolean on DiskStore in getDiskStores, but that kind of breaks
+				// the abstraction since DiskStore also applies to storage cache + tlog
+				bool isTss = s.filename.find(tssPrefix) != std::string::npos;
+				// TODO REMOVE after test
+				printf("%s is%s tss filename\n", s.filename.c_str(), isTss ? "" : " not");
+				Role ssRole = isTss ? Role::TESTING_STORAGE_SERVER : Role::STORAGE_SERVER;
+
 				StorageServerInterface recruited;
 				recruited.uniqueID = s.storeID;
 				recruited.locality = locality;
+				recruited.isTss = isTss;
 				recruited.initEndpoints();
 
 				std::map<std::string, std::string> details;
 				details["StorageEngine"] = s.storeType.toString();
-				startRole(Role::STORAGE_SERVER, recruited.id(), interf.id(), details, "Restored");
+				details["IsTSS"] = isTss ? "Yes" : "No";
+
+				startRole(ssRole, recruited.id(), interf.id(), details, "Restored");
 
 				DUMPTOKEN(recruited.getValue);
 				DUMPTOKEN(recruited.getKey);
@@ -1128,12 +1148,13 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				                                  s.filename,
 				                                  recruited.id(),
 				                                  recruited.locality,
+				                                  isTss,
 				                                  dbInfo,
 				                                  folder,
 				                                  &filesClosed,
 				                                  memoryLimit,
 				                                  kv);
-				errorForwarders.add(forwardError(errors, Role::STORAGE_SERVER, recruited.id(), f));
+				errorForwarders.add(forwardError(errors, ssRole, recruited.id(), f));
 			} else if (s.storedComponent == DiskStore::TLogData) {
 				std::string logQueueBasename;
 				const std::string filename = basename(s.filename);
@@ -1485,13 +1506,29 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 			}
 			when(InitializeStorageRequest req = waitNext(interf.storage.getFuture())) {
 				if (!storageCache.exists(req.reqId)) {
+
+					printf("Got "
+					       "InitializeStorageRequest:seedTag=%s\nreqId=%s\ninterfaceId=%s\nstoreType=%s\nisTss=%"
+					       "s\ntssPairID=%s\ntssPairVersion=%lld\n\n",
+					       req.seedTag.toString().c_str(),
+					       req.reqId.toString().c_str(),
+					       req.interfaceId.toString().c_str(),
+					       req.storeType.toString().c_str(),
+					       req.isTss ? "true" : "false",
+					       req.isTss ? req.tssPairID.toString().c_str() : "",
+					       req.isTss ? req.tssPairVersion : 0);
+
 					StorageServerInterface recruited(req.interfaceId);
 					recruited.locality = locality;
+					recruited.isTss = req.isTss;
+					recruited.tssPairID = req.tssPairID;
 					recruited.initEndpoints();
 
 					std::map<std::string, std::string> details;
 					details["StorageEngine"] = req.storeType.toString();
-					startRole(Role::STORAGE_SERVER, recruited.id(), interf.id(), details);
+					details["IsTSS"] = std::to_string(recruited.isTss);
+					Role ssRole = recruited.isTss ? Role::TESTING_STORAGE_SERVER : Role::STORAGE_SERVER;
+					startRole(ssRole, recruited.id(), interf.id(), details);
 
 					DUMPTOKEN(recruited.getValue);
 					DUMPTOKEN(recruited.getKey);
@@ -1506,16 +1543,21 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 					DUMPTOKEN(recruited.getQueuingMetrics);
 					DUMPTOKEN(recruited.getKeyValueStoreType);
 					DUMPTOKEN(recruited.watchValue);
-					// printf("Recruited as storageServer\n");
+					// TODO re-comment!
+					printf("Recruited as storageServer\n");
 
 					std::string filename =
-					    filenameFromId(req.storeType, folder, fileStoragePrefix.toString(), recruited.id());
+					    filenameFromId(req.storeType,
+					                   folder,
+					                   recruited.isTss ? testingStoragePrefix.toString() : fileStoragePrefix.toString(),
+					                   recruited.id());
 					IKeyValueStore* data = openKVStore(req.storeType, filename, recruited.id(), memoryLimit);
 					Future<Void> kvClosed = data->onClosed();
 					filesClosed.add(kvClosed);
 					ReplyPromise<InitializeStorageReply> storageReady = req.reply;
 					storageCache.set(req.reqId, storageReady.getFuture());
-					Future<Void> s = storageServer(data, recruited, req.seedTag, storageReady, dbInfo, folder);
+					Future<Void> s =
+					    storageServer(data, recruited, req.seedTag, req.tssPairVersion, storageReady, dbInfo, folder);
 					s = handleIOErrors(s, data, recruited.id(), kvClosed);
 					s = storageCache.removeOnReady(req.reqId, s);
 					s = storageServerRollbackRebooter(s,
@@ -1523,12 +1565,13 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 					                                  filename,
 					                                  recruited.id(),
 					                                  recruited.locality,
+					                                  req.isTss,
 					                                  dbInfo,
 					                                  folder,
 					                                  &filesClosed,
 					                                  memoryLimit,
 					                                  data);
-					errorForwarders.add(forwardError(errors, Role::STORAGE_SERVER, recruited.id(), s));
+					errorForwarders.add(forwardError(errors, ssRole, recruited.id(), s));
 				} else
 					forwardPromise(req.reply, storageCache.get(req.reqId));
 			}
@@ -2109,6 +2152,7 @@ ACTOR Future<Void> fdbd(Reference<ClusterConnectionFile> connFile,
 
 const Role Role::WORKER("Worker", "WK", false);
 const Role Role::STORAGE_SERVER("StorageServer", "SS");
+const Role Role::TESTING_STORAGE_SERVER("TestingStorageServer", "TS");
 const Role Role::TRANSACTION_LOG("TLog", "TL");
 const Role Role::SHARED_TRANSACTION_LOG("SharedTLog", "SL", false);
 const Role Role::COMMIT_PROXY("CommitProxyServer", "CP");
@@ -2116,7 +2160,7 @@ const Role Role::GRV_PROXY("GrvProxyServer", "GP");
 const Role Role::MASTER("MasterServer", "MS");
 const Role Role::RESOLVER("Resolver", "RV");
 const Role Role::CLUSTER_CONTROLLER("ClusterController", "CC");
-const Role Role::TESTER("Tester", "TS");
+const Role Role::TESTER("TestClient", "TC");
 const Role Role::LOG_ROUTER("LogRouter", "LR");
 const Role Role::DATA_DISTRIBUTOR("DataDistributor", "DD");
 const Role Role::RATEKEEPER("Ratekeeper", "RK");
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 722e1f5e6ea..0aae7ca9d42 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -48,6 +48,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 	// Whether or not perform consistency check between storage cache servers and storage servers
 	bool performCacheCheck;
 
+	// Whether or not to perform consistency check between storage servers and pair TSS
+	bool performTSSCheck;
+
 	// How long to wait for the database to go quiet before failing (if doing quiescent checks)
 	double quiescentWaitTimeout;
 
@@ -94,6 +97,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 	ConsistencyCheckWorkload(WorkloadContext const& wcx) : TestWorkload(wcx) {
 		performQuiescentChecks = getOption(options, LiteralStringRef("performQuiescentChecks"), false);
 		performCacheCheck = getOption(options, LiteralStringRef("performCacheCheck"), false);
+		performTSSCheck = getOption(options, LiteralStringRef("performTSSCheck"), false);
 		quiescentWaitTimeout = getOption(options, LiteralStringRef("quiescentWaitTimeout"), 600.0);
 		distributed = getOption(options, LiteralStringRef("distributed"), true);
 		shardSampleFactor = std::max(getOption(options, LiteralStringRef("shardSampleFactor"), 1), 1);
@@ -1057,7 +1061,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 					TraceEvent("ConsistencyCheck_FailedToFetchMetrics")
 					    .detail("Begin", printable(shard.begin))
 					    .detail("End", printable(shard.end))
-					    .detail("StorageServer", storageServers[i].id());
+					    .detail("StorageServer", storageServers[i].id())
+					    .detail("IsTSS", storageServers[i].isTss ? "True" : "False")
+					    .error(reply.getError());
 					estimatedBytes.push_back(-1);
 				}
 
@@ -1074,7 +1080,10 @@ struct ConsistencyCheckWorkload : TestWorkload {
 						    .detail("Begin", printable(shard.begin))
 						    .detail("End", printable(shard.end))
 						    .detail("StorageServer1", storageServers[firstValidStorageServer].id())
-						    .detail("StorageServer2", storageServers[i].id());
+						    .detail("StorageServer2", storageServers[i].id())
+						    .detail("IsTSS",
+						            storageServers[i].isTss || storageServers[firstValidStorageServer].isTss ? "True"
+						                                                                                     : "False");
 					}
 				}
 			}
@@ -1236,6 +1245,28 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				}
 			}
 
+			// add TSS to end of list, if configured and if not relocating
+			if (!isRelocating && self->performTSSCheck) {
+				printf("CCheck: Checking for tss to add: isRelocating: %s, performTSSCheck: %s\n",
+				       isRelocating ? "T" : "F",
+				       self->performTSSCheck ? "T" : "F");
+				int initialSize = storageServers.size();
+				for (int i = 0; i < initialSize; i++) {
+					Optional<StorageServerInterface> tssPair = cx->clientInfo->get().getTssPair(storageServers[i]);
+					if (tssPair.present()) {
+						printf("CCheck: Adding TSS %s to consistency check!\n", tssPair.get().id().toString().c_str());
+						storageServers.push_back(tssPair.get().id());
+						storageServerInterfaces.push_back(tssPair.get());
+					} else {
+						printf("CCheck: SS %s doesn't have tss pair\n", storageServers[i].toString().c_str());
+					}
+				}
+			} else {
+				printf("CCheck: Not checking for tss to add: isRelocating: %s, performTSSCheck: %s\n",
+				       isRelocating ? "T" : "F",
+				       self->performTSSCheck ? "T" : "F");
+			}
+
 			state vector<int64_t> estimatedBytes = wait(self->getStorageSizeEstimate(storageServerInterfaces, range));
 
 			// Gets permitted size range of shard
@@ -1323,7 +1354,8 @@ struct ConsistencyCheckWorkload : TestWorkload {
 										// Be especially verbose if in simulation
 										if (g_network->isSimulated()) {
 											int invalidIndex = -1;
-											printf("\nSERVER %d (%s); shard = %s - %s:\n",
+											printf("\n%sSERVER %d (%s); shard = %s - %s:\n",
+											       storageServerInterfaces[j].isTss ? "TSS " : "",
 											       j,
 											       storageServerInterfaces[j].address().toString().c_str(),
 											       printable(req.begin.getKey()).c_str(),
@@ -1341,7 +1373,8 @@ struct ConsistencyCheckWorkload : TestWorkload {
 											}
 
 											printf(
-											    "\nSERVER %d (%s); shard = %s - %s:\n",
+											    "\n%sSERVER %d (%s); shard = %s - %s:\n",
+											    storageServerInterfaces[firstValidServer].isTss ? "TSS " : "",
 											    firstValidServer,
 											    storageServerInterfaces[firstValidServer].address().toString().c_str(),
 											    printable(req.begin.getKey()).c_str(),
@@ -1430,16 +1463,31 @@ struct ConsistencyCheckWorkload : TestWorkload {
 										            printable(referenceUniqueKey))
 										    .detail("ValueMismatches", valueMismatches)
 										    .detail("ValueMismatchKey", printable(valueMismatchKey))
-										    .detail("MatchingKVPairs", matchingKVPairs);
-
-										self->testFailure("Data inconsistent", true);
-										return false;
+										    .detail("MatchingKVPairs", matchingKVPairs)
+										    .detail("IsTSS",
+										            storageServerInterfaces[j].isTss ||
+										                    storageServerInterfaces[firstValidServer].isTss
+										                ? "True"
+										                : "False");
+
+										// TODO should the test still fail if TSS is wrong? Or is just logging the trace
+										// logs ok
+										if ((g_network->isSimulated() &&
+										     g_simulator.tssMode != ISimulator::TSSMode::EnabledDropMutations) ||
+										    (!storageServerInterfaces[j].isTss &&
+										     !storageServerInterfaces[firstValidServer].isTss)) {
+											self->testFailure("Data inconsistent", true);
+											return false;
+										}
 									}
 								}
 							}
 
 							// If the data is not available and we aren't relocating this shard
 							else if (!isRelocating) {
+								Error e =
+								    rangeResult.isError() ? rangeResult.getError() : rangeResult.get().error.get();
+
 								TraceEvent("ConsistencyCheck_StorageServerUnavailable")
 								    .suppressFor(1.0)
 								    .detail("StorageServer", storageServers[j])
@@ -1448,10 +1496,20 @@ struct ConsistencyCheckWorkload : TestWorkload {
 								    .detail("Address", storageServerInterfaces[j].address())
 								    .detail("UID", storageServerInterfaces[j].id())
 								    .detail("GetKeyValuesToken",
-								            storageServerInterfaces[j].getKeyValues.getEndpoint().token);
+								            storageServerInterfaces[j].getKeyValues.getEndpoint().token)
+								    .detail("IsTSS", storageServerInterfaces[j].isTss ? "True" : "False")
+								    .error(e);
+
+								printf("CC %sSS %s failed with error % d\n",
+								       storageServerInterfaces[j].isTss ? "T" : "",
+								       storageServers[j].toString().c_str(),
+								       e.code());
 
 								// All shards should be available in quiscence
-								if (self->performQuiescentChecks) {
+								// TODO should the test still fail if TSS is unavailable? Or is just logging the trace
+								// logs ok
+								if (self->performQuiescentChecks &&
+								    (g_network->isSimulated() || !storageServerInterfaces[j].isTss)) {
 									self->testFailure("Storage server unavailable");
 									return false;
 								}
@@ -1546,19 +1604,25 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				bool hasValidEstimate = estimatedBytes.size() > 0;
 
 				// If the storage servers' sampled estimate of shard size is different from ours
+				// TODO should the test still fail if TSS has wrong estimate? Or is just logging the trace logs ok
 				if (self->performQuiescentChecks) {
 					for (int j = 0; j < estimatedBytes.size(); j++) {
 						if (estimatedBytes[j] >= 0 && estimatedBytes[j] != sampledBytes) {
 							TraceEvent("ConsistencyCheck_IncorrectEstimate")
 							    .detail("EstimatedBytes", estimatedBytes[j])
 							    .detail("CorrectSampledBytes", sampledBytes)
-							    .detail("StorageServer", storageServers[j]);
-							self->testFailure("Storage servers had incorrect sampled estimate");
+							    .detail("StorageServer", storageServers[j])
+							    .detail("IsTSS", storageServerInterfaces[j].isTss ? "True" : "False");
+
+							if (!storageServerInterfaces[j].isTss) {
+								self->testFailure("Storage servers had incorrect sampled estimate");
+							}
 
 							hasValidEstimate = false;
 
 							break;
-						} else if (estimatedBytes[j] < 0) {
+						} else if (estimatedBytes[j] < 0 &&
+						           (g_network->isSimulated() || !storageServerInterfaces[j].isTss)) {
 							self->testFailure("Could not get storage metrics from server");
 							hasValidEstimate = false;
 							break;
@@ -1670,7 +1734,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 			if (!keyValueStoreType.present()) {
 				TraceEvent("ConsistencyCheck_ServerUnavailable").detail("ServerID", storageServers[i].id());
 				self->testFailure("Storage server unavailable");
-			} else if (keyValueStoreType.get() != configuration.storageServerStoreType) {
+			} else if ((!storageServers[i].isTss && keyValueStoreType.get() != configuration.storageServerStoreType) ||
+			           (storageServers[i].isTss &&
+			            keyValueStoreType.get() != configuration.testingStorageServerStoreType)) {
 				TraceEvent("ConsistencyCheck_WrongKeyValueStoreType")
 				    .detail("ServerID", storageServers[i].id())
 				    .detail("StoreType", keyValueStoreType.get().toString())
@@ -1681,6 +1747,10 @@ struct ConsistencyCheckWorkload : TestWorkload {
 
 			// Check each pair of storage servers for an address match
 			for (j = i + 1; j < storageServers.size(); j++) {
+				// TODO change this hack back once i fix recruitment
+				/*if (storageServers[i].isTss || storageServers[j].isTss) {
+				    continue;
+				}*/
 				if (storageServers[i].address() == storageServers[j].address()) {
 					TraceEvent("ConsistencyCheck_UndesirableServer")
 					    .detail("StorageServer1", storageServers[i].id())
@@ -1701,8 +1771,18 @@ struct ConsistencyCheckWorkload : TestWorkload {
 	                                   ConsistencyCheckWorkload* self) {
 		state vector<WorkerDetails> workers = wait(getWorkers(self->dbInfo));
 		state vector<StorageServerInterface> storageServers = wait(getStorageServers(cx));
-		std::set<Optional<Key>> missingStorage;
-
+		std::vector<Optional<Key>> missingStorage; // vector instead of a set to get the count
+
+		printf("CC starting check for storage: %d workers, %d SS\n", workers.size(), storageServers.size());
+		printf("CC checking %d regions: ", configuration.regions.size());
+		if (configuration.regions.size() == 1) {
+			printf("%s", configuration.regions[0].dcId.toString().c_str());
+		} else if (configuration.regions.size() == 2) {
+			printf("%s %s",
+			       configuration.regions[0].dcId.toString().c_str(),
+			       configuration.regions[1].dcId.toString().c_str());
+		}
+		printf("\n");
 		for (int i = 0; i < workers.size(); i++) {
 			NetworkAddress addr = workers[i].interf.stableAddress();
 			if (!configuration.isExcludedServer(workers[i].interf.addresses()) &&
@@ -1712,29 +1792,83 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				for (int j = 0; j < storageServers.size(); j++) {
 					if (storageServers[j].stableAddress() == addr) {
 						found = true;
+						printf("CC found SS %s on %s in dc %s\n",
+						       storageServers[j].id().toString().c_str(),
+						       addr.toString().c_str(),
+						       workers[i].interf.locality.dcId().present()
+						           ? workers[i].interf.locality.dcId().get().toString().c_str()
+						           : "");
 						break;
 					}
 				}
 				if (!found) {
+					if (configuration.regions.size() == 0 ||
+					    (configuration.regions.size() == 1 &&
+					     workers[i].interf.locality.dcId() == configuration.regions[0].dcId) ||
+					    (configuration.regions.size() == 2 &&
+					     (workers[i].interf.locality.dcId() == configuration.regions[0].dcId ||
+					      workers[i].interf.locality.dcId() == configuration.regions[1].dcId))) {
+						printf("CC found no SS on %s in dc %s\n",
+						       addr.toString().c_str(),
+						       workers[i].interf.locality.dcId().present()
+						           ? workers[i].interf.locality.dcId().get().toString().c_str()
+						           : "");
+					}
+
 					TraceEvent("ConsistencyCheck_NoStorage")
 					    .detail("Address", addr)
 					    .detail("ProcessClassEqualToStorageClass",
 					            (int)(workers[i].processClass == ProcessClass::StorageClass));
-					missingStorage.insert(workers[i].interf.locality.dcId());
+					missingStorage.push_back(workers[i].interf.locality.dcId());
 				}
 			}
 		}
 
+		int missingDc0 = configuration.regions.size() == 0
+		                     ? 0
+		                     : std::count(missingStorage.begin(), missingStorage.end(), configuration.regions[0].dcId);
+		int missingDc1 = configuration.regions.size() < 2
+		                     ? 0
+		                     : std::count(missingStorage.begin(), missingStorage.end(), configuration.regions[1].dcId);
+
 		if ((configuration.regions.size() == 0 && missingStorage.size()) ||
-		    (configuration.regions.size() == 1 && missingStorage.count(configuration.regions[0].dcId)) ||
-		    (configuration.regions.size() == 2 && configuration.usableRegions == 1 &&
-		     missingStorage.count(configuration.regions[0].dcId) &&
-		     missingStorage.count(configuration.regions[1].dcId)) ||
-		    (configuration.regions.size() == 2 && configuration.usableRegions > 1 &&
-		     (missingStorage.count(configuration.regions[0].dcId) ||
-		      missingStorage.count(configuration.regions[1].dcId)))) {
-			self->testFailure("No storage server on worker");
-			return false;
+		    (configuration.regions.size() == 1 && missingDc0) ||
+		    (configuration.regions.size() == 2 && configuration.usableRegions == 1 && missingDc0 && missingDc1) ||
+		    (configuration.regions.size() == 2 && configuration.usableRegions > 1 && (missingDc0 || missingDc1))) {
+
+			// TODO could improve this check by also ensuring DD is currently recruiting a TSS by using quietdb?
+			bool couldExpectMissingTss =
+			    (configuration.desiredTSSCount - self->dbInfo->get().client.tssMapping.size()) > 0;
+			printf("CC couldExpectMissingTss = %s\n", couldExpectMissingTss ? "True" : "False");
+
+			int countMissing = missingStorage.size();
+			int acceptableTssMissing = 1;
+			if (configuration.regions.size() == 1) {
+				countMissing = missingDc0;
+			} else if (configuration.regions.size() == 2) {
+				if (configuration.usableRegions == 1) {
+					// all processes should be missing from 1, so take the number missing from the other
+					countMissing = std::min(missingDc0, missingDc1);
+				} else if (configuration.usableRegions == 2) {
+					countMissing = missingDc0 + missingDc1;
+					acceptableTssMissing = 2;
+				} else {
+					ASSERT(false); // in case fdb ever adds 3+ region support?
+				}
+			}
+
+			if (!couldExpectMissingTss || countMissing > acceptableTssMissing) {
+				printf("No storage server on %d workers. CouldBeTSS=%s, acceptableTssMissing=%d\n",
+				       countMissing,
+				       couldExpectMissingTss ? "T" : "F",
+				       acceptableTssMissing);
+				self->testFailure("No storage server on worker");
+				return false;
+			} else {
+				// TODO sev=30 warn instead of print
+				printf("CC found %d missing storage server on worker, but it is likely a tss(es) waiting for a pair\n",
+				       configuration.usableRegions);
+			}
 		}
 
 		return true;
@@ -1751,8 +1885,10 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		state bool foundExtraDataStore = false;
 		state std::vector<struct ProcessInfo*> protectedProcessesToKill;
 
+		printf("CC checking for extra data stores\n");
 		state std::map<NetworkAddress, std::set<UID>> statefulProcesses;
 		for (const auto& ss : storageServers) {
+			printf("CC Marking %ss as ok\n", ss.id().toString().c_str());
 			statefulProcesses[ss.address()].insert(ss.id());
 			// A process may have two addresses (same ip, different ports)
 			if (ss.secondaryAddress().present()) {
@@ -1809,6 +1945,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				if (statefulProcesses[itr->interf.address()].count(id)) {
 					continue;
 				}
+				printf("CC found extra data store %s on %s\n",
+				       id.toString().c_str(),
+				       itr->interf.address().toString().c_str());
 				// For extra data store
 				TraceEvent("ConsistencyCheck_ExtraDataStore")
 				    .detail("Address", itr->interf.address())
@@ -1841,7 +1980,10 @@ struct ConsistencyCheckWorkload : TestWorkload {
 			}
 		}
 
+		printf("CC check for extra data stores complete\n");
+
 		if (foundExtraDataStore) {
+			printf("CC Extra Data Stores\n");
 			self->testFailure("Extra data stores present on workers");
 			return false;
 		}
diff --git a/fdbserver/workloads/RandomMoveKeys.actor.cpp b/fdbserver/workloads/RandomMoveKeys.actor.cpp
index 8bdafb35e0f..4fe5654a18c 100644
--- a/fdbserver/workloads/RandomMoveKeys.actor.cpp
+++ b/fdbserver/workloads/RandomMoveKeys.actor.cpp
@@ -162,12 +162,13 @@ struct MoveKeysWorkload : TestWorkload {
 		// The real data distribution algorithm doesn't want to deal with multiple servers
 		// with the same address having keys.  So if there are two servers with the same address,
 		// don't use either one (so we don't have to find out which of them, if any, already has keys).
+		// Also get rid of tss since we don't want to move a shard to a tss.
 		std::map<NetworkAddress, int> count;
 		for (int s = 0; s < servers.size(); s++)
 			count[servers[s].address()]++;
 		int o = 0;
 		for (int s = 0; s < servers.size(); s++)
-			if (count[servers[s].address()] == 1)
+			if (count[servers[s].address()] == 1 && !servers[s].isTss)
 				servers[o++] = servers[s];
 		servers.resize(o);
 	}
diff --git a/fdbserver/workloads/workloads.actor.h b/fdbserver/workloads/workloads.actor.h
index 36fcf28312a..ffd669e88b4 100644
--- a/fdbserver/workloads/workloads.actor.h
+++ b/fdbserver/workloads/workloads.actor.h
@@ -152,6 +152,7 @@ class TestSpec {
 		databasePingDelay = g_network->isSimulated() ? 0.0 : 15.0;
 		runConsistencyCheck = g_network->isSimulated();
 		runConsistencyCheckOnCache = false;
+		runConsistencyCheckOnTSS = false;
 		waitForQuiescenceBegin = true;
 		waitForQuiescenceEnd = true;
 		simCheckRelocationDuration = false;
@@ -167,8 +168,8 @@ class TestSpec {
 	         double databasePingDelay = -1.0)
 	  : title(title), dumpAfterTest(dump), clearAfterTest(clear), startDelay(startDelay), useDB(useDB), timeout(600),
 	    databasePingDelay(databasePingDelay), runConsistencyCheck(g_network->isSimulated()),
-	    runConsistencyCheckOnCache(false), waitForQuiescenceBegin(true), waitForQuiescenceEnd(true),
-	    simCheckRelocationDuration(false), simConnectionFailuresDisableDuration(0),
+	    runConsistencyCheckOnCache(false), runConsistencyCheckOnTSS(false), waitForQuiescenceBegin(true),
+	    waitForQuiescenceEnd(true), simCheckRelocationDuration(false), simConnectionFailuresDisableDuration(0),
 	    simBackupAgents(ISimulator::BackupAgentType::NoBackupAgents),
 	    simDrAgents(ISimulator::BackupAgentType::NoBackupAgents) {
 		phases = TestWorkload::SETUP | TestWorkload::EXECUTION | TestWorkload::CHECK | TestWorkload::METRICS;
@@ -187,6 +188,7 @@ class TestSpec {
 	double databasePingDelay;
 	bool runConsistencyCheck;
 	bool runConsistencyCheckOnCache;
+	bool runConsistencyCheckOnTSS;
 	bool waitForQuiescenceBegin;
 	bool waitForQuiescenceEnd;
 
diff --git a/flow/ProtocolVersion.h b/flow/ProtocolVersion.h
index d3c601a9b5c..7feb6b3839a 100644
--- a/flow/ProtocolVersion.h
+++ b/flow/ProtocolVersion.h
@@ -121,7 +121,7 @@ class ProtocolVersion {
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B062010001LL, CloseUnusedConnection);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B063010000LL, DBCoreState);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B063010000LL, TagThrottleValue);
-	PROTOCOL_VERSION_FEATURE(0x0FDB00B063010000LL, ServerListValue);
+	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, ServerListValue);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B063010000LL, StorageCacheValue);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B063010000LL, RestoreStatusValue);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B063010000LL, RestoreRequestValue);
@@ -138,6 +138,8 @@ class ProtocolVersion {
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010000LL, StableInterfaces);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, TagThrottleValueReason);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, SpanContext);
+	// TODO is this right?
+	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, TSS);
 };
 
 template <>
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index a9108ed9f44..491e0381c32 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1240,6 +1240,8 @@ Future<T> brokenPromiseToMaybeDelivered(Future<T> in) {
 		return t;
 	} catch (Error& e) {
 		if (e.code() == error_code_broken_promise) {
+			// TODO REMOVE!
+			printf("broken promise!!");
 			throw request_maybe_delivered();
 		}
 		throw;
diff --git a/flow/serialize.h b/flow/serialize.h
index 81bb18ad4d8..7653648a808 100644
--- a/flow/serialize.h
+++ b/flow/serialize.h
@@ -22,6 +22,9 @@
 #define FLOW_SERIALIZE_H
 #pragma once
 
+// TODO REMOVE
+#include <cinttypes>
+
 #include <stdint.h>
 #include <array>
 #include <set>
@@ -109,6 +112,12 @@ class Serializer {
 public:
 	static void serialize(Archive& ar, T& t) {
 		t.serialize(ar);
+		// TODO REMOVE
+		if (!ar.protocolVersion().isValid()) {
+			printf("invalid protocol version %" PRIx64 " < %" PRIx64 "!!!\n",
+			       ar.protocolVersion().version(),
+			       ProtocolVersion::minValidProtocolVersion);
+		}
 		ASSERT(ar.protocolVersion().isValid());
 	}
 };
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 84cdeaaafeb..2ab7d6dcdb3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -87,7 +87,9 @@ if(WITH_PYTHON)
   add_fdb_test(TEST_FILES SlowTask.txt IGNORE)
   add_fdb_test(TEST_FILES SpecificUnitTest.txt IGNORE)
   add_fdb_test(TEST_FILES StorageMetricsSampleTests.txt IGNORE)
+  add_fdb_test(TEST_FILES StorageServerInterface.txt)
   add_fdb_test(TEST_FILES StreamingWrite.txt IGNORE)
+  add_fdb_test(TEST_FILES SystemData.txt)
   add_fdb_test(TEST_FILES ThreadSafety.txt IGNORE)
   add_fdb_test(TEST_FILES TraceEventMetrics.txt IGNORE)
   add_fdb_test(TEST_FILES PopulateTPCC.txt IGNORE)
diff --git a/tests/StorageServerInterface.txt b/tests/StorageServerInterface.txt
new file mode 100644
index 00000000000..b2bf01bb14b
--- /dev/null
+++ b/tests/StorageServerInterface.txt
@@ -0,0 +1,7 @@
+testTitle=UnitTests
+startDelay=0
+useDB=false
+
+    testName=UnitTests
+    maxTestCases=0
+    testsMatching=/StorageServerInterface/
\ No newline at end of file
diff --git a/tests/SystemData.txt b/tests/SystemData.txt
new file mode 100644
index 00000000000..e8bbc2c57db
--- /dev/null
+++ b/tests/SystemData.txt
@@ -0,0 +1,7 @@
+testTitle=UnitTests
+startDelay=0
+useDB=false
+
+    testName=UnitTests
+    maxTestCases=0
+    testsMatching=/SystemData/
\ No newline at end of file

From 2d028f065170e9dded20b899749a39c88256c70d Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Wed, 12 May 2021 18:53:20 +0000
Subject: [PATCH 232/740] More TSS Changes/Fixes

---
 fdbclient/BackupAgentBase.actor.cpp           |   4 +-
 fdbclient/CommitProxyInterface.h              |   1 -
 fdbclient/DatabaseContext.h                   |   1 -
 fdbclient/ManagementAPI.actor.cpp             |   1 -
 fdbclient/NativeAPI.actor.cpp                 | 103 +++---
 fdbclient/StorageServerInterface.cpp          | 162 ++------
 fdbclient/StorageServerInterface.h            |  12 +-
 fdbclient/SystemData.cpp                      |  17 +-
 fdbrpc/LoadBalance.actor.h                    |  53 +--
 fdbrpc/QueueModel.cpp                         |  15 +-
 fdbrpc/QueueModel.h                           |  12 +-
 fdbrpc/TSSComparison.h                        |  23 +-
 fdbrpc/fdbrpc.h                               |   2 -
 fdbserver/ApplyMetadataMutation.cpp           |  74 +++-
 fdbserver/ClusterController.actor.cpp         |  34 +-
 fdbserver/CommitProxyServer.actor.cpp         |   3 -
 fdbserver/DataDistribution.actor.cpp          | 265 ++++++-------
 fdbserver/DataDistributionTracker.actor.cpp   |  14 +-
 fdbserver/Knobs.cpp                           |   4 +-
 fdbserver/Knobs.h                             |   2 +
 fdbserver/MoveKeys.actor.cpp                  | 171 +++------
 fdbserver/MutationTracking.cpp                |   3 -
 fdbserver/QuietDatabase.actor.cpp             |   6 -
 fdbserver/Ratekeeper.actor.cpp                |   2 +-
 fdbserver/SimulatedCluster.actor.cpp          |  20 +-
 fdbserver/Status.actor.cpp                    |  12 +-
 fdbserver/TLogServer.actor.cpp                |   5 -
 fdbserver/TesterInterface.actor.h             |   1 +
 fdbserver/WorkerInterface.actor.h             |  11 +-
 fdbserver/masterserver.actor.cpp              |   6 -
 fdbserver/storageserver.actor.cpp             | 349 ++----------------
 fdbserver/tester.actor.cpp                    |  10 +-
 fdbserver/worker.actor.cpp                    |  47 ++-
 .../workloads/ConsistencyCheck.actor.cpp      | 104 +-----
 fdbserver/workloads/RandomMoveKeys.actor.cpp  |   2 +-
 fdbserver/workloads/workloads.actor.h         |   2 +-
 flow/Knobs.cpp                                |   1 +
 flow/Knobs.h                                  |   1 +
 flow/genericactors.actor.h                    |   2 -
 flow/serialize.h                              |   9 -
 40 files changed, 481 insertions(+), 1085 deletions(-)

diff --git a/fdbclient/BackupAgentBase.actor.cpp b/fdbclient/BackupAgentBase.actor.cpp
index cc861f310a3..4b00857503c 100644
--- a/fdbclient/BackupAgentBase.actor.cpp
+++ b/fdbclient/BackupAgentBase.actor.cpp
@@ -406,7 +406,7 @@ ACTOR Future<Void> readCommitted(Database cx,
 			// When this buggify line is enabled, if there are more than 1 result then use half of the results
 			// Copy the data instead of messing with the results directly to avoid TSS issues.
 			if (values.size() > 1 && BUGGIFY) {
-				Standalone<RangeResultRef> copy;
+				RangeResult copy;
 				// only copy first half of values into copy
 				for (int i = 0; i < values.size() / 2; i++) {
 					copy.push_back_deep(copy.arena(), values[i]);
@@ -478,7 +478,7 @@ ACTOR Future<Void> readCommitted(Database cx,
 			// When this buggify line is enabled, if there are more than 1 result then use half of the results.
 			// Copy the data instead of messing with the results directly to avoid TSS issues.
 			if (rangevalue.size() > 1 && BUGGIFY) {
-				Standalone<RangeResultRef> copy;
+				RangeResult copy;
 				// only copy first half of rangevalue into copy
 				for (int i = 0; i < rangevalue.size() / 2; i++) {
 					copy.push_back_deep(copy.arena(), rangevalue[i]);
diff --git a/fdbclient/CommitProxyInterface.h b/fdbclient/CommitProxyInterface.h
index 16f6695a031..2ac4481a15c 100644
--- a/fdbclient/CommitProxyInterface.h
+++ b/fdbclient/CommitProxyInterface.h
@@ -125,7 +125,6 @@ struct ClientDBInfo {
 	bool operator!=(ClientDBInfo const& r) const { return id != r.id; }
 
 	// convenience method to treat tss mapping like a map
-	// TODO can serializer handle maps? could just change it
 	Optional<StorageServerInterface> getTssPair(UID storageServerID) const {
 		for (auto& it : tssMapping) {
 			if (it.first == storageServerID) {
diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index b1dee87f189..2a3d2ec35ad 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -425,7 +425,6 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	static const std::vector<std::string> debugTransactionTagChoices;
 	std::unordered_map<KeyRef, Reference<WatchMetadata>> watchMap;
 
-	// TODO should this be private?
 	void maybeAddTssMapping(StorageServerInterface const& ssi);
 	void addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi);
 };
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index acba598657c..21a41216d29 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -350,7 +350,6 @@ ConfigurationResult buildConfiguration(std::vector<StringRef> const& modeTokens,
 		// A new tss setup must have count + storage engine. An adjustment must have at least one.
 		if ((isNew && (!count.present() || !storageEngine.present())) ||
 		    (!isNew && !count.present() && !storageEngine.present())) {
-			// TODO is this the right error type? And should we log something?
 			return ConfigurationResult::INCOMPLETE_CONFIGURATION;
 		}
 
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index fa7eed074ba..5e07c1c38d5 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -122,7 +122,6 @@ NetworkOptions::NetworkOptions()
 static const Key CLIENT_LATENCY_INFO_PREFIX = LiteralStringRef("client_latency/");
 static const Key CLIENT_LATENCY_INFO_CTR_PREFIX = LiteralStringRef("client_latency_counter/");
 
-// TODO make tss function here
 void DatabaseContext::maybeAddTssMapping(StorageServerInterface const& ssi) {
 	// add tss mapping if server is new
 
@@ -135,21 +134,14 @@ void DatabaseContext::maybeAddTssMapping(StorageServerInterface const& ssi) {
 // calling getInterface potentially recursively is weird, but since this function is only called when an entry is
 // created/changed, the recursive call should never recurse itself.
 void DatabaseContext::addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi) {
-	// TODO get both with a getInterface call which will create the tss endpoint and/or update both endpoints if there
-	// was a change in endpoint tokens
-
-	// the order of these is important because it hits the "different token same locality" issue, so we always want to
-	// request the tss first so the ss request overrides it.
-	// TODO this shouldn't be necessary after i stop doing the same server hack
 	Reference<StorageServerInfo> tssInfo = StorageServerInfo::getInterface(this, tssi, clientLocality);
 	Reference<StorageServerInfo> ssInfo = StorageServerInfo::getInterface(this, ssi, clientLocality);
 
-	// add new tss metrics object to queue
 	Reference<TSSMetrics> metrics = makeReference<TSSMetrics>();
 	tssMetrics[tssi.id()] = metrics;
 
-	// TODO any other requests it makes sense to duplicate?
-	// add each read data request interface to map (getValue, getKey, getKeyValues, watchValue)
+	// Add each read data request we want to duplicate to TSS to endpoint mapping (getValue, getKey, getKeyValues,
+	// watchValue)
 	queueModel.updateTssEndpoint(
 	    ssInfo->interf.getValue.getEndpoint().token.first(),
 	    TSSEndpointData(tssi.id(), tssInfo->interf.getValue.getEndpoint(), metrics, clientInfo->get().id));
@@ -162,10 +154,6 @@ void DatabaseContext::addTssMapping(StorageServerInterface const& ssi, StorageSe
 	queueModel.updateTssEndpoint(
 	    ssInfo->interf.watchValue.getEndpoint().token.first(),
 	    TSSEndpointData(tssi.id(), tssInfo->interf.watchValue.getEndpoint(), metrics, clientInfo->get().id));
-
-	// TODO REMOVE
-	printf(
-	    "added tss endpoints to queue for mapping %s=%s\n", ssi.id().toString().c_str(), tssi.id().toString().c_str());
 }
 
 Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx,
@@ -182,16 +170,11 @@ Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx
 				//       changes.
 
 				it->second->interf = ssi;
-
-				// TODO remove print
-				printf("maybeAddTss same locality %s\n", ssi.id().toString().c_str());
 				cx->maybeAddTssMapping(ssi);
 			} else {
 				it->second->notifyContextDestroyed();
 				Reference<StorageServerInfo> loc(new StorageServerInfo(cx, ssi, locality));
 				cx->server_interf[ssi.id()] = loc.getPtr();
-				// TODO REMOVE print
-				printf("maybeAddTss different locality %s\n", ssi.id().toString().c_str());
 				cx->maybeAddTssMapping(ssi);
 				return loc;
 			}
@@ -202,8 +185,6 @@ Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx
 
 	Reference<StorageServerInfo> loc(new StorageServerInfo(cx, ssi, locality));
 	cx->server_interf[ssi.id()] = loc.getPtr();
-	// TODO REMOVE print
-	// printf("maybeAddTss new ssi %s\n", ssi.id().toString().c_str());
 	cx->maybeAddTssMapping(ssi);
 	return loc;
 }
@@ -343,6 +324,13 @@ void delref(DatabaseContext* ptr) {
 	ptr->delref();
 }
 
+void traceTSSErrors(const char* name, UID tssId, const std::unordered_map<int, uint64_t>& errorsByCode) {
+	TraceEvent ev(name, tssId);
+	for (auto& it : errorsByCode) {
+		ev.detail("E" + std::to_string(it.first), it.second);
+	}
+}
+
 ACTOR Future<Void> databaseLogger(DatabaseContext* cx) {
 	state double lastLogged = 0;
 	loop {
@@ -389,11 +377,18 @@ ACTOR Future<Void> databaseLogger(DatabaseContext* cx) {
 			// TODO could skip this tss if request counter is zero? would potentially complicate elapsed calculation
 			// though
 			if (it.second->mismatches.getIntervalDelta()) {
-				printf("Found tss %s with %d mismatches!!\n",
-				       it.first.toString().c_str(),
-				       it.second->mismatches.getIntervalDelta());
 				cx->tssMismatchStream.send(it.first);
 			}
+
+			// do error histograms as separate event
+			if (it.second->ssErrorsByCode.size()) {
+				traceTSSErrors("TSS_SSErrors", it.first, it.second->ssErrorsByCode);
+			}
+
+			if (it.second->tssErrorsByCode.size()) {
+				traceTSSErrors("TSS_TSSErrors", it.first, it.second->tssErrorsByCode);
+			}
+
 			TraceEvent tssEv("TSSClientMetrics", cx->dbId);
 			tssEv.detail("TSSID", it.first)
 			    .detail("Elapsed", (lastLogged == 0) ? 0 : now() - lastLogged)
@@ -409,7 +404,7 @@ ACTOR Future<Void> databaseLogger(DatabaseContext* cx) {
 			tssEv.detail("MeanTSSGetValueLatency", it.second->TSSgetValueLatency.mean())
 			    .detail("MedianTSSGetValueLatency", it.second->TSSgetValueLatency.median())
 			    .detail("TSSGetValueLatency90", it.second->TSSgetValueLatency.percentile(0.90))
-			    .detail("TSSGetValueLatencyDiff99", it.second->TSSgetValueLatency.percentile(0.99));
+			    .detail("TSSGetValueLatency99", it.second->TSSgetValueLatency.percentile(0.99));
 
 			tssEv.detail("MeanSSGetKeyLatency", it.second->SSgetKeyLatency.mean())
 			    .detail("MedianSSGetKeyLatency", it.second->SSgetKeyLatency.median())
@@ -419,7 +414,7 @@ ACTOR Future<Void> databaseLogger(DatabaseContext* cx) {
 			tssEv.detail("MeanTSSGetKeyLatency", it.second->TSSgetKeyLatency.mean())
 			    .detail("MedianTSSGetKeyLatency", it.second->TSSgetKeyLatency.median())
 			    .detail("TSSGetKeyLatency90", it.second->TSSgetKeyLatency.percentile(0.90))
-			    .detail("TSSGetKeyLatencyDiff99", it.second->TSSgetKeyLatency.percentile(0.99));
+			    .detail("TSSGetKeyLatency99", it.second->TSSgetKeyLatency.percentile(0.99));
 
 			tssEv.detail("MeanSSGetKeyValuesLatency", it.second->SSgetKeyLatency.mean())
 			    .detail("MedianSSGetKeyValuesLatency", it.second->SSgetKeyLatency.median())
@@ -429,7 +424,7 @@ ACTOR Future<Void> databaseLogger(DatabaseContext* cx) {
 			tssEv.detail("MeanTSSGetKeyValuesLatency", it.second->TSSgetKeyValuesLatency.mean())
 			    .detail("MedianTSSGetKeyValuesLatency", it.second->TSSgetKeyValuesLatency.median())
 			    .detail("TSSGetKeyValuesLatency90", it.second->TSSgetKeyValuesLatency.percentile(0.90))
-			    .detail("TSSGetKeyValuesLatencyDiff99", it.second->TSSgetKeyValuesLatency.percentile(0.99));
+			    .detail("TSSGetKeyValuesLatency99", it.second->TSSgetKeyValuesLatency.percentile(0.99));
 
 			it.second->clear();
 		}
@@ -826,13 +821,12 @@ ACTOR static Future<Void> monitorTssChange(DatabaseContext* cx) {
 	loop {
 		wait(cx->clientInfo->onChange());
 		if (cx->clientInfo->get().tssMapping != curTssMapping) {
-			// TODO maybe re-read this from system keys instead if it changes
+			// To optimize size of the ClientDBInfo payload, we could eventually change CC to just send a tss change
+			// id/generation, and have client reread the mapping here if it changed. It's a very minor optimization
+			// though, and would cause extra read load.
 			ClientDBInfo clientInfo = cx->clientInfo->get();
 			curTssMapping = clientInfo.tssMapping;
 
-			// TODO REMOVE print
-			// printf("gonna do tss stuff with %d tss's\n", curTssMapping.size());
-
 			std::unordered_set<UID> seenTssIds;
 
 			if (curTssMapping.size()) {
@@ -840,15 +834,7 @@ ACTOR static Future<Void> monitorTssChange(DatabaseContext* cx) {
 					seenTssIds.insert(it.second.id());
 
 					if (cx->server_interf.count(it.first)) {
-						// TODO REMOVE
-						printf("found new tss mapping %s -> %s\n",
-						       it.first.toString().c_str(),
-						       it.second.id().toString().c_str());
 						cx->addTssMapping(cx->server_interf[it.first]->interf, it.second);
-					} else {
-						// TODO REMOVE case and print
-						// printf("server %s with tss pair %s not in server_interf, skipping for now\n",
-						// it.first.toString().c_str(), it.second.id().toString().c_str());
 					}
 				}
 			}
@@ -857,8 +843,6 @@ ACTOR static Future<Void> monitorTssChange(DatabaseContext* cx) {
 				if (seenTssIds.count(it->first)) {
 					it++;
 				} else {
-					// TODO REMOVE
-					printf("Erasing tss %s from tss_metrics\n", it->first.toString().c_str());
 					it = cx->tssMetrics.erase(it);
 				}
 			}
@@ -883,18 +867,14 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 				break;
 			}
 		}
-		// TODO maybe instead of assert, do a trace event because it's possible that by the time we checked the mismatch
-		// the tss is gone?
 		if (found) {
-			// TODO add trace event
+			TraceEvent(SevWarnAlways, "TSS_KillMismatch").detail("TSSID", tssID.toString());
 			TEST(true); // killing TSS because it got mismatch
-			printf("KILLING TSS %s (partner=%s) BECAUSE OF TSS MISMATCH\n",
-			       tssID.toString().c_str(),
-			       tssPairID.toString().c_str());
-
+			
 			// TODO we could write something to the system keyspace and then have DD listen to that keyspace and then DD
 			// do exactly this, so why not just cut out the middle man (or the middle system keys, as it were)
 			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(cx)));
+			state int tries = 0;
 			loop {
 				try {
 					tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
@@ -908,16 +888,20 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 
 					break;
 				} catch (Error& e) {
-					printf("Kill Mismatch TSS Transaction got error %d\n", e.code());
 					wait(tr->onError(e));
 				}
+				tries++;
+				if (tries > 10) {
+					// Give up on trying to kill the tss, it'll get another mismatch or a human will investigate
+					// eventually
+					TraceEvent("TSS_KillMismatchGaveUp").detail("TSSID", tssID.toString());
+					break;
+				}
 			}
-			tr = makeReference<ReadYourWritesTransaction>(); // clear out txn so that the extra ref gets decref'd and we
-			                                                 // can free cx
-
+			// clear out txn so that the extra DatabaseContext ref gets decref'd and we can free cx
+			tr = makeReference<ReadYourWritesTransaction>();
 		} else {
 			TEST(true); // Not killing TSS with mismatch because it's already gone
-			printf("Not killing TSS %s because of tss mismatch, must be already removed\n", tssID.toString().c_str());
 		}
 	}
 }
@@ -1262,14 +1246,16 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
 		    std::make_unique<ClientProfilingImpl>(
 		        KeyRangeRef(LiteralStringRef("profiling/"), LiteralStringRef("profiling0"))
-				.withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
+		            .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
 		registerSpecialKeySpaceModule(
-		    SpecialKeySpace::MODULE::MANAGEMENT, SpecialKeySpace::IMPLTYPE::READWRITE,
+		    SpecialKeySpace::MODULE::MANAGEMENT,
+		    SpecialKeySpace::IMPLTYPE::READWRITE,
 		    std::make_unique<MaintenanceImpl>(
 		        KeyRangeRef(LiteralStringRef("maintenance/"), LiteralStringRef("maintenance0"))
 		            .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
 		registerSpecialKeySpaceModule(
-		    SpecialKeySpace::MODULE::MANAGEMENT, SpecialKeySpace::IMPLTYPE::READWRITE,
+		    SpecialKeySpace::MODULE::MANAGEMENT,
+		    SpecialKeySpace::IMPLTYPE::READWRITE,
 		    std::make_unique<DataDistributionImpl>(
 		        KeyRangeRef(LiteralStringRef("data_distribution/"), LiteralStringRef("data_distribution0"))
 		            .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
@@ -3364,10 +3350,9 @@ ACTOR Future<RangeResult> getRange(Database cx,
 					output.readThroughEnd = readThroughEnd;
 
 					if (BUGGIFY && limits.hasByteLimit() && output.size() > std::max(1, originalLimits.minRows)) {
-						printf("Buggify resizing in nativeapi\n");
 						// Copy instead of resizing because TSS maybe be using output's arena for comparison. This only
 						// happens in simulation so it's fine
-						Standalone<RangeResultRef> copy;
+						RangeResult copy;
 						int newSize =
 						    deterministicRandom()->randomInt(std::max(1, originalLimits.minRows), output.size());
 						for (int i = 0; i < newSize; i++) {
@@ -4419,8 +4404,6 @@ ACTOR static Future<Void> tryCommit(Database cx,
 		choose {
 			when(wait(cx->onProxiesChanged())) {
 				reply.cancel();
-				// TODO REMOVE
-				printf("tryCommit proxies changed ERROR!\n");
 				throw request_maybe_delivered();
 			}
 			when(CommitID ci = wait(reply)) {
diff --git a/fdbclient/StorageServerInterface.cpp b/fdbclient/StorageServerInterface.cpp
index 180d1b814cd..fe5ef4aaebd 100644
--- a/fdbclient/StorageServerInterface.cpp
+++ b/fdbclient/StorageServerInterface.cpp
@@ -37,11 +37,6 @@ bool TSS_doCompare(const GetValueRequest& req,
                    Severity traceSeverity,
                    UID tssId) {
 	if (src.value.present() != tss.value.present() || (src.value.present() && src.value.get() != tss.value.get())) {
-		printf("GetValue %s @ %lld mismatch: src=%s, tss=%s\n",
-		       req.key.printable().c_str(),
-		       req.version,
-		       src.value.present() ? traceChecksumValue(src.value.get()).c_str() : "missing",
-		       tss.value.present() ? traceChecksumValue(tss.value.get()).c_str() : "missing");
 		TraceEvent(traceSeverity, "TSSMismatchGetValue")
 		    .suppressFor(1.0)
 		    .detail("TSSID", tssId)
@@ -52,8 +47,6 @@ bool TSS_doCompare(const GetValueRequest& req,
 
 		return false;
 	}
-	// printf("tss GetValueReply matched! src=%s, tss=%s\n", src.value.present() ? src.value.get().toString().c_str() :
-	// "missing", tss.value.present() ? tss.value.get().toString().c_str() : "missing");
 	return true;
 }
 
@@ -70,8 +63,6 @@ bool TSS_doCompare(const GetKeyRequest& req,
 	// check key selectors that start in a TSS shard and end in a non-TSS shard because the other read queries and the
 	// consistency check will eventually catch a misbehaving storage engine.
 	bool matches = true;
-	// printf("GetKey %s:<%s:%d @ %lld start:\n",
-	//		req.sel.getKey().toString().c_str(), req.sel.orEqual ? "=" : "", req.sel.offset, req.version);
 	if (src.sel.orEqual == tss.sel.orEqual && src.sel.offset == tss.sel.offset) {
 		// full matching case
 		if (src.sel.offset == 0 && src.sel.orEqual) {
@@ -99,23 +90,9 @@ bool TSS_doCompare(const GetKeyRequest& req,
 		// where one response has <=0 with the actual result and the other has <0 with the shard upper boundary.
 		// So whichever one has the actual result should have the lower key.
 		bool tssOffsetLarger = (src.sel.offset == tss.sel.offset) ? tss.sel.orEqual : src.sel.offset < tss.sel.offset;
-		// printf("  partial comparison: tssLarger=%s, tssOffsetLarger=%s, matches=%s\n", tssKeyLarger ? "T" : "F",
-		// tssOffsetLarger ? "T": "F", matches ? "T" : "F");
 		matches = tssKeyLarger != tssOffsetLarger;
 	}
 	if (!matches) {
-		// TODO REMOVE print
-		printf("GetKey %s:<%s:%d @ %lld mismatch: src=%s:<%s:%d, tss=%s:<%s:%d\n",
-		       req.sel.getKey().printable().c_str(),
-		       req.sel.orEqual ? "=" : "",
-		       req.sel.offset,
-		       req.version,
-		       src.sel.getKey().printable().c_str(),
-		       src.sel.orEqual ? "=" : "",
-		       src.sel.offset,
-		       tss.sel.getKey().printable().c_str(),
-		       tss.sel.orEqual ? "=" : "",
-		       tss.sel.offset);
 		TraceEvent(traceSeverity, "TSSMismatchGetKey")
 		    .suppressFor(1.0)
 		    .detail("TSSID", tssId)
@@ -138,32 +115,16 @@ bool TSS_doCompare(const GetKeyValuesRequest& req,
                    Severity traceSeverity,
                    UID tssId) {
 	if (src.more != tss.more || src.data != tss.data) {
-		// TODO REMOVE debugging prints
-		printf("GetKeyValues [%s:<%s:%d - %s:<%s:%d) @ %lld (lim=%d limB=%d) mismatch:\n",
-		       req.begin.getKey().printable().c_str(),
-		       req.begin.orEqual ? "=" : "",
-		       req.begin.offset,
-		       req.end.getKey().printable().c_str(),
-		       req.end.orEqual ? "=" : "",
-		       req.end.offset,
-		       req.version,
-		       req.limit,
-		       req.limitBytes);
 
 		std::string ssResultsString = format("(%d)%s:\n", src.data.size(), src.more ? "+" : "");
-		printf("src= (%d)%s:", src.data.size(), src.more ? "+" : "");
 		for (auto& it : src.data) {
-			printf("    %s=%s\n", it.key.printable().c_str(), it.value.printable().c_str());
 			ssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
 		}
 
 		std::string tssResultsString = format("(%d)%s:\n", tss.data.size(), tss.more ? "+" : "");
-		printf("tss= (%d)%s:", tss.data.size(), tss.more ? "+" : "");
 		for (auto& it : tss.data) {
-			printf("    %s=%s\n", it.key.printable().c_str(), it.value.printable().c_str());
 			tssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
 		}
-		printf("\n");
 
 		TraceEvent(traceSeverity, "TSSMismatchGetKeyValues")
 		    .suppressFor(1.0)
@@ -182,10 +143,6 @@ bool TSS_doCompare(const GetKeyValuesRequest& req,
 
 		return false;
 	}
-	/*printf("tss GetKeyValues [%s:<%s:%d - %s:<%s:%d) matched! %d=%d\n",
-	        req.begin.getKey().printable().c_str(), req.begin.orEqual ? "=" : "", req.begin.offset,
-	        req.end.getKey().printable().c_str(), req.end.orEqual ? "=" : "", req.end.offset,
-	        src.data.size(), tss.data.size());*/
 	return true;
 }
 
@@ -195,7 +152,7 @@ bool TSS_doCompare(const WatchValueRequest& req,
                    const WatchValueReply& tss,
                    Severity traceSeverity,
                    UID tssId) {
-	// TODO should this check that both returned the same version? We mainly want to duplicate watches just for load
+	// We duplicate watches just for load, no need to validte replies.
 	return true;
 }
 
@@ -233,53 +190,9 @@ bool TSS_doCompare(const SplitRangeRequest& req,
                    const SplitRangeReply& tss,
                    Severity traceSeverity,
                    UID tssId) {
-	// TODO in theory this should return the same response from both right?
 	return true;
 }
 
-// don't duplicate \xff reads or fetchKeys (avoid adding load to servers)
-template <>
-bool TSS_shouldDuplicateRequest(const GetValueRequest& req) {
-	return req.key.size() == 0 || req.key[0] != 0xff;
-}
-
-template <>
-bool TSS_shouldDuplicateRequest(const GetKeyRequest& req) {
-	return req.sel.getKey().size() == 0 || req.sel.getKey()[0] != 0xff;
-}
-
-template <>
-bool TSS_shouldDuplicateRequest(const GetKeyValuesRequest& req) {
-	return (req.begin.getKey().size() == 0 || req.begin.getKey()[0] != 0xff || req.end.getKey().size() == 0 ||
-	        req.end.getKey()[0] != 0xff) &&
-	       !req.isFetchKeys;
-}
-
-template <>
-bool TSS_shouldDuplicateRequest(const WatchValueRequest& req) {
-	return req.key.size() == 0 || req.key[0] != 0xff;
-}
-
-template <>
-bool TSS_shouldDuplicateRequest(const WaitMetricsRequest& req) {
-	return false;
-}
-
-template <>
-bool TSS_shouldDuplicateRequest(const SplitMetricsRequest& req) {
-	return false;
-}
-
-template <>
-bool TSS_shouldDuplicateRequest(const ReadHotSubRangeRequest& req) {
-	return false;
-}
-
-template <>
-bool TSS_shouldDuplicateRequest(const SplitRangeRequest& req) {
-	return false;
-}
-
 // only record metrics for data reads
 
 template <>
@@ -317,20 +230,26 @@ void TSSMetrics::recordLatency(const SplitRangeRequest& req, double ssLatency, d
 
 // -------------------
 
-// TODO ADD UNIT TESTS for compare methods, especially GetKey!!
 TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 	printf("testing tss comparisons\n");
 
+	// to avoid compiler issues that StringRef(char* is deprecated)
+	std::string s_a = "a";
+	std::string s_b = "b";
+	std::string s_c = "c";
+	std::string s_d = "d";
+	std::string s_e = "e";
+
 	// test getValue
 	GetValueRequest gvReq;
-	gvReq.key = StringRef("a");
+	gvReq.key = StringRef(s_a);
 	gvReq.version = 5;
 
 	UID tssId;
 
 	GetValueReply gvReplyMissing;
-	GetValueReply gvReplyA(Optional<Value>(StringRef("a")), false);
-	GetValueReply gvReplyB(Optional<Value>(StringRef("b")), false);
+	GetValueReply gvReplyA(Optional<Value>(StringRef(s_a)), false);
+	GetValueReply gvReplyB(Optional<Value>(StringRef(s_b)), false);
 	ASSERT(TSS_doCompare(gvReq, gvReplyMissing, gvReplyMissing, SevInfo, tssId));
 	ASSERT(TSS_doCompare(gvReq, gvReplyA, gvReplyA, SevInfo, tssId));
 	ASSERT(TSS_doCompare(gvReq, gvReplyB, gvReplyB, SevInfo, tssId));
@@ -341,15 +260,15 @@ TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 	// test GetKeyValues
 	Arena a; // for all of the refs. ASAN complains if this isn't done. Could also make them all standalone i guess
 	GetKeyValuesRequest gkvReq;
-	gkvReq.begin = firstGreaterOrEqual(StringRef(a, "A"));
-	gkvReq.end = firstGreaterOrEqual(StringRef(a, "C"));
+	gkvReq.begin = firstGreaterOrEqual(StringRef(a, s_a));
+	gkvReq.end = firstGreaterOrEqual(StringRef(a, s_b));
 	gkvReq.version = 5;
 
 	GetKeyValuesReply gkvReplyEmpty;
 	GetKeyValuesReply gkvReplyOne;
 	KeyValueRef v;
-	v.key = StringRef(a, "a");
-	v.value = StringRef(a, "1");
+	v.key = StringRef(a, s_a);
+	v.value = StringRef(a, s_b);
 	gkvReplyOne.data.push_back_deep(gkvReplyOne.arena, v);
 	GetKeyValuesReply gkvReplyOneMore;
 	gkvReplyOneMore.data.push_back_deep(gkvReplyOneMore.arena, v);
@@ -363,14 +282,14 @@ TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 
 	// test GetKey
 	GetKeyRequest gkReq;
-	gkReq.sel = KeySelectorRef(StringRef(a, "Z"), false, 1);
+	gkReq.sel = KeySelectorRef(StringRef(a, s_a), false, 1);
 	gkReq.version = 5;
 
-	GetKeyReply gkReplyA(KeySelectorRef(StringRef(a, "A"), false, 20), false);
-	GetKeyReply gkReplyB(KeySelectorRef(StringRef(a, "B"), false, 10), false);
-	GetKeyReply gkReplyC(KeySelectorRef(StringRef(a, "C"), true, 0), false);
-	GetKeyReply gkReplyD(KeySelectorRef(StringRef(a, "D"), false, -10), false);
-	GetKeyReply gkReplyE(KeySelectorRef(StringRef(a, "E"), false, -20), false);
+	GetKeyReply gkReplyA(KeySelectorRef(StringRef(a, s_a), false, 20), false);
+	GetKeyReply gkReplyB(KeySelectorRef(StringRef(a, s_b), false, 10), false);
+	GetKeyReply gkReplyC(KeySelectorRef(StringRef(a, s_c), true, 0), false);
+	GetKeyReply gkReplyD(KeySelectorRef(StringRef(a, s_d), false, -10), false);
+	GetKeyReply gkReplyE(KeySelectorRef(StringRef(a, s_e), false, -20), false);
 
 	// identical cases
 	ASSERT(TSS_doCompare(gkReq, gkReplyA, gkReplyA, SevInfo, tssId));
@@ -396,26 +315,26 @@ TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 
 	// test same offset/orEqual wrong key
 	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), true, 0), false),
-	                      GetKeyReply(KeySelectorRef(StringRef("B"), true, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false),
 	                      SevInfo,
 	                      tssId));
 	// this could be from different shard boundaries, so don't say it's a mismatch
 	ASSERT(TSS_doCompare(gkReq,
-	                     GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, 10), false),
-	                     GetKeyReply(KeySelectorRef(StringRef(a, "B"), false, 10), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 10), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 10), false),
 	                     SevInfo,
 	                     tssId));
 
 	// test offsets and key difference don't match
 	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, 0), false),
-	                      GetKeyReply(KeySelectorRef(StringRef("B"), false, 10), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 10), false),
 	                      SevInfo,
 	                      tssId));
 	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, -10), false),
-	                      GetKeyReply(KeySelectorRef(StringRef("B"), false, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, -10), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 0), false),
 	                      SevInfo,
 	                      tssId));
 
@@ -423,42 +342,41 @@ TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 	// positive
 	// one that didn't find is +1
 	ASSERT(TSS_doCompare(gkReq,
-	                     GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, 1), false),
-	                     GetKeyReply(KeySelectorRef(StringRef("B"), true, 0), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 1), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false),
 	                     SevInfo,
 	                     tssId));
 	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), true, 0), false),
-	                      GetKeyReply(KeySelectorRef(StringRef("B"), false, 1), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 1), false),
 	                      SevInfo,
 	                      tssId));
 
 	// negative will have zero offset but not equal set
 	ASSERT(TSS_doCompare(gkReq,
-	                     GetKeyReply(KeySelectorRef(StringRef(a, "A"), true, 0), false),
-	                     GetKeyReply(KeySelectorRef(StringRef("B"), false, 0), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 0), false),
 	                     SevInfo,
 	                     tssId));
 	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, "A"), false, 0), false),
-	                      GetKeyReply(KeySelectorRef(StringRef("B"), true, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false),
 	                      SevInfo,
 	                      tssId));
 
 	// test shard boundary key returned by incomplete query is the same as the key found by the other (only possible in
 	// positive direction)
 	ASSERT(TSS_doCompare(gkReq,
-	                     GetKeyReply(KeySelectorRef(StringRef(a, "A"), true, 0), false),
-	                     GetKeyReply(KeySelectorRef(StringRef("A"), false, 1), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 1), false),
 	                     SevInfo,
 	                     tssId));
 
 	// explictly test checksum function
-	std::string s = "A";
 	std::string s12 = "ABCDEFGHIJKL";
 	std::string s13 = "ABCDEFGHIJKLO";
 	std::string checksumStart13 = "(13)";
-	ASSERT(s == traceChecksumValue(StringRef(s)));
+	ASSERT(s_a == traceChecksumValue(StringRef(s_a)));
 	ASSERT(s12 == traceChecksumValue(StringRef(s12)));
 	ASSERT(checksumStart13 == traceChecksumValue(StringRef(s13)).substr(0, 4));
 	return Void();
diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index 9a514a447eb..be1a2234534 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -56,10 +56,7 @@ struct StorageServerInterface {
 
 	LocalityData locality;
 	UID uniqueID;
-	// TODO get rid of explicit mapping?
-	// Effectively implements Optional<UID> but serializer didn't like Optional
-	bool isTss;
-	UID tssPairID;
+	Optional<UID> tssPairID;
 
 	RequestStream<struct GetValueRequest> getValue;
 	RequestStream<struct GetKeyRequest> getKey;
@@ -80,12 +77,13 @@ struct StorageServerInterface {
 	RequestStream<struct ReadHotSubRangeRequest> getReadHotRanges;
 	RequestStream<struct SplitRangeRequest> getRangeSplitPoints;
 
-	explicit StorageServerInterface(UID uid) : uniqueID(uid), isTss(false) {}
-	StorageServerInterface() : uniqueID(deterministicRandom()->randomUniqueID()), isTss(false) {}
+	explicit StorageServerInterface(UID uid) : uniqueID(uid) {}
+	StorageServerInterface() : uniqueID(deterministicRandom()->randomUniqueID()) {}
 	NetworkAddress address() const { return getValue.getEndpoint().getPrimaryAddress(); }
 	NetworkAddress stableAddress() const { return getValue.getEndpoint().getStableAddress(); }
 	Optional<NetworkAddress> secondaryAddress() const { return getValue.getEndpoint().addresses.secondaryAddress; }
 	UID id() const { return uniqueID; }
+	bool isTss() const { return tssPairID.present(); }
 	std::string toString() const { return id().shortString(); }
 	template <class Ar>
 	void serialize(Ar& ar) {
@@ -95,7 +93,7 @@ struct StorageServerInterface {
 
 		if (ar.protocolVersion().hasSmallEndpoints()) {
 			if (ar.protocolVersion().hasTSS()) {
-				serializer(ar, uniqueID, locality, getValue, isTss, tssPairID);
+				serializer(ar, uniqueID, locality, getValue, tssPairID);
 			} else {
 				serializer(ar, uniqueID, locality, getValue);
 			}
diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index 5f345fe705d..52590cf719e 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -556,7 +556,6 @@ StorageServerInterface decodeServerListValue(ValueRef const& value) {
 	return s;
 }
 
-// TODO merge this with above stuff or something
 const Value serverListValueFB(StorageServerInterface const& server) {
 	return ObjectWriter::toValue(server, IncludeVersion());
 }
@@ -1108,8 +1107,8 @@ void testSSISerdes(StorageServerInterface const& ssi, bool useFB) {
 	printf("ssi=\nid=%s\nlocality=%s\nisTss=%s\ntssId=%s\naddress=%s\ngetValue=%s\n\n\n",
 	       ssi.id().toString().c_str(),
 	       ssi.locality.toString().c_str(),
-	       ssi.isTss ? "true" : "false",
-	       ssi.isTss ? ssi.tssPairID.toString().c_str() : "",
+	       ssi.isTss() ? "true" : "false",
+	       ssi.isTss() ? ssi.tssPairID.get().toString().c_str() : "",
 	       ssi.address().toString().c_str(),
 	       ssi.getValue.getEndpoint().token.toString().c_str());
 
@@ -1119,16 +1118,16 @@ void testSSISerdes(StorageServerInterface const& ssi, bool useFB) {
 	printf("ssi2=\nid=%s\nlocality=%s\nisTss=%s\ntssId=%s\naddress=%s\ngetValue=%s\n\n\n",
 	       ssi2.id().toString().c_str(),
 	       ssi2.locality.toString().c_str(),
-	       ssi2.isTss ? "true" : "false",
-	       ssi2.isTss ? ssi2.tssPairID.toString().c_str() : "",
+	       ssi2.isTss() ? "true" : "false",
+	       ssi2.isTss() ? ssi2.tssPairID.get().toString().c_str() : "",
 	       ssi2.address().toString().c_str(),
 	       ssi2.getValue.getEndpoint().token.toString().c_str());
 
 	ASSERT(ssi.id() == ssi2.id());
 	ASSERT(ssi.locality == ssi2.locality);
-	ASSERT(ssi.isTss == ssi2.isTss);
-	if (ssi.isTss) {
-		ASSERT(ssi2.tssPairID == ssi2.tssPairID);
+	ASSERT(ssi.isTss() == ssi2.isTss());
+	if (ssi.isTss()) {
+		ASSERT(ssi2.tssPairID.get() == ssi2.tssPairID.get());
 	}
 	ASSERT(ssi.address() == ssi2.address());
 	ASSERT(ssi.getValue.getEndpoint().token == ssi2.getValue.getEndpoint().token);
@@ -1146,13 +1145,11 @@ TEST_CASE("/SystemData/SerDes/SSI") {
 	StorageServerInterface ssi;
 	ssi.uniqueID = UID(0x1234123412341234, 0x5678567856785678);
 	ssi.locality = localityData;
-	ssi.isTss = false;
 	ssi.initEndpoints();
 
 	testSSISerdes(ssi, false);
 	testSSISerdes(ssi, true);
 
-	ssi.isTss = true;
 	ssi.tssPairID = UID(0x2345234523452345, 0x1238123812381238);
 
 	testSSISerdes(ssi, false);
diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 2f1ee375bf5..33a689c31d4 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -31,9 +31,6 @@
 #include "flow/flow.h"
 #include "flow/Knobs.h"
 
-// TODO REMOVE?
-#include <cinttypes>
-
 #include "fdbrpc/FailureMonitor.h"
 #include "fdbrpc/fdbrpc.h"
 #include "fdbrpc/Locality.h"
@@ -85,9 +82,8 @@ Future<Void> tssComparison(Req req,
                            Future<ErrorOr<Resp>> fSource,
                            Future<ErrorOr<Resp>> fTss,
                            TSSEndpointData tssData) {
-	// TODO add timeout and time requests
 	state double startTime = now();
-	state Future<Optional<ErrorOr<Resp>>> fTssWithTimeout = timeout(fTss, 5.0 /*TODO knob?*/);
+	state Future<Optional<ErrorOr<Resp>>> fTssWithTimeout = timeout(fTss, FLOW_KNOBS->LOAD_BALANCE_TSS_TIMEOUT);
 	state int finished = 0;
 	state double srcEndTime;
 	state double tssEndTime;
@@ -113,16 +109,21 @@ Future<Void> tssComparison(Req req,
 		}
 	}
 
+	// we want to record ss/tss errors to metrics
+	int srcErrorCode = error_code_success;
+	int tssErrorCode = error_code_success;
+
 	++tssData.metrics->requests;
 
 	if (src.isError()) {
-		++tssData.metrics->ssErrors;
+		srcErrorCode = src.getError().code();
+		tssData.metrics->ssError(srcErrorCode);
 	}
 	if (!tss.present()) {
 		++tssData.metrics->tssTimeouts;
 	} else if (tss.get().isError()) {
-		++tssData.metrics->tssErrors;
-		printf("Tss got error %d\n", tss.get().getError().code());
+		tssErrorCode = tss.get().getError().code();
+		tssData.metrics->tssError(tssErrorCode);
 	}
 	if (!src.isError() && tss.present() && !tss.get().isError()) {
 		Optional<LoadBalancedReply> srcLB = getLoadBalancedReply(&src.get());
@@ -146,13 +147,23 @@ Future<Void> tssComparison(Req req,
 				++tssData.metrics->mismatches;
 			}
 		} else if (tssLB.present() && tssLB.get().error.present()) {
-			++tssData.metrics->tssErrors;
-			printf("Tss got LB error %d\n", tssLB.get().error.get().code());
+			tssErrorCode = tssLB.get().error.get().code();
+			tssData.metrics->tssError(tssErrorCode);
 		} else if (srcLB.present() && srcLB.get().error.present()) {
-			++tssData.metrics->ssErrors;
+			srcErrorCode = srcLB.get().error.get().code();
+			tssData.metrics->ssError(srcErrorCode);
 		}
 	}
 
+	if (srcErrorCode != error_code_success && tssErrorCode != error_code_success && srcErrorCode != tssErrorCode) {
+		// if ss and tss both got different errors, record them
+		TraceEvent("TSSErrorMismatch")
+		    .suppressFor(1.0)
+		    .detail("TSSID", tssData.tssId)
+		    .detail("SSError", srcErrorCode)
+		    .detail("TSSError", tssErrorCode);
+	}
+
 	return Void();
 }
 
@@ -172,22 +183,20 @@ struct RequestData : NonCopyable {
 	// This is true once setupRequest is called, even though at that point the response is Never().
 	bool isValid() { return response.isValid(); }
 
-	void maybeDuplicateTSSRequest(RequestStream<Request> const* stream,
-	                              Request const& request,
-	                              QueueModel* model,
-								  Future<Reply> ssResponse) {
+	static void maybeDuplicateTSSRequest(RequestStream<Request> const* stream,
+	                                     Request& request,
+	                                     QueueModel* model,
+	                                     Future<Reply> ssResponse) {
 		if (model) {
 			// Send parallel request to TSS pair, if it exists
 			Optional<TSSEndpointData> tssData = model->getTssData(stream->getEndpoint().token.first());
 
-			if (tssData.present() && TSS_shouldDuplicateRequest(request)) {
+			if (tssData.present()) {
 				resetReply(request);
-
-				// TODO add timeout from knob to tss request?
 				// FIXME: optimize to avoid creating new netNotifiedQueue for each message
 				RequestStream<Request> tssRequestStream(tssData.get().endpoint);
 				Future<ErrorOr<REPLY_TYPE(Request)>> fTssResult = tssRequestStream.tryGetReply(request);
-				model->addActor.send(tssComparison(request, fResult, fTssResult, tssData.get()));
+				model->addActor.send(tssComparison(request, ssResponse, fTssResult, tssData.get()));
 			}
 		}
 	}
@@ -196,7 +205,7 @@ struct RequestData : NonCopyable {
 	void startRequest(double backoff,
 	                  bool triedAllOptions,
 	                  RequestStream<Request> const* stream,
-	                  Request const& request,
+	                  Request& request,
 	                  QueueModel* model) {
 		modelHolder = Reference<ModelHolder>();
 		requestStarted = false;
@@ -207,8 +216,8 @@ struct RequestData : NonCopyable {
 				    requestStarted = true;
 				    modelHolder = Reference<ModelHolder>(new ModelHolder(model, stream->getEndpoint().token.first()));
 				    Future<Reply> resp = stream->tryGetReply(request);
-					maybeDuplicateTSSRequest(stream, request, model, resp);
-					return resp;
+				    maybeDuplicateTSSRequest(stream, request, model, resp);
+				    return resp;
 			    });
 		} else {
 			requestStarted = true;
diff --git a/fdbrpc/QueueModel.cpp b/fdbrpc/QueueModel.cpp
index 2cb5687b612..6aaaf3df34e 100644
--- a/fdbrpc/QueueModel.cpp
+++ b/fdbrpc/QueueModel.cpp
@@ -18,8 +18,6 @@
  * limitations under the License.
  */
 
-#include <cinttypes>
-
 #include "fdbrpc/QueueModel.h"
 #include "fdbrpc/LoadBalance.h"
 
@@ -66,11 +64,10 @@ void QueueModel::updateTssEndpoint(uint64_t endpointId, TSSEndpointData tssData)
 	auto& d = data[endpointId];
 	if (!d.tssData.present()) {
 		tssCount++;
+		d.tssData = Optional<TSSEndpointData>(tssData);
+	} else {
+		d.tssData.get().generation = tssData.generation;
 	}
-
-	d.tssData = Optional<TSSEndpointData>(tssData);
-	// TODO REMOVE print
-	printf("Setting tss endpoint for %" PRIx64 " = %s\n", endpointId, tssData.endpoint.token.toString().c_str());
 }
 
 void QueueModel::removeOldTssData(UID currentGeneration) {
@@ -78,12 +75,6 @@ void QueueModel::removeOldTssData(UID currentGeneration) {
 		// expire old tss mappings that aren't present in new mapping
 		for (auto& it : data) {
 			if (it.second.tssData.present() && it.second.tssData.get().generation != currentGeneration) {
-				// TODO REMOVE print
-				printf("Removing tss endpoint for %" PRIx64
-				       " because its generation %s doesn't match the current one %s\n",
-				       it.first,
-				       it.second.tssData.get().generation.toString().c_str(),
-				       currentGeneration.toString().c_str());
 				it.second.tssData = Optional<TSSEndpointData>();
 				tssCount--;
 			}
diff --git a/fdbrpc/QueueModel.h b/fdbrpc/QueueModel.h
index f8592fa9a55..1e8cd009a0a 100644
--- a/fdbrpc/QueueModel.h
+++ b/fdbrpc/QueueModel.h
@@ -33,8 +33,7 @@ struct TSSEndpointData {
 	UID tssId;
 	Endpoint endpoint;
 	Reference<TSSMetrics> metrics;
-	UID generation; // TODO this isn't exactly like a generation since it's not ordered, i'll try to think of a better
-	                // name
+	UID generation;
 
 	TSSEndpointData(UID tssId, Endpoint endpoint, Reference<TSSMetrics> metrics, UID generation)
 	  : tssId(tssId), endpoint(endpoint), metrics(metrics), generation(generation) {}
@@ -106,7 +105,10 @@ class QueueModel {
 	double secondBudget;
 	PromiseStream<Future<Void>> addActor;
 	Future<Void> laggingRequests; // requests for which a different recipient already answered
+	PromiseStream<Future<Void>> addTSSActor;
+	Future<Void> tssComparisons; // requests for which a different recipient already answered
 	int laggingRequestCount;
+	int laggingTSSCompareCount;
 
 	void updateTssEndpoint(uint64_t endpointId, TSSEndpointData endpointData);
 	void removeOldTssData(UID currentGeneration);
@@ -114,9 +116,13 @@ class QueueModel {
 
 	QueueModel() : secondMultiplier(1.0), secondBudget(0), laggingRequestCount(0), tssCount(0) {
 		laggingRequests = actorCollection(addActor.getFuture(), &laggingRequestCount);
+		tssComparisons = actorCollection(addTSSActor.getFuture(), &laggingTSSCompareCount);
 	}
 
-	~QueueModel() { laggingRequests.cancel(); }
+	~QueueModel() {
+		laggingRequests.cancel();
+		tssComparisons.cancel();
+	}
 
 private:
 	std::unordered_map<uint64_t, QueueData> data;
diff --git a/fdbrpc/TSSComparison.h b/fdbrpc/TSSComparison.h
index 6724e3dae73..335e8ae68e7 100644
--- a/fdbrpc/TSSComparison.h
+++ b/fdbrpc/TSSComparison.h
@@ -37,7 +37,7 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	Counter tssTimeouts;
 	Counter mismatches;
 
-	// TODO we could probably just ignore getKey as it's seldom used?
+	// We could probably just ignore getKey as it's seldom used?
 	ContinuousSample<double> SSgetValueLatency;
 	ContinuousSample<double> SSgetKeyLatency;
 	ContinuousSample<double> SSgetKeyValuesLatency;
@@ -46,6 +46,19 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	ContinuousSample<double> TSSgetKeyLatency;
 	ContinuousSample<double> TSSgetKeyValuesLatency;
 
+	std::unordered_map<int, uint64_t> ssErrorsByCode;
+	std::unordered_map<int, uint64_t> tssErrorsByCode;
+
+	void ssError(int code) {
+		++ssErrors;
+		ssErrorsByCode[code]++;
+	}
+
+	void tssError(int code) {
+		++tssErrors;
+		tssErrorsByCode[code]++;
+	}
+
 	template <class Req>
 	void recordLatency(const Req& req, double ssLatency, double tssLatency);
 
@@ -57,6 +70,9 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 		TSSgetValueLatency.clear();
 		TSSgetKeyLatency.clear();
 		TSSgetKeyValuesLatency.clear();
+
+		tssErrorsByCode.clear();
+		ssErrorsByCode.clear();
 	}
 
 	TSSMetrics()
@@ -65,11 +81,6 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	    SSgetKeyValuesLatency(1000), TSSgetValueLatency(1000), TSSgetKeyLatency(1000), TSSgetKeyValuesLatency(1000) {}
 };
 
-// global static functions
-
-template <class Req>
-bool TSS_shouldDuplicateRequest(const Req& req);
-
 // part of the contract of this function is that if there is a mismatch, the implementation needs to record a trace
 // event with the specified severity and tssId in the event.
 template <class Req, class Rep>
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index e15e0126a16..a2a6af5af62 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -335,7 +335,6 @@ class RequestStream {
 			Future<Void> disc =
 			    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint(taskID));
 			if (disc.isReady()) {
-				printf("got disconnect or failure 1 :O\n");
 				return ErrorOr<REPLY_TYPE(X)>(request_maybe_delivered());
 			}
 			Reference<Peer> peer =
@@ -354,7 +353,6 @@ class RequestStream {
 			Future<Void> disc =
 			    makeDependent<T>(IFailureMonitor::failureMonitor()).onDisconnectOrFailure(getEndpoint());
 			if (disc.isReady()) {
-				printf("got disconnect or failure 2 :O\n");
 				return ErrorOr<REPLY_TYPE(X)>(request_maybe_delivered());
 			}
 			Reference<Peer> peer =
diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index 87044f49b70..7349918f7ab 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -68,6 +68,12 @@ void applyMetadataMutations(SpanID const& spanContext,
 	// std::map<keyRef, vector<uint16_t>> cacheRangeInfo;
 	std::map<KeyRef, MutationRef> cachedRangeInfo;
 
+	// Testing Storage Server removal (clearing serverTagKey) needs to read tss server list value to determine it is a
+	// tss + find partner's tag to send the private mutation. Since the removeStorageServer transaction clears both the
+	// storage list and server tag, we have to enforce ordering, proccessing the server tag first, and postpone the
+	// server list clear until the end;
+	std::vector<KeyRangeRef> tssServerListToRemove;
+
 	for (auto const& m : mutations) {
 		//TraceEvent("MetadataMutation", dbgid).detail("M", m.toString());
 		if (toCommit) {
@@ -95,14 +101,14 @@ void applyMetadataMutations(SpanID const& spanContext,
 
 						for (const auto& id : src) {
 							auto storageInfo = getStorageInfo(id, storageCache, txnStateStore);
-							ASSERT(!storageInfo->interf.isTss);
+							ASSERT(!storageInfo->interf.isTss());
 							ASSERT(storageInfo->tag != invalidTag);
 							info.tags.push_back(storageInfo->tag);
 							info.src_info.push_back(storageInfo);
 						}
 						for (const auto& id : dest) {
 							auto storageInfo = getStorageInfo(id, storageCache, txnStateStore);
-							ASSERT(!storageInfo->interf.isTss);
+							ASSERT(!storageInfo->interf.isTss());
 							ASSERT(storageInfo->tag != invalidTag);
 							info.tags.push_back(storageInfo->tag);
 							info.dest_info.push_back(storageInfo);
@@ -115,11 +121,8 @@ void applyMetadataMutations(SpanID const& spanContext,
 					txnStateStore->set(KeyValueRef(m.param1, m.param2));
 			} else if (m.param1.startsWith(serverKeysPrefix)) {
 				if (toCommit) {
-					Optional<Value> t =
-					    txnStateStore->readValue(serverTagKeyFor(serverKeysDecodeServer(m.param1))).get();
-					// printf("got SetValue for serverKeysPrefix/%s, tag=%s\n",
-					// serverKeysDecodeServer(m.param1).toString().c_str(), t.present() ?
-					// decodeServerTagValue(t.get()).toString().c_str() : "");
+					Tag tag = decodeServerTagValue(
+					    txnStateStore->readValue(serverTagKeyFor(serverKeysDecodeServer(m.param1))).get().get());
 					MutationRef privatized = m;
 					privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
 					TraceEvent(SevDebug, "SendingPrivateMutation", dbgid)
@@ -127,14 +130,9 @@ void applyMetadataMutations(SpanID const& spanContext,
 					    .detail("Privatized", privatized.toString())
 					    .detail("Server", serverKeysDecodeServer(m.param1))
 					    .detail("TagKey", serverTagKeyFor(serverKeysDecodeServer(m.param1)))
-					    .detail(
-					        "Tag",
-					        decodeServerTagValue(
-					            txnStateStore->readValue(serverTagKeyFor(serverKeysDecodeServer(m.param1))).get().get())
-					            .toString());
-
-					toCommit->addTag(decodeServerTagValue(
-					    txnStateStore->readValue(serverTagKeyFor(serverKeysDecodeServer(m.param1))).get().get()));
+					    .detail("Tag", tag.toString());
+
+					toCommit->addTag(tag);
 					toCommit->writeTypedMessage(privatized);
 				}
 			} else if (m.param1.startsWith(serverTagPrefix)) {
@@ -386,8 +384,20 @@ void applyMetadataMutations(SpanID const& spanContext,
 				}
 			}
 			if (serverListKeys.intersects(range)) {
-				if (!initialCommit)
-					txnStateStore->clear(range & serverListKeys);
+				if (!initialCommit) {
+					KeyRangeRef rangeToClear = range & serverListKeys;
+					if (rangeToClear.singleKeyRange()) {
+						UID id = decodeServerListKey(rangeToClear.begin);
+						Optional<Value> ssiV = txnStateStore->readValue(serverListKeyFor(id)).get();
+						if (ssiV.present() && decodeServerListValue(ssiV.get()).isTss()) {
+							tssServerListToRemove.push_back(rangeToClear);
+						} else {
+							txnStateStore->clear(rangeToClear);
+						}
+					} else {
+						txnStateStore->clear(rangeToClear);
+					}
+				}
 			}
 			if (tagLocalityListKeys.intersects(range)) {
 				if (!initialCommit)
@@ -418,6 +428,32 @@ void applyMetadataMutations(SpanID const& spanContext,
 							toCommit->writeTypedMessage(privatized);
 						}
 					}
+					// Might be a tss removal, which doesn't store a tag there.
+					// Chained if is a little verbose, but avoids unecessary work
+					if (!initialCommit && !serverKeysCleared.size()) {
+						KeyRangeRef maybeTssRange = range & serverTagKeys;
+						if (maybeTssRange.singleKeyRange()) {
+							UID id = decodeServerTagKey(maybeTssRange.begin);
+							Optional<Value> ssiV = txnStateStore->readValue(serverListKeyFor(id)).get();
+
+							if (ssiV.present()) {
+								StorageServerInterface ssi = decodeServerListValue(ssiV.get());
+								if (ssi.isTss()) {
+									Optional<Value> tagV =
+									    txnStateStore->readValue(serverTagKeyFor(ssi.tssPairID.get())).get();
+									if (tagV.present()) {
+										MutationRef privatized = m;
+										privatized.param1 = maybeTssRange.begin.withPrefix(systemKeys.begin, arena);
+										privatized.param2 =
+										    keyAfter(maybeTssRange.begin, arena).withPrefix(systemKeys.begin, arena);
+
+										toCommit->addTag(decodeServerTagValue(tagV.get()));
+										toCommit->writeTypedMessage(privatized);
+									}
+								}
+							}
+						}
+					}
 				}
 				if (!initialCommit) {
 					KeyRangeRef clearRange = range & serverTagKeys;
@@ -575,6 +611,10 @@ void applyMetadataMutations(SpanID const& spanContext,
 		}
 	}
 
+	for (KeyRangeRef& range : tssServerListToRemove) {
+		txnStateStore->clear(range);
+	}
+
 	// If we accumulated private mutations for cached key-ranges, we also need to
 	// tag them with the relevant storage servers. This is done to make the storage
 	// servers aware of the cached key-ranges
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index fc66d46fc3a..113b2472eed 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -1,4 +1,3 @@
-
 /*
  * ClusterController.actor.cpp
  *
@@ -3081,9 +3080,9 @@ ACTOR Future<Void> workerAvailabilityWatch(WorkerInterface worker,
 					checkOutstandingRequests(cluster);
 				}
 			}
-
 			when(wait(failed)) { // remove workers that have failed
 				WorkerInfo& failedWorkerInfo = cluster->id_worker[worker.locality.processId()];
+
 				if (!failedWorkerInfo.reply.isSet()) {
 					failedWorkerInfo.reply.send(
 					    RegisterWorkerReply(failedWorkerInfo.details.processClass, failedWorkerInfo.priorityInfo));
@@ -3270,12 +3269,6 @@ void clusterRegisterMaster(ClusterControllerData* self, RegisterMasterRequest co
 		isChanged = true;
 	}
 
-	// TODO remove debugging
-	printf("CC:\ntss_count=%d\ntss_storage_engine=%d|%s\n",
-	       db->config.desiredTSSCount,
-	       db->config.testingStorageServerStoreType,
-	       db->config.testingStorageServerStoreType.toString().c_str());
-
 	// Construct the client information
 	if (db->clientInfo->get().commitProxies != req.commitProxies ||
 	    db->clientInfo->get().grvProxies != req.grvProxies) {
@@ -3785,12 +3778,11 @@ ACTOR Future<Void> monitorTSSMapping(ClusterControllerData* self) {
 					tssIdMap[it.first] = it.second;
 					// ensure two storage servers don't map to same TSS
 					ASSERT(seenTssIds.insert(it.second).second);
+					// ensure a storage server doesn't accidentally map to itself (unless we're in HACK_IDENTITY_MAPPING
+					// mode)
+					ASSERT(SERVER_KNOBS->TSS_HACK_IDENTITY_MAPPING || it.first != it.second);
 				}
 
-				// TODO REMOVE print
-				printf("tss mapping of size %d\n", tssIdMap.size());
-
-				// TODO is copying storage server interfaces bad?
 				state std::vector<std::pair<UID, StorageServerInterface>> newMapping;
 				state std::map<UID, StorageServerInterface> oldMapping;
 				state bool mappingChanged = false;
@@ -3800,10 +3792,6 @@ ACTOR Future<Void> monitorTSSMapping(ClusterControllerData* self) {
 				for (auto& it : clientInfo.tssMapping) {
 					oldMapping[it.first] = it.second;
 					if (!tssIdMap.count(it.first)) {
-						// TODO add trace event
-						printf("tss mapping removed: %s=%s\n",
-						       it.first.toString().c_str(),
-						       it.second.id().toString().c_str());
 						TraceEvent("TSS_MappingRemoved", self->id)
 						    .detail("SSID", it.first)
 						    .detail("TSSID", it.second.id());
@@ -3827,22 +3815,16 @@ ACTOR Future<Void> monitorTSSMapping(ClusterControllerData* self) {
 							    .detail("SSID", it.first)
 							    .detail("TSSID", it.second)
 							    .detail("OldTSSID", interf.id());
-							printf("tss mapping updated: %s=%s\n",
-							       it.first.toString().c_str(),
-							       it.second.toString().c_str());
 							mappingChanged = true;
 						}
 					} else {
-						// TODO add trace event
 						TraceEvent("TSS_MappingAdded", self->id).detail("SSID", it.first).detail("TSSID", it.second);
-						printf("tss mapping added: %s=%s\n", it.first.toString().c_str(), it.second.toString().c_str());
 						mappingChanged = true;
 					}
 
 					state UID ssid = it.first;
 					state UID tssid = it.second;
 					// request storage server interface for tssid, add it to results
-					// TODO could issue all of these futures and then process then after as an optimization
 					Optional<Value> tssiVal = wait(tr->get(serverListKeyFor(it.second)));
 
 					// because we read the tss mapping in the same transaction, there can be no races with tss removal
@@ -3852,11 +3834,6 @@ ACTOR Future<Void> monitorTSSMapping(ClusterControllerData* self) {
 					StorageServerInterface tssi = decodeServerListValue(tssiVal.get());
 					if (oldTssId.present() && tssi.id() == oldTssId.get() && oldGetValueEndpoint.present() &&
 					    oldGetValueEndpoint.get() != tssi.getValue.getEndpoint().token) {
-						// TODO REMOVE print
-						printf("tss %s restarted, getValue %s -> %s\n",
-						       tssi.id().toString().c_str(),
-						       oldGetValueEndpoint.get().toString().c_str(),
-						       tssi.getValue.getEndpoint().token.toString().c_str());
 						mappingChanged = true;
 					}
 					newMapping.push_back(std::pair<UID, StorageServerInterface>(ssid, tssi));
@@ -3864,8 +3841,6 @@ ACTOR Future<Void> monitorTSSMapping(ClusterControllerData* self) {
 
 				// if nothing changed, skip updating
 				if (mappingChanged) {
-					// TODO REMOVE print
-					printf("CC updating tss client and server info\n");
 					clientInfo.id = deterministicRandom()->randomUniqueID();
 					clientInfo.tssMapping = newMapping;
 					self->db.clientInfo->set(clientInfo);
@@ -4491,7 +4466,6 @@ ACTOR Future<Void> clusterControllerCore(ClusterControllerFullInterface interf,
 		when(GetWorkersRequest req = waitNext(interf.getWorkers.getFuture())) {
 			++self.getWorkersRequests;
 			vector<WorkerDetails> workers;
-			// printf("CC got GetWorkersRequest\n");
 
 			for (auto& it : self.id_worker) {
 				if ((req.flags & GetWorkersRequest::NON_EXCLUDED_PROCESSES_ONLY) &&
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 3fc1ed02c3f..d1469c0d3b1 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1507,7 +1507,6 @@ ACTOR static Future<Void> rejoinServer(CommitProxyInterface proxy, ProxyCommitDa
 
 	loop {
 		GetStorageServerRejoinInfoRequest req = waitNext(proxy.getStorageServerRejoinInfo.getFuture());
-		printf("Proxy got Rejoin req for %s\n", req.id.toString().c_str());
 		if (commitData->txnStateStore->readValue(serverListKeyFor(req.id)).get().present()) {
 			GetStorageServerRejoinInfoReply rep;
 			rep.version = commitData->version;
@@ -1568,10 +1567,8 @@ ACTOR static Future<Void> rejoinServer(CommitProxyInterface proxy, ProxyCommitDa
 				}
 				rep.newTag = Tag(maxTagLocality + 1, 0);
 			}
-			printf("Proxy sent Rejoin response for %s\n", req.id.toString().c_str());
 			req.reply.send(rep);
 		} else {
-			printf("Proxy notifying %s it can't rejoin because it was removed.\n", req.id.toString().c_str());
 			req.reply.sendError(worker_removed());
 		}
 	}
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index cbb03641787..659ce2cbd01 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -67,6 +67,7 @@ struct TCServerInfo : public ReferenceCounted<TCServerInfo> {
 	Promise<Void> removed;
 	Future<Void> onRemoved;
 	Future<Void> onTSSPairRemoved;
+	Promise<Void> killTss;
 	Promise<Void> wakeUpTracker;
 	bool inDesiredDC;
 	LocalityEntry localityEntry;
@@ -85,7 +86,7 @@ struct TCServerInfo : public ReferenceCounted<TCServerInfo> {
 	  : id(ssi.id()), collection(collection), lastKnownInterface(ssi), lastKnownClass(processClass),
 	    dataInFlightToServer(0), onInterfaceChanged(interfaceChanged.getFuture()), onRemoved(removed.getFuture()),
 	    inDesiredDC(inDesiredDC), storeType(KeyValueStoreType::END), onTSSPairRemoved(Never()) {
-		if (!ssi.isTss) {
+		if (!ssi.isTss()) {
 			localityEntry = ((LocalityMap<UID>*)storageServerSet.getPtr())->add(ssi.locality, &id);
 		}
 	}
@@ -451,19 +452,16 @@ ACTOR Future<Reference<InitialDataDistribution>> getInitialDataDistribution(Data
 
 			for (int i = 0; i < serverList.get().size(); i++) {
 				auto ssi = decodeServerListValue(serverList.get()[i].value);
-				if (!ssi.isTss) {
-					printf("DD adding SS %s on init\n", ssi.id().toString().c_str());
+				if (!ssi.isTss()) {
 					result->allServers.push_back(std::make_pair(ssi, id_data[ssi.locality.processId()].processClass));
 					server_dc[ssi.id()] = ssi.locality.dcId();
 				} else {
-					printf("DD ignoring TSS %s on init until after team building\n", ssi.id().toString().c_str());
 					tss_servers.push_back(std::make_pair(ssi, id_data[ssi.locality.processId()].processClass));
 				}
 			}
 
 			break;
 		} catch (Error& e) {
-			printf("get initial DD failed %d\n", e.code());
 			wait(tr.onError(e));
 
 			ASSERT(!succeeded); // We shouldn't be retrying if we have already started modifying result in this loop
@@ -557,7 +555,6 @@ ACTOR Future<Reference<InitialDataDistribution>> getInitialDataDistribution(Data
 				beginKey = keyServers.end()[-1].key;
 				break;
 			} catch (Error& e) {
-				printf("GetInitialTeams got error %d\n", e.code());
 				TraceEvent("GetInitialTeamsKeyServersRetry", distributorId).error(e);
 
 				wait(tr.onError(e));
@@ -573,7 +570,6 @@ ACTOR Future<Reference<InitialDataDistribution>> getInitialDataDistribution(Data
 
 	// add tss to server list AFTER teams are built
 	for (auto& it : tss_servers) {
-		printf("DD adding TSS %s on init\n", it.first.id().toString().c_str());
 		result->allServers.push_back(it);
 	}
 
@@ -1167,7 +1163,6 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 						self->addActor.send(self->checkInvalidLocalities);
 					}
 				}
-				printf("%p init adding %s\n", (void*)self, i->first.toString().c_str());
 				self->addServer(i->first, i->second, self->serverTrackerErrorOut, 0, ddEnabledState);
 			}
 		}
@@ -2447,23 +2442,16 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 			return;
 		}
 
-		// printf("addServer(%s)\n", newServer.id().toString().c_str());
-
-		if (!newServer.isTss) {
+		if (!newServer.isTss()) {
 			allServers.push_back(newServer.id());
 		}
 
-		TraceEvent(newServer.isTss ? "AddedTSS" : "AddedStorageServer", distributorId)
+		TraceEvent(newServer.isTss() ? "AddedTSS" : "AddedStorageServer", distributorId)
 		    .detail("ServerID", newServer.id())
 		    .detail("ProcessClass", processClass.toString())
 		    .detail("WaitFailureToken", newServer.waitFailure.getEndpoint().token)
 		    .detail("Address", newServer.waitFailure.getEndpoint().getPrimaryAddress());
 
-		// TODO how to do this?
-		/*if (newServer.isTss) {
-		    tr.detail("TSSPairID", newServer.tssPairID);
-		}*/
-
 		auto& r = server_and_tss_info[newServer.id()] = makeReference<TCServerInfo>(
 		    newServer,
 		    this,
@@ -2472,11 +2460,11 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		        std::find(includedDCs.begin(), includedDCs.end(), newServer.locality.dcId()) != includedDCs.end(),
 		    storageServerSet);
 
-		if (newServer.isTss) {
-			tss_info_by_pair[newServer.tssPairID] = r;
+		if (newServer.isTss()) {
+			tss_info_by_pair[newServer.tssPairID.get()] = r;
 
-			if (server_info.count(newServer.tssPairID)) {
-				r->onTSSPairRemoved = server_info[newServer.tssPairID]->onRemoved;
+			if (server_info.count(newServer.tssPairID.get())) {
+				r->onTSSPairRemoved = server_info[newServer.tssPairID.get()]->onRemoved;
 			}
 		} else {
 			server_info[newServer.id()] = r;
@@ -2485,9 +2473,9 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		}
 
 		r->tracker =
-		    storageServerTracker(this, cx, r.getPtr(), errorOut, addedVersion, ddEnabledState, newServer.isTss);
+		    storageServerTracker(this, cx, r.getPtr(), errorOut, addedVersion, ddEnabledState, newServer.isTss());
 
-		if (!newServer.isTss) {
+		if (!newServer.isTss()) {
 			// link and wake up tss' tracker so it knows when this server gets removed
 			if (tss_info_by_pair.count(newServer.id())) {
 				tss_info_by_pair[newServer.id()]->onTSSPairRemoved = r->onRemoved;
@@ -2666,19 +2654,16 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 
 	void removeTSS(UID removedServer) {
 		// much simpler than remove server. tss isn't in any teams, so just remove it from data structures
-		TEST(true); // Remove a TSS frm the cluster
-		printf("Removing tss %s\n", removedServer.toString().c_str());
 		TraceEvent("RemovedTSS", distributorId).detail("ServerID", removedServer);
 		Reference<TCServerInfo> removedServerInfo = server_and_tss_info[removedServer];
 
-		tss_info_by_pair.erase(removedServerInfo->lastKnownInterface.tssPairID);
+		tss_info_by_pair.erase(removedServerInfo->lastKnownInterface.tssPairID.get());
 		server_and_tss_info.erase(removedServer);
 
 		server_status.clear(removedServer);
 	}
 
 	void removeServer(UID removedServer) {
-		printf("Removing ss %s\n", removedServer.toString().c_str());
 		TraceEvent("RemovedStorageServer", distributorId).detail("ServerID", removedServer);
 
 		// ASSERT( !shardsAffectedByTeamFailure->getServersForTeam( t ) for all t in teams that contain removedServer )
@@ -2800,7 +2785,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 };
 
 TCServerInfo::~TCServerInfo() {
-	if (collection && ssVersionTooFarBehind.get() && !lastKnownInterface.isTss) {
+	if (collection && ssVersionTooFarBehind.get() && !lastKnownInterface.isTss()) {
 		collection->removeLaggingStorageServer(lastKnownInterface.locality.zoneId().get());
 	}
 }
@@ -3476,19 +3461,18 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 			bool recheck = !healthy && (lastReady != self->initialFailureReactionDelay.isReady() ||
 			                            (lastZeroHealthy && !self->zeroHealthyTeams->get()) || containsFailed);
 
-			// TODO recomment
-			TraceEvent("TeamHealthChangeDetected", self->distributorId)
-			    .detail("Team", team->getDesc())
-			    .detail("ServersLeft", serversLeft)
-			    .detail("LastServersLeft", lastServersLeft)
-			    .detail("AnyUndesired", anyUndesired)
-			    .detail("LastAnyUndesired", lastAnyUndesired)
-			    .detail("AnyWrongConfiguration", anyWrongConfiguration)
-			    .detail("LastWrongConfiguration", lastWrongConfiguration)
-			    .detail("Recheck", recheck)
-			    .detail("BadTeam", badTeam)
-			    .detail("LastZeroHealthy", lastZeroHealthy)
-			    .detail("ZeroHealthyTeam", self->zeroHealthyTeams->get());
+			// TraceEvent("TeamHealthChangeDetected", self->distributorId)
+			//     .detail("Team", team->getDesc())
+			//     .detail("ServersLeft", serversLeft)
+			//     .detail("LastServersLeft", lastServersLeft)
+			//     .detail("AnyUndesired", anyUndesired)
+			//     .detail("LastAnyUndesired", lastAnyUndesired)
+			//     .detail("AnyWrongConfiguration", anyWrongConfiguration)
+			//     .detail("LastWrongConfiguration", lastWrongConfiguration)
+			//     .detail("Recheck", recheck)
+			//     .detail("BadTeam", badTeam)
+			//     .detail("LastZeroHealthy", lastZeroHealthy)
+			//     .detail("ZeroHealthyTeam", self->zeroHealthyTeams->get());
 
 			lastReady = self->initialFailureReactionDelay.isReady();
 			lastZeroHealthy = self->zeroHealthyTeams->get();
@@ -3860,7 +3844,7 @@ ACTOR Future<Void> waitServerListChange(DDTeamCollection* self,
 							                self->serverTrackerErrorOut,
 							                tr.getReadVersion().get(),
 							                ddEnabledState);
-							if (!ssi.isTss) {
+							if (!ssi.isTss()) {
 								self->doBuildTeams = true;
 							}
 						}
@@ -3877,7 +3861,6 @@ ACTOR Future<Void> waitServerListChange(DDTeamCollection* self,
 				}
 			}
 		} catch (Error& e) {
-			printf("WaitServerListChange got error %d\n", e.code());
 			wait(tr.onError(e));
 			serverListAndProcessClasses = Never();
 			isFetchingResults = false;
@@ -3967,7 +3950,6 @@ ACTOR Future<Void> keyValueStoreTypeTracker(DDTeamCollection* self, TCServerInfo
 
 ACTOR Future<Void> waitForAllDataRemoved(Database cx, UID serverID, Version addedVersion, DDTeamCollection* teams) {
 	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);
-	printf("Waiting for data to be removed from %s\n", serverID.toString().c_str());
 	loop {
 		try {
 			tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
@@ -4005,10 +3987,6 @@ ACTOR Future<Void> storageServerFailureTracker(DDTeamCollection* self,
 	state StorageServerInterface interf = server->lastKnownInterface;
 	state int targetTeamNumPerServer =
 	    (SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER * (self->configuration.storageTeamSize + 1)) / 2;
-
-	printf("Starting failure tracker for %sSS %s\n",
-	       server->lastKnownInterface.isTss ? "T" : "",
-	       server->lastKnownInterface.id().toString().c_str());
 	loop {
 		state bool inHealthyZone = false; // healthChanged actor will be Never() if this flag is true
 		if (self->healthyZone.get().present()) {
@@ -4027,7 +4005,7 @@ ACTOR Future<Void> storageServerFailureTracker(DDTeamCollection* self,
 			}
 		}
 
-		if (!interf.isTss) {
+		if (!interf.isTss()) {
 			if (self->server_status.get(interf.id()).initialized) {
 				bool unhealthy = self->server_status.get(interf.id()).isUnhealthy();
 				if (unhealthy && !status->isUnhealthy()) {
@@ -4059,7 +4037,7 @@ ACTOR Future<Void> storageServerFailureTracker(DDTeamCollection* self,
 		choose {
 			when(wait(healthChanged)) {
 				status->isFailed = !status->isFailed;
-				if (!status->isFailed && !server->lastKnownInterface.isTss &&
+				if (!status->isFailed && !server->lastKnownInterface.isTss() &&
 				    (server->teams.size() < targetTeamNumPerServer || self->lastBuildTeamsFailed)) {
 					self->doBuildTeams = true;
 				}
@@ -4119,9 +4097,6 @@ ACTOR Future<Void> storageServerTracker(
 	state int targetTeamNumPerServer =
 	    (SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER * (self->configuration.storageTeamSize + 1)) / 2;
 
-	// TODO REMOVE
-	printf("Started %sSS tracker for %s\n", isTss ? "T" : "", server->id.toString().c_str());
-
 	try {
 		loop {
 			status.isUndesired = !self->disableFailingLaggingServers.get() && server->ssVersionTooFarBehind.get();
@@ -4267,9 +4242,7 @@ ACTOR Future<Void> storageServerTracker(
 
 			state bool recordTeamCollectionInfo = false;
 			choose {
-				when(wait(failureTracker || server->onTSSPairRemoved)) {
-					printf("Server %s getting removed\n", server->id.toString().c_str());
-
+				when(wait(failureTracker || server->onTSSPairRemoved || server->killTss.getFuture())) {
 					// The server is failed AND all data has been removed from it, so permanently remove it.
 					TraceEvent("StatusMapChange", self->distributorId)
 					    .detail("ServerID", server->id)
@@ -4280,9 +4253,8 @@ ACTOR Future<Void> storageServerTracker(
 					}
 
 					// Remove server from FF/serverList
-					Optional<UID> tssPairID =
-					    server->lastKnownInterface.isTss ? server->lastKnownInterface.tssPairID : Optional<UID>();
-					wait(removeStorageServer(cx, server->id, tssPairID, self->lock, ddEnabledState));
+					wait(removeStorageServer(
+					    cx, server->id, server->lastKnownInterface.tssPairID, self->lock, ddEnabledState));
 
 					TraceEvent("StatusMapChange", self->distributorId)
 					    .detail("ServerID", server->id)
@@ -4556,7 +4528,6 @@ ACTOR Future<Void> checkAndRemoveInvalidLocalityAddr(DDTeamCollection* self) {
 }
 
 int numExistingSSOnAddr(DDTeamCollection* self, const AddressExclusion& addr) {
-	// TODO add tss?
 	int numExistingSS = 0;
 	for (auto& server : self->server_and_tss_info) {
 		const NetworkAddress& netAddr = server.second->lastKnownInterface.stableAddress();
@@ -4570,16 +4541,24 @@ int numExistingSSOnAddr(DDTeamCollection* self, const AddressExclusion& addr) {
 }
 
 // All state that represents an ongoing tss pair recruitment
-struct TSSRecruitmentState : ReferenceCounted<TSSRecruitmentState>, NonCopyable {
+struct TSSPairState : ReferenceCounted<TSSPairState>, NonCopyable {
 	Promise<Optional<std::pair<UID, Version>>>
 	    ssPairInfo; // if set, for ss to pass its id to tss pair once it is successfully recruited
 	Promise<bool> tssPairDone; // if set, for tss to pass ss that it was successfully recruited
+
 	Optional<Key> dcId; // dc
+	Optional<Key> dataHallId; // data hall
+
 	bool active;
 
-	TSSRecruitmentState() : active(false) {}
+	TSSPairState() : active(false) {}
 
-	TSSRecruitmentState(Optional<Key> dcId) : active(true), dcId(dcId) {}
+	TSSPairState(const LocalityData& locality)
+	  : active(true), dcId(locality.dcId()), dataHallId(locality.dataHallId()) {}
+
+	bool inDataZone(const LocalityData& locality) {
+		return locality.dcId() == dcId && locality.dataHallId() == dataHallId;
+	}
 
 	void cancel() {
 		// only cancel if both haven't been set, otherwise one half of pair could think it was successful but the other
@@ -4603,7 +4582,6 @@ struct TSSRecruitmentState : ReferenceCounted<TSSRecruitmentState>, NonCopyable
 
 	bool tssRecruitFailed() {
 		if (active && tssPairDone.canBeSet()) {
-			printf("tssPair: %p\n", &tssPairDone);
 			tssPairDone.send(false);
 			return true;
 		}
@@ -4631,13 +4609,11 @@ struct TSSRecruitmentState : ReferenceCounted<TSSRecruitmentState>, NonCopyable
 	Future<bool> waitOnTSS() { return tssPairDone.getFuture(); }
 };
 
-// TODO switch recruitment order(ish) - grab tss but don't init it, wait for it to actually grab an ss, then the ss
-// signals here to start, then when done this signals the ss to add server
 ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
                                      RecruitStorageReply candidateWorker,
                                      const DDEnabledState* ddEnabledState,
                                      bool recruitTss,
-                                     Reference<TSSRecruitmentState> tssState) {
+                                     Reference<TSSPairState> tssState) {
 	// SOMEDAY: Cluster controller waits for availability, retry quickly if a server's Locality changes
 	self->recruitingStream.set(self->recruitingStream.get() + 1);
 
@@ -4656,12 +4632,6 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 		isr.seedTag = invalidTag;
 		isr.reqId = deterministicRandom()->randomUniqueID();
 		isr.interfaceId = interfaceId;
-		isr.isTss = recruitTss;
-
-		printf("InitStorage %s on %sSS %s\n",
-		       interfaceId.toString().c_str(),
-		       recruitTss ? "T" : "",
-		       candidateWorker.worker.address().toString().c_str());
 
 		self->recruitingIds.insert(interfaceId);
 		self->recruitingLocalities.insert(candidateWorker.worker.stableAddress());
@@ -4675,29 +4645,21 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 			    .detail("Addr", candidateWorker.worker.address())
 			    .detail("Locality", candidateWorker.worker.locality.toString());
 
-			printf("TSS %s waiting for partner uid\n", interfaceId.toString().c_str());
 			Optional<std::pair<UID, Version>> ssPairInfoResult = wait(tssState->waitOnSS());
 			if (ssPairInfoResult.present()) {
-				printf("TSS %s got pair of %s @ %lld\n",
-				       interfaceId.toString().c_str(),
-				       ssPairInfoResult.get().first.toString().c_str(),
-				       ssPairInfoResult.get().second);
-				isr.tssPairID = ssPairInfoResult.get().first;
-				isr.tssPairVersion = ssPairInfoResult.get().second;
+				isr.tssPairIDAndVersion = ssPairInfoResult.get();
 
 				TraceEvent("TSS_Recruit", self->distributorId)
-				    .detail("SSID", isr.tssPairID)
+				    .detail("SSID", ssPairInfoResult.get().first)
 				    .detail("TSSID", interfaceId)
 				    .detail("Stage", "TSSWaitingPair")
 				    .detail("Addr", candidateWorker.worker.address())
+				    .detail("Version", ssPairInfoResult.get().second)
 				    .detail("Locality", candidateWorker.worker.locality.toString());
 			} else {
-				printf("TSS %s didn't get partner, partner recruitment must have failed, abandoning\n",
-				       interfaceId.toString().c_str());
-				isr.isTss = false;
 				doRecruit = false;
 
-				TraceEvent(SevWarn, "TSS_RecruitError", self->distributorId)
+				TraceEvent(SevWarnAlways, "TSS_RecruitError", self->distributorId)
 				    .detail("TSSID", interfaceId)
 				    .detail("Reason", "SS recruitment failed for some reason")
 				    .detail("Addr", candidateWorker.worker.address())
@@ -4731,10 +4693,7 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 
 		if (!recruitTss && newServer.present() &&
 		    tssState->ssRecruitSuccess(std::pair(interfaceId, newServer.get().addedVersion))) {
-			printf("ss %s signalling tss pair with version %lld\n",
-			       interfaceId.toString().c_str(),
-			       newServer.get().addedVersion);
-			// ss has a tss pair. send it this id, but wait for add server until tss is recruited
+			// SS has a tss pair. send it this id, but try to wait for add server until tss is recruited
 
 			TraceEvent("TSS_Recruit", self->distributorId)
 			    .detail("SSID", interfaceId)
@@ -4742,10 +4701,9 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 			    .detail("Addr", candidateWorker.worker.address())
 			    .detail("Locality", candidateWorker.worker.locality.toString());
 
-			// wait for timeout, and give up if no TSS pair recruited
+			// wait for timeout, but eventually move on if no TSS pair recruited
 			Optional<bool> tssSuccessful = wait(timeout(tssState->waitOnTSS(), SERVER_KNOBS->TSS_RECRUITMENT_TIMEOUT));
 
-			// TODO if unsuccessful, fail out tss so it doesn't cause a mismatch error?
 			if (tssSuccessful.present() && tssSuccessful.get()) {
 				TraceEvent("TSS_Recruit", self->distributorId)
 				    .detail("SSID", interfaceId)
@@ -4760,14 +4718,7 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 				                                    : "TSS recruitment timed out")
 				    .detail("Addr", candidateWorker.worker.address())
 				    .detail("Locality", candidateWorker.worker.locality.toString());
-
-				// TODO need to remove that tss here!!
 			}
-
-			// TODO trace event, change sev and message if timeout or if unsuccessful
-			printf("ss %s %ssuccessfully got tss pair!\n",
-			       interfaceId.toString().c_str(),
-			       (tssSuccessful.present() && tssSuccessful.get()) ? "" : "un");
 		}
 
 		self->recruitingIds.erase(interfaceId);
@@ -4791,9 +4742,6 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 					                self->serverTrackerErrorOut,
 					                newServer.get().addedVersion,
 					                ddEnabledState);
-				} else {
-					// TODO tss recruitment was cancelled since it failed to send a response to the ss, kill it
-					printf("TSS recruitment was cancelled, stop\n");
 				}
 			} else {
 				TraceEvent(SevWarn, "DDRecruitmentError")
@@ -4806,15 +4754,12 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 		}
 	}
 
+	// SS and/or TSS recruitment failed at this point, update tssState
 	if (recruitTss && tssState->tssRecruitFailed()) {
 		TEST(true); // TSS recruitment failed for some reason
-		// if tss wasn't already marked as done, it was unsuccessful in recruitment
-		printf("tss recruitment failed for some reason, signalling ss.\n");
 	}
 	if (!recruitTss && tssState->ssRecruitFailed()) {
 		TEST(true); // SS with pair TSS recruitment failed for some reason
-		// if ss didn't already send its pair id to tss, it was unsuccessful in recruitment
-		printf("ss recruitment failed for some reason, signalling tss.\n");
 	}
 
 	self->recruitingStream.set(self->recruitingStream.get() - 1);
@@ -4832,13 +4777,11 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 	state std::map<AddressExclusion, int> numSSPerAddr;
 
 	// tss-specific recruitment state
-	state uint32_t tssToRecruit = self->configuration.desiredTSSCount - db->get().client.tssMapping.size();
-	state Reference<TSSRecruitmentState> tssState = makeReference<TSSRecruitmentState>();
+	state int32_t tssToRecruit = self->configuration.desiredTSSCount - db->get().client.tssMapping.size();
+	state Reference<TSSPairState> tssState = makeReference<TSSPairState>();
+	state Future<Void> checkKillTss = self->initialFailureReactionDelay;
+	state bool sleepingAfterKillTss = false;
 
-	printf("DD setting tssToRecruit=%d (%d - %d)\n",
-	       tssToRecruit,
-	       self->configuration.desiredTSSCount,
-	       db->get().client.tssMapping.size());
 	TraceEvent(SevDebug, "TSS_RecruitUpdated", self->distributorId).detail("Count", tssToRecruit);
 
 	loop {
@@ -4924,87 +4867,97 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						    .detail("Locality", candidateWorker.worker.locality.toString());
 
 						TEST(true); // Starting TSS recruitment
-						printf("starting recruitment of tss\n");
 						self->isTssRecruiting = true;
-						tssState = makeReference<TSSRecruitmentState>(candidateWorker.worker.locality.dcId());
+						tssState = makeReference<TSSPairState>(candidateWorker.worker.locality);
 
 						self->addActor.send(initializeStorage(self, candidateWorker, ddEnabledState, true, tssState));
 					} else {
-						if (tssState->active && candidateWorker.worker.locality.dcId() == tssState->dcId) {
-							TEST(true); // TSS recruits pair in same dc
+						if (tssState->active && tssState->inDataZone(candidateWorker.worker.locality)) {
+							TEST(true); // TSS recruits pair in same dc/datahall
 							self->isTssRecruiting = false;
 							TraceEvent("TSS_Recruit", self->distributorId)
 							    .detail("Stage", "PairSS")
 							    .detail("Addr", candidateSSAddr.toString())
 							    .detail("Locality", candidateWorker.worker.locality.toString());
-							printf("starting recruitment of ss with eventual tss pair in dc \'%s\'\n",
-							       tssState->dcId.present() ? tssState->dcId.get().toString().c_str() : "");
 							self->addActor.send(
 							    initializeStorage(self, candidateWorker, ddEnabledState, false, tssState));
 							// successfully started recruitment of pair, reset tss recruitment state
-							tssState = makeReference<TSSRecruitmentState>();
+							tssState = makeReference<TSSPairState>();
 							tssToRecruit--;
-							if (tssToRecruit > 0) {
-								printf("%d tss pairs left to recruit\n", tssToRecruit);
-							}
 						} else {
-							if (tssState->active) {
-								TEST(true); // TSS recruitment skipped potential pair because it's in a different dc
-								printf("Recruiting normal ss (no tss) b/c new ss is in different dc \'%s\' than tss "
-								       "\'%s\'\n",
-								       candidateWorker.worker.locality.dcId().present()
-								           ? candidateWorker.worker.locality.dcId().get().toString().c_str()
-								           : "",
-								       tssState->dcId.present() ? tssState->dcId.get().toString().c_str() : "");
-							} else {
-								printf("recruiting normal ss (no tss)\n");
-							}
+							TEST(tssState->active); // TSS recruitment skipped potential pair because it's in a
+							                        // different dc/datahall
 							self->addActor.send(initializeStorage(
-							    self, candidateWorker, ddEnabledState, false, makeReference<TSSRecruitmentState>()));
+							    self, candidateWorker, ddEnabledState, false, makeReference<TSSPairState>()));
 						}
 					}
 				}
 				when(wait(db->onChange())) { // SOMEDAY: only if clusterInterface or tss changes?
 					fCandidateWorker = Future<RecruitStorageReply>();
-					// TODO REMOVE print
 					int newTssToRecruit = self->configuration.desiredTSSCount - db->get().client.tssMapping.size();
+
 					if (newTssToRecruit != tssToRecruit) {
 						TraceEvent("TSS_RecruitUpdated", self->distributorId).detail("Count", newTssToRecruit);
 						tssToRecruit = newTssToRecruit;
 					}
 
-					// TODO HANDLE HERE if count is more than desired tss?
-
-					printf("DD updated tssToRecruit=%d (%d - %d)\n",
-					       tssToRecruit,
-					       self->configuration.desiredTSSCount,
-					       db->get().client.tssMapping.size());
-
-					if (self->isTssRecruiting && (tssToRecruit == 0 || self->zeroHealthyTeams->get())) {
-						TEST(tssToRecruit == 0); // tss recruitment cancelled due to too many TSS
+					if (self->isTssRecruiting && (tssToRecruit <= 0 || self->zeroHealthyTeams->get())) {
+						TEST(tssToRecruit <= 0); // tss recruitment cancelled due to too many TSS
 						TEST(self->zeroHealthyTeams->get()); // tss recruitment cancelled due zero healthy teams
 						TraceEvent(SevWarn, "TSS_RecruitCancelled", self->distributorId)
-						    .detail("Reason", tssToRecruit == 0 ? "ConfigChange" : "ZeroHealthyTeams");
-						printf("Cancelling tss recruitment! tssToRecruit: %d, zeroHealthyTeams: %s\n",
-						       tssToRecruit,
-						       self->zeroHealthyTeams->get() ? "T" : "F");
+						    .detail("Reason", tssToRecruit <= 0 ? "ConfigChange" : "ZeroHealthyTeams");
 						tssState->cancel();
-						tssState = makeReference<TSSRecruitmentState>();
+						tssState = makeReference<TSSPairState>();
 						self->isTssRecruiting = false;
+					} else if (!self->isTssRecruiting &&
+					           (tssToRecruit < 0 ||
+					            (self->zeroHealthyTeams->get() && db->get().client.tssMapping.size() > 0))) {
+						if (!sleepingAfterKillTss) {
+							checkKillTss = self->initialFailureReactionDelay;
+						}
 					}
 				}
 				when(wait(self->zeroHealthyTeams->onChange())) {
-					// TODO refactor?
 					if (self->isTssRecruiting && self->zeroHealthyTeams->get()) {
 						TEST(self->zeroHealthyTeams->get()); // tss recruitment cancelled due zero healthy teams 2
 						TraceEvent(SevWarn, "TSS_RecruitCancelled", self->distributorId)
 						    .detail("Reason", "ZeroHealthyTeams");
-						printf("Cancelling tss recruitment!! tssToRecruit: %d, zeroHealthyTeams: %s\n",
-						       tssToRecruit,
-						       self->zeroHealthyTeams->get() ? "T" : "F");
 						tssState->cancel();
-						tssState = makeReference<TSSRecruitmentState>();
+						tssState = makeReference<TSSPairState>();
 						self->isTssRecruiting = false;
+					} else if (!self->isTssRecruiting && self->zeroHealthyTeams->get() &&
+					           db->get().client.tssMapping.size() > 0) {
+						if (!sleepingAfterKillTss) {
+							checkKillTss = self->initialFailureReactionDelay;
+						}
+					}
+				}
+				when(wait(checkKillTss)) {
+					int tssToKill = std::min((int)db->get().client.tssMapping.size(),
+					                         std::max(-tssToRecruit, self->zeroHealthyTeams->get() ? 1 : 0));
+					if (tssToKill > 0) {
+						for (int i = 0; i < tssToKill; i++) {
+							StorageServerInterface tssi = db->get().client.tssMapping[i].second;
+
+							if (self->shouldHandleServer(tssi) && self->server_and_tss_info.count(tssi.id())) {
+								TraceEvent(SevWarn, "TSS_DDKill", self->distributorId)
+								    .detail("TSSID", tssi.id())
+								    .detail("Reason",
+								            self->zeroHealthyTeams->get() ? "ZeroHealthyTeams" : "ConfigChange");
+
+								Promise<Void> killPromise = self->server_and_tss_info[tssi.id()]->killTss;
+								if (killPromise.canBeSet()) {
+									killPromise.send(Void());
+								}
+							}
+						}
+						// If we're killing a TSS because of zero healthy teams, wait a bit to give the replacing SS a
+						// change to join teams and stuff before killing another TSS
+						sleepingAfterKillTss = true;
+						checkKillTss = delay(SERVER_KNOBS->TSS_DD_KILL_INTERVAL);
+					} else {
+						sleepingAfterKillTss = false;
+						checkKillTss = Never();
 					}
 				}
 				when(wait(self->restartRecruiting.onTrigger())) {}
@@ -5652,8 +5605,6 @@ ACTOR Future<Void> dataDistribution(Reference<DataDistributorData> self,
 			wait(waitForAll(actors));
 			return Void();
 		} catch (Error& e) {
-			// TODO REMOVE
-			printf("DD got error! %d\n", e.code());
 			trackerCancelled = true;
 			state Error err = e;
 			TraceEvent("DataDistributorDestroyTeamCollections").error(e);
@@ -6321,6 +6272,4 @@ TEST_CASE("/DataDistribution/AddTeamsBestOf/NotEnoughServers") {
 	ASSERT(result == 8);
 
 	return Void();
-}
-
-// TODO add unit test for TSS recruitment?
+}
\ No newline at end of file
diff --git a/fdbserver/DataDistributionTracker.actor.cpp b/fdbserver/DataDistributionTracker.actor.cpp
index c774ae10f58..40ca28aa08e 100644
--- a/fdbserver/DataDistributionTracker.actor.cpp
+++ b/fdbserver/DataDistributionTracker.actor.cpp
@@ -497,22 +497,14 @@ ACTOR Future<Void> shardSplitter(DataDistributionTracker* self,
 		    .detail("MaxBytes", shardBounds.max.bytes)
 		    .detail("MetricsBytes", metrics.bytes)
 		    .detail("Bandwidth",
-		            bandwidthStatus == BandwidthStatusHigh
-		                ? "High"
-		                : bandwidthStatus == BandwidthStatusNormal ? "Normal" : "Low")
+		            bandwidthStatus == BandwidthStatusHigh     ? "High"
+		            : bandwidthStatus == BandwidthStatusNormal ? "Normal"
+		                                                       : "Low")
 		    .detail("BytesPerKSec", metrics.bytesPerKSecond)
 		    .detail("NumShards", numShards);
 	}
 
 	if (numShards > 1) {
-		// TODO REMOVE
-		printf("Splitting [%s - %s) into %d shards:\n",
-		       splitKeys[0].toString().c_str(),
-		       splitKeys[numShards].toString().c_str(),
-		       numShards);
-		for (int i = 0; i < numShards; i++) {
-			printf("    [%s - %s)\n", splitKeys[i].toString().c_str(), splitKeys[i + 1].toString().c_str());
-		}
 		int skipRange = deterministicRandom()->randomInt(0, numShards);
 		// The queue can't deal with RelocateShard requests which split an existing shard into three pieces, so
 		// we have to send the unskipped ranges in this order (nibbling in from the edges of the old range)
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index 18b76a3f44e..839803ab416 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -217,7 +217,9 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( SERVER_LIST_DELAY,                                     1.0 );
 	init( RECRUITMENT_IDLE_DELAY,                                1.0 );
 	init( STORAGE_RECRUITMENT_DELAY,                            10.0 );
-	init( TSS_RECRUITMENT_TIMEOUT,       3*STORAGE_RECRUITMENT_DELAY ); if (randomize && BUGGIFY ) TSS_RECRUITMENT_TIMEOUT = 1.0; //Super low timeout should cause tss recruitments to fail
+	init( TSS_HACK_IDENTITY_MAPPING,                           false ); // THIS SHOULD NEVER BE SET IN PROD. Only for performance testing
+	init( TSS_RECRUITMENT_TIMEOUT,       3*STORAGE_RECRUITMENT_DELAY ); if (randomize && BUGGIFY ) TSS_RECRUITMENT_TIMEOUT = 1.0; // Super low timeout should cause tss recruitments to fail
+	init( TSS_DD_KILL_INTERVAL,                                 60.0 ); if (randomize && BUGGIFY ) TSS_DD_KILL_INTERVAL = 1.0;    // May kill all TSS quickly
 	init( DATA_DISTRIBUTION_LOGGING_INTERVAL,                    5.0 );
 	init( DD_ENABLED_CHECK_DELAY,                                1.0 );
 	init( DD_STALL_CHECK_DELAY,                                  0.4 ); //Must be larger than 2*MAX_BUGGIFIED_DELAY
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 447867e99ea..0436c4a4dd5 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -167,7 +167,9 @@ class ServerKnobs : public Knobs {
 	double SERVER_LIST_DELAY;
 	double RECRUITMENT_IDLE_DELAY;
 	double STORAGE_RECRUITMENT_DELAY;
+	bool TSS_HACK_IDENTITY_MAPPING;
 	double TSS_RECRUITMENT_TIMEOUT;
+	double TSS_DD_KILL_INTERVAL;
 	double DATA_DISTRIBUTION_LOGGING_INTERVAL;
 	double DD_ENABLED_CHECK_DELAY;
 	double DD_STALL_CHECK_DELAY;
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index 927a7af00bd..afd12a81c17 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -101,7 +101,6 @@ ACTOR static Future<Void> checkMoveKeysLock(Transaction* tr,
                                             bool isWrite = true) {
 	if (!ddEnabledState->isDDEnabled()) {
 		TraceEvent(SevDebug, "DDDisabledByInMemoryCheck");
-		printf("MK: DD disabled\n");
 		throw movekeys_conflict();
 	}
 	Optional<Value> readVal = wait(tr->get(moveKeysLockOwnerKey));
@@ -113,7 +112,6 @@ ACTOR static Future<Void> checkMoveKeysLock(Transaction* tr,
 		UID lastWrite = readVal.present() ? BinaryReader::fromStringRef<UID>(readVal.get(), Unversioned()) : UID();
 		if (lastWrite != lock.prevWrite) {
 			TEST(true); // checkMoveKeysLock: Conflict with previous owner
-			printf("MK: conflict with previous owner\n");
 			throw movekeys_conflict();
 		}
 
@@ -147,7 +145,6 @@ ACTOR static Future<Void> checkMoveKeysLock(Transaction* tr,
 		return Void();
 	} else {
 		TEST(true); // checkMoveKeysLock: Conflict with new owner
-		printf("MK: conflict %s with new owner %s\n", currentOwner.toString().c_str(), lock.myOwner.toString().c_str());
 		throw movekeys_conflict();
 	}
 }
@@ -330,12 +327,6 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 	state Future<Void> warningLogger = logWarningAfter("StartMoveKeysTooLong", 600, servers);
 	// state TraceInterval waitInterval("");
 
-	// TODO REMOVE
-	printf("starting move keys for [%s, %s): to %s\n",
-	       keys.begin.toString().c_str(),
-	       keys.end.toString().c_str(),
-	       servers[0].toString().c_str());
-
 	wait(startMoveKeysLock->take(TaskPriority::DataDistributionLaunch));
 	state FlowLock::Releaser releaser(*startMoveKeysLock);
 
@@ -395,10 +386,10 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 					state KeyRange currentKeys = KeyRangeRef(begin, keys.end);
 
 					state RangeResult old = wait(krmGetRanges(tr,
-					                                                         keyServersPrefix,
-					                                                         currentKeys,
-					                                                         SERVER_KNOBS->MOVE_KEYS_KRM_LIMIT,
-					                                                         SERVER_KNOBS->MOVE_KEYS_KRM_LIMIT_BYTES));
+					                                          keyServersPrefix,
+					                                          currentKeys,
+					                                          SERVER_KNOBS->MOVE_KEYS_KRM_LIMIT,
+					                                          SERVER_KNOBS->MOVE_KEYS_KRM_LIMIT_BYTES));
 
 					// Determine the last processed key (which will be the beginning for the next iteration)
 					state Key endKey = old.end()[-1].key;
@@ -531,37 +522,15 @@ ACTOR Future<Void> waitForShardReady(StorageServerInterface server,
                                      KeyRange keys,
                                      Version minVersion,
                                      GetShardStateRequest::waitMode mode) {
-	// TODO REMOVE
-	printf("waiting for shard [%s, %s) in state %d from %sss %s @ %lld\n",
-	       keys.begin.toString().c_str(),
-	       keys.end.toString().c_str(),
-	       mode,
-	       server.isTss ? "t" : "",
-	       server.id().toString().c_str(),
-	       minVersion);
 	loop {
 		try {
 			GetShardStateReply rep =
 			    wait(server.getShardState.getReply(GetShardStateRequest(keys, mode), TaskPriority::MoveKeys));
 			if (rep.first >= minVersion) {
-				// TODO REMOVE
-				printf("shard [%s, %s) is in state %d from %sss %s @ %lld >= %lld\n",
-				       keys.begin.toString().c_str(),
-				       keys.end.toString().c_str(),
-				       mode,
-				       server.isTss ? "t" : "",
-				       server.id().toString().c_str(),
-				       rep.first,
-				       minVersion);
 				return Void();
 			}
 			wait(delayJittered(SERVER_KNOBS->SHARD_READY_DELAY, TaskPriority::MoveKeys));
 		} catch (Error& e) {
-			printf("Waiting for shard from %sss %s getValue=%s got error! %d\n",
-			       server.isTss ? "t" : "",
-			       server.id().toString().c_str(),
-			       server.getValue.getEndpoint().token.toString().c_str(),
-			       e.code());
 			if (e.code() != error_code_timed_out) {
 				if (e.code() != error_code_broken_promise)
 					throw e;
@@ -656,18 +625,16 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 	state Key endKey;
 	state int retries = 0;
 	state FlowLock::Releaser releaser;
-	state int waitForTSSCounter =
-	    2; // try waiting for tss for a 2 loops, give up if they're stuck to not affect the rest of the cluster
 
 	// for killing tss if any get stuck during movekeys
 	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
 	state std::vector<StorageServerInterface> tssToKill;
-	state std::set<UID> tssToIgnore;
+	state std::unordered_set<UID> tssToIgnore;
+	// try waiting for tss for a 2 loops, give up if they're stuck to not affect the rest of the cluster
+	state int waitForTSSCounter = 2;
 
 	ASSERT(!destinationTeam.empty());
 
-	printf("finishing move keys for [%s, %s)\n", keys.begin.toString().c_str(), keys.end.toString().c_str());
-
 	try {
 		TraceEvent(SevDebug, interval.begin(), relocationIntervalId)
 		    .detail("KeyBegin", keys.begin)
@@ -680,21 +647,17 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 
 			state Transaction tr(occ);
 
-			// TODO re-comment and change back
-			printf("finishMoveKeys( '%s'-'%s' )\n", begin.toString().c_str(), keys.end.toString().c_str());
+			// printf("finishMoveKeys( '%s'-'%s' )\n", begin.toString().c_str(), keys.end.toString().c_str());
 			loop {
 				try {
 					if (tssToKill.size()) {
-						// TODO could move this to helper method?
-						// TODO add trace event
 						TEST(true); // killing TSS because they were unavailable for movekeys
-						printf("KILLING %d TSS BECAUSE THEY TIMED OUT IN MOVEKEYS\n", tssToKill.size());
 
-						// kill tss BEFORE committing main txn so that client requests don't make it to the tss when it
+						// Kill tss BEFORE committing main txn so that client requests don't make it to the tss when it
 						// has a different shard set than its pair use a different RYW transaction since i'm too lazy
-						// (and don't want to add bugs) by changing whole method to RYW. also using a different
+						// (and don't want to add bugs) by changing whole method to RYW. Also, using a different
 						// transaction makes it commit earlier which we may need to guarantee causality of tss getting
-						// removed before client sends a request to this key range on the new ss
+						// removed before client sends a request to this key range on the new SS
 						state Reference<ReadYourWritesTransaction> tssTr =
 						    makeReference<ReadYourWritesTransaction>(occ);
 						loop {
@@ -703,25 +666,22 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 								tssTr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 								for (auto& tss : tssToKill) {
 									// DO NOT remove server list key - that'll break a bunch of stuff. DD will
-									// eventually call removeStorageServer tssTr->clear(serverListKeyFor(tss.id()));
+									// eventually call removeStorageServer
+
 									tssTr->clear(serverTagKeyFor(tss.id()));
-									// tssTr->clear(serverTagHistoryRangeFor(tss.id()));
-									tssMapDB.erase(tssTr, tss.tssPairID);
+									tssMapDB.erase(tssTr, tss.tssPairID.get());
 								}
 								tssTr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 								wait(tssTr->commit());
 
 								for (auto& tss : tssToKill) {
-									// TODO ADD trace event (sev30?)
-									printf("Successfully removed TSS %s in finishMoveKeys\n",
-									       tss.id().toString().c_str());
+									TraceEvent(SevWarnAlways, "TSS_KillMoveKeys").detail("TSSID", tss.id().toString());
 									tssToIgnore.insert(tss.id());
 								}
 								tssToKill.clear();
 
 								break;
 							} catch (Error& e) {
-								printf("MoveKeys TSS Removal Transaction got error %d\n", e.code());
 								wait(tssTr->onError(e));
 							}
 						}
@@ -950,9 +910,6 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 							for (auto& f : tssReady) {
 								if (!f.isReady() || f.isError()) {
 									anyTssNotDone = true;
-									printf("MK: [%s - %s) waiting on tss!\n",
-									       begin.toString().c_str(),
-									       keys.end.toString().c_str());
 									waitForTSSCounter--;
 									break;
 								}
@@ -961,9 +918,6 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 							if (anyTssNotDone && waitForTSSCounter == 0) {
 								for (int i = 0; i < tssReady.size(); i++) {
 									if (!tssReady[i].isReady() || tssReady[i].isError()) {
-										// TODO trace event!!
-										printf("TSS NOT DONE %s with move keys, killing!!\n",
-										       tssReadyInterfs[i].id().toString().c_str());
 										tssToKill.push_back(tssReadyInterfs[i]);
 									}
 								}
@@ -981,22 +935,21 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 					for (int s = 0; s < tssReady.size(); s++)
 						tssCount += tssReady[s].isReady() && !tssReady[s].isError();
 
-					// TODO re-comment
-					if (tssReady.size()) {
-						printf("  fMK: [%s - %s) moved data to %d/%d servers and %d/%d tss\n",
-						       begin.toString().c_str(),
-						       keys.end.toString().c_str(),
-						       count,
-						       serverReady.size(),
-						       tssCount,
-						       tssReady.size());
+					/*if (tssReady.size()) {
+					    printf("  fMK: [%s - %s) moved data to %d/%d servers and %d/%d tss\n",
+					           begin.toString().c_str(),
+					           keys.end.toString().c_str(),
+					           count,
+					           serverReady.size(),
+					           tssCount,
+					           tssReady.size());
 					} else {
-						printf("  fMK: [%s - %s) moved data to %d/%d servers\n",
-						       begin.toString().c_str(),
-						       keys.end.toString().c_str(),
-						       count,
-						       serverReady.size());
-					}
+					    printf("  fMK: [%s - %s) moved data to %d/%d servers\n",
+					           begin.toString().c_str(),
+					           keys.end.toString().c_str(),
+					           count,
+					           serverReady.size());
+					}*/
 					TraceEvent(SevDebug, waitInterval.end(), relocationIntervalId).detail("ReadyServers", count);
 
 					if (count == dest.size()) {
@@ -1026,7 +979,6 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 					}
 					tr.reset();
 				} catch (Error& error) {
-					printf("   fMK: error %d\n", error.code());
 					if (error.code() == error_code_actor_cancelled)
 						throw;
 					state Error err = error;
@@ -1059,13 +1011,11 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
 	state int maxSkipTags = 1;
 
-	printf("%sSS %s adding itself\n", server.isTss ? "T" : "", server.id().toString().c_str());
 	loop {
 		try {
-			// TODO should also set priority system immediate? also why is this needed?
 			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 
-			// TODO don't fetch tag localities, all tags, and history tags if tss. Just fetch pair's tag
+			// FIXME: don't fetch tag localities, all tags, and history tags if tss. Just fetch pair's tag
 			state Future<RangeResult> fTagLocalities = tr->getRange(tagLocalityListKeys, CLIENT_KNOBS->TOO_MANY);
 			state Future<Optional<Value>> fv = tr->get(serverListKeyFor(server.id()));
 
@@ -1108,9 +1058,6 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 			if (fExclProc.get().present() || fExclIP.get().present() || fFailProc.get().present() ||
 			    fFailIP.get().present() || fExclProc2.get().present() || fExclIP2.get().present() ||
 			    fFailProc2.get().present() || fFailIP2.get().present()) {
-				printf("%sSS %s failing to recruit because of exclusion\n",
-				       server.isTss ? "T" : "",
-				       server.id().toString().c_str());
 				throw recruitment_failed();
 			}
 
@@ -1118,11 +1065,11 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 				ASSERT(false);
 
 			state Tag tag;
-			if (server.isTss) {
+			if (server.isTss()) {
 				bool foundTag = false;
 				for (auto& it : fTags.get()) {
 					UID key = decodeServerTagKey(it.key);
-					if (key == server.tssPairID) {
+					if (key == server.tssPairID.get()) {
 						tag = decodeServerTagValue(it.value);
 						foundTag = true;
 						break;
@@ -1131,19 +1078,13 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 				if (!foundTag) {
 					throw recruitment_failed();
 				}
-				// ASSERT(foundTag); // TSS's pair was removed before TSS could register. Should never happen, since the
-				// SS shouldn't be tracked by DD until this completes.
-				printf("TSS %s found tag %s for pair %s\n",
-				       server.id().toString().c_str(),
-				       tag.toString().c_str(),
-				       server.tssPairID.toString().c_str());
-				tssMapDB.set(tr, server.tssPairID, server.id());
+
+				tssMapDB.set(tr, server.tssPairID.get(), server.id());
 				tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 
 			} else {
 				int8_t maxTagLocality = 0;
 				state int8_t locality = -1;
-				// TODO i think tss can ignore this part?
 				for (auto& kv : fTagLocalities.get()) {
 					int8_t loc = decodeTagLocalityListValue(kv.value);
 					if (decodeTagLocalityListKey(kv.key) == server.locality.dcId()) {
@@ -1197,20 +1138,19 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 				KeyRange conflictRange = singleKeyRange(serverTagConflictKeyFor(tag));
 				tr->addReadConflictRange(conflictRange);
 				tr->addWriteConflictRange(conflictRange);
+
+				if (SERVER_KNOBS->TSS_HACK_IDENTITY_MAPPING) {
+					// THIS SHOULD NEVER BE ENABLED IN ANY NON-TESTING ENVIRONMENT
+					TraceEvent(SevError, "TSSIdentityMappingEnabled");
+					tssMapDB.set(tr, server.id(), server.id());
+					tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
+				}
 			}
 
 			tr->set(serverListKeyFor(server.id()), serverListValue(server));
 			wait(tr->commit());
-			printf("%sSS %s successfully added itself @ %lld\n",
-			       server.isTss ? "T" : "",
-			       server.id().toString().c_str(),
-			       tr->getCommittedVersion());
 			return std::make_pair(tr->getCommittedVersion(), tag);
 		} catch (Error& e) {
-			printf("%sSS %s got error adding itself: %d!!\n",
-			       server.isTss ? "T" : "",
-			       server.id().toString().c_str(),
-			       e.code());
 			if (e.code() == error_code_commit_unknown_result)
 				throw recruitment_failed(); // There is a remote possibility that we successfully added ourselves and
 				                            // then someone removed us, so we have to fail
@@ -1252,8 +1192,6 @@ ACTOR Future<Void> removeStorageServer(Database cx,
 	state bool retry = false;
 	state int noCanRemoveCount = 0;
 
-	printf("Removing storage server %s\n", serverID.toString().c_str());
-
 	loop {
 		try {
 			tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
@@ -1323,18 +1261,19 @@ ACTOR Future<Void> removeStorageServer(Database cx,
 				}
 
 				tr->clear(serverListKeyFor(serverID));
-				tr->clear(serverTagKeyFor(serverID)); // the tss uses this to communicate shutdown but it never has a
+				tr->clear(serverTagKeyFor(serverID)); // A tss uses this to communicate shutdown but it never has a
 				                                      // server tag key set in the first place
 				tr->clear(serverTagHistoryRangeFor(serverID));
 
-				// TODO a small optimization would be to only erase and trigger tss mapping if this is a tss or an  ss
-				// with a tss pair, instead of always
-				if (tssPairID.present()) {
-					tssMapDB.erase(tr, tssPairID.get());
-				} else {
+				if (SERVER_KNOBS->TSS_HACK_IDENTITY_MAPPING) {
+					// THIS SHOULD NEVER BE ENABLED IN ANY NON-TESTING ENVIRONMENT
+					TraceEvent(SevError, "TSSIdentityMappingEnabled");
 					tssMapDB.erase(tr, serverID);
+					tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
+				} else if (tssPairID.present()) {
+					tssMapDB.erase(tr, tssPairID.get());
+					tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 				}
-				tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 
 				retry = true;
 				wait(tr->commit());
@@ -1354,7 +1293,6 @@ ACTOR Future<Void> removeKeysFromFailedServer(Database cx,
                                               MoveKeysLock lock,
                                               const DDEnabledState* ddEnabledState) {
 	state Key begin = allKeys.begin;
-	printf("Removing keys from failed server %s\n", serverID.toString().c_str());
 	// Multi-transactional removal in case of large number of shards, concern in violating 5s transaction limit
 	while (begin < allKeys.end) {
 		state Transaction tr(cx);
@@ -1456,8 +1394,6 @@ ACTOR Future<Void> moveKeys(Database cx,
 	if (!dataMovementComplete.isSet())
 		dataMovementComplete.send(Void());
 
-	printf("move keys done for [%s, %s)\n", keys.begin.toString().c_str(), keys.end.toString().c_str());
-
 	return Void();
 }
 
@@ -1486,6 +1422,15 @@ void seedShardServers(Arena& arena, CommitTransactionRef& tr, vector<StorageServ
 	for (auto& s : servers) {
 		tr.set(arena, serverTagKeyFor(s.id()), serverTagValue(server_tag[s.id()]));
 		tr.set(arena, serverListKeyFor(s.id()), serverListValue(s));
+		if (SERVER_KNOBS->TSS_HACK_IDENTITY_MAPPING) {
+			// THIS SHOULD NEVER BE ENABLED IN ANY NON-TESTING ENVIRONMENT
+			TraceEvent(SevError, "TSSIdentityMappingEnabled");
+			// hack key-backed map here since we can't really change CommitTransactionRef to a RYW transaction
+			Key uidRef = Codec<UID>::pack(s.id()).pack();
+			tr.set(arena, uidRef.withPrefix(tssMappingKeys.begin), uidRef);
+			// tssMapDB.set(tr, server.id(), server.id());
+			tr.set(arena, tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
+		}
 	}
 
 	std::vector<Tag> serverTags;
diff --git a/fdbserver/MutationTracking.cpp b/fdbserver/MutationTracking.cpp
index b0e7215fb8f..16a17a0f108 100644
--- a/fdbserver/MutationTracking.cpp
+++ b/fdbserver/MutationTracking.cpp
@@ -30,9 +30,6 @@
 // Track up to 2 keys in simulation via enabling MUTATION_TRACKING_ENABLED and setting the keys here.
 StringRef debugKey = LiteralStringRef("");
 StringRef debugKey2 = LiteralStringRef("\xff\xff\xff\xff");
-// StringRef debugKey = LiteralStringRef("\x00\x00\x02\xff\x00\x00\x04\xc1\x00\x00\x00\x01\x00\x00\x00\x02"); // missing
-// from ss StringRef debugKey2 = LiteralStringRef("\x00\x00\x02\xff\x00\x00\x01\x89\x00\x00\x00\x04\x00\x00\x00\x02");
-// // missing from tss
 
 TraceEvent debugMutationEnabled(const char* context, Version version, MutationRef const& mutation) {
 	if ((mutation.type == mutation.ClearRange || mutation.type == mutation.DebugKeyRange) &&
diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index 40f731aed66..223393bcdde 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -294,11 +294,6 @@ ACTOR Future<int64_t> getMaxStorageServerQueueSize(Database cx, Reference<AsyncV
 	state std::vector<StorageServerInterface> servers = wait(serversFuture);
 	state std::vector<WorkerDetails> workers = wait(workersFuture);
 
-	/*printf("Found %d storage servers:\n", servers.size());
-	for (auto& it : servers) {
-	    printf("    %s\n", it.id().toString().c_str());
-	}*/
-
 	std::map<NetworkAddress, WorkerInterface> workersMap;
 	for (auto worker : workers) {
 		workersMap[worker.interf.address()] = worker.interf;
@@ -328,7 +323,6 @@ ACTOR Future<int64_t> getMaxStorageServerQueueSize(Database cx, Reference<AsyncV
 		try {
 			maxQueueSize = std::max(maxQueueSize, getQueueSize(messages[i].get()));
 		} catch (Error& e) {
-			printf("Error getting max storage server queue size: %d\n", e.code());
 			TraceEvent("QuietDatabaseFailure")
 			    .detail("Reason", "Failed to extract MaxStorageServerQueue")
 			    .detail("SS", servers[i].id());
diff --git a/fdbserver/Ratekeeper.actor.cpp b/fdbserver/Ratekeeper.actor.cpp
index 83894c12016..4881b00914f 100644
--- a/fdbserver/Ratekeeper.actor.cpp
+++ b/fdbserver/Ratekeeper.actor.cpp
@@ -719,7 +719,7 @@ ACTOR Future<Void> trackEachStorageServer(
 		when(state std::pair<UID, Optional<StorageServerInterface>> change = waitNext(serverChanges)) {
 			wait(delay(0)); // prevent storageServerTracker from getting cancelled while on the call stack
 			if (change.second.present()) {
-				if (!change.second.get().isTss) { // TODO is this all we need to do to get ratekeeper to ignore tss?
+				if (!change.second.get().isTss()) {
 					auto& a = actors[change.first];
 					a = Future<Void>();
 					a = splitError(trackStorageServerQueueInfo(self, change.second.get()), err);
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index f6c8ba8e1f8..82117a7d737 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -937,13 +937,9 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	}
 
 	int tssCount = 0;
-	// if (!testConfig.simpleConfig && deterministicRandom()->random01() < 0.25) {
-	if (true) {
-		// if (false) {
-		// tss
+	if (!testconfig.simpleConfig && deterministicRandom()->random01() < 0.25) {
 		// 1 or 2 tss
 		tssCount = deterministicRandom()->randomInt(1, 3);
-		printf("Initial tss count to %d\n", tssCount);
 	}
 
 	//	if (deterministicRandom()->random01() < 0.5) {
@@ -1268,7 +1264,6 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	// reduce tss to half of extra non-seed servers that can be recruited in usable regions.
 	tssCount =
 	    std::max(0, std::min(tssCount, (db.usableRegions * (machine_count / datacenters) - replication_type) / 2));
-	printf("Adjusted tss count to %d\n", tssCount);
 
 	if (tssCount > 0) {
 		std::string confStr = format("tss_count:=%d tss_storage_engine:=%d", tssCount, db.storageServerStoreType);
@@ -1277,13 +1272,13 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 		if (tssRandom > 0.5) {
 			// normal tss mode
 			g_simulator.tssMode = ISimulator::TSSMode::EnabledNormal;
-			printf("normal tss mode\n");
-		} else if (tssRandom < 0.25) {
+		} else if (tssRandom < 0.25 && !testConfig.isFirstTestInRestart) {
+			// fault injection - don't enable in first test in restart because second test won't know it intentionally
+			// lost data
+			g_simulator.tssMode = ISimulator::TSSMode::EnabledDropMutations;
+		} else {
 			// delay injection
 			g_simulator.tssMode = ISimulator::TSSMode::EnabledAddDelay;
-		} else {
-			// fault injection
-			g_simulator.tssMode = ISimulator::TSSMode::EnabledDropMutations;
 		}
 		printf("enabling tss for simulation in mode %d: %s\n", g_simulator.tssMode, confStr.c_str());
 	}
@@ -1728,6 +1723,9 @@ void checkTestConf(const char* testFile, TestConfig* testConfig) {
 		if (attrib == "maxTLogVersion") {
 			sscanf(value.c_str(), "%d", &testConfig->maxTLogVersion);
 		}
+		if (attrib == "restartInfoLocation") {
+			testConfig->isFirstTestInRestart = true;
+		}
 	}
 
 	ifs.close();
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index ce3e4850cb9..ca4ed58ccee 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -635,7 +635,7 @@ struct RolesInfo {
 			TraceEventFields const& commitLatencyBands = metrics.at("CommitLatencyBands");
 			if (commitLatencyBands.size()) {
 				obj["commit_latency_bands"] = addLatencyBandInfo(commitLatencyBands);
-			} 
+			}
 
 			TraceEventFields const& commitBatchingWindowSize = metrics.at("CommitBatchingWindowSize");
 			if (commitBatchingWindowSize.size()) {
@@ -1874,10 +1874,10 @@ ACTOR static Future<vector<std::pair<TLogInterface, EventMap>>> getTLogsAndMetri
 ACTOR static Future<vector<std::pair<CommitProxyInterface, EventMap>>> getCommitProxiesAndMetrics(
     Reference<AsyncVar<ServerDBInfo>> db,
     std::unordered_map<NetworkAddress, WorkerInterface> address_workers) {
-	vector<std::pair<CommitProxyInterface, EventMap>> results =
-	    wait(getServerMetrics(db->get().client.commitProxies,
-	                          address_workers,
-	                          std::vector<std::string>{ "CommitLatencyMetrics", "CommitLatencyBands", "CommitBatchingWindowSize"}));
+	vector<std::pair<CommitProxyInterface, EventMap>> results = wait(getServerMetrics(
+	    db->get().client.commitProxies,
+	    address_workers,
+	    std::vector<std::string>{ "CommitLatencyMetrics", "CommitLatencyBands", "CommitBatchingWindowSize" }));
 
 	return results;
 }
@@ -3012,7 +3012,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 
 		int activeTSSCount = 0;
 		for (auto& it : storageServers) {
-			if (it.first.isTss) {
+			if (it.first.isTss()) {
 				activeTSSCount++;
 			}
 		}
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index bce4ba05f3e..9b1291ec5c8 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -1671,11 +1671,6 @@ ACTOR Future<Void> tLogPeekMessages(TLogData* self, TLogPeekRequest req, Referen
 
 	Version poppedVer = poppedVersion(logData, req.tag);
 	if (poppedVer > req.begin) {
-		printf("tag %s - %s tried to peek popped data!!: %lld > %lld\n",
-		       req.tag.toString().c_str(),
-		       peekId.toString().c_str(),
-		       poppedVer,
-		       req.begin);
 		TLogPeekReply rep;
 		rep.maxKnownVersion = logData->version.get();
 		rep.minKnownCommittedVersion = logData->minKnownCommittedVersion;
diff --git a/fdbserver/TesterInterface.actor.h b/fdbserver/TesterInterface.actor.h
index ddfb04da226..e1bed55d406 100644
--- a/fdbserver/TesterInterface.actor.h
+++ b/fdbserver/TesterInterface.actor.h
@@ -109,6 +109,7 @@ struct TestConfig {
 	int configureLocked = 0;
 	bool startIncompatibleProcess = false;
 	int logAntiQuorum = -1;
+	bool isFirstTestInRestart;
 	// Storage Engine Types: Verify match with SimulationConfig::generateNormalConfig
 	//	0 = "ssd"
 	//	1 = "memory"
diff --git a/fdbserver/WorkerInterface.actor.h b/fdbserver/WorkerInterface.actor.h
index 48a4d9ce075..689bf0a68cb 100644
--- a/fdbserver/WorkerInterface.actor.h
+++ b/fdbserver/WorkerInterface.actor.h
@@ -614,18 +614,13 @@ struct InitializeStorageRequest {
 	UID reqId;
 	UID interfaceId;
 	KeyValueStoreType storeType;
-	bool isTss;
-	UID tssPairID;
-	Version tssPairVersion;
+	Optional<std::pair<UID, Version>>
+	    tssPairIDAndVersion; // Only set if recruiting a tss. Will be the UID and Version of its SS pair.
 	ReplyPromise<InitializeStorageReply> reply;
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		if (ar.protocolVersion().hasTSS()) {
-			serializer(ar, seedTag, reqId, interfaceId, storeType, reply, isTss, tssPairID, tssPairVersion);
-		} else {
-			serializer(ar, seedTag, reqId, interfaceId, storeType, reply);
-		}
+		serializer(ar, seedTag, reqId, interfaceId, storeType, reply, tssPairIDAndVersion);
 	}
 };
 
diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index c0dee606821..97953ce1a3b 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -417,14 +417,11 @@ ACTOR Future<Void> newTLogServers(Reference<MasterData> self,
 ACTOR Future<Void> newSeedServers(Reference<MasterData> self,
                                   RecruitFromConfigurationReply recruits,
                                   vector<StorageServerInterface>* servers) {
-	printf("Seeding initial %d storage servers\n", recruits.storageServers.size());
 	// This is only necessary if the database is at version 0
 	servers->clear();
 	if (self->lastEpochEnd)
 		return Void();
 
-	// TODO might need to make this handle TSS recruitment (or make RecruitFromConfiguration handle it?) for simulation
-
 	state int idx = 0;
 	state std::map<Optional<Value>, Tag> dcId_tags;
 	state int8_t nextLocality = 0;
@@ -437,7 +434,6 @@ ACTOR Future<Void> newSeedServers(Reference<MasterData> self,
 		                  ? dcId_tags[recruits.storageServers[idx].locality.dcId()]
 		                  : Tag(nextLocality, 0);
 		isr.storeType = self->configuration.storageServerStoreType;
-		isr.isTss = false;
 		isr.reqId = deterministicRandom()->randomUniqueID();
 		isr.interfaceId = deterministicRandom()->randomUniqueID();
 
@@ -473,8 +469,6 @@ ACTOR Future<Void> newSeedServers(Reference<MasterData> self,
 	    .detail("TargetCount", self->configuration.storageTeamSize)
 	    .detail("Servers", describe(*servers));
 
-	printf("Seed servers sees %d desired tss\n", self->configuration.desiredTSSCount);
-
 	return Void();
 }
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 5f9c7133f5d..a0deef61a67 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -523,10 +523,6 @@ struct StorageServer {
 			TraceEvent(SevWarnAlways, "TSSInjectFaultEnabled", thisServerID)
 			    .detail("Mode", g_simulator.tssMode)
 			    .detail("At", tssFaultInjectTime.get());
-			printf("ENABLING FAULT INJECTION FOR TSS %s at time %.4f in mode %d\n",
-			       thisServerID.toString().c_str(),
-			       tssFaultInjectTime.get(),
-			       g_simulator.tssMode);
 		}
 	}
 
@@ -1077,24 +1073,12 @@ void updateProcessStats(StorageServer* self) {
 
 ACTOR Future<Version> waitForVersionActor(StorageServer* data, Version version, SpanID spanContext) {
 	state Span span("SS.WaitForVersion"_loc, { spanContext });
-	/*if (172218491 == version) {
-	    printf("%sSS %s starting waitForVersionActor @ %lld\n", data->tssPairID.present() ? "T" : "",
-	data->thisServerID.toString().c_str(), version);
-	}*/
 	choose {
 		when(wait(data->version.whenAtLeast(version))) {
 			// FIXME: A bunch of these can block with or without the following delay 0.
 			// wait( delay(0) );  // don't do a whole bunch of these at once
-			/*if (172218491 == version) {
-			    printf("%sSS %s waitForVersionActor @ %lld - at least version\n", data->tssPairID.present() ? "T" : "",
-			data->thisServerID.toString().c_str(), version);
-			}*/
 			if (version < data->oldestVersion.get())
 				throw transaction_too_old(); // just in case
-			/*if (172218491 == version) {
-			    printf("%sSS %s waitForVersionActor @ %lld - not too old\n", data->tssPairID.present() ? "T" : "",
-			data->thisServerID.toString().c_str(), version);
-			}*/
 			return version;
 		}
 		when(wait(delay(SERVER_KNOBS->FUTURE_VERSION_DELAY))) {
@@ -1103,39 +1087,23 @@ ACTOR Future<Version> waitForVersionActor(StorageServer* data, Version version,
 				    .detail("Version", version)
 				    .detail("MyVersion", data->version.get())
 				    .detail("ServerID", data->thisServerID);
-			/*if (172218491 == version) {
-			    printf("%sSS %s waitForVersionActor @ %lld - future version\n", data->tssPairID.present() ? "T" : "",
-			data->thisServerID.toString().c_str(), version);
-			}*/
 			throw future_version();
 		}
 	}
 }
 
 Future<Version> waitForVersion(StorageServer* data, Version version, SpanID spanContext) {
-	/*if (172218491 == version) {
-	    printf("%sSS %s started waitForVersion @ %lld\n", data->tssPairID.present() ? "T" : "",
-	data->thisServerID.toString().c_str(), version);
-	}*/
 	if (version == latestVersion) {
 		version = std::max(Version(1), data->version.get());
 	}
 
 	if (version < data->oldestVersion.get() || version <= 0) {
-		/*if (172218491 == version) {
-		    printf("%sSS %s waitForVersion @ %lld - transaction too old\n", data->tssPairID.present() ? "T" : "",
-		data->thisServerID.toString().c_str(), version);
-		}*/
 		return transaction_too_old();
 	} else if (version <= data->version.get()) {
 		return version;
 	}
 
 	if ((data->behind || data->versionBehind) && version > data->version.get()) {
-		/*if (172218491 == version) {
-		    printf("%sSS %s waitForVersion @ %lld - process_behind\n", data->tssPairID.present() ? "T" : "",
-		data->thisServerID.toString().c_str(), version);
-		}*/
 		return process_behind();
 	}
 
@@ -1169,11 +1137,6 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 	Span span("SS:getValue"_loc, { req.spanContext });
 	span.addTag("key"_sr, req.key);
 
-	/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-	    printf("%sSS %s started getValueQ for %s @ %lld\n", data->tssPairID.present() ? "T" : "",
-	data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
-	}*/
-
 	try {
 		++data->counters.getValueQueries;
 		++data->counters.allQueries;
@@ -1185,11 +1148,6 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 		// so we need to downgrade here
 		wait(data->getQueryDelay());
 
-		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-		    printf("%sSS %s  getValueQ for %s @ %lld - got query delay\n", data->tssPairID.present() ? "T" : "",
-		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
-		}*/
-
 		if (req.debugID.present())
 			g_traceBatch.addEvent("GetValueDebug",
 			                      req.debugID.get().first(),
@@ -1204,17 +1162,8 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 
 		state uint64_t changeCounter = data->shardChangeCounter;
 
-		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-		    printf("%sSS %s  getValueQ for %s @ %lld - waited for version\n", data->tssPairID.present() ? "T" : "",
-		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
-		}*/
-
 		if (!data->shards[req.key]->isReadable()) {
 			//TraceEvent("WrongShardServer", data->thisServerID).detail("Key", req.key).detail("Version", version).detail("In", "getValueQ");
-			/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-			    printf("%sSS %s started getValueQ for %s @ %lld got wrong shard server\n", data->tssPairID.present() ?
-			"T" : "", data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
-			}*/
 			throw wrong_shard_server();
 		}
 
@@ -1223,10 +1172,6 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 		if (i && i->isValue() && i.key() == req.key) {
 			v = (Value)i->getValue();
 			path = 1;
-			/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-			    printf("%sSS %s  getValueQ for %s @ %lld - got from memory\n", data->tssPairID.present() ? "T" : "",
-			data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
-			}*/
 		} else if (!i || !i->isClearTo() || i->getEndKey() <= req.key) {
 			path = 2;
 			Optional<Value> vv = wait(data->storage.readValue(req.key, req.debugID));
@@ -1237,10 +1182,6 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 			}
 			data->checkChangeCounter(changeCounter, req.key);
 			v = vv;
-			/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-			    printf("%sSS %s  getValueQ for %s @ %lld - got from storage\n", data->tssPairID.present() ? "T" : "",
-			data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version);
-			}*/
 		}
 
 		DEBUG_MUTATION("ShardGetValue",
@@ -1268,12 +1209,6 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 			++data->counters.emptyQueries;
 		}
 
-		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-		    printf("%sSS %s getValueQ for %s @ %lld = %s\n", data->tssPairID.present() ? "T" : "",
-		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version, v.present() ?
-		v.get().toString().c_str() : "");
-		}*/
-
 		if (SERVER_KNOBS->READ_SAMPLING_ENABLED) {
 			// If the read yields no value, randomly sample the empty read.
 			int64_t bytesReadPerKSecond =
@@ -1296,16 +1231,8 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 		reply.penalty = data->getPenalty();
 		req.reply.send(reply);
 	} catch (Error& e) {
-		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-		    printf("%sSS %s getValueQ for %s @ %lld = ERROR: %d\n", data->tssPairID.present() ? "T" : "",
-		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version, e.code());
-		}*/
 		if (!canReplyWith(e))
 			throw;
-		/*if ("000002ff000004c10000000100000002" == req.key.toString() && 172218491 == req.version) {
-		    printf("%sSS %s getValueQ for %s @ %lld = replying with error: %d\n", data->tssPairID.present() ? "T" : "",
-		data->thisServerID.toString().c_str(), req.key.toString().c_str(), req.version, e.code());
-		}*/
 		data->sendErrorWithPenalty(req.reply, e, data->getPenalty());
 	}
 
@@ -1816,12 +1743,6 @@ ACTOR Future<Key> findKey(StorageServer* data,
 	state int distance = forward ? sel.offset : 1 - sel.offset;
 	state Span span("SS.findKey"_loc, { parentSpan });
 
-	/*if (version == 166817893 && sel.offset == 80) {
-	    printf("%sSS %s FindKey request %s:<%s:%d @ %lld: with key range [%s - %s):\n", data->isTss() ? "t" : "",
-	data->thisServerID.toString().c_str(), sel.getKey().printable().c_str(), sel.orEqual ? "=" : "", sel.offset,
-	version, range.begin.toString().c_str(), range.end.toString().c_str());
-	}*/
-
 	// Don't limit the number of bytes if this is a trivial key selector (there will be at most two items returned from
 	// the read range in this case)
 	state int maxBytes;
@@ -1841,13 +1762,6 @@ ACTOR Future<Key> findKey(StorageServer* data,
 	              span.context));
 	state bool more = rep.more && rep.data.size() != distance + skipEqualKey;
 
-	/*if (version == 166817893 && sel.offset == 80) {
-	    printf("%sSS %s FindKey request %s:<%s:%d @ %lld: readRange with limBytes=%d got %d:\n", data->isTss() ? "t" :
-	"", data->thisServerID.toString().c_str(), sel.getKey().printable().c_str(), sel.orEqual ? "=" : "", sel.offset,
-	version, maxBytes, rep.data.size()); for (auto& it : rep.data) { printf("    %s\n", it.key.toString().c_str());
-	    }
-	}*/
-
 	// If we get only one result in the reverse direction as a result of the data being too large, we could get stuck in
 	// a loop
 	if (more && !forward && rep.data.size() == 1) {
@@ -1894,19 +1808,8 @@ ACTOR Future<Key> findKey(StorageServer* data,
 			// This is possible if key/value pairs are very large and only one result is returned on a last less than
 			// query SOMEDAY: graceful handling of exceptionally sized values
 			ASSERT(returnKey != sel.getKey());
-
-			/*if (version == 166817893 && sel.offset == 80) {
-			    printf("%sSS %s FindKey request %s:<%s:%d @ %lld: moving same shard\n", data->isTss() ? "t" : "",
-			data->thisServerID.toString().c_str(), sel.getKey().printable().c_str(), sel.orEqual ? "=" : "", sel.offset,
-			version);
-			}*/
 			return returnKey;
 		} else {
-			/*if (version == 166817893 && sel.offset == 80) {
-			    printf("%sSS %s FindKey request %s:<%s:%d @ %lld: moving shard boundary\n", data->isTss() ? "t" : "",
-			data->thisServerID.toString().c_str(), sel.getKey().printable().c_str(), sel.orEqual ? "=" : "", sel.offset,
-			version);
-			}*/
 			return forward ? range.end : range.begin;
 		}
 	}
@@ -1931,15 +1834,6 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 	state Span span("SS:getKeyValues"_loc, { req.spanContext });
 	state int64_t resultSize = 0;
 
-	if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" && req.version == 107157353) {
-		printf("%sSS %s starting query [%s - %s) @ %lld\n",
-		       data->isTss() ? "T" : "",
-		       data->thisServerID.toString().c_str(),
-		       req.begin.getKey().printable().c_str(),
-		       req.end.getKey().printable().c_str(),
-		       req.version);
-	}
-
 	++data->counters.getRangeQueries;
 	++data->counters.allQueries;
 	++data->readQueueSizeMetric;
@@ -1954,15 +1848,6 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 		wait(data->getQueryDelay());
 	}
 
-	if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" && req.version == 107157353) {
-		printf("%sSS %s downgraded [%s - %s) @ %lld\n",
-		       data->isTss() ? "T" : "",
-		       data->thisServerID.toString().c_str(),
-		       req.begin.getKey().printable().c_str(),
-		       req.end.getKey().printable().c_str(),
-		       req.version);
-	}
-
 	try {
 		if (req.debugID.present())
 			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Before");
@@ -1987,15 +1872,6 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 			throw wrong_shard_server();
 		}
 
-		if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" && req.version == 107157353) {
-			printf("%sSS %s validated shard [%s - %s) @ %lld\n",
-			       data->isTss() ? "T" : "",
-			       data->thisServerID.toString().c_str(),
-			       req.begin.getKey().printable().c_str(),
-			       req.end.getKey().printable().c_str(),
-			       req.version);
-		}
-
 		state int offset1;
 		state int offset2;
 		state Future<Key> fBegin = req.begin.isFirstGreaterOrEqual()
@@ -2026,25 +1902,6 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 			throw wrong_shard_server();
 		}
 
-		if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" && req.version == 107157353) {
-			printf("%sSS %s resolved begin and end [%s - %s) @ %lld\n",
-			       data->isTss() ? "T" : "",
-			       data->thisServerID.toString().c_str(),
-			       req.begin.getKey().printable().c_str(),
-			       req.end.getKey().printable().c_str(),
-			       req.version);
-			printf("    %s:<%s:%d @ -> %s\n",
-			       req.begin.getKey().printable().c_str(),
-			       req.begin.orEqual ? "=" : "",
-			       req.begin.offset,
-			       req.begin.getKey().printable().c_str());
-			printf("    %s:<%s:%d @ -> %s\n",
-			       req.end.getKey().printable().c_str(),
-			       req.end.orEqual ? "=" : "",
-			       req.end.offset,
-			       req.end.getKey().printable().c_str());
-		}
-
 		if (begin >= end) {
 			if (req.debugID.present())
 				g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Send");
@@ -2062,28 +1919,10 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 		} else {
 			state int remainingLimitBytes = req.limitBytes;
 
-			/*if (req.begin.getKey().toString() == "m3fc7" && req.end.getKey().toString() == "s" && req.version ==
-			133421369) { printf("%sSS %s beginning readRange [%s - %s) @ %lld\n", data->isTss() ? "T" : "",
-			data->thisServerID.toString().c_str(), req.begin.getKey().printable().c_str(),
-			req.end.getKey().printable().c_str(), req.version);
-			}*/
-
 			GetKeyValuesReply _r =
 			    wait(readRange(data, version, KeyRangeRef(begin, end), req.limit, &remainingLimitBytes, span.context));
 			GetKeyValuesReply r = _r;
 
-			if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" &&
-			    req.version == 107157353) {
-				printf("%sSS %s completed readRange (%d)%s: \n",
-				       data->isTss() ? "T" : "",
-				       data->thisServerID.toString().c_str(),
-				       r.data.size(),
-				       r.more ? "+" : "");
-				/*for (auto& it : r.data) {
-				    printf("    %s=%s\n", it.key.printable().c_str(), it.value.printable().c_str());
-				}*/
-			}
-
 			if (req.debugID.present())
 				g_traceBatch.addEvent(
 				    "TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.AfterReadRange");
@@ -2116,14 +1955,6 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 				data->metrics.notifyBytesReadPerKSecond(r.data[r.data.size() - 1].key, bytesReadPerKSecond);
 			}
 
-			if (req.begin.getKey().toString() == "B" && req.end.getKey().toString() == "v" &&
-			    req.version == 107157353) {
-				printf("%sSS %s replying to %s\n",
-				       data->isTss() ? "T" : "",
-				       data->thisServerID.toString().c_str(),
-				       req.reply.getEndpoint().token.toString().c_str());
-			}
-
 			r.penalty = data->getPenalty();
 			req.reply.send(r);
 
@@ -2174,33 +2005,15 @@ ACTOR Future<Void> getKeyQ(StorageServer* data, GetKeyRequest req) {
 	// so we need to downgrade here
 	wait(data->getQueryDelay());
 
-	/*if (req.version == 166817893 && req.sel.offset == 80) {
-	    printf("%sSS %s GetKey request %s:<%s:%d @ %lld\n", data->isTss() ? "t" : "",
-	data->thisServerID.toString().c_str(), req.sel.getKey().printable().c_str(), req.sel.orEqual ? "=" : "",
-	req.sel.offset, req.version);
-	}*/
-
 	try {
 		state Version version = wait(waitForVersion(data, req.version, req.spanContext));
 
-		/*if (req.version == 166817893 && req.sel.offset == 80) {
-		    printf("%sSS %s GetKey request %s:<%s:%d @ %lld: waited for version\n", data->isTss() ? "t" : "",
-		data->thisServerID.toString().c_str(), req.sel.getKey().printable().c_str(), req.sel.orEqual ? "=" : "",
-		req.sel.offset, req.version);
-		}*/
-
 		state uint64_t changeCounter = data->shardChangeCounter;
 		state KeyRange shard = getShardKeyRange(data, req.sel);
 
 		state int offset;
 		Key k = wait(findKey(data, req.sel, version, shard, &offset, req.spanContext));
 
-		/*if (req.version == 166817893 && req.sel.offset == 80) {
-		    printf("%sSS %s GetKey request %s:<%s:%d @ %lld: found key: %s\n", data->isTss() ? "t" : "",
-		data->thisServerID.toString().c_str(), req.sel.getKey().printable().c_str(), req.sel.orEqual ? "=" : "",
-		req.sel.offset, req.version, k.toString().c_str());
-		}*/
-
 		data->checkChangeCounter(
 		    changeCounter, KeyRangeRef(std::min<KeyRef>(req.sel.getKey(), k), std::max<KeyRef>(req.sel.getKey(), k)));
 
@@ -2215,12 +2028,6 @@ ACTOR Future<Void> getKeyQ(StorageServer* data, GetKeyRequest req) {
 		else
 			updated = KeySelectorRef(k, true, 0); // found
 
-		/*if (req.version == 166817893 && req.sel.offset == 80) {
-		    printf("%sSS %s GetKey request %s:<%s:%d @ %lld: updated: %s:<%s:%d\n", data->isTss() ? "t" : "",
-		data->thisServerID.toString().c_str(), req.sel.getKey().printable().c_str(), req.sel.orEqual ? "=" : "",
-		req.sel.offset, req.version, updated.getKey().printable().c_str(), updated.orEqual ? "=" : "", updated.offset);
-		}*/
-
 		resultSize = k.size();
 		data->counters.bytesQueried += resultSize;
 		++data->counters.rowsQueried;
@@ -2545,14 +2352,6 @@ void removeDataRange(StorageServer* ss,
 	// disk when this latest version becomes durable mLV is also modified if necessary to ensure that split clears can
 	// be forgotten
 
-	// TODO REMOVE print
-	printf("%sss %s removing data range [%s - %s) @ %lld\n",
-	       ss->isTss() ? "t" : "",
-	       ss->thisServerID.toString().c_str(),
-	       range.begin.toString().c_str(),
-	       range.end.toString().c_str(),
-	       mLV.version);
-
 	MutationRef clearRange(MutationRef::ClearRange, range.begin, range.end);
 	clearRange = ss->addMutationToMutationLog(mLV, clearRange);
 
@@ -2583,13 +2382,6 @@ void removeDataRange(StorageServer* ss,
 	}
 
 	data.erase(range.begin, range.end);
-
-	printf("%sss %s removed data range [%s - %s) @ %lld\n",
-	       ss->isTss() ? "t" : "",
-	       ss->thisServerID.toString().c_str(),
-	       range.begin.toString().c_str(),
-	       range.end.toString().c_str(),
-	       mLV.version);
 }
 
 void setAvailableStatus(StorageServer* self, KeyRangeRef keys, bool available);
@@ -3170,12 +2962,12 @@ void changeServerKeys(StorageServer* data,
                       ChangeServerKeysContext context) {
 	ASSERT(!keys.empty());
 
-	TraceEvent("ChangeServerKeys", data->thisServerID)
-	    .detail("KeyBegin", keys.begin)
-	    .detail("KeyEnd", keys.end)
-	    .detail("NowAssigned", nowAssigned)
-	    .detail("Version", version)
-	    .detail("Context", changeServerKeysContextName[(int)context]);
+	// TraceEvent("ChangeServerKeys", data->thisServerID)
+	//     .detail("KeyBegin", keys.begin)
+	//     .detail("KeyEnd", keys.end)
+	//     .detail("NowAssigned", nowAssigned)
+	//     .detail("Version", version)
+	//     .detail("Context", changeServerKeysContextName[(int)context]);
 	validate(data);
 
 	// TODO(alexmiller): Figure out how to selectively enable spammy data distribution events.
@@ -3193,7 +2985,7 @@ void changeServerKeys(StorageServer* data,
 		}
 	}
 	if (!isDifferent) {
-		TraceEvent("CSKShortCircuit", data->thisServerID).detail("KeyBegin", keys.begin).detail("KeyEnd", keys.end);
+		// TraceEvent("CSKShortCircuit", data->thisServerID).detail("KeyBegin", keys.begin).detail("KeyEnd", keys.end);
 		return;
 	}
 
@@ -3231,13 +3023,13 @@ void changeServerKeys(StorageServer* data,
 	for (auto r = vr.begin(); r != vr.end(); ++r) {
 		KeyRangeRef range = keys & r->range();
 		bool dataAvailable = r->value() == latestVersion || r->value() >= version;
-		TraceEvent("CSKRange", data->thisServerID)
-		    .detail("KeyBegin", range.begin)
-		    .detail("KeyEnd", range.end)
-		    .detail("Available", dataAvailable)
-		    .detail("NowAssigned", nowAssigned)
-		    .detail("NewestAvailable", r->value())
-		    .detail("ShardState0", data->shards[range.begin]->debugDescribeState());
+		// TraceEvent("CSKRange", data->thisServerID)
+		//     .detail("KeyBegin", range.begin)
+		//     .detail("KeyEnd", range.end)
+		//     .detail("Available", dataAvailable)
+		//     .detail("NowAssigned", nowAssigned)
+		//     .detail("NewestAvailable", r->value())
+		//     .detail("ShardState0", data->shards[range.begin]->debugDescribeState());
 		if (!nowAssigned) {
 			if (dataAvailable) {
 				ASSERT(r->value() ==
@@ -3279,14 +3071,8 @@ void changeServerKeys(StorageServer* data,
 	oldShards.clear();
 	ranges.clear();
 	for (auto r = removeRanges.begin(); r != removeRanges.end(); ++r) {
-		// TODO should we do this at the passed in version? (or the passed in version + 1?)
 		removeDataRange(data, data->addVersionToMutationLog(data->data().getLatestVersion()), data->shards, *r);
 		setAvailableStatus(data, *r, false);
-		printf("%sss %s set data range unavailable [%s - %s)\n",
-		       data->isTss() ? "t" : "",
-		       data->thisServerID.toString().c_str(),
-		       keys.begin.toString().c_str(),
-		       keys.end.toString().c_str());
 	}
 	validate(data);
 }
@@ -3458,26 +3244,18 @@ class StorageUpdater {
 
 			data->recoveryVersionSkips.emplace_back(rollbackVersion, currentVersion - rollbackVersion);
 		} else if (m.type == MutationRef::SetValue && m.param1 == killStoragePrivateKey) {
-			printf("worked removed kill storage: %s\n", data->thisServerID.toString().c_str());
 			throw worker_removed();
 		} else if ((m.type == MutationRef::SetValue || m.type == MutationRef::ClearRange) &&
 		           m.param1.substr(1).startsWith(serverTagPrefix)) {
 			UID serverTagKey = decodeServerTagKey(m.param1.substr(1));
-			// bool matchesThisServer = (!data->isTss() && serverTagKey == data->thisServerID) || (data->isTss() &&
-			// serverTagKey == data->tssPairID.get());
 			bool matchesThisServer = serverTagKey == data->thisServerID;
 			bool matchesTssPair = data->isTss() ? serverTagKey == data->tssPairID.get() : false;
 			if ((m.type == MutationRef::SetValue && !data->isTss() && !matchesThisServer) ||
 			    (m.type == MutationRef::ClearRange && (matchesThisServer || (data->isTss() && matchesTssPair)))) {
-				printf("%sSS %s removed b/c tag mutation: %s\n",
-				       data->isTss() ? "T" : "",
-				       data->thisServerID.toString().c_str(),
-				       m.toString().c_str());
 				throw worker_removed();
 			}
 		} else if (m.type == MutationRef::SetValue && m.param1 == rebootWhenDurablePrivateKey) {
 			data->rebootAfterDurableVersion = currentVersion;
-			printf("%s got reboot after durable @ %lld\n", data->thisServerID.toString().c_str(), currentVersion);
 			TraceEvent("RebootWhenDurableSet", data->thisServerID)
 			    .detail("DurableVersion", data->durableVersion.get())
 			    .detail("RebootAfterDurableVersion", data->rebootAfterDurableVersion);
@@ -3542,12 +3320,10 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 			wait(delayJittered(.005, TaskPriority::TLogPeekReply));
 		}
 
-		// TODO REMOVE!! just for testing what happens when TSS gets behind
 		if (g_network->isSimulated() && data->isTss() && g_simulator.tssMode == ISimulator::TSSMode::EnabledAddDelay &&
 		    data->tssFaultInjectTime.present() && data->tssFaultInjectTime.get() < now()) {
 			if (deterministicRandom()->random01() < 0.01) {
 				TraceEvent(SevWarnAlways, "TSSInjectDelayForever", data->thisServerID);
-				printf("TSS %s INJECTING DELAY FOREVER!!\n", data->thisServerID.toString().c_str());
 				// small random chance to just completely get stuck here, each tss should eventually hit this in this
 				// mode
 				wait(Never());
@@ -3555,7 +3331,6 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 				// otherwise pause for part of a second
 				double delayTime = deterministicRandom()->random01();
 				TraceEvent(SevWarnAlways, "TSSInjectDelay", data->thisServerID).detail("Delay", delayTime);
-				printf("TSS %s INJECTING DELAY for %.4f!!\n", data->thisServerID.toString().c_str(), delayTime);
 				wait(delay(delayTime));
 			}
 		}
@@ -3573,8 +3348,6 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 			}
 		}
 		if (cursor->popped() > 0) {
-			printf(
-			    "Worker removed because of popped=%d: %s\n", cursor->popped(), data->thisServerID.toString().c_str());
 			throw worker_removed();
 		}
 
@@ -3982,9 +3755,6 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
 #endif
 
 void StorageServerDisk::makeNewStorageServerDurable() {
-	// TODO REMOVE print
-	printf(
-	    "%sSS %s saving durable state\n", data->tssPairID.present() ? "T" : "", data->thisServerID.toString().c_str());
 	storage->set(persistFormat);
 	storage->set(KeyValueRef(persistID, BinaryWriter::toValue(data->thisServerID, Unversioned())));
 	if (data->tssPairID.present()) {
@@ -4268,17 +4038,6 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 	debug_checkRestoredVersion(data->thisServerID, version, "StorageServer");
 	data->setInitialVersion(version);
 
-	// TODO REMOVE print
-	printf("%sSS %s restored durable state @ %lld\n",
-	       data->tssPairID.present() ? "T" : "",
-	       data->thisServerID.toString().c_str(),
-	       version);
-	if (data->tssPairID.present()) {
-		printf("TSS %s recovered pairing to SS %s\n",
-		       data->thisServerID.toString().c_str(),
-		       data->tssPairID.get().toString().c_str());
-	}
-
 	state RangeResult available = fShardAvailable.get();
 	state int availableLoc;
 	for (availableLoc = 0; availableLoc < available.size(); availableLoc++) {
@@ -4565,9 +4324,9 @@ ACTOR Future<Void> metricsCore(StorageServer* self, StorageServerInterface ssi)
 	                               SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                               &self->counters.cc,
 	                               self->thisServerID.toString() + "/StorageMetrics",
-	                               [self=self](TraceEvent& te) {
+	                               [self = self](TraceEvent& te) {
 		                               te.detail("Tag", self->tag.toString());
-									   StorageBytes sb = self->storage.getStorageBytes();
+		                               StorageBytes sb = self->storage.getStorageBytes();
 		                               te.detail("KvstoreBytesUsed", sb.used);
 		                               te.detail("KvstoreBytesFree", sb.free);
 		                               te.detail("KvstoreBytesAvailable", sb.available);
@@ -4688,19 +4447,6 @@ ACTOR Future<Void> serveGetKeyValuesRequests(StorageServer* self, FutureStream<G
 	loop {
 		GetKeyValuesRequest req = waitNext(getKeyValues);
 
-		if (req.begin.getKey().toString() == "m3fc7" && req.end.getKey().toString() == "s" &&
-		    req.version == 133421369) {
-			printf("%sSS %s got range read [%s - %s) @ %lld\n",
-			       self->isTss() ? "T" : "",
-			       self->thisServerID.toString().c_str(),
-			       req.begin.getKey().printable().c_str(),
-			       req.end.getKey().printable().c_str(),
-			       req.version);
-		}
-
-		// A TSS should never be the source for fetch keys
-		ASSERT(!self->tssPairID.present() || !req.isFetchKeys);
-
 		// Warning: This code is executed at extremely high priority (TaskPriority::LoadBalancedEndpoint), so downgrade
 		// before doing real work
 		self->actors.add(self->readGuard(req, getKeyValuesQ));
@@ -4939,18 +4685,8 @@ ACTOR Future<Void> storageServerCore(StorageServer* self, StorageServerInterface
 					ClientDBInfo clientInfo = self->db->get().client;
 					Optional<StorageServerInterface> myTssPair = clientInfo.getTssPair(self->thisServerID);
 					if (myTssPair.present()) {
-						// TODO REMOVE print, just for debugging
-						if (!self->ssPairID.present()) {
-							printf("SS %s found tss pair %s\n",
-							       self->thisServerID.toString().c_str(),
-							       myTssPair.get().id().toString().c_str());
-						}
 						self->setSSWithTssPair(myTssPair.get().id());
 					} else {
-						// TODO REMOVE print, just for debugging
-						if (self->ssPairID.present()) {
-							printf("SS %s lost tss pair\n", self->thisServerID.toString().c_str());
-						}
 						self->clearSSWithTssPair();
 					}
 				}
@@ -5057,17 +4793,11 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
                                  Reference<AsyncVar<ServerDBInfo>> db,
                                  std::string folder) {
 	state StorageServer self(persistentData, db, ssi);
-	if (ssi.isTss) {
-		self.setTssPair(ssi.tssPairID);
+	if (ssi.isTss()) {
+		self.setTssPair(ssi.tssPairID.get());
 		ASSERT(self.isTss());
 	}
 
-	// TODO REMOVE
-	printf("initializing %sstorage %s with tag %s and tss pair=%s\n",
-	       ssi.isTss ? "testing " : "",
-	       ssi.id().toString().c_str(),
-	       seedTag.toString().c_str(),
-	       self.tssPairID.present() ? self.tssPairID.get().toString().c_str() : "");
 	self.sk = serverKeysPrefixFor(self.tssPairID.present() ? self.tssPairID.get() : self.thisServerID)
 	              .withPrefix(systemKeys.begin); // FFFF/serverKeys/[this server]/
 	self.folder = folder;
@@ -5080,12 +4810,7 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 			std::pair<Version, Tag> verAndTag = wait(addStorageServer(
 			    self.cx, ssi)); // Might throw recruitment_failed in case of simultaneous master failure
 			self.tag = verAndTag.second;
-			// self.setInitialVersion(ssi.isTss ? 0 : verAndTag.first - 1);
-			if (ssi.isTss) {
-				printf("TSS %s overriding initial version from %lld to %lld\n",
-				       ssi.id().toString().c_str(),
-				       verAndTag.first - 1,
-				       tssSeedVersion);
+			if (ssi.isTss()) {
 				self.setInitialVersion(tssSeedVersion);
 			} else {
 				self.setInitialVersion(verAndTag.first - 1);
@@ -5100,7 +4825,7 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 		TraceEvent("StorageServerInit", ssi.id())
 		    .detail("Version", self.version.get())
 		    .detail("SeedTag", seedTag.toString())
-		    .detail("TssPair", ssi.isTss ? ssi.tssPairID.toString() : "");
+		    .detail("TssPair", ssi.isTss() ? ssi.tssPairID.get().toString() : "");
 		InitializeStorageReply rep;
 		rep.interf = ssi;
 		rep.addedVersion = self.version.get();
@@ -5121,10 +4846,7 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 }
 
 ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface ssi) {
-	printf("SS %s replacing interface\ngetValue=%s\n",
-	       ssi.id().toString().c_str(),
-	       ssi.getValue.getEndpoint().token.toString().c_str());
-	ASSERT(!ssi.isTss);
+	ASSERT(!ssi.isTss());
 	state Transaction tr(self->cx);
 
 	loop {
@@ -5140,16 +4862,8 @@ ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface
 			                  : Never())) {
 				state GetStorageServerRejoinInfoReply rep = _rep;
 
-				printf("SS %s got rejoin reply:\nversion: %" PRIu64 "\ntag: %s\nnewTag: %s\nnewLocality: %s\n",
-				       ssi.id().toString().c_str(),
-				       rep.version,
-				       rep.tag.toString().c_str(),
-				       rep.newTag.present() ? rep.newTag.get().toString().c_str() : "",
-				       rep.newLocality ? "true" : "false");
-
 				try {
 					tr.reset();
-					// TODO why doesn't this need ACCESS_SYSTEM_KEYS?
 					tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 					tr.setVersion(rep.version);
 
@@ -5184,7 +4898,6 @@ ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface
 
 					choose {
 						when(wait(tr.commit())) {
-							printf("SS committed rejoin txn\n");
 							self->history = rep.history;
 
 							if (rep.newTag.present()) {
@@ -5213,7 +4926,6 @@ ACTOR Future<Void> replaceInterface(StorageServer* self, StorageServerInterface
 						when(wait(infoChanged)) {}
 					}
 				} catch (Error& e) {
-					printf("rejoin txn got error: %d!!\n", e.code());
 					wait(tr.onError(e));
 				}
 			}
@@ -5229,20 +4941,14 @@ ACTOR Future<Void> replaceTSSInterface(StorageServer* self, StorageServerInterfa
 	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(self->cx);
 	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
 
-	ASSERT(ssi.isTss);
-
-	printf("TSS %s replacing interface:\ngetValue=%s\n",
-	       ssi.id().toString().c_str(),
-	       ssi.getValue.getEndpoint().token.toString().c_str());
-
-	// TODO should this loop until successful? it should never have conflicts, in theory
+	ASSERT(ssi.isTss());
 
 	loop {
 		try {
 			state Tag myTag;
 
 			tr->reset();
-			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS); // TODO is this needed?
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 			tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 
 			Optional<Value> pairTagValue = wait(tr->get(serverTagKeyFor(self->tssPairID.get())));
@@ -5263,17 +4969,10 @@ ACTOR Future<Void> replaceTSSInterface(StorageServer* self, StorageServerInterfa
 			tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 
 			wait(tr->commit());
-
-			// TODO trace event instead
-			printf("tss %s added itself back, got tag %s for partner %s\n",
-			       self->thisServerID.toString().c_str(),
-			       self->tag.toString().c_str(),
-			       self->tssPairID.get().toString().c_str());
 			self->tag = myTag;
 
 			break;
 		} catch (Error& e) {
-			printf("tss replace interface got error %d!!\n", e.code());
 			wait(tr->onError(e));
 		}
 	}
@@ -5317,7 +5016,7 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 
 		// if this is a tss storage file, use that as source of truth for this server being a tss instead of the
 		// presence of the tss pair key in the storage engine
-		if (ssi.isTss) {
+		if (ssi.isTss()) {
 			ASSERT(self.isTss());
 			ssi.tssPairID = self.tssPairID.get();
 		} else {
diff --git a/fdbserver/tester.actor.cpp b/fdbserver/tester.actor.cpp
index 66cfea0747d..7b2505bd03c 100644
--- a/fdbserver/tester.actor.cpp
+++ b/fdbserver/tester.actor.cpp
@@ -979,8 +979,7 @@ ACTOR Future<bool> runTest(Database cx,
 				                                   testers,
 				                                   quiescent,
 				                                   spec.runConsistencyCheckOnCache,
-				                                   // spec.runConsistencyCheckOnTSS, // TODO override with true to test
-				                                   true,
+				                                   spec.runConsistencyCheckOnTSS,
 				                                   10000.0,
 				                                   18000,
 				                                   spec.databasePingDelay,
@@ -1443,19 +1442,14 @@ ACTOR Future<Void> runTests(Reference<AsyncVar<Optional<struct ClusterController
 	if (useDB && startingConfiguration != StringRef()) {
 		try {
 			wait(timeoutError(changeConfiguration(cx, testers, startingConfiguration), 2000.0));
-			printf("starting config changed\n");
 			if (g_network->isSimulated() && enableDD) {
-				printf("waiting for DD\n");
 				wait(success(setDDMode(cx, 1)));
-				printf("done waiting for DD\n");
 			}
 		} catch (Error& e) {
 			TraceEvent(SevError, "TestFailure").error(e).detail("Reason", "Unable to set starting configuration");
 		}
 	}
 
-	printf("starting configuration set, moving on\n");
-
 	if (useDB && waitForQuiescenceBegin) {
 		TraceEvent("TesterStartingPreTestChecks")
 		    .detail("DatabasePingDelay", databasePingDelay)
@@ -1471,8 +1465,6 @@ ACTOR Future<Void> runTests(Reference<AsyncVar<Optional<struct ClusterController
 		}
 	}
 
-	printf("database quiesced, starting tests.\n");
-
 	TraceEvent("TestsExpectedToPass").detail("Count", tests.size());
 	state int idx = 0;
 	for (; idx < tests.size(); idx++) {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 0ec4ce458fb..e2adaadd433 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -331,7 +331,7 @@ std::string filenameFromId(KeyValueStoreType storeType, std::string folder, std:
 	else if (storeType == KeyValueStoreType::SSD_ROCKSDB_V1)
 		return joinPath(folder, prefix + id.toString() + ".rocksdb");
 
-	printf("UNKNOWN storeType %s\n", storeType.toString().c_str());
+	TraceEvent(SevError, "UnknownStoreType").detail("StoreType", storeType.toString());
 	UNREACHABLE();
 }
 
@@ -762,7 +762,9 @@ ACTOR Future<Void> storageServerRollbackRebooter(Future<Void> prevStorageServer,
 		StorageServerInterface recruited;
 		recruited.uniqueID = id;
 		recruited.locality = locality;
-		recruited.isTss = isTss;
+		recruited.tssPairID =
+		    isTss ? Optional<UID>(UID()) : Optional<UID>(); // set this here since we use its presence to determine
+		                                                    // whether this server is a tss or not
 		recruited.initEndpoints();
 
 		DUMPTOKEN(recruited.getValue);
@@ -1109,14 +1111,15 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 				// TODO might be more efficient to mark a boolean on DiskStore in getDiskStores, but that kind of breaks
 				// the abstraction since DiskStore also applies to storage cache + tlog
 				bool isTss = s.filename.find(tssPrefix) != std::string::npos;
-				// TODO REMOVE after test
-				printf("%s is%s tss filename\n", s.filename.c_str(), isTss ? "" : " not");
 				Role ssRole = isTss ? Role::TESTING_STORAGE_SERVER : Role::STORAGE_SERVER;
 
 				StorageServerInterface recruited;
 				recruited.uniqueID = s.storeID;
 				recruited.locality = locality;
-				recruited.isTss = isTss;
+				recruited.tssPairID =
+				    isTss ? Optional<UID>(UID())
+				          : Optional<UID>(); // presence of optional is used as source of truth for tss vs not. Value
+				                             // gets overridden later in restoreDurableState
 				recruited.initEndpoints();
 
 				std::map<std::string, std::string> details;
@@ -1507,27 +1510,17 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 			when(InitializeStorageRequest req = waitNext(interf.storage.getFuture())) {
 				if (!storageCache.exists(req.reqId)) {
 
-					printf("Got "
-					       "InitializeStorageRequest:seedTag=%s\nreqId=%s\ninterfaceId=%s\nstoreType=%s\nisTss=%"
-					       "s\ntssPairID=%s\ntssPairVersion=%lld\n\n",
-					       req.seedTag.toString().c_str(),
-					       req.reqId.toString().c_str(),
-					       req.interfaceId.toString().c_str(),
-					       req.storeType.toString().c_str(),
-					       req.isTss ? "true" : "false",
-					       req.isTss ? req.tssPairID.toString().c_str() : "",
-					       req.isTss ? req.tssPairVersion : 0);
+					bool isTss = req.tssPairIDAndVersion.present();
 
 					StorageServerInterface recruited(req.interfaceId);
 					recruited.locality = locality;
-					recruited.isTss = req.isTss;
-					recruited.tssPairID = req.tssPairID;
+					recruited.tssPairID = isTss ? req.tssPairIDAndVersion.get().first : Optional<UID>();
 					recruited.initEndpoints();
 
 					std::map<std::string, std::string> details;
 					details["StorageEngine"] = req.storeType.toString();
-					details["IsTSS"] = std::to_string(recruited.isTss);
-					Role ssRole = recruited.isTss ? Role::TESTING_STORAGE_SERVER : Role::STORAGE_SERVER;
+					details["IsTSS"] = std::to_string(isTss);
+					Role ssRole = isTss ? Role::TESTING_STORAGE_SERVER : Role::STORAGE_SERVER;
 					startRole(ssRole, recruited.id(), interf.id(), details);
 
 					DUMPTOKEN(recruited.getValue);
@@ -1543,21 +1536,25 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 					DUMPTOKEN(recruited.getQueuingMetrics);
 					DUMPTOKEN(recruited.getKeyValueStoreType);
 					DUMPTOKEN(recruited.watchValue);
-					// TODO re-comment!
-					printf("Recruited as storageServer\n");
+					// printf("Recruited as storageServer\n");
 
 					std::string filename =
 					    filenameFromId(req.storeType,
 					                   folder,
-					                   recruited.isTss ? testingStoragePrefix.toString() : fileStoragePrefix.toString(),
+					                   isTss ? testingStoragePrefix.toString() : fileStoragePrefix.toString(),
 					                   recruited.id());
 					IKeyValueStore* data = openKVStore(req.storeType, filename, recruited.id(), memoryLimit);
 					Future<Void> kvClosed = data->onClosed();
 					filesClosed.add(kvClosed);
 					ReplyPromise<InitializeStorageReply> storageReady = req.reply;
 					storageCache.set(req.reqId, storageReady.getFuture());
-					Future<Void> s =
-					    storageServer(data, recruited, req.seedTag, req.tssPairVersion, storageReady, dbInfo, folder);
+					Future<Void> s = storageServer(data,
+					                               recruited,
+					                               req.seedTag,
+					                               isTss ? req.tssPairIDAndVersion.get().second : 0,
+					                               storageReady,
+					                               dbInfo,
+					                               folder);
 					s = handleIOErrors(s, data, recruited.id(), kvClosed);
 					s = storageCache.removeOnReady(req.reqId, s);
 					s = storageServerRollbackRebooter(s,
@@ -1565,7 +1562,7 @@ ACTOR Future<Void> workerServer(Reference<ClusterConnectionFile> connFile,
 					                                  filename,
 					                                  recruited.id(),
 					                                  recruited.locality,
-					                                  req.isTss,
+					                                  isTss,
 					                                  dbInfo,
 					                                  folder,
 					                                  &filesClosed,
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 0aae7ca9d42..3b5156fb1e9 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -1062,7 +1062,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 					    .detail("Begin", printable(shard.begin))
 					    .detail("End", printable(shard.end))
 					    .detail("StorageServer", storageServers[i].id())
-					    .detail("IsTSS", storageServers[i].isTss ? "True" : "False")
+					    .detail("IsTSS", storageServers[i].isTss() ? "True" : "False")
 					    .error(reply.getError());
 					estimatedBytes.push_back(-1);
 				}
@@ -1082,8 +1082,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 						    .detail("StorageServer1", storageServers[firstValidStorageServer].id())
 						    .detail("StorageServer2", storageServers[i].id())
 						    .detail("IsTSS",
-						            storageServers[i].isTss || storageServers[firstValidStorageServer].isTss ? "True"
-						                                                                                     : "False");
+						            storageServers[i].isTss() || storageServers[firstValidStorageServer].isTss()
+						                ? "True"
+						                : "False");
 					}
 				}
 			}
@@ -1247,24 +1248,14 @@ struct ConsistencyCheckWorkload : TestWorkload {
 
 			// add TSS to end of list, if configured and if not relocating
 			if (!isRelocating && self->performTSSCheck) {
-				printf("CCheck: Checking for tss to add: isRelocating: %s, performTSSCheck: %s\n",
-				       isRelocating ? "T" : "F",
-				       self->performTSSCheck ? "T" : "F");
 				int initialSize = storageServers.size();
 				for (int i = 0; i < initialSize; i++) {
 					Optional<StorageServerInterface> tssPair = cx->clientInfo->get().getTssPair(storageServers[i]);
 					if (tssPair.present()) {
-						printf("CCheck: Adding TSS %s to consistency check!\n", tssPair.get().id().toString().c_str());
 						storageServers.push_back(tssPair.get().id());
 						storageServerInterfaces.push_back(tssPair.get());
-					} else {
-						printf("CCheck: SS %s doesn't have tss pair\n", storageServers[i].toString().c_str());
 					}
 				}
-			} else {
-				printf("CCheck: Not checking for tss to add: isRelocating: %s, performTSSCheck: %s\n",
-				       isRelocating ? "T" : "F",
-				       self->performTSSCheck ? "T" : "F");
 			}
 
 			state vector<int64_t> estimatedBytes = wait(self->getStorageSizeEstimate(storageServerInterfaces, range));
@@ -1355,7 +1346,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 										if (g_network->isSimulated()) {
 											int invalidIndex = -1;
 											printf("\n%sSERVER %d (%s); shard = %s - %s:\n",
-											       storageServerInterfaces[j].isTss ? "TSS " : "",
+											       storageServerInterfaces[j].isTss() ? "TSS " : "",
 											       j,
 											       storageServerInterfaces[j].address().toString().c_str(),
 											       printable(req.begin.getKey()).c_str(),
@@ -1374,7 +1365,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 
 											printf(
 											    "\n%sSERVER %d (%s); shard = %s - %s:\n",
-											    storageServerInterfaces[firstValidServer].isTss ? "TSS " : "",
+											    storageServerInterfaces[firstValidServer].isTss() ? "TSS " : "",
 											    firstValidServer,
 											    storageServerInterfaces[firstValidServer].address().toString().c_str(),
 											    printable(req.begin.getKey()).c_str(),
@@ -1465,17 +1456,15 @@ struct ConsistencyCheckWorkload : TestWorkload {
 										    .detail("ValueMismatchKey", printable(valueMismatchKey))
 										    .detail("MatchingKVPairs", matchingKVPairs)
 										    .detail("IsTSS",
-										            storageServerInterfaces[j].isTss ||
-										                    storageServerInterfaces[firstValidServer].isTss
+										            storageServerInterfaces[j].isTss() ||
+										                    storageServerInterfaces[firstValidServer].isTss()
 										                ? "True"
 										                : "False");
 
-										// TODO should the test still fail if TSS is wrong? Or is just logging the trace
-										// logs ok
 										if ((g_network->isSimulated() &&
 										     g_simulator.tssMode != ISimulator::TSSMode::EnabledDropMutations) ||
-										    (!storageServerInterfaces[j].isTss &&
-										     !storageServerInterfaces[firstValidServer].isTss)) {
+										    (!storageServerInterfaces[j].isTss() &&
+										     !storageServerInterfaces[firstValidServer].isTss())) {
 											self->testFailure("Data inconsistent", true);
 											return false;
 										}
@@ -1497,19 +1486,12 @@ struct ConsistencyCheckWorkload : TestWorkload {
 								    .detail("UID", storageServerInterfaces[j].id())
 								    .detail("GetKeyValuesToken",
 								            storageServerInterfaces[j].getKeyValues.getEndpoint().token)
-								    .detail("IsTSS", storageServerInterfaces[j].isTss ? "True" : "False")
+								    .detail("IsTSS", storageServerInterfaces[j].isTss() ? "True" : "False")
 								    .error(e);
 
-								printf("CC %sSS %s failed with error % d\n",
-								       storageServerInterfaces[j].isTss ? "T" : "",
-								       storageServers[j].toString().c_str(),
-								       e.code());
-
 								// All shards should be available in quiscence
-								// TODO should the test still fail if TSS is unavailable? Or is just logging the trace
-								// logs ok
 								if (self->performQuiescentChecks &&
-								    (g_network->isSimulated() || !storageServerInterfaces[j].isTss)) {
+								    (g_network->isSimulated() || !storageServerInterfaces[j].isTss())) {
 									self->testFailure("Storage server unavailable");
 									return false;
 								}
@@ -1604,7 +1586,6 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				bool hasValidEstimate = estimatedBytes.size() > 0;
 
 				// If the storage servers' sampled estimate of shard size is different from ours
-				// TODO should the test still fail if TSS has wrong estimate? Or is just logging the trace logs ok
 				if (self->performQuiescentChecks) {
 					for (int j = 0; j < estimatedBytes.size(); j++) {
 						if (estimatedBytes[j] >= 0 && estimatedBytes[j] != sampledBytes) {
@@ -1612,9 +1593,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 							    .detail("EstimatedBytes", estimatedBytes[j])
 							    .detail("CorrectSampledBytes", sampledBytes)
 							    .detail("StorageServer", storageServers[j])
-							    .detail("IsTSS", storageServerInterfaces[j].isTss ? "True" : "False");
+							    .detail("IsTSS", storageServerInterfaces[j].isTss() ? "True" : "False");
 
-							if (!storageServerInterfaces[j].isTss) {
+							if (!storageServerInterfaces[j].isTss()) {
 								self->testFailure("Storage servers had incorrect sampled estimate");
 							}
 
@@ -1622,7 +1603,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 
 							break;
 						} else if (estimatedBytes[j] < 0 &&
-						           (g_network->isSimulated() || !storageServerInterfaces[j].isTss)) {
+						           (g_network->isSimulated() || !storageServerInterfaces[j].isTss())) {
 							self->testFailure("Could not get storage metrics from server");
 							hasValidEstimate = false;
 							break;
@@ -1734,8 +1715,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 			if (!keyValueStoreType.present()) {
 				TraceEvent("ConsistencyCheck_ServerUnavailable").detail("ServerID", storageServers[i].id());
 				self->testFailure("Storage server unavailable");
-			} else if ((!storageServers[i].isTss && keyValueStoreType.get() != configuration.storageServerStoreType) ||
-			           (storageServers[i].isTss &&
+			} else if ((!storageServers[i].isTss() &&
+			            keyValueStoreType.get() != configuration.storageServerStoreType) ||
+			           (storageServers[i].isTss() &&
 			            keyValueStoreType.get() != configuration.testingStorageServerStoreType)) {
 				TraceEvent("ConsistencyCheck_WrongKeyValueStoreType")
 				    .detail("ServerID", storageServers[i].id())
@@ -1747,10 +1729,6 @@ struct ConsistencyCheckWorkload : TestWorkload {
 
 			// Check each pair of storage servers for an address match
 			for (j = i + 1; j < storageServers.size(); j++) {
-				// TODO change this hack back once i fix recruitment
-				/*if (storageServers[i].isTss || storageServers[j].isTss) {
-				    continue;
-				}*/
 				if (storageServers[i].address() == storageServers[j].address()) {
 					TraceEvent("ConsistencyCheck_UndesirableServer")
 					    .detail("StorageServer1", storageServers[i].id())
@@ -1773,16 +1751,6 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		state vector<StorageServerInterface> storageServers = wait(getStorageServers(cx));
 		std::vector<Optional<Key>> missingStorage; // vector instead of a set to get the count
 
-		printf("CC starting check for storage: %d workers, %d SS\n", workers.size(), storageServers.size());
-		printf("CC checking %d regions: ", configuration.regions.size());
-		if (configuration.regions.size() == 1) {
-			printf("%s", configuration.regions[0].dcId.toString().c_str());
-		} else if (configuration.regions.size() == 2) {
-			printf("%s %s",
-			       configuration.regions[0].dcId.toString().c_str(),
-			       configuration.regions[1].dcId.toString().c_str());
-		}
-		printf("\n");
 		for (int i = 0; i < workers.size(); i++) {
 			NetworkAddress addr = workers[i].interf.stableAddress();
 			if (!configuration.isExcludedServer(workers[i].interf.addresses()) &&
@@ -1792,29 +1760,10 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				for (int j = 0; j < storageServers.size(); j++) {
 					if (storageServers[j].stableAddress() == addr) {
 						found = true;
-						printf("CC found SS %s on %s in dc %s\n",
-						       storageServers[j].id().toString().c_str(),
-						       addr.toString().c_str(),
-						       workers[i].interf.locality.dcId().present()
-						           ? workers[i].interf.locality.dcId().get().toString().c_str()
-						           : "");
 						break;
 					}
 				}
 				if (!found) {
-					if (configuration.regions.size() == 0 ||
-					    (configuration.regions.size() == 1 &&
-					     workers[i].interf.locality.dcId() == configuration.regions[0].dcId) ||
-					    (configuration.regions.size() == 2 &&
-					     (workers[i].interf.locality.dcId() == configuration.regions[0].dcId ||
-					      workers[i].interf.locality.dcId() == configuration.regions[1].dcId))) {
-						printf("CC found no SS on %s in dc %s\n",
-						       addr.toString().c_str(),
-						       workers[i].interf.locality.dcId().present()
-						           ? workers[i].interf.locality.dcId().get().toString().c_str()
-						           : "");
-					}
-
 					TraceEvent("ConsistencyCheck_NoStorage")
 					    .detail("Address", addr)
 					    .detail("ProcessClassEqualToStorageClass",
@@ -1839,7 +1788,6 @@ struct ConsistencyCheckWorkload : TestWorkload {
 			// TODO could improve this check by also ensuring DD is currently recruiting a TSS by using quietdb?
 			bool couldExpectMissingTss =
 			    (configuration.desiredTSSCount - self->dbInfo->get().client.tssMapping.size()) > 0;
-			printf("CC couldExpectMissingTss = %s\n", couldExpectMissingTss ? "True" : "False");
 
 			int countMissing = missingStorage.size();
 			int acceptableTssMissing = 1;
@@ -1858,16 +1806,10 @@ struct ConsistencyCheckWorkload : TestWorkload {
 			}
 
 			if (!couldExpectMissingTss || countMissing > acceptableTssMissing) {
-				printf("No storage server on %d workers. CouldBeTSS=%s, acceptableTssMissing=%d\n",
-				       countMissing,
-				       couldExpectMissingTss ? "T" : "F",
-				       acceptableTssMissing);
 				self->testFailure("No storage server on worker");
 				return false;
 			} else {
-				// TODO sev=30 warn instead of print
-				printf("CC found %d missing storage server on worker, but it is likely a tss(es) waiting for a pair\n",
-				       configuration.usableRegions);
+				TraceEvent(SevWarn, "ConsistencyCheck_TSSMissing");
 			}
 		}
 
@@ -1885,10 +1827,8 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		state bool foundExtraDataStore = false;
 		state std::vector<struct ProcessInfo*> protectedProcessesToKill;
 
-		printf("CC checking for extra data stores\n");
 		state std::map<NetworkAddress, std::set<UID>> statefulProcesses;
 		for (const auto& ss : storageServers) {
-			printf("CC Marking %ss as ok\n", ss.id().toString().c_str());
 			statefulProcesses[ss.address()].insert(ss.id());
 			// A process may have two addresses (same ip, different ports)
 			if (ss.secondaryAddress().present()) {
@@ -1945,9 +1885,6 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				if (statefulProcesses[itr->interf.address()].count(id)) {
 					continue;
 				}
-				printf("CC found extra data store %s on %s\n",
-				       id.toString().c_str(),
-				       itr->interf.address().toString().c_str());
 				// For extra data store
 				TraceEvent("ConsistencyCheck_ExtraDataStore")
 				    .detail("Address", itr->interf.address())
@@ -1980,10 +1917,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 			}
 		}
 
-		printf("CC check for extra data stores complete\n");
-
 		if (foundExtraDataStore) {
-			printf("CC Extra Data Stores\n");
 			self->testFailure("Extra data stores present on workers");
 			return false;
 		}
diff --git a/fdbserver/workloads/RandomMoveKeys.actor.cpp b/fdbserver/workloads/RandomMoveKeys.actor.cpp
index 4fe5654a18c..887c6da897d 100644
--- a/fdbserver/workloads/RandomMoveKeys.actor.cpp
+++ b/fdbserver/workloads/RandomMoveKeys.actor.cpp
@@ -168,7 +168,7 @@ struct MoveKeysWorkload : TestWorkload {
 			count[servers[s].address()]++;
 		int o = 0;
 		for (int s = 0; s < servers.size(); s++)
-			if (count[servers[s].address()] == 1 && !servers[s].isTss)
+			if (count[servers[s].address()] == 1 && !servers[s].isTss())
 				servers[o++] = servers[s];
 		servers.resize(o);
 	}
diff --git a/fdbserver/workloads/workloads.actor.h b/fdbserver/workloads/workloads.actor.h
index ffd669e88b4..d85e3469b57 100644
--- a/fdbserver/workloads/workloads.actor.h
+++ b/fdbserver/workloads/workloads.actor.h
@@ -152,7 +152,7 @@ class TestSpec {
 		databasePingDelay = g_network->isSimulated() ? 0.0 : 15.0;
 		runConsistencyCheck = g_network->isSimulated();
 		runConsistencyCheckOnCache = false;
-		runConsistencyCheckOnTSS = false;
+		runConsistencyCheckOnTSS = true;
 		waitForQuiescenceBegin = true;
 		waitForQuiescenceEnd = true;
 		simCheckRelocationDuration = false;
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index e4d5a4e6f96..1d287feed35 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -234,6 +234,7 @@ void FlowKnobs::initialize(bool randomize, bool isSimulated) {
 	init( BASIC_LOAD_BALANCE_MIN_CPU,                         0.05 ); //do not adjust LB probabilities if the proxies are less than 5% utilized
 	init( BASIC_LOAD_BALANCE_BUCKETS,                           40 ); //proxies bin recent GRV requests into 40 time bins
 	init( BASIC_LOAD_BALANCE_COMPUTE_PRECISION,              10000 ); //determines how much of the LB usage is holding the CPU usage of the proxy
+	init( LOAD_BALANCE_TSS_TIMEOUT,                            5.0 );
 
 	// Health Monitor
 	init( FAILURE_DETECTION_DELAY,                             4.0 ); if( randomize && BUGGIFY ) FAILURE_DETECTION_DELAY = 1.0;
diff --git a/flow/Knobs.h b/flow/Knobs.h
index 67ec3b82b71..9b700613f32 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -250,6 +250,7 @@ class FlowKnobs : public Knobs {
 	int BASIC_LOAD_BALANCE_COMPUTE_PRECISION;
 	double BASIC_LOAD_BALANCE_MIN_REQUESTS;
 	double BASIC_LOAD_BALANCE_MIN_CPU;
+	double LOAD_BALANCE_TSS_TIMEOUT;
 
 	// Health Monitor
 	int FAILURE_DETECTION_DELAY;
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 491e0381c32..a9108ed9f44 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -1240,8 +1240,6 @@ Future<T> brokenPromiseToMaybeDelivered(Future<T> in) {
 		return t;
 	} catch (Error& e) {
 		if (e.code() == error_code_broken_promise) {
-			// TODO REMOVE!
-			printf("broken promise!!");
 			throw request_maybe_delivered();
 		}
 		throw;
diff --git a/flow/serialize.h b/flow/serialize.h
index 7653648a808..81bb18ad4d8 100644
--- a/flow/serialize.h
+++ b/flow/serialize.h
@@ -22,9 +22,6 @@
 #define FLOW_SERIALIZE_H
 #pragma once
 
-// TODO REMOVE
-#include <cinttypes>
-
 #include <stdint.h>
 #include <array>
 #include <set>
@@ -112,12 +109,6 @@ class Serializer {
 public:
 	static void serialize(Archive& ar, T& t) {
 		t.serialize(ar);
-		// TODO REMOVE
-		if (!ar.protocolVersion().isValid()) {
-			printf("invalid protocol version %" PRIx64 " < %" PRIx64 "!!!\n",
-			       ar.protocolVersion().version(),
-			       ProtocolVersion::minValidProtocolVersion);
-		}
 		ASSERT(ar.protocolVersion().isValid());
 	}
 };

From 0ef30465d5550cac08cae1c0818daf44cd747e8f Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Tue, 25 May 2021 20:06:32 +0000
Subject: [PATCH 233/740] Changing role names and enabling tss by default in
 consistency check

---
 fdbserver/SimulatedCluster.actor.cpp           | 4 ++--
 fdbserver/worker.actor.cpp                     | 4 ++--
 fdbserver/workloads/ConsistencyCheck.actor.cpp | 2 +-
 flow/ProtocolVersion.h                         | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index 82117a7d737..4acc41d5d60 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -937,7 +937,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	}
 
 	int tssCount = 0;
-	if (!testconfig.simpleConfig && deterministicRandom()->random01() < 0.25) {
+	if (!testConfig.simpleConfig && deterministicRandom()->random01() < 0.25) {
 		// 1 or 2 tss
 		tssCount = deterministicRandom()->randomInt(1, 3);
 	}
@@ -1265,7 +1265,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	tssCount =
 	    std::max(0, std::min(tssCount, (db.usableRegions * (machine_count / datacenters) - replication_type) / 2));
 
-	if (tssCount > 0) {
+	if (!testConfig.config.present() && tssCount > 0) {
 		std::string confStr = format("tss_count:=%d tss_storage_engine:=%d", tssCount, db.storageServerStoreType);
 		set_config(confStr);
 		double tssRandom = deterministicRandom()->random01();
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index e2adaadd433..ff435195c7c 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -2149,7 +2149,7 @@ ACTOR Future<Void> fdbd(Reference<ClusterConnectionFile> connFile,
 
 const Role Role::WORKER("Worker", "WK", false);
 const Role Role::STORAGE_SERVER("StorageServer", "SS");
-const Role Role::TESTING_STORAGE_SERVER("TestingStorageServer", "TS");
+const Role Role::TESTING_STORAGE_SERVER("TestingStorageServer", "ST");
 const Role Role::TRANSACTION_LOG("TLog", "TL");
 const Role Role::SHARED_TRANSACTION_LOG("SharedTLog", "SL", false);
 const Role Role::COMMIT_PROXY("CommitProxyServer", "CP");
@@ -2157,7 +2157,7 @@ const Role Role::GRV_PROXY("GrvProxyServer", "GP");
 const Role Role::MASTER("MasterServer", "MS");
 const Role Role::RESOLVER("Resolver", "RV");
 const Role Role::CLUSTER_CONTROLLER("ClusterController", "CC");
-const Role Role::TESTER("TestClient", "TC");
+const Role Role::TESTER("Tester", "TS");
 const Role Role::LOG_ROUTER("LogRouter", "LR");
 const Role Role::DATA_DISTRIBUTOR("DataDistributor", "DD");
 const Role Role::RATEKEEPER("Ratekeeper", "RK");
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 3b5156fb1e9..459501198ec 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -97,7 +97,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 	ConsistencyCheckWorkload(WorkloadContext const& wcx) : TestWorkload(wcx) {
 		performQuiescentChecks = getOption(options, LiteralStringRef("performQuiescentChecks"), false);
 		performCacheCheck = getOption(options, LiteralStringRef("performCacheCheck"), false);
-		performTSSCheck = getOption(options, LiteralStringRef("performTSSCheck"), false);
+		performTSSCheck = getOption(options, LiteralStringRef("performTSSCheck"), true);
 		quiescentWaitTimeout = getOption(options, LiteralStringRef("quiescentWaitTimeout"), 600.0);
 		distributed = getOption(options, LiteralStringRef("distributed"), true);
 		shardSampleFactor = std::max(getOption(options, LiteralStringRef("shardSampleFactor"), 1), 1);
diff --git a/flow/ProtocolVersion.h b/flow/ProtocolVersion.h
index 7feb6b3839a..af7c6f11088 100644
--- a/flow/ProtocolVersion.h
+++ b/flow/ProtocolVersion.h
@@ -138,7 +138,6 @@ class ProtocolVersion {
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010000LL, StableInterfaces);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, TagThrottleValueReason);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, SpanContext);
-	// TODO is this right?
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, TSS);
 };
 

From cef2bb140b9deb528628eccad538e196a2e4bd52 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 28 May 2021 18:19:42 +0000
Subject: [PATCH 234/740] Addressing final PR comments

---
 fdbrpc/QueueModel.cpp             | 2 +-
 fdbrpc/QueueModel.h               | 2 +-
 fdbserver/storageserver.actor.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbrpc/QueueModel.cpp b/fdbrpc/QueueModel.cpp
index 6aaaf3df34e..124c8396473 100644
--- a/fdbrpc/QueueModel.cpp
+++ b/fdbrpc/QueueModel.cpp
@@ -60,7 +60,7 @@ double QueueModel::addRequest(uint64_t id) {
 	return d.penalty;
 }
 
-void QueueModel::updateTssEndpoint(uint64_t endpointId, TSSEndpointData tssData) {
+void QueueModel::updateTssEndpoint(uint64_t endpointId, const TSSEndpointData& tssData) {
 	auto& d = data[endpointId];
 	if (!d.tssData.present()) {
 		tssCount++;
diff --git a/fdbrpc/QueueModel.h b/fdbrpc/QueueModel.h
index 1e8cd009a0a..89db9afee88 100644
--- a/fdbrpc/QueueModel.h
+++ b/fdbrpc/QueueModel.h
@@ -110,7 +110,7 @@ class QueueModel {
 	int laggingRequestCount;
 	int laggingTSSCompareCount;
 
-	void updateTssEndpoint(uint64_t endpointId, TSSEndpointData endpointData);
+	void updateTssEndpoint(uint64_t endpointId, const TSSEndpointData& endpointData);
 	void removeOldTssData(UID currentGeneration);
 	Optional<TSSEndpointData> getTssData(uint64_t endpointId);
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index a0deef61a67..3931c58be9d 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -4071,7 +4071,7 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 		wait(yield());
 	}
 
-	// TODO why is this seemingly random delay here?
+	// TODO: why is this seemingly random delay here?
 	wait(delay(0.0001));
 
 	{

From 49ba3c4cf8f3dd1c6b270e78c7f26139fa653447 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 28 May 2021 18:15:52 +0000
Subject: [PATCH 235/740] TSS Mapping Change

---
 fdbclient/CommitProxyInterface.h              |  19 +--
 fdbclient/DatabaseContext.h                   |   7 +-
 fdbclient/NativeAPI.actor.cpp                 | 141 ++++++++---------
 fdbclient/SystemData.cpp                      |   1 -
 fdbclient/SystemData.h                        |   2 -
 fdbrpc/LoadBalance.actor.h                    |   2 +
 fdbrpc/QueueModel.cpp                         |  20 +--
 fdbrpc/QueueModel.h                           |  10 +-
 fdbserver/ApplyMetadataMutation.cpp           |  51 +++++-
 fdbserver/CMakeLists.txt                      |   2 +
 fdbserver/ClusterController.actor.cpp         | 115 +-------------
 fdbserver/CommitProxyServer.actor.cpp         |  20 ++-
 fdbserver/DataDistribution.actor.cpp          | 146 +++++++++++-------
 fdbserver/Knobs.cpp                           |   2 +-
 fdbserver/Knobs.h                             |   2 +-
 fdbserver/MoveKeys.actor.cpp                  |  93 +++++------
 fdbserver/ProxyCommitData.actor.h             |   1 +
 fdbserver/QuietDatabase.actor.cpp             |  10 +-
 fdbserver/TSSMappingUtil.actor.cpp            |  88 +++++++++++
 fdbserver/TSSMappingUtil.h                    |  36 +++++
 fdbserver/storageserver.actor.cpp             |  37 +++--
 .../workloads/ConsistencyCheck.actor.cpp      |  28 ++--
 22 files changed, 463 insertions(+), 370 deletions(-)
 create mode 100644 fdbserver/TSSMappingUtil.actor.cpp
 create mode 100644 fdbserver/TSSMappingUtil.h

diff --git a/fdbclient/CommitProxyInterface.h b/fdbclient/CommitProxyInterface.h
index 2ac4481a15c..aee43c26381 100644
--- a/fdbclient/CommitProxyInterface.h
+++ b/fdbclient/CommitProxyInterface.h
@@ -116,30 +116,18 @@ struct ClientDBInfo {
 	    firstCommitProxy; // not serialized, used for commitOnFirstProxy when the commit proxies vector has been shrunk
 	Optional<Value> forward;
 	vector<VersionHistory> history;
-	vector<std::pair<UID, StorageServerInterface>>
-	    tssMapping; // logically map<ssid, tss interface> for all active TSS pairs
 
 	ClientDBInfo() {}
 
 	bool operator==(ClientDBInfo const& r) const { return id == r.id; }
 	bool operator!=(ClientDBInfo const& r) const { return id != r.id; }
 
-	// convenience method to treat tss mapping like a map
-	Optional<StorageServerInterface> getTssPair(UID storageServerID) const {
-		for (auto& it : tssMapping) {
-			if (it.first == storageServerID) {
-				return Optional<StorageServerInterface>(it.second);
-			}
-		}
-		return Optional<StorageServerInterface>();
-	}
-
 	template <class Archive>
 	void serialize(Archive& ar) {
 		if constexpr (!is_fb_function<Archive>) {
 			ASSERT(ar.protocolVersion().isValid());
 		}
-		serializer(ar, grvProxies, commitProxies, id, forward, history, tssMapping);
+		serializer(ar, grvProxies, commitProxies, id, forward, history);
 	}
 };
 
@@ -300,9 +288,12 @@ struct GetKeyServerLocationsReply {
 	Arena arena;
 	std::vector<std::pair<KeyRangeRef, vector<StorageServerInterface>>> results;
 
+	// if any storage servers in results have a TSS pair, that mapping is in here
+	std::vector<std::pair<UID, StorageServerInterface>> resultsTssMapping;
+
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, results, arena);
+		serializer(ar, results, resultsTssMapping, arena);
 	}
 };
 
diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index 2a3d2ec35ad..de41f9d46f7 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -323,7 +323,10 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 
 	std::map<UID, StorageServerInfo*> server_interf;
 
-	std::map<UID, Reference<TSSMetrics>> tssMetrics;
+	// map from ssid -> tss interface
+	std::unordered_map<UID, StorageServerInterface> tssMapping;
+	// map from tssid -> metrics for that tss pair
+	std::unordered_map<UID, Reference<TSSMetrics>> tssMetrics;
 
 	UID dbId;
 	bool internal; // Only contexts created through the C client and fdbcli are non-internal
@@ -425,8 +428,8 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	static const std::vector<std::string> debugTransactionTagChoices;
 	std::unordered_map<KeyRef, Reference<WatchMetadata>> watchMap;
 
-	void maybeAddTssMapping(StorageServerInterface const& ssi);
 	void addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi);
+	void removeTssMapping(StorageServerInterface const& ssi);
 };
 
 #endif
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 5e07c1c38d5..359be78a681 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -122,38 +122,50 @@ NetworkOptions::NetworkOptions()
 static const Key CLIENT_LATENCY_INFO_PREFIX = LiteralStringRef("client_latency/");
 static const Key CLIENT_LATENCY_INFO_CTR_PREFIX = LiteralStringRef("client_latency_counter/");
 
-void DatabaseContext::maybeAddTssMapping(StorageServerInterface const& ssi) {
-	// add tss mapping if server is new
+void DatabaseContext::addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi) {
+	auto result = tssMapping.find(ssi.id());
+	// Update tss endpoint mapping if ss isn't in mapping, or the interface it mapped to changed
+	if (result == tssMapping.end() ||
+	    result->second.getValue.getEndpoint().token.first() != tssi.getValue.getEndpoint().token.first()) {
+		Reference<TSSMetrics> metrics;
+		if (result == tssMapping.end()) {
+			// new TSS pairing
+			metrics = makeReference<TSSMetrics>();
+			tssMetrics[tssi.id()] = metrics;
+			tssMapping[ssi.id()] = tssi;
+		} else {
+			if (result->second.id() == tssi.id()) {
+				metrics = tssMetrics[tssi.id()];
+			} else {
+				TEST(true); // SS now maps to new TSS! This will probably never happen in practice
+				tssMetrics.erase(result->second.id());
+				metrics = makeReference<TSSMetrics>();
+				tssMetrics[tssi.id()] = metrics;
+			}
+			result->second = tssi;
+		}
 
-	Optional<StorageServerInterface> tssPair = clientInfo->get().getTssPair(ssi.id());
-	if (tssPair.present()) {
-		addTssMapping(ssi, tssPair.get());
+		queueModel.updateTssEndpoint(ssi.getValue.getEndpoint().token.first(),
+		                             TSSEndpointData(tssi.id(), tssi.getValue.getEndpoint(), metrics));
+		queueModel.updateTssEndpoint(ssi.getKey.getEndpoint().token.first(),
+		                             TSSEndpointData(tssi.id(), tssi.getKey.getEndpoint(), metrics));
+		queueModel.updateTssEndpoint(ssi.getKeyValues.getEndpoint().token.first(),
+		                             TSSEndpointData(tssi.id(), tssi.getKeyValues.getEndpoint(), metrics));
+		queueModel.updateTssEndpoint(ssi.watchValue.getEndpoint().token.first(),
+		                             TSSEndpointData(tssi.id(), tssi.watchValue.getEndpoint(), metrics));
 	}
 }
 
-// calling getInterface potentially recursively is weird, but since this function is only called when an entry is
-// created/changed, the recursive call should never recurse itself.
-void DatabaseContext::addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi) {
-	Reference<StorageServerInfo> tssInfo = StorageServerInfo::getInterface(this, tssi, clientLocality);
-	Reference<StorageServerInfo> ssInfo = StorageServerInfo::getInterface(this, ssi, clientLocality);
-
-	Reference<TSSMetrics> metrics = makeReference<TSSMetrics>();
-	tssMetrics[tssi.id()] = metrics;
-
-	// Add each read data request we want to duplicate to TSS to endpoint mapping (getValue, getKey, getKeyValues,
-	// watchValue)
-	queueModel.updateTssEndpoint(
-	    ssInfo->interf.getValue.getEndpoint().token.first(),
-	    TSSEndpointData(tssi.id(), tssInfo->interf.getValue.getEndpoint(), metrics, clientInfo->get().id));
-	queueModel.updateTssEndpoint(
-	    ssInfo->interf.getKey.getEndpoint().token.first(),
-	    TSSEndpointData(tssi.id(), tssInfo->interf.getKey.getEndpoint(), metrics, clientInfo->get().id));
-	queueModel.updateTssEndpoint(
-	    ssInfo->interf.getKeyValues.getEndpoint().token.first(),
-	    TSSEndpointData(tssi.id(), tssInfo->interf.getKeyValues.getEndpoint(), metrics, clientInfo->get().id));
-	queueModel.updateTssEndpoint(
-	    ssInfo->interf.watchValue.getEndpoint().token.first(),
-	    TSSEndpointData(tssi.id(), tssInfo->interf.watchValue.getEndpoint(), metrics, clientInfo->get().id));
+void DatabaseContext::removeTssMapping(StorageServerInterface const& ssi) {
+	auto result = tssMapping.find(ssi.id());
+	if (result != tssMapping.end()) {
+		tssMetrics.erase(ssi.id());
+		tssMapping.erase(result);
+		queueModel.removeTssEndpoint(ssi.getValue.getEndpoint().token.first());
+		queueModel.removeTssEndpoint(ssi.getKey.getEndpoint().token.first());
+		queueModel.removeTssEndpoint(ssi.getKeyValues.getEndpoint().token.first());
+		queueModel.removeTssEndpoint(ssi.watchValue.getEndpoint().token.first());
+	}
 }
 
 Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx,
@@ -170,12 +182,10 @@ Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx
 				//       changes.
 
 				it->second->interf = ssi;
-				cx->maybeAddTssMapping(ssi);
 			} else {
 				it->second->notifyContextDestroyed();
 				Reference<StorageServerInfo> loc(new StorageServerInfo(cx, ssi, locality));
 				cx->server_interf[ssi.id()] = loc.getPtr();
-				cx->maybeAddTssMapping(ssi);
 				return loc;
 			}
 		}
@@ -185,7 +195,6 @@ Reference<StorageServerInfo> StorageServerInfo::getInterface(DatabaseContext* cx
 
 	Reference<StorageServerInfo> loc(new StorageServerInfo(cx, ssi, locality));
 	cx->server_interf[ssi.id()] = loc.getPtr();
-	cx->maybeAddTssMapping(ssi);
 	return loc;
 }
 
@@ -813,45 +822,6 @@ ACTOR Future<Void> monitorCacheList(DatabaseContext* self) {
 	}
 }
 
-// updates tss mapping when set of tss servers changes
-ACTOR static Future<Void> monitorTssChange(DatabaseContext* cx) {
-	state vector<std::pair<UID, StorageServerInterface>> curTssMapping;
-	curTssMapping = cx->clientInfo->get().tssMapping;
-
-	loop {
-		wait(cx->clientInfo->onChange());
-		if (cx->clientInfo->get().tssMapping != curTssMapping) {
-			// To optimize size of the ClientDBInfo payload, we could eventually change CC to just send a tss change
-			// id/generation, and have client reread the mapping here if it changed. It's a very minor optimization
-			// though, and would cause extra read load.
-			ClientDBInfo clientInfo = cx->clientInfo->get();
-			curTssMapping = clientInfo.tssMapping;
-
-			std::unordered_set<UID> seenTssIds;
-
-			if (curTssMapping.size()) {
-				for (const auto& it : curTssMapping) {
-					seenTssIds.insert(it.second.id());
-
-					if (cx->server_interf.count(it.first)) {
-						cx->addTssMapping(cx->server_interf[it.first]->interf, it.second);
-					}
-				}
-			}
-
-			for (auto it = cx->tssMetrics.begin(); it != cx->tssMetrics.end();) {
-				if (seenTssIds.count(it->first)) {
-					it++;
-				} else {
-					it = cx->tssMetrics.erase(it);
-				}
-			}
-
-			cx->queueModel.removeOldTssData(clientInfo.id);
-		}
-	}
-}
-
 ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 	state Reference<ReadYourWritesTransaction> tr;
 	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
@@ -860,7 +830,7 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 		// find ss pair id so we can remove it from the mapping
 		state UID tssPairID;
 		bool found = false;
-		for (const auto& it : cx->clientInfo->get().tssMapping) {
+		for (const auto& it : cx->tssMapping) {
 			if (it.second.id() == tssID) {
 				tssPairID = it.first;
 				found = true;
@@ -870,7 +840,7 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 		if (found) {
 			TraceEvent(SevWarnAlways, "TSS_KillMismatch").detail("TSSID", tssID.toString());
 			TEST(true); // killing TSS because it got mismatch
-			
+
 			// TODO we could write something to the system keyspace and then have DD listen to that keyspace and then DD
 			// do exactly this, so why not just cut out the middle man (or the middle system keys, as it were)
 			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(cx)));
@@ -883,7 +853,6 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 					tr->clear(serverTagKeyFor(tssID));
 					tssMapDB.erase(tr, tssPairID);
 
-					tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 					wait(tr->commit());
 
 					break;
@@ -1153,7 +1122,6 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 	getValueCompleted.init(LiteralStringRef("NativeAPI.GetValueCompleted"));
 
 	monitorProxiesInfoChange = monitorProxiesChange(clientInfo, &proxiesChangeTrigger);
-	monitorTssInfoChange = monitorTssChange(this);
 	tssMismatchHandler = handleTssMismatches(this);
 	clientStatusUpdater.actor = clientStatusUpdateActor(this);
 	cacheListMonitor = monitorCacheList(this);
@@ -2216,6 +2184,29 @@ ACTOR Future<Optional<vector<StorageServerInterface>>> transactionalGetServerInt
 	return serverInterfaces;
 }
 
+void updateTssMappings(Database cx, const GetKeyServerLocationsReply& reply) {
+	// Since a ss -> tss mapping is included in resultsTssMapping iff that SS is in results and has a tss pair,
+	// all SS in results that do not have a mapping present must not have a tss pair.
+	std::unordered_map<UID, const StorageServerInterface*> ssiById;
+	for (const auto& [_, shard] : reply.results) {
+		for (auto& ssi : shard) {
+			ssiById[ssi.id()] = &ssi;
+		}
+	}
+
+	for (const auto& mapping : reply.resultsTssMapping) {
+		auto ssi = ssiById.find(mapping.first);
+		ASSERT(ssi != ssiById.end());
+		cx->addTssMapping(*ssi->second, mapping.second);
+		ssiById.erase(mapping.first);
+	}
+
+	// if SS didn't have a mapping above, it's still in the ssiById map, so remove its tss mapping
+	for (const auto& it : ssiById) {
+		cx->removeTssMapping(*it.second);
+	}
+}
+
 // If isBackward == true, returns the shard containing the key before 'key' (an infinitely long, inexpressible key).
 // Otherwise returns the shard containing key
 ACTOR Future<pair<KeyRange, Reference<LocationInfo>>> getKeyLocation_internal(Database cx,
@@ -2248,6 +2239,7 @@ ACTOR Future<pair<KeyRange, Reference<LocationInfo>>> getKeyLocation_internal(Da
 				ASSERT(rep.results.size() == 1);
 
 				auto locationInfo = cx->setCachedLocation(rep.results[0].first, rep.results[0].second);
+				updateTssMappings(cx, rep);
 				return std::make_pair(KeyRange(rep.results[0].first, rep.arena), locationInfo);
 			}
 		}
@@ -2311,6 +2303,7 @@ ACTOR Future<vector<pair<KeyRange, Reference<LocationInfo>>>> getKeyRangeLocatio
 					                     cx->setCachedLocation(rep.results[shard].first, rep.results[shard].second));
 					wait(yield());
 				}
+				updateTssMappings(cx, rep);
 
 				return results;
 			}
diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index 52590cf719e..02c2fee1057 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -346,7 +346,6 @@ uint16_t cacheChangeKeyDecodeIndex(const KeyRef& key) {
 	return idx;
 }
 
-const KeyRef tssMappingChangeKey = LiteralStringRef("\xff\x02/tssMappingChangeKey");
 const KeyRangeRef tssMappingKeys(LiteralStringRef("\xff/tss/"), LiteralStringRef("\xff/tss0"));
 
 const KeyRangeRef serverTagKeys(LiteralStringRef("\xff/serverTag/"), LiteralStringRef("\xff/serverTag0"));
diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h
index 39f6e4d79b1..6094b8078a3 100644
--- a/fdbclient/SystemData.h
+++ b/fdbclient/SystemData.h
@@ -116,9 +116,7 @@ const Key cacheChangeKeyFor(uint16_t idx);
 uint16_t cacheChangeKeyDecodeIndex(const KeyRef& key);
 
 //    "\xff/tss/[[serverId]]" := "[[tssId]]"
-extern const KeyRef tssMappingChangeKey;
 extern const KeyRangeRef tssMappingKeys;
-extern const KeyRef tssMappingPrefix;
 
 // "\xff/serverTag/[[serverID]]" = "[[Tag]]"
 //	Provides the Tag for the given serverID. Used to access a
diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 33a689c31d4..4bbaa030056 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -144,6 +144,7 @@ Future<Void> tssComparison(Req req,
 			        : SevError;
 
 			if (!TSS_doCompare(req, src.get(), tss.get().get(), traceSeverity, tssData.tssId)) {
+				TEST(true); // TSS Mismatch
 				++tssData.metrics->mismatches;
 			}
 		} else if (tssLB.present() && tssLB.get().error.present()) {
@@ -192,6 +193,7 @@ struct RequestData : NonCopyable {
 			Optional<TSSEndpointData> tssData = model->getTssData(stream->getEndpoint().token.first());
 
 			if (tssData.present()) {
+				TEST(true); // duplicating request to TSS
 				resetReply(request);
 				// FIXME: optimize to avoid creating new netNotifiedQueue for each message
 				RequestStream<Request> tssRequestStream(tssData.get().endpoint);
diff --git a/fdbrpc/QueueModel.cpp b/fdbrpc/QueueModel.cpp
index 124c8396473..0fceb8929d4 100644
--- a/fdbrpc/QueueModel.cpp
+++ b/fdbrpc/QueueModel.cpp
@@ -62,24 +62,12 @@ double QueueModel::addRequest(uint64_t id) {
 
 void QueueModel::updateTssEndpoint(uint64_t endpointId, const TSSEndpointData& tssData) {
 	auto& d = data[endpointId];
-	if (!d.tssData.present()) {
-		tssCount++;
-		d.tssData = Optional<TSSEndpointData>(tssData);
-	} else {
-		d.tssData.get().generation = tssData.generation;
-	}
+	d.tssData = tssData;
 }
 
-void QueueModel::removeOldTssData(UID currentGeneration) {
-	if (tssCount > 0) {
-		// expire old tss mappings that aren't present in new mapping
-		for (auto& it : data) {
-			if (it.second.tssData.present() && it.second.tssData.get().generation != currentGeneration) {
-				it.second.tssData = Optional<TSSEndpointData>();
-				tssCount--;
-			}
-		}
-	}
+void QueueModel::removeTssEndpoint(uint64_t endpointId) {
+	auto& d = data[endpointId];
+	d.tssData = Optional<TSSEndpointData>();
 }
 
 Optional<TSSEndpointData> QueueModel::getTssData(uint64_t id) {
diff --git a/fdbrpc/QueueModel.h b/fdbrpc/QueueModel.h
index 89db9afee88..f0b3d5f8678 100644
--- a/fdbrpc/QueueModel.h
+++ b/fdbrpc/QueueModel.h
@@ -33,10 +33,9 @@ struct TSSEndpointData {
 	UID tssId;
 	Endpoint endpoint;
 	Reference<TSSMetrics> metrics;
-	UID generation;
 
-	TSSEndpointData(UID tssId, Endpoint endpoint, Reference<TSSMetrics> metrics, UID generation)
-	  : tssId(tssId), endpoint(endpoint), metrics(metrics), generation(generation) {}
+	TSSEndpointData(UID tssId, Endpoint endpoint, Reference<TSSMetrics> metrics)
+	  : tssId(tssId), endpoint(endpoint), metrics(metrics) {}
 };
 
 // The data structure used for the client-side load balancing algorithm to
@@ -111,10 +110,10 @@ class QueueModel {
 	int laggingTSSCompareCount;
 
 	void updateTssEndpoint(uint64_t endpointId, const TSSEndpointData& endpointData);
-	void removeOldTssData(UID currentGeneration);
+	void removeTssEndpoint(uint64_t endpointId);
 	Optional<TSSEndpointData> getTssData(uint64_t endpointId);
 
-	QueueModel() : secondMultiplier(1.0), secondBudget(0), laggingRequestCount(0), tssCount(0) {
+	QueueModel() : secondMultiplier(1.0), secondBudget(0), laggingRequestCount(0) {
 		laggingRequests = actorCollection(addActor.getFuture(), &laggingRequestCount);
 		tssComparisons = actorCollection(addTSSActor.getFuture(), &laggingTSSCompareCount);
 	}
@@ -126,7 +125,6 @@ class QueueModel {
 
 private:
 	std::unordered_map<uint64_t, QueueData> data;
-	uint32_t tssCount;
 };
 
 /* old queue model
diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index 7349918f7ab..4f5a86c8501 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "fdbclient/MutationList.h"
+#include "fdbclient/KeyBackedTypes.h" // for key backed map codecs for tss mapping
 #include "fdbclient/SystemData.h"
 #include "fdbclient/BackupAgent.actor.h"
 #include "fdbclient/Notified.h"
@@ -64,6 +65,7 @@ void applyMetadataMutations(SpanID const& spanContext,
                             NotifiedVersion* commitVersion,
                             std::map<UID, Reference<StorageInfo>>* storageCache,
                             std::map<Tag, Version>* tag_popped,
+                            std::unordered_map<UID, StorageServerInterface>* tssMapping,
                             bool initialCommit) {
 	// std::map<keyRef, vector<uint16_t>> cacheRangeInfo;
 	std::map<KeyRef, MutationRef> cachedRangeInfo;
@@ -72,7 +74,9 @@ void applyMetadataMutations(SpanID const& spanContext,
 	// tss + find partner's tag to send the private mutation. Since the removeStorageServer transaction clears both the
 	// storage list and server tag, we have to enforce ordering, proccessing the server tag first, and postpone the
 	// server list clear until the end;
+	// Similarly, the TSS mapping change key needs to read the server list at the end of the commit
 	std::vector<KeyRangeRef> tssServerListToRemove;
+	std::vector<std::pair<UID, UID>> tssMappingToAdd;
 
 	for (auto const& m : mutations) {
 		//TraceEvent("MetadataMutation", dbgid).detail("M", m.toString());
@@ -240,6 +244,29 @@ void applyMetadataMutations(SpanID const& spanContext,
 						}
 					}
 				}
+			} else if (m.param1.startsWith(tssMappingKeys.begin)) {
+				if (!initialCommit) {
+					txnStateStore->set(KeyValueRef(m.param1, m.param2));
+					if (tssMapping) {
+						// Normally uses key backed map, so have to use same unpacking code here.
+						UID ssId = Codec<UID>::unpack(Tuple::unpack(m.param1.removePrefix(tssMappingKeys.begin)));
+						UID tssId = Codec<UID>::unpack(Tuple::unpack(m.param2));
+
+						tssMappingToAdd.push_back(std::pair(ssId, tssId));
+
+						// send private mutation to SS that it now has a TSS pair
+						if (toCommit) {
+							MutationRef privatized = m;
+							privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
+
+							Optional<Value> tagV = txnStateStore->readValue(serverTagKeyFor(ssId)).get();
+							if (tagV.present()) {
+								toCommit->addTag(decodeServerTagValue(tagV.get()));
+								toCommit->writeTypedMessage(privatized);
+							}
+						}
+					}
+				}
 			} else if (m.param1 == databaseLockedKey || m.param1 == metadataVersionKey ||
 			           m.param1 == mustContainSystemMutationsKey ||
 			           m.param1.startsWith(applyMutationsBeginRange.begin) ||
@@ -430,7 +457,7 @@ void applyMetadataMutations(SpanID const& spanContext,
 					}
 					// Might be a tss removal, which doesn't store a tag there.
 					// Chained if is a little verbose, but avoids unecessary work
-					if (!initialCommit && !serverKeysCleared.size()) {
+					if (toCommit && !initialCommit && !serverKeysCleared.size()) {
 						KeyRangeRef maybeTssRange = range & serverTagKeys;
 						if (maybeTssRange.singleKeyRange()) {
 							UID id = decodeServerTagKey(maybeTssRange.begin);
@@ -482,6 +509,19 @@ void applyMetadataMutations(SpanID const& spanContext,
 				if (!initialCommit)
 					txnStateStore->clear(range & serverTagHistoryKeys);
 			}
+			if (tssMappingKeys.intersects(range)) {
+				if (!initialCommit) {
+					KeyRangeRef rangeToClear = range & tssMappingKeys;
+					ASSERT(rangeToClear.singleKeyRange());
+					txnStateStore->clear(rangeToClear);
+					if (tssMapping) {
+						// Normally uses key backed map, so have to use same unpacking code here.
+						UID ssId =
+						    Codec<UID>::unpack(Tuple::unpack(rangeToClear.begin.removePrefix(tssMappingKeys.begin)));
+						tssMapping->erase(ssId);
+					}
+				}
+			}
 			if (range.contains(coordinatorsKey)) {
 				if (!initialCommit)
 					txnStateStore->clear(singleKeyRange(coordinatorsKey));
@@ -615,6 +655,13 @@ void applyMetadataMutations(SpanID const& spanContext,
 		txnStateStore->clear(range);
 	}
 
+	for (auto& tssPair : tssMappingToAdd) {
+		// read tss server list from txn state store and add it to tss mapping
+		StorageServerInterface tssi =
+		    decodeServerListValue(txnStateStore->readValue(serverListKeyFor(tssPair.second)).get().get());
+		(*tssMapping)[tssPair.first] = tssi;
+	}
+
 	// If we accumulated private mutations for cached key-ranges, we also need to
 	// tag them with the relevant storage servers. This is done to make the storage
 	// servers aware of the cached key-ranges
@@ -713,6 +760,7 @@ void applyMetadataMutations(SpanID const& spanContext,
 	                       &proxyCommitData.committedVersion,
 	                       &proxyCommitData.storageCache,
 	                       &proxyCommitData.tag_popped,
+	                       &proxyCommitData.tssMapping,
 	                       initialCommit);
 }
 
@@ -742,5 +790,6 @@ void applyMetadataMutations(SpanID const& spanContext,
 	                       /* commitVersion= */ nullptr,
 	                       /* storageCache= */ nullptr,
 	                       /* tag_popped= */ nullptr,
+	                       /* tssMapping= */ nullptr,
 	                       /* initialCommit= */ false);
 }
diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index f3d37bb01e9..267d67d2d9e 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -103,6 +103,8 @@ set(FDBSERVER_SRCS
   TesterInterface.actor.h
   TLogInterface.h
   TLogServer.actor.cpp
+  TSSMappingUtil.h
+  TSSMappingUtil.actor.cpp
   VersionedBTree.actor.cpp
   VFSAsync.h
   VFSAsync.cpp
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 113b2472eed..43b6e768b0a 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -3278,7 +3278,6 @@ void clusterRegisterMaster(ClusterControllerData* self, RegisterMasterRequest co
 		clientInfo.id = deterministicRandom()->randomUniqueID();
 		clientInfo.commitProxies = req.commitProxies;
 		clientInfo.grvProxies = req.grvProxies;
-		clientInfo.tssMapping = db->clientInfo->get().tssMapping;
 		db->clientInfo->set(clientInfo);
 		dbInfo.client = db->clientInfo->get();
 	}
@@ -3754,118 +3753,6 @@ ACTOR Future<Void> monitorServerInfoConfig(ClusterControllerData::DBInfo* db) {
 	}
 }
 
-// Monitors the tss mapping change key for changes,
-// and broadcasts the new tss mapping to the rest of the cluster in ClientDBInfo.
-ACTOR Future<Void> monitorTSSMapping(ClusterControllerData* self) {
-	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
-	loop {
-		state Reference<ReadYourWritesTransaction> tr =
-		    Reference<ReadYourWritesTransaction>(new ReadYourWritesTransaction(self->db.db));
-		loop {
-			try {
-				tr->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
-				tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
-				tr->setOption(FDBTransactionOptions::READ_LOCK_AWARE);
-
-				std::vector<std::pair<UID, UID>> tssResults =
-				    wait(tssMapDB.getRange(tr, UID(), Optional<UID>(), CLIENT_KNOBS->TOO_MANY));
-				ASSERT(tssResults.size() < CLIENT_KNOBS->TOO_MANY);
-
-				state std::unordered_map<UID, UID> tssIdMap;
-				std::set<UID> seenTssIds;
-
-				for (auto& it : tssResults) {
-					tssIdMap[it.first] = it.second;
-					// ensure two storage servers don't map to same TSS
-					ASSERT(seenTssIds.insert(it.second).second);
-					// ensure a storage server doesn't accidentally map to itself (unless we're in HACK_IDENTITY_MAPPING
-					// mode)
-					ASSERT(SERVER_KNOBS->TSS_HACK_IDENTITY_MAPPING || it.first != it.second);
-				}
-
-				state std::vector<std::pair<UID, StorageServerInterface>> newMapping;
-				state std::map<UID, StorageServerInterface> oldMapping;
-				state bool mappingChanged = false;
-
-				state ClientDBInfo clientInfo = self->db.clientInfo->get();
-
-				for (auto& it : clientInfo.tssMapping) {
-					oldMapping[it.first] = it.second;
-					if (!tssIdMap.count(it.first)) {
-						TraceEvent("TSS_MappingRemoved", self->id)
-						    .detail("SSID", it.first)
-						    .detail("TSSID", it.second.id());
-						mappingChanged = true;
-					}
-				}
-
-				for (auto& it : tssIdMap) {
-					bool ssAlreadyPaired = oldMapping.count(it.first);
-
-					state Optional<UID> oldTssId;
-					state Optional<UID> oldGetValueEndpoint;
-
-					if (ssAlreadyPaired) {
-						auto interf = oldMapping[it.first];
-						// check if this SS maps to a new TSS
-						oldTssId = Optional<UID>(interf.id());
-						oldGetValueEndpoint = Optional<UID>(interf.getValue.getEndpoint().token);
-						if (interf.id() != it.second) {
-							TraceEvent("TSS_MappingChanged", self->id)
-							    .detail("SSID", it.first)
-							    .detail("TSSID", it.second)
-							    .detail("OldTSSID", interf.id());
-							mappingChanged = true;
-						}
-					} else {
-						TraceEvent("TSS_MappingAdded", self->id).detail("SSID", it.first).detail("TSSID", it.second);
-						mappingChanged = true;
-					}
-
-					state UID ssid = it.first;
-					state UID tssid = it.second;
-					// request storage server interface for tssid, add it to results
-					Optional<Value> tssiVal = wait(tr->get(serverListKeyFor(it.second)));
-
-					// because we read the tss mapping in the same transaction, there can be no races with tss removal
-					// and the tss interface must exist
-					ASSERT(tssiVal.present());
-
-					StorageServerInterface tssi = decodeServerListValue(tssiVal.get());
-					if (oldTssId.present() && tssi.id() == oldTssId.get() && oldGetValueEndpoint.present() &&
-					    oldGetValueEndpoint.get() != tssi.getValue.getEndpoint().token) {
-						mappingChanged = true;
-					}
-					newMapping.push_back(std::pair<UID, StorageServerInterface>(ssid, tssi));
-				}
-
-				// if nothing changed, skip updating
-				if (mappingChanged) {
-					clientInfo.id = deterministicRandom()->randomUniqueID();
-					clientInfo.tssMapping = newMapping;
-					self->db.clientInfo->set(clientInfo);
-
-					ServerDBInfo serverInfo = self->db.serverInfo->get();
-					// also change server db info so workers get new mapping
-					serverInfo.id = deterministicRandom()->randomUniqueID();
-					serverInfo.infoGeneration = ++self->db.dbInfoCount;
-					serverInfo.client = clientInfo;
-					self->db.serverInfo->set(serverInfo);
-				}
-
-				state Future<Void> tssChangeFuture = tr->watch(tssMappingChangeKey);
-
-				wait(tr->commit());
-				wait(tssChangeFuture);
-
-				break;
-			} catch (Error& e) {
-				wait(tr->onError(e));
-			}
-		}
-	}
-}
-
 // Monitors the global configuration version key for changes. When changes are
 // made, the global configuration history is read and any updates are sent to
 // all processes in the system by updating the ClientDBInfo object. The
@@ -4424,7 +4311,7 @@ ACTOR Future<Void> clusterControllerCore(ClusterControllerFullInterface interf,
 	self.addActor.send(handleForcedRecoveries(&self, interf));
 	self.addActor.send(monitorDataDistributor(&self));
 	self.addActor.send(monitorRatekeeper(&self));
-	self.addActor.send(monitorTSSMapping(&self));
+	// self.addActor.send(monitorTSSMapping(&self));
 	self.addActor.send(dbInfoUpdater(&self));
 	self.addActor.send(traceCounters("ClusterControllerMetrics",
 	                                 self.id,
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index d1469c0d3b1..0fa96678def 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1275,7 +1275,8 @@ ACTOR Future<Void> reply(CommitBatchContext* self) {
 	// self->committedVersion by reporting commit version first before updating self->committedVersion. Otherwise, a
 	// client may get a commit version that the master is not aware of, and next GRV request may get a version less than
 	// self->committedVersion.
-	TEST(pProxyCommitData->committedVersion.get() > self->commitVersion); // A later version was reported committed first
+	TEST(pProxyCommitData->committedVersion.get() >
+	     self->commitVersion); // A later version was reported committed first
 	if (self->commitVersion >= pProxyCommitData->committedVersion.get()) {
 		wait(pProxyCommitData->master.reportLiveCommittedVersion.getReply(
 		    ReportRawCommittedVersionRequest(self->commitVersion,
@@ -1430,11 +1431,25 @@ ACTOR Future<Void> commitBatch(ProxyCommitData* self,
 	return Void();
 }
 
+void maybeAddTssMapping(GetKeyServerLocationsReply& reply,
+                        ProxyCommitData* commitData,
+                        std::unordered_set<UID>& included,
+                        UID ssId) {
+	if (!included.count(ssId)) {
+		auto mappingItr = commitData->tssMapping.find(ssId);
+		if (mappingItr != commitData->tssMapping.end()) {
+			included.insert(ssId);
+			reply.resultsTssMapping.push_back(*mappingItr);
+		}
+	}
+}
+
 ACTOR static Future<Void> doKeyServerLocationRequest(GetKeyServerLocationsRequest req, ProxyCommitData* commitData) {
 	// We can't respond to these requests until we have valid txnStateStore
 	wait(commitData->validState.getFuture());
 	wait(delay(0, TaskPriority::DefaultEndpoint));
 
+	std::unordered_set<UID> tssMappingsIncluded;
 	GetKeyServerLocationsReply rep;
 	if (!req.end.present()) {
 		auto r = req.reverse ? commitData->keyInfo.rangeContainingKeyBefore(req.begin)
@@ -1443,6 +1458,7 @@ ACTOR static Future<Void> doKeyServerLocationRequest(GetKeyServerLocationsReques
 		ssis.reserve(r.value().src_info.size());
 		for (auto& it : r.value().src_info) {
 			ssis.push_back(it->interf);
+			maybeAddTssMapping(rep, commitData, tssMappingsIncluded, it->interf.id());
 		}
 		rep.results.push_back(std::make_pair(r.range(), ssis));
 	} else if (!req.reverse) {
@@ -1454,6 +1470,7 @@ ACTOR static Future<Void> doKeyServerLocationRequest(GetKeyServerLocationsReques
 			ssis.reserve(r.value().src_info.size());
 			for (auto& it : r.value().src_info) {
 				ssis.push_back(it->interf);
+				maybeAddTssMapping(rep, commitData, tssMappingsIncluded, it->interf.id());
 			}
 			rep.results.push_back(std::make_pair(r.range(), ssis));
 			count++;
@@ -1466,6 +1483,7 @@ ACTOR static Future<Void> doKeyServerLocationRequest(GetKeyServerLocationsReques
 			ssis.reserve(r.value().src_info.size());
 			for (auto& it : r.value().src_info) {
 				ssis.push_back(it->interf);
+				maybeAddTssMapping(rep, commitData, tssMappingsIncluded, it->interf.id());
 			}
 			rep.results.push_back(std::make_pair(r.range(), ssis));
 			if (r == commitData->keyInfo.ranges().begin()) {
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 659ce2cbd01..aaaa8943481 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -628,7 +628,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	Reference<ShardsAffectedByTeamFailure> shardsAffectedByTeamFailure;
 	PromiseStream<UID> removedServers;
 	PromiseStream<UID> removedTSS;
-	std::set<UID> recruitingIds; // The IDs of the SS which are being recruited
+	std::set<UID> recruitingIds; // The IDs of the SS/TSS which are being recruited
 	std::set<NetworkAddress> recruitingLocalities;
 	Future<Void> initialFailureReactionDelay;
 	Future<Void> initializationDoneActor;
@@ -4545,6 +4545,7 @@ struct TSSPairState : ReferenceCounted<TSSPairState>, NonCopyable {
 	Promise<Optional<std::pair<UID, Version>>>
 	    ssPairInfo; // if set, for ss to pass its id to tss pair once it is successfully recruited
 	Promise<bool> tssPairDone; // if set, for tss to pass ss that it was successfully recruited
+	Promise<Void> complete;
 
 	Optional<Key> dcId; // dc
 	Optional<Key> dataHallId; // data hall
@@ -4569,6 +4570,9 @@ struct TSSPairState : ReferenceCounted<TSSPairState>, NonCopyable {
 			if (tssPairDone.canBeSet()) {
 				tssPairDone.send(false);
 			}
+			if (complete.canBeSet()) {
+				complete.send(Void());
+			}
 		}
 	}
 
@@ -4604,9 +4608,19 @@ struct TSSPairState : ReferenceCounted<TSSPairState>, NonCopyable {
 		return false;
 	}
 
+	bool markComplete() {
+		if (active && complete.canBeSet()) {
+			complete.send(Void());
+			return true;
+		}
+		return false;
+	}
+
 	Future<Optional<std::pair<UID, Version>>> waitOnSS() { return ssPairInfo.getFuture(); }
 
 	Future<bool> waitOnTSS() { return tssPairDone.getFuture(); }
+
+	Future<Void> waitComplete() { return complete.getFuture(); }
 };
 
 ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
@@ -4742,6 +4756,8 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 					                self->serverTrackerErrorOut,
 					                newServer.get().addedVersion,
 					                ddEnabledState);
+					// signal all done after adding tss to tracking info
+					tssState->markComplete();
 				}
 			} else {
 				TraceEvent(SevWarn, "DDRecruitmentError")
@@ -4756,6 +4772,7 @@ ACTOR Future<Void> initializeStorage(DDTeamCollection* self,
 
 	// SS and/or TSS recruitment failed at this point, update tssState
 	if (recruitTss && tssState->tssRecruitFailed()) {
+		tssState->markComplete();
 		TEST(true); // TSS recruitment failed for some reason
 	}
 	if (!recruitTss && tssState->ssRecruitFailed()) {
@@ -4777,15 +4794,42 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 	state std::map<AddressExclusion, int> numSSPerAddr;
 
 	// tss-specific recruitment state
-	state int32_t tssToRecruit = self->configuration.desiredTSSCount - db->get().client.tssMapping.size();
+	state int32_t targetTSSInDC = 0;
+	state int32_t tssToRecruit = 0;
+	state int inProgressTSSCount = 0;
+	state PromiseStream<Future<Void>> addTSSInProgress;
+	state Future<Void> inProgressTSS =
+	    actorCollection(addTSSInProgress.getFuture(), &inProgressTSSCount, nullptr, nullptr, nullptr);
 	state Reference<TSSPairState> tssState = makeReference<TSSPairState>();
-	state Future<Void> checkKillTss = self->initialFailureReactionDelay;
-	state bool sleepingAfterKillTss = false;
+	state Future<Void> checkTss = self->initialFailureReactionDelay;
+	state bool pendingTSSCheck = false;
 
 	TraceEvent(SevDebug, "TSS_RecruitUpdated", self->distributorId).detail("Count", tssToRecruit);
 
 	loop {
 		try {
+			// Divide TSS evenly in each DC if there are multiple
+			// TODO would it be better to put all of them in primary DC?
+			targetTSSInDC = self->configuration.desiredTSSCount;
+			if (self->configuration.usableRegions > 1) {
+				targetTSSInDC /= self->configuration.usableRegions;
+				if (self->primary) {
+					// put extras in primary DC if it's uneven
+					targetTSSInDC += (self->configuration.desiredTSSCount % self->configuration.usableRegions);
+				}
+			}
+			int newTssToRecruit = targetTSSInDC - self->tss_info_by_pair.size() - inProgressTSSCount;
+			if (newTssToRecruit != tssToRecruit) {
+				TraceEvent("TSS_RecruitUpdated", self->distributorId).detail("Count", newTssToRecruit);
+				tssToRecruit = newTssToRecruit;
+
+				// if we need to get rid of some TSS processes, signal to either cancel recruitment or kill existing TSS
+				// processes
+				if (!pendingTSSCheck && (tssToRecruit < 0 || self->zeroHealthyTeams->get()) &&
+				    (self->isTssRecruiting || (self->zeroHealthyTeams->get() && self->tss_info_by_pair.size() > 0))) {
+					checkTss = self->initialFailureReactionDelay;
+				}
+			}
 			numSSPerAddr.clear();
 			hasHealthyTeam = (self->healthyTeamCount != 0);
 			RecruitStorageRequest rsr;
@@ -4870,7 +4914,9 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						self->isTssRecruiting = true;
 						tssState = makeReference<TSSPairState>(candidateWorker.worker.locality);
 
+						addTSSInProgress.send(tssState->waitComplete());
 						self->addActor.send(initializeStorage(self, candidateWorker, ddEnabledState, true, tssState));
+						checkTss = self->initialFailureReactionDelay;
 					} else {
 						if (tssState->active && tssState->inDataZone(candidateWorker.worker.locality)) {
 							TEST(true); // TSS recruits pair in same dc/datahall
@@ -4883,7 +4929,6 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 							    initializeStorage(self, candidateWorker, ddEnabledState, false, tssState));
 							// successfully started recruitment of pair, reset tss recruitment state
 							tssState = makeReference<TSSPairState>();
-							tssToRecruit--;
 						} else {
 							TEST(tssState->active); // TSS recruitment skipped potential pair because it's in a
 							                        // different dc/datahall
@@ -4892,72 +4937,64 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						}
 					}
 				}
-				when(wait(db->onChange())) { // SOMEDAY: only if clusterInterface or tss changes?
+				when(wait(db->onChange())) { // SOMEDAY: only if clusterInterface changes?
 					fCandidateWorker = Future<RecruitStorageReply>();
-					int newTssToRecruit = self->configuration.desiredTSSCount - db->get().client.tssMapping.size();
-
-					if (newTssToRecruit != tssToRecruit) {
-						TraceEvent("TSS_RecruitUpdated", self->distributorId).detail("Count", newTssToRecruit);
-						tssToRecruit = newTssToRecruit;
-					}
-
-					if (self->isTssRecruiting && (tssToRecruit <= 0 || self->zeroHealthyTeams->get())) {
-						TEST(tssToRecruit <= 0); // tss recruitment cancelled due to too many TSS
-						TEST(self->zeroHealthyTeams->get()); // tss recruitment cancelled due zero healthy teams
-						TraceEvent(SevWarn, "TSS_RecruitCancelled", self->distributorId)
-						    .detail("Reason", tssToRecruit <= 0 ? "ConfigChange" : "ZeroHealthyTeams");
-						tssState->cancel();
-						tssState = makeReference<TSSPairState>();
-						self->isTssRecruiting = false;
-					} else if (!self->isTssRecruiting &&
-					           (tssToRecruit < 0 ||
-					            (self->zeroHealthyTeams->get() && db->get().client.tssMapping.size() > 0))) {
-						if (!sleepingAfterKillTss) {
-							checkKillTss = self->initialFailureReactionDelay;
-						}
-					}
 				}
 				when(wait(self->zeroHealthyTeams->onChange())) {
-					if (self->isTssRecruiting && self->zeroHealthyTeams->get()) {
-						TEST(self->zeroHealthyTeams->get()); // tss recruitment cancelled due zero healthy teams 2
+					if (!pendingTSSCheck && self->zeroHealthyTeams->get() &&
+					    (self->isTssRecruiting || self->tss_info_by_pair.size() > 0)) {
+						checkTss = self->initialFailureReactionDelay;
+					}
+				}
+				when(wait(checkTss)) {
+					bool cancelTss = self->isTssRecruiting && (tssToRecruit < 0 || self->zeroHealthyTeams->get());
+					// Can't kill more tss' than we have. Kill 1 if zero healthy teams, otherwise kill enough to get
+					// back to the desired amount
+					int tssToKill = std::min((int)self->tss_info_by_pair.size(),
+					                         std::max(-tssToRecruit, self->zeroHealthyTeams->get() ? 1 : 0));
+					if (cancelTss) {
+						TEST(tssToRecruit < 0); // tss recruitment cancelled due to too many TSS
+						TEST(self->zeroHealthyTeams->get()); // tss recruitment cancelled due zero healthy teams
+
 						TraceEvent(SevWarn, "TSS_RecruitCancelled", self->distributorId)
-						    .detail("Reason", "ZeroHealthyTeams");
+						    .detail("Reason", tssToRecruit <= 0 ? "TooMany" : "ZeroHealthyTeams");
 						tssState->cancel();
 						tssState = makeReference<TSSPairState>();
 						self->isTssRecruiting = false;
-					} else if (!self->isTssRecruiting && self->zeroHealthyTeams->get() &&
-					           db->get().client.tssMapping.size() > 0) {
-						if (!sleepingAfterKillTss) {
-							checkKillTss = self->initialFailureReactionDelay;
-						}
-					}
-				}
-				when(wait(checkKillTss)) {
-					int tssToKill = std::min((int)db->get().client.tssMapping.size(),
-					                         std::max(-tssToRecruit, self->zeroHealthyTeams->get() ? 1 : 0));
-					if (tssToKill > 0) {
-						for (int i = 0; i < tssToKill; i++) {
-							StorageServerInterface tssi = db->get().client.tssMapping[i].second;
 
-							if (self->shouldHandleServer(tssi) && self->server_and_tss_info.count(tssi.id())) {
-								TraceEvent(SevWarn, "TSS_DDKill", self->distributorId)
-								    .detail("TSSID", tssi.id())
-								    .detail("Reason",
-								            self->zeroHealthyTeams->get() ? "ZeroHealthyTeams" : "ConfigChange");
+						pendingTSSCheck = true;
+						checkTss = delay(SERVER_KNOBS->TSS_DD_CHECK_INTERVAL);
+					} else if (tssToKill > 0) {
+						auto itr = self->tss_info_by_pair.begin();
+						for (int i = 0; i < tssToKill; i++, itr++) {
+							UID tssId = itr->second->id;
+							StorageServerInterface tssi = itr->second->lastKnownInterface;
 
-								Promise<Void> killPromise = self->server_and_tss_info[tssi.id()]->killTss;
+							if (self->shouldHandleServer(tssi) && self->server_and_tss_info.count(tssId)) {
+								Promise<Void> killPromise = itr->second->killTss;
 								if (killPromise.canBeSet()) {
+									TEST(tssToRecruit < 0); // Killing TSS due to too many TSS
+									TEST(self->zeroHealthyTeams->get()); // Killing TSS due zero healthy teams
+									TraceEvent(SevWarn, "TSS_DDKill", self->distributorId)
+									    .detail("TSSID", tssId)
+									    .detail("Reason",
+									            self->zeroHealthyTeams->get() ? "ZeroHealthyTeams" : "TooMany");
 									killPromise.send(Void());
 								}
 							}
 						}
 						// If we're killing a TSS because of zero healthy teams, wait a bit to give the replacing SS a
 						// change to join teams and stuff before killing another TSS
-						sleepingAfterKillTss = true;
-						checkKillTss = delay(SERVER_KNOBS->TSS_DD_KILL_INTERVAL);
+						pendingTSSCheck = true;
+						checkTss = delay(SERVER_KNOBS->TSS_DD_CHECK_INTERVAL);
+					} else if (self->isTssRecruiting) {
+						// check again later in case we need to cancel recruitment
+						pendingTSSCheck = true;
+						checkTss = delay(SERVER_KNOBS->TSS_DD_CHECK_INTERVAL);
+						// FIXME: better way to do this than timer?
 					} else {
-						sleepingAfterKillTss = false;
-						checkKillTss = Never();
+						pendingTSSCheck = false;
+						checkTss = Never();
 					}
 				}
 				when(wait(self->restartRecruiting.onTrigger())) {}
@@ -5622,6 +5659,7 @@ ACTOR Future<Void> dataDistribution(Reference<DataDistributorData> self,
 				if (err.code() != error_code_movekeys_conflict) {
 					throw err;
 				}
+
 				bool ddEnabled = wait(isDataDistributionEnabled(cx, ddEnabledState));
 				TraceEvent("DataDistributionMoveKeysConflict").detail("DataDistributionEnabled", ddEnabled).error(err);
 				if (ddEnabled) {
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index 839803ab416..1a7483fddb1 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -219,7 +219,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( STORAGE_RECRUITMENT_DELAY,                            10.0 );
 	init( TSS_HACK_IDENTITY_MAPPING,                           false ); // THIS SHOULD NEVER BE SET IN PROD. Only for performance testing
 	init( TSS_RECRUITMENT_TIMEOUT,       3*STORAGE_RECRUITMENT_DELAY ); if (randomize && BUGGIFY ) TSS_RECRUITMENT_TIMEOUT = 1.0; // Super low timeout should cause tss recruitments to fail
-	init( TSS_DD_KILL_INTERVAL,                                 60.0 ); if (randomize && BUGGIFY ) TSS_DD_KILL_INTERVAL = 1.0;    // May kill all TSS quickly
+	init( TSS_DD_CHECK_INTERVAL,                                60.0 ); if (randomize && BUGGIFY ) TSS_DD_CHECK_INTERVAL = 1.0;    // May kill all TSS quickly
 	init( DATA_DISTRIBUTION_LOGGING_INTERVAL,                    5.0 );
 	init( DD_ENABLED_CHECK_DELAY,                                1.0 );
 	init( DD_STALL_CHECK_DELAY,                                  0.4 ); //Must be larger than 2*MAX_BUGGIFIED_DELAY
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 0436c4a4dd5..3761e9b3692 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -169,7 +169,7 @@ class ServerKnobs : public Knobs {
 	double STORAGE_RECRUITMENT_DELAY;
 	bool TSS_HACK_IDENTITY_MAPPING;
 	double TSS_RECRUITMENT_TIMEOUT;
-	double TSS_DD_KILL_INTERVAL;
+	double TSS_DD_CHECK_INTERVAL;
 	double DATA_DISTRIBUTION_LOGGING_INTERVAL;
 	double DD_ENABLED_CHECK_DELAY;
 	double DD_STALL_CHECK_DELAY;
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index afd12a81c17..9975a6993e8 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -20,11 +20,11 @@
 
 #include "flow/Util.h"
 #include "fdbrpc/FailureMonitor.h"
-#include "fdbclient/DatabaseContext.h" // for tss mapping
 #include "fdbclient/KeyBackedTypes.h"
 #include "fdbclient/SystemData.h"
 #include "fdbserver/MoveKeys.actor.h"
 #include "fdbserver/Knobs.h"
+#include "fdbserver/TSSMappingUtil.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 using std::max;
@@ -322,6 +322,7 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
                                         MoveKeysLock lock,
                                         FlowLock* startMoveKeysLock,
                                         UID relocationIntervalId,
+                                        std::map<UID, StorageServerInterface>* tssMapping,
                                         const DDEnabledState* ddEnabledState) {
 	state TraceInterval interval("RelocateShard_StartMoveKeys");
 	state Future<Void> warningLogger = logWarningAfter("StartMoveKeysTooLong", 600, servers);
@@ -329,6 +330,7 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 
 	wait(startMoveKeysLock->take(TaskPriority::DataDistributionLaunch));
 	state FlowLock::Releaser releaser(*startMoveKeysLock);
+	state bool loadedTssMapping = false;
 
 	TraceEvent(SevDebug, interval.begin(), relocationIntervalId);
 
@@ -365,6 +367,12 @@ ACTOR static Future<Void> startMoveKeys(Database occ,
 
 					wait(checkMoveKeysLock(&(tr->getTransaction()), lock, ddEnabledState));
 
+					if (!loadedTssMapping) {
+						// share transaction for loading tss mapping with the rest of start move keys
+						wait(readTSSMappingRYW(tr, tssMapping));
+						loadedTssMapping = true;
+					}
+
 					vector<Future<Optional<Value>>> serverListEntries;
 					serverListEntries.reserve(servers.size());
 					for (int s = 0; s < servers.size(); s++)
@@ -547,7 +555,8 @@ ACTOR Future<Void> checkFetchingState(Database cx,
                                       vector<UID> dest,
                                       KeyRange keys,
                                       Promise<Void> dataMovementComplete,
-                                      UID relocationIntervalId) {
+                                      UID relocationIntervalId,
+                                      std::map<UID, StorageServerInterface> tssMapping) {
 	state Transaction tr(cx);
 
 	loop {
@@ -565,7 +574,6 @@ ACTOR Future<Void> checkFetchingState(Database cx,
 			state vector<Optional<Value>> serverListValues = wait(getAll(serverListEntries));
 			vector<Future<Void>> requests;
 			state vector<Future<Void>> tssRequests;
-			ClientDBInfo clientInfo = cx->clientInfo->get();
 			for (int s = 0; s < serverListValues.size(); s++) {
 				if (!serverListValues[s].present()) {
 					// FIXME: Is this the right behavior?  dataMovementComplete will never be sent!
@@ -577,10 +585,10 @@ ACTOR Future<Void> checkFetchingState(Database cx,
 				requests.push_back(
 				    waitForShardReady(si, keys, tr.getReadVersion().get(), GetShardStateRequest::FETCHING));
 
-				Optional<StorageServerInterface> tssPair = clientInfo.getTssPair(si.id());
-				if (tssPair.present()) {
+				auto tssPair = tssMapping.find(si.id());
+				if (tssPair != tssMapping.end()) {
 					tssRequests.push_back(waitForShardReady(
-					    tssPair.get(), keys, tr.getReadVersion().get(), GetShardStateRequest::FETCHING));
+					    tssPair->second, keys, tr.getReadVersion().get(), GetShardStateRequest::FETCHING));
 				}
 			}
 
@@ -617,6 +625,7 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
                                          FlowLock* finishMoveKeysParallelismLock,
                                          bool hasRemote,
                                          UID relocationIntervalId,
+                                         std::map<UID, StorageServerInterface> tssMapping,
                                          const DDEnabledState* ddEnabledState) {
 	state TraceInterval interval("RelocateShard_FinishMoveKeys");
 	state TraceInterval waitInterval("");
@@ -626,9 +635,7 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 	state int retries = 0;
 	state FlowLock::Releaser releaser;
 
-	// for killing tss if any get stuck during movekeys
-	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
-	state std::vector<StorageServerInterface> tssToKill;
+	state std::vector<std::pair<UID, UID>> tssToKill;
 	state std::unordered_set<UID> tssToIgnore;
 	// try waiting for tss for a 2 loops, give up if they're stuck to not affect the rest of the cluster
 	state int waitForTSSCounter = 2;
@@ -658,33 +665,13 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 						// (and don't want to add bugs) by changing whole method to RYW. Also, using a different
 						// transaction makes it commit earlier which we may need to guarantee causality of tss getting
 						// removed before client sends a request to this key range on the new SS
-						state Reference<ReadYourWritesTransaction> tssTr =
-						    makeReference<ReadYourWritesTransaction>(occ);
-						loop {
-							try {
-								tssTr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
-								tssTr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-								for (auto& tss : tssToKill) {
-									// DO NOT remove server list key - that'll break a bunch of stuff. DD will
-									// eventually call removeStorageServer
-
-									tssTr->clear(serverTagKeyFor(tss.id()));
-									tssMapDB.erase(tssTr, tss.tssPairID.get());
-								}
-								tssTr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
-								wait(tssTr->commit());
-
-								for (auto& tss : tssToKill) {
-									TraceEvent(SevWarnAlways, "TSS_KillMoveKeys").detail("TSSID", tss.id().toString());
-									tssToIgnore.insert(tss.id());
-								}
-								tssToKill.clear();
+						wait(removeTSSPairsFromCluster(occ, tssToKill));
 
-								break;
-							} catch (Error& e) {
-								wait(tssTr->onError(e));
-							}
+						for (auto& tssPair : tssToKill) {
+							TraceEvent(SevWarnAlways, "TSS_KillMoveKeys").detail("TSSID", tssPair.second);
+							tssToIgnore.insert(tssPair.second);
 						}
+						tssToKill.clear();
 					}
 
 					tr.info.taskID = TaskPriority::MoveKeys;
@@ -861,9 +848,6 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 
 					// update client info in case tss mapping changed or server got updated
 
-					// Use most up to date version of tss mapping
-					ClientDBInfo clientInfo = occ->clientInfo->get();
-
 					// Wait for new destination servers to fetch the keys
 
 					serverReady.reserve(storageServerInterfaces.size());
@@ -875,13 +859,13 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 						                                        tr.getReadVersion().get(),
 						                                        GetShardStateRequest::READABLE));
 
-						Optional<StorageServerInterface> tssPair =
-						    clientInfo.getTssPair(storageServerInterfaces[s].id());
+						auto tssPair = tssMapping.find(storageServerInterfaces[s].id());
 
-						if (tssPair.present() && waitForTSSCounter > 0 && !tssToIgnore.count(tssPair.get().id())) {
-							tssReadyInterfs.push_back(tssPair.get());
+						if (tssPair != tssMapping.end() && waitForTSSCounter > 0 &&
+						    !tssToIgnore.count(tssPair->second.id())) {
+							tssReadyInterfs.push_back(tssPair->second);
 							tssReady.push_back(waitForShardReady(
-							    tssPair.get(), keys, tr.getReadVersion().get(), GetShardStateRequest::READABLE));
+							    tssPair->second, keys, tr.getReadVersion().get(), GetShardStateRequest::READABLE));
 						}
 					}
 
@@ -918,7 +902,8 @@ ACTOR static Future<Void> finishMoveKeys(Database occ,
 							if (anyTssNotDone && waitForTSSCounter == 0) {
 								for (int i = 0; i < tssReady.size(); i++) {
 									if (!tssReady[i].isReady() || tssReady[i].isError()) {
-										tssToKill.push_back(tssReadyInterfs[i]);
+										tssToKill.push_back(
+										    std::pair(tssReadyInterfs[i].tssPairID.get(), tssReadyInterfs[i].id()));
 									}
 								}
 								// repeat loop and go back to start to kill tss' before continuing on
@@ -1080,7 +1065,6 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 				}
 
 				tssMapDB.set(tr, server.tssPairID.get(), server.id());
-				tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 
 			} else {
 				int8_t maxTagLocality = 0;
@@ -1143,7 +1127,6 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 					// THIS SHOULD NEVER BE ENABLED IN ANY NON-TESTING ENVIRONMENT
 					TraceEvent(SevError, "TSSIdentityMappingEnabled");
 					tssMapDB.set(tr, server.id(), server.id());
-					tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 				}
 			}
 
@@ -1269,10 +1252,8 @@ ACTOR Future<Void> removeStorageServer(Database cx,
 					// THIS SHOULD NEVER BE ENABLED IN ANY NON-TESTING ENVIRONMENT
 					TraceEvent(SevError, "TSSIdentityMappingEnabled");
 					tssMapDB.erase(tr, serverID);
-					tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 				} else if (tssPairID.present()) {
 					tssMapDB.erase(tr, tssPairID.get());
-					tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 				}
 
 				retry = true;
@@ -1374,11 +1355,20 @@ ACTOR Future<Void> moveKeys(Database cx,
                             const DDEnabledState* ddEnabledState) {
 	ASSERT(destinationTeam.size());
 	std::sort(destinationTeam.begin(), destinationTeam.end());
-	wait(startMoveKeys(
-	    cx, keys, destinationTeam, lock, startMoveKeysParallelismLock, relocationIntervalId, ddEnabledState));
+
+	state std::map<UID, StorageServerInterface> tssMapping;
+
+	wait(startMoveKeys(cx,
+	                   keys,
+	                   destinationTeam,
+	                   lock,
+	                   startMoveKeysParallelismLock,
+	                   relocationIntervalId,
+	                   &tssMapping,
+	                   ddEnabledState));
 
 	state Future<Void> completionSignaller =
-	    checkFetchingState(cx, healthyDestinations, keys, dataMovementComplete, relocationIntervalId);
+	    checkFetchingState(cx, healthyDestinations, keys, dataMovementComplete, relocationIntervalId, tssMapping);
 
 	wait(finishMoveKeys(cx,
 	                    keys,
@@ -1387,6 +1377,7 @@ ACTOR Future<Void> moveKeys(Database cx,
 	                    finishMoveKeysParallelismLock,
 	                    hasRemote,
 	                    relocationIntervalId,
+	                    tssMapping,
 	                    ddEnabledState));
 
 	// This is defensive, but make sure that we always say that the movement is complete before moveKeys completes
@@ -1428,8 +1419,6 @@ void seedShardServers(Arena& arena, CommitTransactionRef& tr, vector<StorageServ
 			// hack key-backed map here since we can't really change CommitTransactionRef to a RYW transaction
 			Key uidRef = Codec<UID>::pack(s.id()).pack();
 			tr.set(arena, uidRef.withPrefix(tssMappingKeys.begin), uidRef);
-			// tssMapDB.set(tr, server.id(), server.id());
-			tr.set(arena, tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 		}
 	}
 
diff --git a/fdbserver/ProxyCommitData.actor.h b/fdbserver/ProxyCommitData.actor.h
index 752fde14a33..9ef0f837787 100644
--- a/fdbserver/ProxyCommitData.actor.h
+++ b/fdbserver/ProxyCommitData.actor.h
@@ -158,6 +158,7 @@ struct ProxyCommitData {
 	EventMetricHandle<SingleKeyMutation> singleKeyMutationEvent;
 
 	std::map<UID, Reference<StorageInfo>> storageCache;
+	std::unordered_map<UID, StorageServerInterface> tssMapping;
 	std::map<Tag, Version> tag_popped;
 	Deque<std::pair<Version, Version>> txsPopVersions;
 	Version lastTxsPop;
diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index 223393bcdde..9bb55388b72 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -308,9 +308,13 @@ ACTOR Future<int64_t> getMaxStorageServerQueueSize(Database cx, Reference<AsyncV
 			    .detail("SS", servers[i].id());
 			throw attribute_not_found();
 		}
-		messages.push_back(timeoutError(itr->second.eventLogRequest.getReply(
-		                                    EventLogRequest(StringRef(servers[i].id().toString() + "/StorageMetrics"))),
-		                                1.0));
+		// Ignore TSS in add delay mode since it can purposefully freeze forever
+		if (!servers[i].isTss() || !g_network->isSimulated() ||
+		    g_simulator.tssMode != ISimulator::TSSMode::EnabledAddDelay) {
+			messages.push_back(timeoutError(itr->second.eventLogRequest.getReply(EventLogRequest(
+			                                    StringRef(servers[i].id().toString() + "/StorageMetrics"))),
+			                                1.0));
+		}
 	}
 
 	wait(waitForAll(messages));
diff --git a/fdbserver/TSSMappingUtil.actor.cpp b/fdbserver/TSSMappingUtil.actor.cpp
new file mode 100644
index 00000000000..b0ca848536b
--- /dev/null
+++ b/fdbserver/TSSMappingUtil.actor.cpp
@@ -0,0 +1,88 @@
+/*
+ * TSSMappingUtil.actor.cpp
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "fdbclient/SystemData.h"
+#include "fdbclient/KeyBackedTypes.h"
+#include "fdbserver/TSSMappingUtil.h"
+#include "flow/actorcompiler.h" // This must be the last #include.
+
+// TODO should I just change back to not use KeyBackedMap at this point?
+
+/*ACTOR Future<std::map<UID, StorageServerInterface>> readTSSMapping(Database cx) {
+    state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);    
+    loop {
+        try {
+            state std::map<UID, StorageServerInterface> mapping;
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+            readTSSMappingRYW(tr, &mapping);
+			return mapping;
+		} catch (Error& e) {
+			wait(tr->onError(e));
+		}
+    }
+}*/
+
+ACTOR Future<Void> readTSSMappingRYW(Reference<ReadYourWritesTransaction> tr, std::map<UID, StorageServerInterface>* tssMapping) {
+    KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+    state std::vector<std::pair<UID, UID>> uidMapping = wait(tssMapDB.getRange(tr, UID(), Optional<UID>(), CLIENT_KNOBS->TOO_MANY));
+    ASSERT(uidMapping.size() < CLIENT_KNOBS->TOO_MANY);
+
+    state std::map<UID, StorageServerInterface> mapping;
+    for (auto& it : uidMapping) {
+        state UID ssId = it.first;
+        Optional<Value> v = wait(tr->get(serverListKeyFor(it.second)));
+        (*tssMapping)[ssId] = decodeServerListValue(v.get());
+    }
+    return Void();
+}
+
+ACTOR Future<Void> readTSSMapping(Transaction* tr, std::map<UID, StorageServerInterface>* tssMapping) {
+    state RangeResult mappingList = wait(tr->getRange(tssMappingKeys, CLIENT_KNOBS->TOO_MANY));
+    ASSERT(!mappingList.more && mappingList.size() < CLIENT_KNOBS->TOO_MANY);
+
+    for (auto& it : mappingList) {
+        state UID ssId = Codec<UID>::unpack(Tuple::unpack(it.key.removePrefix(tssMappingKeys.begin)));
+        UID tssId = Codec<UID>::unpack(Tuple::unpack(it.value));
+        Optional<Value> v = wait(tr->get(serverListKeyFor(tssId)));
+        (*tssMapping)[ssId] = decodeServerListValue(v.get());
+    }
+    return Void();
+}
+
+ACTOR Future<Void> removeTSSPairsFromCluster(Database cx, vector<std::pair<UID, UID>> pairsToRemove) {
+    state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);
+    state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+    loop {
+        try {
+            tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+            tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+            for (auto& tssPair : pairsToRemove) {
+                // DO NOT remove server list key - that'll break a bunch of stuff. DD will eventually call removeStorageServer
+                tr->clear(serverTagKeyFor(tssPair.second));
+                tssMapDB.erase(tr, tssPair.first);
+            }
+            wait(tr->commit());
+            break;
+        } catch (Error& e) {
+            wait(tr->onError(e));
+        }
+    }
+    return Void();
+}
\ No newline at end of file
diff --git a/fdbserver/TSSMappingUtil.h b/fdbserver/TSSMappingUtil.h
new file mode 100644
index 00000000000..963270156d5
--- /dev/null
+++ b/fdbserver/TSSMappingUtil.h
@@ -0,0 +1,36 @@
+/*
+ * TSSMappingUtil.h
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef TSS_MAPPING_UTIL_SERVER_H
+#define TSS_MAPPING_UTIL_SERVER_H
+#pragma once
+
+#include "fdbclient/StorageServerInterface.h"
+
+// TODO unused
+// Future<std::map<UID, StorageServerInterface>> readTSSMapping(Database cx);
+
+Future<Void> readTSSMappingRYW(Reference<ReadYourWritesTransaction> const& tr, std::map<UID, StorageServerInterface>* const& tssMapping);
+
+Future<Void> readTSSMapping(Transaction* const& tr, std::map<UID, StorageServerInterface>* const& tssMapping);
+
+Future<Void> removeTSSPairsFromCluster(Database const& cx, vector<std::pair<UID, UID>> const& pairsToRemove);
+
+#endif
\ No newline at end of file
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 3931c58be9d..167a814fbcb 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -719,9 +719,9 @@ struct StorageServer {
 		    fetchExecutingMS("FetchExecutingMS", cc), fetchExecutingCount("FetchExecutingCount", cc),
 		    readsRejected("ReadsRejected", cc), fetchedVersions("FetchedVersions", cc),
 		    fetchesFromLogs("FetchesFromLogs", cc), readLatencySample("ReadLatencyMetrics",
-                                                                      self->thisServerID,
-                                                                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-                                                                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		                                                              self->thisServerID,
+		                                                              SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                                                              SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
 			specialCounter(cc, "LastTLogVersion", [self]() { return self->lastTLogVersion; });
 			specialCounter(cc, "Version", [self]() { return self->version.get(); });
@@ -3254,6 +3254,10 @@ class StorageUpdater {
 			    (m.type == MutationRef::ClearRange && (matchesThisServer || (data->isTss() && matchesTssPair)))) {
 				throw worker_removed();
 			}
+			if (!data->isTss() && m.type == MutationRef::ClearRange && data->ssPairID.present() &&
+			    serverTagKey == data->ssPairID.get()) {
+				data->clearSSWithTssPair();
+			}
 		} else if (m.type == MutationRef::SetValue && m.param1 == rebootWhenDurablePrivateKey) {
 			data->rebootAfterDurableVersion = currentVersion;
 			TraceEvent("RebootWhenDurableSet", data->thisServerID)
@@ -3263,6 +3267,13 @@ class StorageUpdater {
 			data->primaryLocality = BinaryReader::fromStringRef<int8_t>(m.param2, Unversioned());
 			auto& mLV = data->addVersionToMutationLog(data->data().getLatestVersion());
 			data->addMutationToMutationLog(mLV, MutationRef(MutationRef::SetValue, persistPrimaryLocality, m.param2));
+		} else if (m.type == MutationRef::SetValue && m.param1.substr(1).startsWith(tssMappingKeys.begin)) {
+			if (!data->isTss()) {
+				UID ssId = Codec<UID>::unpack(Tuple::unpack(m.param1.substr(1).removePrefix(tssMappingKeys.begin)));
+				UID tssId = Codec<UID>::unpack(Tuple::unpack(m.param2));
+				ASSERT(ssId == data->thisServerID);
+				data->setSSWithTssPair(tssId);
+			}
 		} else {
 			ASSERT(false); // Unknown private mutation
 		}
@@ -3588,8 +3599,9 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 				data->sourceTLogID = curSourceTLogID;
 
 				TraceEvent("StorageServerSourceTLogID", data->thisServerID)
-					.detail("SourceTLogID", data->sourceTLogID.present() ? data->sourceTLogID.get().toString() : "unknown")
-					.trackLatest(data->thisServerID.toString() + "/StorageServerSourceTLogID");
+				    .detail("SourceTLogID",
+				            data->sourceTLogID.present() ? data->sourceTLogID.get().toString() : "unknown")
+				    .trackLatest(data->thisServerID.toString() + "/StorageServerSourceTLogID");
 			}
 
 			data->noRecentUpdates.set(false);
@@ -4678,18 +4690,6 @@ ACTOR Future<Void> storageServerCore(StorageServer* self, StorageServerInterface
 						}
 					}
 				}
-				// SS monitors tss mapping here to see if it has a tss pair.
-				// This information is only used for ss/tss pair metrics reporting so it's ok to be eventually
-				// consistent.
-				if (!self->isTss()) {
-					ClientDBInfo clientInfo = self->db->get().client;
-					Optional<StorageServerInterface> myTssPair = clientInfo.getTssPair(self->thisServerID);
-					if (myTssPair.present()) {
-						self->setSSWithTssPair(myTssPair.get().id());
-					} else {
-						self->clearSSWithTssPair();
-					}
-				}
 			}
 			when(GetShardStateRequest req = waitNext(ssi.getShardState.getFuture())) {
 				if (req.mode == GetShardStateRequest::NO_WAIT) {
@@ -4831,6 +4831,7 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 		rep.addedVersion = self.version.get();
 		recruitReply.send(rep);
 		self.byteSampleRecovery = Void();
+
 		wait(storageServerCore(&self, ssi));
 
 		throw internal_error();
@@ -4964,9 +4965,7 @@ ACTOR Future<Void> replaceTSSInterface(StorageServer* self, StorageServerInterfa
 			tr->set(serverListKeyFor(ssi.id()), serverListValue(ssi));
 
 			// add itself back to tss mapping
-			// tr->set(tssMappingKeyFor(self->tssPairID.get()), tssMappingValueFor(ssi.id()));
 			tssMapDB.set(tr, self->tssPairID.get(), ssi.id());
-			tr->set(tssMappingChangeKey, deterministicRandom()->randomUniqueID().toString());
 
 			wait(tr->commit());
 			self->tag = myTag;
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 459501198ec..799c5368b01 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -32,6 +32,7 @@
 #include "fdbserver/StorageMetrics.h"
 #include "fdbserver/DataDistribution.actor.h"
 #include "fdbserver/QuietDatabase.h"
+#include "fdbserver/TSSMappingUtil.h"
 #include "flow/DeterministicRandom.h"
 #include "fdbclient/ManagementAPI.actor.h"
 #include "fdbclient/StorageServerInterface.h"
@@ -209,11 +210,16 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		if (self->firstClient || self->distributed) {
 			try {
 				state DatabaseConfiguration configuration;
+				state std::map<UID, StorageServerInterface> tssMapping;
 
 				state Transaction tr(cx);
 				tr.setOption(FDBTransactionOptions::LOCK_AWARE);
 				loop {
 					try {
+						if (self->performTSSCheck) {
+							tssMapping.clear();
+							wait(readTSSMapping(&tr, &tssMapping));
+						}
 						RangeResult res = wait(tr.getRange(configKeys, 1000));
 						if (res.size() == 1000) {
 							TraceEvent("ConsistencyCheck_TooManyConfigOptions");
@@ -286,7 +292,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 							throw;
 					}
 
-					wait(::success(self->checkForStorage(cx, configuration, self)));
+					wait(::success(self->checkForStorage(cx, configuration, tssMapping, self)));
 					wait(::success(self->checkForExtraDataStores(cx, self)));
 
 					// Check that each machine is operating as its desired class
@@ -317,7 +323,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 						state Standalone<VectorRef<KeyValueRef>> keyLocations = keyLocationPromise.getFuture().get();
 
 						// Check that each shard has the same data on all storage servers that it resides on
-						wait(::success(self->checkDataConsistency(cx, keyLocations, configuration, self)));
+						wait(::success(self->checkDataConsistency(cx, keyLocations, configuration, tssMapping, self)));
 
 						// Cache consistency check
 						if (self->performCacheCheck)
@@ -1124,6 +1130,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 	ACTOR Future<bool> checkDataConsistency(Database cx,
 	                                        VectorRef<KeyValueRef> keyLocations,
 	                                        DatabaseConfiguration configuration,
+	                                        std::map<UID, StorageServerInterface> tssMapping,
 	                                        ConsistencyCheckWorkload* self) {
 		// Stores the total number of bytes on each storage server
 		// In a distributed test, this will be an estimated size
@@ -1250,10 +1257,11 @@ struct ConsistencyCheckWorkload : TestWorkload {
 			if (!isRelocating && self->performTSSCheck) {
 				int initialSize = storageServers.size();
 				for (int i = 0; i < initialSize; i++) {
-					Optional<StorageServerInterface> tssPair = cx->clientInfo->get().getTssPair(storageServers[i]);
-					if (tssPair.present()) {
-						storageServers.push_back(tssPair.get().id());
-						storageServerInterfaces.push_back(tssPair.get());
+					auto tssPair = tssMapping.find(storageServers[i]);
+					if (tssPair != tssMapping.end()) {
+						TEST(true); // TSS checked in consistency check
+						storageServers.push_back(tssPair->second.id());
+						storageServerInterfaces.push_back(tssPair->second);
 					}
 				}
 			}
@@ -1491,7 +1499,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 
 								// All shards should be available in quiscence
 								if (self->performQuiescentChecks &&
-								    (g_network->isSimulated() || !storageServerInterfaces[j].isTss())) {
+								    ((g_network->isSimulated() &&
+								      g_simulator.tssMode != ISimulator::TSSMode::EnabledAddDelay) ||
+								     !storageServerInterfaces[j].isTss())) {
 									self->testFailure("Storage server unavailable");
 									return false;
 								}
@@ -1746,6 +1756,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 	// Returns false if any worker that should have a storage server does not have one
 	ACTOR Future<bool> checkForStorage(Database cx,
 	                                   DatabaseConfiguration configuration,
+	                                   std::map<UID, StorageServerInterface> tssMapping,
 	                                   ConsistencyCheckWorkload* self) {
 		state vector<WorkerDetails> workers = wait(getWorkers(self->dbInfo));
 		state vector<StorageServerInterface> storageServers = wait(getStorageServers(cx));
@@ -1786,8 +1797,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		    (configuration.regions.size() == 2 && configuration.usableRegions > 1 && (missingDc0 || missingDc1))) {
 
 			// TODO could improve this check by also ensuring DD is currently recruiting a TSS by using quietdb?
-			bool couldExpectMissingTss =
-			    (configuration.desiredTSSCount - self->dbInfo->get().client.tssMapping.size()) > 0;
+			bool couldExpectMissingTss = (configuration.desiredTSSCount - tssMapping.size()) > 0;
 
 			int countMissing = missingStorage.size();
 			int acceptableTssMissing = 1;

From 9d89a90d951e08a43cc87c8288a95180e499dc19 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Thu, 3 Jun 2021 15:31:16 +0000
Subject: [PATCH 236/740] Addressing review comments

---
 fdbclient/DatabaseContext.h                   |  5 ++
 fdbrpc/QueueModel.h                           |  7 ++-
 fdbserver/CMakeLists.txt                      |  2 +-
 fdbserver/CommitProxyServer.actor.cpp         |  1 +
 fdbserver/MoveKeys.actor.cpp                  |  2 +-
 fdbserver/TSSMappingUtil.actor.cpp            | 20 +-------
 fdbserver/TSSMappingUtil.actor.h              | 48 +++++++++++++++++++
 fdbserver/TSSMappingUtil.h                    | 36 --------------
 .../workloads/ConsistencyCheck.actor.cpp      |  2 +-
 9 files changed, 65 insertions(+), 58 deletions(-)
 create mode 100644 fdbserver/TSSMappingUtil.actor.h
 delete mode 100644 fdbserver/TSSMappingUtil.h

diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index de41f9d46f7..52c1945f8e6 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -428,7 +428,12 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	static const std::vector<std::string> debugTransactionTagChoices;
 	std::unordered_map<KeyRef, Reference<WatchMetadata>> watchMap;
 
+        // Adds or updates the specified (SS, TSS) pair in the TSS mapping (if not already present).
+        // Requests to the storage server will be duplicated to the TSS.
 	void addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi);
+
+        // Removes the storage server and its TSS pair from the TSS mapping (if present).
+        // Requests to the storage server will no longer be duplicated to its pair TSS.
 	void removeTssMapping(StorageServerInterface const& ssi);
 };
 
diff --git a/fdbrpc/QueueModel.h b/fdbrpc/QueueModel.h
index f0b3d5f8678..84ec5c5afe2 100644
--- a/fdbrpc/QueueModel.h
+++ b/fdbrpc/QueueModel.h
@@ -109,8 +109,13 @@ class QueueModel {
 	int laggingRequestCount;
 	int laggingTSSCompareCount;
 
+        // Updates this endpoint data to duplicate requests to the specified TSS endpoint
 	void updateTssEndpoint(uint64_t endpointId, const TSSEndpointData& endpointData);
+
+        // Removes the TSS mapping from this endpoint to stop duplicating requests to a TSS endpoint
 	void removeTssEndpoint(uint64_t endpointId);
+
+        // Retrieves the data for this endpoint's pair TSS endpoint, if present
 	Optional<TSSEndpointData> getTssData(uint64_t endpointId);
 
 	QueueModel() : secondMultiplier(1.0), secondBudget(0), laggingRequestCount(0) {
@@ -147,4 +152,4 @@ class QueueModel {
 };
 */
 
-#endif
\ No newline at end of file
+#endif
diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index 267d67d2d9e..9220dfed5bc 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -103,7 +103,7 @@ set(FDBSERVER_SRCS
   TesterInterface.actor.h
   TLogInterface.h
   TLogServer.actor.cpp
-  TSSMappingUtil.h
+  TSSMappingUtil.actor.h
   TSSMappingUtil.actor.cpp
   VersionedBTree.actor.cpp
   VFSAsync.h
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 0fa96678def..1a46fb055f9 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1431,6 +1431,7 @@ ACTOR Future<Void> commitBatch(ProxyCommitData* self,
 	return Void();
 }
 
+// Add tss mapping data to the reply, if any of the included storage servers have a TSS pair
 void maybeAddTssMapping(GetKeyServerLocationsReply& reply,
                         ProxyCommitData* commitData,
                         std::unordered_set<UID>& included,
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index 9975a6993e8..59e1c13261c 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -24,7 +24,7 @@
 #include "fdbclient/SystemData.h"
 #include "fdbserver/MoveKeys.actor.h"
 #include "fdbserver/Knobs.h"
-#include "fdbserver/TSSMappingUtil.h"
+#include "fdbserver/TSSMappingUtil.actor.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 using std::max;
diff --git a/fdbserver/TSSMappingUtil.actor.cpp b/fdbserver/TSSMappingUtil.actor.cpp
index b0ca848536b..e34611ce261 100644
--- a/fdbserver/TSSMappingUtil.actor.cpp
+++ b/fdbserver/TSSMappingUtil.actor.cpp
@@ -20,25 +20,9 @@
 
 #include "fdbclient/SystemData.h"
 #include "fdbclient/KeyBackedTypes.h"
-#include "fdbserver/TSSMappingUtil.h"
+#include "fdbserver/TSSMappingUtil.actor.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
-// TODO should I just change back to not use KeyBackedMap at this point?
-
-/*ACTOR Future<std::map<UID, StorageServerInterface>> readTSSMapping(Database cx) {
-    state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);    
-    loop {
-        try {
-            state std::map<UID, StorageServerInterface> mapping;
-			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-            readTSSMappingRYW(tr, &mapping);
-			return mapping;
-		} catch (Error& e) {
-			wait(tr->onError(e));
-		}
-    }
-}*/
-
 ACTOR Future<Void> readTSSMappingRYW(Reference<ReadYourWritesTransaction> tr, std::map<UID, StorageServerInterface>* tssMapping) {
     KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
     state std::vector<std::pair<UID, UID>> uidMapping = wait(tssMapDB.getRange(tr, UID(), Optional<UID>(), CLIENT_KNOBS->TOO_MANY));
@@ -85,4 +69,4 @@ ACTOR Future<Void> removeTSSPairsFromCluster(Database cx, vector<std::pair<UID,
         }
     }
     return Void();
-}
\ No newline at end of file
+}
diff --git a/fdbserver/TSSMappingUtil.actor.h b/fdbserver/TSSMappingUtil.actor.h
new file mode 100644
index 00000000000..78bbbdae3a6
--- /dev/null
+++ b/fdbserver/TSSMappingUtil.actor.h
@@ -0,0 +1,48 @@
+/*
+ * TSSMappingUtil.actor.h
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+// When actually compiled (NO_INTELLISENSE), include the generated version of this file.  In intellisense use the source
+// version.
+#if defined(NO_INTELLISENSE) && !defined(TSS_MAPPING_UTIL_SERVER_G_H)
+#define TSS_MAPPING_UTIL_SERVER_G_H
+#include "fdbserver/TSSMappingUtil.actor.g.h"
+#elif !defined(TSS_MAPPING_UTIL_SERVER_H)
+#define TSS_MAPPING_UTIL_SERVER_H
+
+#include "fdbclient/StorageServerInterface.h"
+#include "flow/actorcompiler.h" // This must be the last #include.
+
+/*
+ * Collection of utility functions for dealing with the TSS mapping
+ */
+
+// Reads the current cluster TSS mapping as part of the RYW transaction
+ACTOR Future<Void> readTSSMappingRYW(Reference<ReadYourWritesTransaction> tr, std::map<UID, StorageServerInterface>* tssMapping);
+
+// Reads the current cluster TSS mapping as part of the given Transaction
+ACTOR Future<Void> readTSSMapping(Transaction* tr, std::map<UID, StorageServerInterface>* tssMapping);
+
+// Removes the TSS pairs from the cluster
+ACTOR Future<Void> removeTSSPairsFromCluster(Database cx, vector<std::pair<UID, UID>> pairsToRemove);
+
+#include "flow/unactorcompiler.h"
+#endif
diff --git a/fdbserver/TSSMappingUtil.h b/fdbserver/TSSMappingUtil.h
deleted file mode 100644
index 963270156d5..00000000000
--- a/fdbserver/TSSMappingUtil.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * TSSMappingUtil.h
- *
- * This source file is part of the FoundationDB open source project
- *
- * Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TSS_MAPPING_UTIL_SERVER_H
-#define TSS_MAPPING_UTIL_SERVER_H
-#pragma once
-
-#include "fdbclient/StorageServerInterface.h"
-
-// TODO unused
-// Future<std::map<UID, StorageServerInterface>> readTSSMapping(Database cx);
-
-Future<Void> readTSSMappingRYW(Reference<ReadYourWritesTransaction> const& tr, std::map<UID, StorageServerInterface>* const& tssMapping);
-
-Future<Void> readTSSMapping(Transaction* const& tr, std::map<UID, StorageServerInterface>* const& tssMapping);
-
-Future<Void> removeTSSPairsFromCluster(Database const& cx, vector<std::pair<UID, UID>> const& pairsToRemove);
-
-#endif
\ No newline at end of file
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 799c5368b01..ab20b3041d7 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -32,7 +32,7 @@
 #include "fdbserver/StorageMetrics.h"
 #include "fdbserver/DataDistribution.actor.h"
 #include "fdbserver/QuietDatabase.h"
-#include "fdbserver/TSSMappingUtil.h"
+#include "fdbserver/TSSMappingUtil.actor.h"
 #include "flow/DeterministicRandom.h"
 #include "fdbclient/ManagementAPI.actor.h"
 #include "fdbclient/StorageServerInterface.h"

From 483c429b7c15706a02cea6481885fe27c25b7590 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Thu, 3 Jun 2021 15:56:21 +0000
Subject: [PATCH 237/740] Fixing valgrind error in TSS StorageServerInterface
 unit test

---
 fdbclient/StorageServerInterface.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fdbclient/StorageServerInterface.cpp b/fdbclient/StorageServerInterface.cpp
index fe5ef4aaebd..79f2e2bc4b7 100644
--- a/fdbclient/StorageServerInterface.cpp
+++ b/fdbclient/StorageServerInterface.cpp
@@ -263,6 +263,8 @@ TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 	gkvReq.begin = firstGreaterOrEqual(StringRef(a, s_a));
 	gkvReq.end = firstGreaterOrEqual(StringRef(a, s_b));
 	gkvReq.version = 5;
+	gkvReq.limit = 100;
+	gkvReq.limitBytes = 1000;
 
 	GetKeyValuesReply gkvReplyEmpty;
 	GetKeyValuesReply gkvReplyOne;

From 2e46bc528918addd19add640c270c4ff82fc2c72 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Wed, 2 Jun 2021 22:23:29 +0000
Subject: [PATCH 238/740] Added TSS documentation

---
 .../sphinx/source/command-line-interface.rst  |   9 +-
 documentation/sphinx/source/operations.rst    |   3 +
 documentation/sphinx/source/tss.rst           | 115 ++++++++++++++++++
 fdbcli/fdbcli.actor.cpp                       |   3 +-
 4 files changed, 128 insertions(+), 2 deletions(-)
 create mode 100644 documentation/sphinx/source/tss.rst

diff --git a/documentation/sphinx/source/command-line-interface.rst b/documentation/sphinx/source/command-line-interface.rst
index 036ee0e059f..3811e16a3b4 100644
--- a/documentation/sphinx/source/command-line-interface.rst
+++ b/documentation/sphinx/source/command-line-interface.rst
@@ -64,10 +64,12 @@ The ``commit`` command commits the current transaction. Any sets or clears execu
 configure
 ---------
 
-The ``configure`` command changes the database configuration. Its syntax is ``configure [new] [single|double|triple|three_data_hall|three_datacenter] [ssd|memory] [grv_proxies=<N>] [commit_proxies=<N>] [resolvers=<N>] [logs=<N>]``.
+The ``configure`` command changes the database configuration. Its syntax is ``configure [new|tss] [single|double|triple|three_data_hall|three_datacenter] [ssd|memory] [grv_proxies=<N>] [commit_proxies=<N>] [resolvers=<N>] [logs=<N>] [count=<TSS_COUNT>] [perpetual_storage_wiggle=<WIGGLE_SPEED>]``.
 
 The ``new`` option, if present, initializes a new database with the given configuration rather than changing the configuration of an existing one. When ``new`` is used, both a redundancy mode and a storage engine must be specified.
 
+The ``tss`` option, if present, changes the Testing Storage Server (TSS) configuration for a cluster. When used for the first time, both a count and a storage engine must be specified. For more details, see :ref:`testing-storage-server`.
+
 redundancy mode
 ^^^^^^^^^^^^^^^
 
@@ -107,6 +109,11 @@ Set the process using ``configure [grv_proxies|commit_proxies|resolvers|logs]=<N
 
 For recommendations on appropriate values for process types in large clusters, see :ref:`guidelines-process-class-config`.
 
+perpetual storage wiggle
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Set the value speed (a.k.a., the number of processes that the Data Distributor should wiggle at a time). Currently, only 0 and 1 are supported. The value 0 means to disable the perpetual storage wiggle.
+
 consistencycheck
 ----------------
 
diff --git a/documentation/sphinx/source/operations.rst b/documentation/sphinx/source/operations.rst
index 0765f9fd33a..3621f52366e 100644
--- a/documentation/sphinx/source/operations.rst
+++ b/documentation/sphinx/source/operations.rst
@@ -26,6 +26,8 @@ Ready to operate an externally accessible FoundationDB cluster? You'll find what
 
 * :doc:`transaction-tagging` gives an overview of transaction tagging, including details about throttling particular tags.
 
+* :doc:`tss` gives an overview of the Testing Storage Server feature of FoundationDB, which allows you to safely run an untrusted storage engine in a production cluster.
+
 .. toctree::
  :maxdepth: 2
  :titlesonly:
@@ -41,3 +43,4 @@ Ready to operate an externally accessible FoundationDB cluster? You'll find what
  disk-snapshot-backup
  platforms
  transaction-tagging
+ tss
diff --git a/documentation/sphinx/source/tss.rst b/documentation/sphinx/source/tss.rst
new file mode 100644
index 00000000000..928b7d73abe
--- /dev/null
+++ b/documentation/sphinx/source/tss.rst
@@ -0,0 +1,115 @@
+.. _testing-storage-server:
+
+############################
+Testing Storage Server (TSS)
+############################
+
+.. include:: guide-common.rst.inc
+
+This document covers the operation and architecture of the Testing Storage Server feature, or TSS for short.
+
+.. _tss-introduction:
+
+Summary
+============
+
+The TSS feature allows FoundationDB to run an "untrusted" storage engine (the *testing storage engine*) directly in a QA or production envronment with identical workload to the current storage engine, with zero impact on durability or correctness, and minimal impact on performance.
+
+This allows a FoundationDB cluster operator to validate the correctness and performance of a different storage engine on the exact cluster workload before migrating data to the different storage engine.
+
+A Testing Storage Server is paired to a normal Storage Server. Both servers in the pair recieve the exact same requests, and contain the exact same data. The SS and TSS' responses are compared to ensure that they match, and performance metrics are recorded for the pair.
+
+Configuring TSS
+===============
+
+You can configure TSS via the FDB :ref:`command line interface <command-line-interface>`.
+
+Because of the performance overhead of duplicating and comparing read requests, it is recommended to configure the number of TSS processes to a small percentage of the number of storage processes in the cluster (at most 5% - 10%). It is also recommended to add enough servers to the cluster before enabling TSS to end up with the same number of normal Storage processes as the cluster had before enabling TSS.
+
+Because TSS recruitment only pairs *new* storage processes, you must add processes to the cluster and/or enable the *perpetual wiggle* to actually start recruiting TSS processes.
+
+Example commands
+----------------
+
+Set the desired TSS processes count to 4, using the redwood storage engine: ``configure tss ssd-redwood-experimental count=4``.
+
+Change the desired TSS process count to 2: ``configure tss count=2``.
+
+Disable TSS on the cluster: ``configure tss count=0``.
+
+Monitoring TSS
+==============
+
+The ``status`` command in the FDB :ref:`command line interface <command-line-interface>` will show the current and desired number of TSS processes in the cluster, and the full status JSON will include the full TSS configuration parameters.
+
+Trace Events
+----------------------
+Whenever a client detects a *TSS Mismatch*, or when the SS and TSS response differ, and the difference can only be explained by different storage engine contents, it will emit an error-level trace event with a type starting with ``TSSMismatch``, with a different type for each read request. This trace event will include all of the information necessary to investgate the mismatch, such as the TSS storage ID, the full request data, and the summarized replies (full keys and checksummed values) from both the SS and TSS.
+
+Each client emits a ``TSSClientMetrics`` trace event for each TSS pair in the cluster that it has sent requests to recently, similar to the ``TransactionMetrics`` trace event.
+It contains the TSS storage ID, and latency statistics for each type of read request. It also includes a count of any mismatches, and a histogram of error codes recieved by the SS and TSS to ensure the storage engines have similar error rates and types.
+
+The ``StorageMetrics`` trace event emitted by storage servers includes the storage ID of its pair if part of a TSS pairing, and includes a ``TSSJointID`` detail with a unique id for the SS/TSS pair that enables correlating the separate StorageMetrics events from the SS and TSS.
+
+
+Quarantined TSS
+---------------
+If a *TSS Mismatch* is detected for a given TSS, instead of killing the TSS, it will be put into a *quarantined* state. In this state, the TSS doesn't respond to any data requests, but is still recruited on the worker, preventing a new storage process from replacing it.
+This is so that the cluster operator can investigate the storage engine file of the TSS's *testing storage engine* to determine the cause of the data inconsistency.
+
+You can also manually quarantine a TSS, or dispose of a quarantined TSS once you're done investigating using the FDB :ref:`command line interface <command-line-interface>`.
+
+TODO include exact commands once implemented.
+
+The Storage Consistency Check will also check TSS processes against the rest of that shard's team, and fail if there is a mismatch, but it will not automatically quarantine the offending TSS.
+
+Other Failure Types
+-------------------
+
+The TSS feature is designed to insulate the cluster from an incorrect storage engine, but it is also designed to insulate the cluster as much as possible from a poor-performing storage engine.
+
+Read Requests to TSS processes are never on the critical path for a client transaction, so a slow-responding TSS will not affect client latencies.
+
+If the TSS falls behind its pair for ingesting new mutations or processing data movements, it will be killed by the cluster.
+
+Architecture Overview
+=====================
+
+TSS Mapping
+-----------
+
+The *TSS Mapping*, the mapping containing the (SS Storage ID, TSS Storage ID) pairs for all active TSS pairs in the cluster, is stored in the system keyspace under ``\xff/tss/``.
+
+This information is lazily propagated to clients in the ``KeyServerLocationsRequest`` from the Commit Proxies, which read the TSS mapping from the Transaction State Store.
+
+Clients will use this mapping to duplicate any request to a storage server that has a TSS pair.
+
+Other cluster components that need the full, up-to-date TSS mapping (MoveKeys, ConsistencyCheck, etc...) read it directly from the system keyspace as part of a transaction.
+
+Recruitment
+-----------
+
+TSS Pair recruitment is designed to use the *Perpetual Storage Wiggle*, but will also work if multiple storage processes are added to the cluster.
+
+When Data Distribution detects a deficit of TSS processes in the cluster, it will begin recruiting a TSS pair.
+The pair recruitment logic is as follows:
+
+* Once DD gets a candidate worker from the Cluster Controller, hold that worker as a desired TSS process.
+* Once DD gets a second candidate worker from the Cluster Controller, initialize that worker as a normal SS.
+* Once the second candidate worker is successfully initialized, initialize the first candidate worker as a TSS, passing it the storage ID, starting tag + version, and other information from its SS pair. Because the TSS reads from the same tag starting at the same version, it is guaranteed to recieve the same mutations and data movements as its pair.
+
+One implication of this is, during TSS recruitment, the cluster is effectively down one storage process until a second storage process becomes available.
+While clusters should be able to handle being down a single storage process anyway to tolerate machine failure, an active TSS recruitment will be cancelled if the lack of that single storage process is causing the cluster to be unhealthy. Similarly, if the cluster is unhealthy and unable to find new teams to replicate data to, any existing TSS processes may be killed to make room for new storage servers.
+
+TSS Process
+-----------
+
+A TSS process is almost identical to a normal Storage process, with the exception that it does not pop its tag from the TLog mutation stream, and it listens to and processes private mutations for both itself and its SS pair.
+
+
+Caveats
+=======
+
+Despite its usefulness, the TSS feature does not give a perfect performance comparison of the storage engine(s) under test.
+
+Because it is only enabled on a small percentage of the cluster and only compares single storage processes for the same workload, it may miss potential aggregate performance problems, such as the testing storage engine overall consuming more cpu/memory. It is not a substitute for full-cluster performance and correctness testing or simulation testing.
diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 126104c792a..1b4fca69840 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -490,9 +490,10 @@ void initHelp() {
 	    "All keys between BEGINKEY (inclusive) and ENDKEY (exclusive) are cleared from the database. This command will "
 	    "succeed even if the specified range is empty, but may fail because of conflicts." ESCAPINGK);
 	helpMap["configure"] = CommandHelp(
-	    "configure [new] "
+	    "configure [new|tss]"
 	    "<single|double|triple|three_data_hall|three_datacenter|ssd|memory|memory-radixtree-beta|proxies=<PROXIES>|"
 	    "commit_proxies=<COMMIT_PROXIES>|grv_proxies=<GRV_PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*",
+	    "count=<TSS_COUNT>",
 	    "change the database configuration",
 	    "The `new' option, if present, initializes a new database with the given configuration rather than changing "
 	    "the configuration of an existing one. When used, both a redundancy mode and a storage engine must be "

From ffa8f8914ea5b2bd02811d4c1a533aea424c21cd Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Mon, 7 Jun 2021 19:54:24 +0000
Subject: [PATCH 239/740] Added TSS Quarantine and fixed TSS mapping bug in
 CommitProxy

---
 fdbcli/fdbcli.actor.cpp               | 101 ++++++++++++++++++++++++
 fdbclient/Knobs.cpp                   |   1 +
 fdbclient/Knobs.h                     |   1 +
 fdbclient/NativeAPI.actor.cpp         |  22 +++---
 fdbclient/SystemData.cpp              |  16 ++++
 fdbclient/SystemData.h                |   9 ++-
 fdbserver/ApplyMetadataMutation.cpp   |  96 ++++++++++++++++++-----
 fdbserver/CommitProxyServer.actor.cpp |   2 +-
 fdbserver/storageserver.actor.cpp     | 107 +++++++++++++++++++++-----
 9 files changed, 307 insertions(+), 48 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 1b4fca69840..48ec5a00d79 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -22,6 +22,7 @@
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/Status.h"
+#include "fdbclient/KeyBackedTypes.h"
 #include "fdbclient/StatusClient.h"
 #include "fdbclient/DatabaseContext.h"
 #include "fdbclient/GlobalConfig.actor.h"
@@ -682,6 +683,12 @@ void initHelp() {
 	    CommandHelp("triggerddteaminfolog",
 	                "trigger the data distributor teams logging",
 	                "Trigger the data distributor to log detailed information about its teams.");
+	helpMap["tssq"] =
+	    CommandHelp("tssq start|stop <StorageUID>",
+	                "start/stop tss quarantine",
+	                "Toggles Quarantine mode for a Testing Storage Server. Quarantine will happen automatically if the "
+	                "TSS is detected to have incorrect data, but can also be initiated manually. You can also remove a "
+	                "TSS from quarantine once your investigation is finished, which will destroy the TSS process.");
 
 	hiddenCommands.insert("expensive_data_check");
 	hiddenCommands.insert("datadistribution");
@@ -1889,6 +1896,75 @@ ACTOR Future<Void> triggerDDTeamInfoLog(Database db) {
 	}
 }
 
+ACTOR Future<Void> tssQuarantineList(Database db) {
+	state ReadYourWritesTransaction tr(db);
+	loop {
+		try {
+			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+			tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+
+			RangeResult result = wait(tr.getRange(tssQuarantineKeys, CLIENT_KNOBS->TOO_MANY));
+			// shouldn't have many quarantined TSSes
+			ASSERT(!result.more);
+			printf("Found %d quarantined TSS processes%s\n", result.size(), result.size() == 0 ? "." : ":");
+			for (auto& it : result) {
+				printf("  %s\n", decodeTssQuarantineKey(it.key).toString().c_str());
+			}
+			return Void();
+		} catch (Error& e) {
+			wait(tr.onError(e));
+		}
+	}
+}
+
+ACTOR Future<bool> tssQuarantine(Database db, bool enable, UID tssId) {
+	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(db);
+	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+
+	loop {
+		try {
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+			tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+
+			// Do some validation first to make sure the command is valid
+			Optional<Value> serverListValue = wait(tr->get(serverListKeyFor(tssId)));
+			if (!serverListValue.present()) {
+				printf("No TSS %s found in cluster!\n", tssId.toString().c_str());
+				return false;
+			}
+			state StorageServerInterface ssi = decodeServerListValue(serverListValue.get());
+			if (!ssi.isTss()) {
+				printf("Cannot quarantine Non-TSS storage ID %s!\n", tssId.toString().c_str());
+				return false;
+			}
+
+			Optional<Value> currentQuarantineValue = wait(tr->get(tssQuarantineKeyFor(tssId)));
+			if (enable && currentQuarantineValue.present()) {
+				printf("TSS %s already in quarantine, doing nothing.\n", tssId.toString().c_str());
+				return false;
+			} else if (!enable && !currentQuarantineValue.present()) {
+				printf("TSS %s is not in quarantine, cannot remove from quarantine!.\n", tssId.toString().c_str());
+				return false;
+			}
+
+			if (enable) {
+				tr->set(tssQuarantineKeyFor(tssId), LiteralStringRef(""));
+				// remove server from TSS mapping when quarantine is enabled
+				tssMapDB.erase(tr, ssi.tssPairID.get());
+			} else {
+				tr->clear(tssQuarantineKeyFor(tssId));
+			}
+
+			wait(tr->commit());
+			break;
+		} catch (Error& e) {
+			wait(tr->onError(e));
+		}
+	}
+	printf("Successfully %s TSS %s\n", enable ? "quarantined" : "removed", tssId.toString().c_str());
+	return true;
+}
+
 ACTOR Future<Void> timeWarning(double when, const char* msg) {
 	wait(delay(when));
 	fputs(msg, stderr);
@@ -3408,6 +3484,31 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 					continue;
 				}
 
+				if (tokencmp(tokens[0], "tssq")) {
+					if (tokens.size() == 2) {
+						if (tokens[1] != LiteralStringRef("list")) {
+							printUsage(tokens[0]);
+							is_error = true;
+						} else {
+							wait(tssQuarantineList(db));
+						}
+					}
+					if (tokens.size() == 3) {
+						if ((tokens[1] != LiteralStringRef("start") && tokens[1] != LiteralStringRef("stop")) ||
+						    (tokens[2].size() != 32) || !std::all_of(tokens[2].begin(), tokens[2].end(), &isxdigit)) {
+							printUsage(tokens[0]);
+							is_error = true;
+						} else {
+							bool enable = tokens[1] == LiteralStringRef("start");
+							UID tssId = UID::fromString(tokens[2].toString());
+							bool err = wait(tssQuarantine(db, enable, tssId));
+							if (err)
+								is_error = true;
+						}
+					}
+					continue;
+				}
+
 				if (tokencmp(tokens[0], "configure")) {
 					bool err = wait(configure(db, tokens, db->getConnectionFile(), &linenoise, warn));
 					if (err)
diff --git a/fdbclient/Knobs.cpp b/fdbclient/Knobs.cpp
index 5186ca0c5c4..bcee9cdaff4 100644
--- a/fdbclient/Knobs.cpp
+++ b/fdbclient/Knobs.cpp
@@ -97,6 +97,7 @@ void ClientKnobs::initialize(bool randomize) {
 	init( DETAILED_HEALTH_METRICS_MAX_STALENESS,   5.0 );
 	init( MID_SHARD_SIZE_MAX_STALENESS,           10.0 );
 	init( TAG_ENCODE_KEY_SERVERS,                false ); if( randomize && BUGGIFY ) TAG_ENCODE_KEY_SERVERS = true;
+	init( QUARANTINE_TSS_ON_MISMATCH,             true ); if( randomize && BUGGIFY ) QUARANTINE_TSS_ON_MISMATCH = false; // if true, a tss mismatch will put the offending tss in quarantine. If false, it will just be killed
 
 	//KeyRangeMap
 	init( KRM_GET_RANGE_LIMIT,                     1e5 ); if( randomize && BUGGIFY ) KRM_GET_RANGE_LIMIT = 10;
diff --git a/fdbclient/Knobs.h b/fdbclient/Knobs.h
index 1c21d34dca1..92ec43af28e 100644
--- a/fdbclient/Knobs.h
+++ b/fdbclient/Knobs.h
@@ -90,6 +90,7 @@ class ClientKnobs : public Knobs {
 	double DETAILED_HEALTH_METRICS_MAX_STALENESS;
 	double MID_SHARD_SIZE_MAX_STALENESS;
 	bool TAG_ENCODE_KEY_SERVERS;
+	bool QUARANTINE_TSS_ON_MISMATCH;
 
 	// KeyRangeMap
 	int KRM_GET_RANGE_LIMIT;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 359be78a681..22e0ebbe32b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -838,11 +838,12 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 			}
 		}
 		if (found) {
-			TraceEvent(SevWarnAlways, "TSS_KillMismatch").detail("TSSID", tssID.toString());
-			TEST(true); // killing TSS because it got mismatch
+			state bool quarantine = CLIENT_KNOBS->QUARANTINE_TSS_ON_MISMATCH;
+			TraceEvent(SevWarnAlways, quarantine ? "TSS_QuarantineMismatch" : "TSS_KillMismatch")
+			    .detail("TSSID", tssID.toString());
+			TEST(quarantine); // Quarantining TSS because it got mismatch
+			TEST(!quarantine); // Killing TSS because it got mismatch
 
-			// TODO we could write something to the system keyspace and then have DD listen to that keyspace and then DD
-			// do exactly this, so why not just cut out the middle man (or the middle system keys, as it were)
 			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(cx)));
 			state int tries = 0;
 			loop {
@@ -850,7 +851,11 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 					tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 					tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 
-					tr->clear(serverTagKeyFor(tssID));
+					if (quarantine) {
+						tr->set(tssQuarantineKeyFor(tssID), LiteralStringRef(""));
+					} else {
+						tr->clear(serverTagKeyFor(tssID));
+					}
 					tssMapDB.erase(tr, tssPairID);
 
 					wait(tr->commit());
@@ -861,16 +866,15 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 				}
 				tries++;
 				if (tries > 10) {
-					// Give up on trying to kill the tss, it'll get another mismatch or a human will investigate
-					// eventually
-					TraceEvent("TSS_KillMismatchGaveUp").detail("TSSID", tssID.toString());
+					// Give up, it'll get another mismatch or a human will investigate eventually
+					TraceEvent("TSS_MismatchGaveUp").detail("TSSID", tssID.toString());
 					break;
 				}
 			}
 			// clear out txn so that the extra DatabaseContext ref gets decref'd and we can free cx
 			tr = makeReference<ReadYourWritesTransaction>();
 		} else {
-			TEST(true); // Not killing TSS with mismatch because it's already gone
+			TEST(true); // Not handling TSS with mismatch because it's already gone
 		}
 	}
 }
diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index 02c2fee1057..db765152f0d 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -348,6 +348,22 @@ uint16_t cacheChangeKeyDecodeIndex(const KeyRef& key) {
 
 const KeyRangeRef tssMappingKeys(LiteralStringRef("\xff/tss/"), LiteralStringRef("\xff/tss0"));
 
+const KeyRangeRef tssQuarantineKeys(LiteralStringRef("\xff/tssQ/"), LiteralStringRef("\xff/tssQ0"));
+
+const Key tssQuarantineKeyFor(UID serverID) {
+	BinaryWriter wr(Unversioned());
+	wr.serializeBytes(tssQuarantineKeys.begin);
+	wr << serverID;
+	return wr.toValue();
+}
+
+UID decodeTssQuarantineKey(KeyRef const& key) {
+	UID serverID;
+	BinaryReader rd(key.removePrefix(tssQuarantineKeys.begin), Unversioned());
+	rd >> serverID;
+	return serverID;
+}
+
 const KeyRangeRef serverTagKeys(LiteralStringRef("\xff/serverTag/"), LiteralStringRef("\xff/serverTag0"));
 
 const KeyRef serverTagPrefix = serverTagKeys.begin;
diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h
index 6094b8078a3..03a8ef27f19 100644
--- a/fdbclient/SystemData.h
+++ b/fdbclient/SystemData.h
@@ -115,9 +115,16 @@ extern const KeyRef cacheChangePrefix;
 const Key cacheChangeKeyFor(uint16_t idx);
 uint16_t cacheChangeKeyDecodeIndex(const KeyRef& key);
 
-//    "\xff/tss/[[serverId]]" := "[[tssId]]"
+// "\xff/tss/[[serverId]]" := "[[tssId]]"
 extern const KeyRangeRef tssMappingKeys;
 
+// "\xff/tssQ/[[serverId]]" := ""
+// For quarantining a misbehaving TSS.
+extern const KeyRangeRef tssQuarantineKeys;
+
+const Key tssQuarantineKeyFor(UID serverID);
+UID decodeTssQuarantineKey(KeyRef const&);
+
 // "\xff/serverTag/[[serverID]]" = "[[Tag]]"
 //	Provides the Tag for the given serverID. Used to access a
 //	storage server's corresponding TLog in order to apply mutations.
diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index 4f5a86c8501..1a1e314a36e 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -245,24 +245,45 @@ void applyMetadataMutations(SpanID const& spanContext,
 					}
 				}
 			} else if (m.param1.startsWith(tssMappingKeys.begin)) {
+				// Normally uses key backed map, so have to use same unpacking code here.
+				UID ssId = Codec<UID>::unpack(Tuple::unpack(m.param1.removePrefix(tssMappingKeys.begin)));
+				UID tssId = Codec<UID>::unpack(Tuple::unpack(m.param2));
 				if (!initialCommit) {
 					txnStateStore->set(KeyValueRef(m.param1, m.param2));
-					if (tssMapping) {
-						// Normally uses key backed map, so have to use same unpacking code here.
-						UID ssId = Codec<UID>::unpack(Tuple::unpack(m.param1.removePrefix(tssMappingKeys.begin)));
-						UID tssId = Codec<UID>::unpack(Tuple::unpack(m.param2));
+				}
+				if (tssMapping) {
+					tssMappingToAdd.push_back(std::pair(ssId, tssId));
+				}
 
-						tssMappingToAdd.push_back(std::pair(ssId, tssId));
+				if (toCommit) {
+					// send private mutation to SS that it now has a TSS pair
+					MutationRef privatized = m;
+					privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
 
-						// send private mutation to SS that it now has a TSS pair
-						if (toCommit) {
-							MutationRef privatized = m;
-							privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
+					Optional<Value> tagV = txnStateStore->readValue(serverTagKeyFor(ssId)).get();
+					if (tagV.present()) {
+						toCommit->addTag(decodeServerTagValue(tagV.get()));
+						toCommit->writeTypedMessage(privatized);
+					}
+				}
+			} else if (m.param1.startsWith(tssQuarantineKeys.begin)) {
+				if (!initialCommit) {
+					txnStateStore->set(KeyValueRef(m.param1, m.param2));
 
-							Optional<Value> tagV = txnStateStore->readValue(serverTagKeyFor(ssId)).get();
-							if (tagV.present()) {
-								toCommit->addTag(decodeServerTagValue(tagV.get()));
-								toCommit->writeTypedMessage(privatized);
+					if (toCommit) {
+						UID tssId = decodeTssQuarantineKey(m.param1);
+						Optional<Value> ssiV = txnStateStore->readValue(serverListKeyFor(tssId)).get();
+						if (ssiV.present()) {
+							StorageServerInterface ssi = decodeServerListValue(ssiV.get());
+							if (ssi.isTss()) {
+								Optional<Value> tagV =
+								    txnStateStore->readValue(serverTagKeyFor(ssi.tssPairID.get())).get();
+								if (tagV.present()) {
+									MutationRef privatized = m;
+									privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
+									toCommit->addTag(decodeServerTagValue(tagV.get()));
+									toCommit->writeTypedMessage(privatized);
+								}
 							}
 						}
 					}
@@ -510,15 +531,52 @@ void applyMetadataMutations(SpanID const& spanContext,
 					txnStateStore->clear(range & serverTagHistoryKeys);
 			}
 			if (tssMappingKeys.intersects(range)) {
+				KeyRangeRef rangeToClear = range & tssMappingKeys;
+				ASSERT(rangeToClear.singleKeyRange());
+
+				// Normally uses key backed map, so have to use same unpacking code here.
+				UID ssId = Codec<UID>::unpack(Tuple::unpack(m.param1.removePrefix(tssMappingKeys.begin)));
 				if (!initialCommit) {
-					KeyRangeRef rangeToClear = range & tssMappingKeys;
+					txnStateStore->clear(rangeToClear);
+				}
+
+				if (tssMapping) {
+					tssMapping->erase(ssId);
+				}
+
+				if (toCommit) {
+					// send private mutation to SS to notify that it no longer has a tss pair
+					Optional<Value> tagV = txnStateStore->readValue(serverTagKeyFor(ssId)).get();
+					if (tagV.present()) {
+						MutationRef privatized = m;
+						privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
+						toCommit->addTag(decodeServerTagValue(tagV.get()));
+						toCommit->writeTypedMessage(privatized);
+					}
+				}
+			}
+			if (tssQuarantineKeys.intersects(range)) {
+				if (!initialCommit) {
+					KeyRangeRef rangeToClear = range & tssQuarantineKeys;
 					ASSERT(rangeToClear.singleKeyRange());
 					txnStateStore->clear(rangeToClear);
-					if (tssMapping) {
-						// Normally uses key backed map, so have to use same unpacking code here.
-						UID ssId =
-						    Codec<UID>::unpack(Tuple::unpack(rangeToClear.begin.removePrefix(tssMappingKeys.begin)));
-						tssMapping->erase(ssId);
+
+					if (toCommit) {
+						UID tssId = decodeTssQuarantineKey(m.param1);
+						Optional<Value> ssiV = txnStateStore->readValue(serverListKeyFor(tssId)).get();
+						if (ssiV.present()) {
+							StorageServerInterface ssi = decodeServerListValue(ssiV.get());
+							if (ssi.isTss()) {
+								Optional<Value> tagV =
+								    txnStateStore->readValue(serverTagKeyFor(ssi.tssPairID.get())).get();
+								if (tagV.present()) {
+									MutationRef privatized = m;
+									privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
+									toCommit->addTag(decodeServerTagValue(tagV.get()));
+									toCommit->writeTypedMessage(privatized);
+								}
+							}
+						}
 					}
 				}
 			}
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 1a46fb055f9..f2e7c78fd49 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1439,9 +1439,9 @@ void maybeAddTssMapping(GetKeyServerLocationsReply& reply,
 	if (!included.count(ssId)) {
 		auto mappingItr = commitData->tssMapping.find(ssId);
 		if (mappingItr != commitData->tssMapping.end()) {
-			included.insert(ssId);
 			reply.resultsTssMapping.push_back(*mappingItr);
 		}
+		included.insert(ssId);
 	}
 }
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 167a814fbcb..9aa421d4a1a 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -167,6 +167,7 @@ struct StorageServerDisk {
 	void makeNewStorageServerDurable();
 	bool makeVersionMutationsDurable(Version& prevStorageVersion, Version newStorageVersion, int64_t& bytesLeft);
 	void makeVersionDurable(Version version);
+	void makeTssQuarantineDurable();
 	Future<bool> restoreDurableState();
 
 	void changeLogProtocol(Version version, ProtocolVersion protocol);
@@ -526,6 +527,22 @@ struct StorageServer {
 		}
 	}
 
+	// If a TSS is "in quarantine", it means it has incorrect data. It is effectively in a "zombie" state where it
+	// rejects all read requests and ignores all non-private mutations and data movements, but otherwise is still part
+	// of the cluster. The purpose of this state is to "freeze" the TSS state after a mismatch so a human operator can
+	// investigate, but preventing a new storage process from replacing the TSS on the worker. It will still get removed
+	// from the cluster if it falls behind on the mutation stream, or if its tss pair gets removed and its tag is no
+	// longer valid.
+	bool isTSSInQuarantine() { return tssPairID.present() && tssInQuarantine; }
+
+	void startTssQuarantine() {
+		if (!tssInQuarantine) {
+			// persist quarantine so it's still quarantined if rebooted
+			storage.makeTssQuarantineDurable();
+		}
+		tssInQuarantine = true;
+	}
+
 	StorageServerDisk storage;
 
 	KeyRangeMap<Reference<ShardInfo>> shards;
@@ -571,6 +588,8 @@ struct StorageServer {
 	Optional<UID> tssPairID; // if this server is a tss, this is the id of its (ss) pair
 	Optional<UID> ssPairID; // if this server is an ss, this is the id of its (tss) pair
 	Optional<double> tssFaultInjectTime;
+	bool tssInQuarantine;
+
 	Key sk;
 	Reference<AsyncVar<ServerDBInfo>> db;
 	Database cx;
@@ -758,7 +777,7 @@ struct StorageServer {
 	    primaryLocality(tagLocalityInvalid), updateEagerReads(0), shardChangeCounter(0),
 	    fetchKeysParallelismLock(SERVER_KNOBS->FETCH_KEYS_PARALLELISM_BYTES), shuttingDown(false),
 	    debug_inApplyUpdate(false), debug_lastValidateTime(0), watchBytes(0), numWatches(0), logProtocol(0),
-	    counters(this), tag(invalidTag), maxQueryQueue(0), thisServerID(ssi.id()),
+	    counters(this), tag(invalidTag), maxQueryQueue(0), thisServerID(ssi.id()), tssInQuarantine(false),
 	    readQueueSizeMetric(LiteralStringRef("StorageServer.ReadQueueSize")), behind(false), versionBehind(false),
 	    byteSampleClears(false, LiteralStringRef("\xff\xff\xff")), noRecentUpdates(false), lastUpdate(now()),
 	    poppedAllAfter(std::numeric_limits<Version>::max()), cpuUsage(0.0), diskUsage(0.0) {
@@ -885,10 +904,10 @@ struct StorageServer {
 	template <class Request>
 	bool shouldRead(const Request& request) {
 		auto rate = currentRate();
-		if (rate < SERVER_KNOBS->STORAGE_DURABILITY_LAG_REJECT_THRESHOLD &&
-		    deterministicRandom()->random01() >
-		        std::max(SERVER_KNOBS->STORAGE_DURABILITY_LAG_MIN_RATE,
-		                 rate / SERVER_KNOBS->STORAGE_DURABILITY_LAG_REJECT_THRESHOLD)) {
+		if (isTSSInQuarantine() || (rate < SERVER_KNOBS->STORAGE_DURABILITY_LAG_REJECT_THRESHOLD &&
+		                            deterministicRandom()->random01() >
+		                                std::max(SERVER_KNOBS->STORAGE_DURABILITY_LAG_MIN_RATE,
+		                                         rate / SERVER_KNOBS->STORAGE_DURABILITY_LAG_REJECT_THRESHOLD))) {
 			sendErrorWithPenalty(request.reply, server_overloaded(), getPenalty());
 			++counters.readsRejected;
 			return false;
@@ -3132,6 +3151,7 @@ static const KeyRangeRef persistFormatReadableRange(LiteralStringRef("Foundation
                                                     LiteralStringRef("FoundationDB/StorageServer/1/5"));
 static const KeyRef persistID = LiteralStringRef(PERSIST_PREFIX "ID");
 static const KeyRef persistTssPairID = LiteralStringRef(PERSIST_PREFIX "tssPairID");
+static const KeyRef persistTssQuarantine = LiteralStringRef(PERSIST_PREFIX "tssQ");
 
 // (Potentially) change with the durable version or when fetchKeys completes
 static const KeyRef persistVersion = LiteralStringRef(PERSIST_PREFIX "Version");
@@ -3208,12 +3228,16 @@ class StorageUpdater {
 			ASSERT(m.type == MutationRef::SetValue && m.param1.startsWith(data->sk));
 			KeyRangeRef keys(startKey.removePrefix(data->sk), m.param1.removePrefix(data->sk));
 
-			// add changes in shard assignment to the mutation log
-			setAssignedStatus(data, keys, nowAssigned);
+			// ignore data movements for tss in quarantine
+			if (!data->isTSSInQuarantine()) {
+				// add changes in shard assignment to the mutation log
+				setAssignedStatus(data, keys, nowAssigned);
+
+				// The changes for version have already been received (and are being processed now).  We need to fetch
+				// the data for change.version-1 (changes from versions < change.version)
+				changeServerKeys(data, keys, nowAssigned, currentVersion - 1, CSK_UPDATE);
+			}
 
-			// The changes for version have already been received (and are being processed now).  We need
-			// to fetch the data for change.version-1 (changes from versions < change.version)
-			changeServerKeys(data, keys, nowAssigned, currentVersion - 1, CSK_UPDATE);
 			processedStartKey = false;
 		} else if (m.type == MutationRef::SetValue && m.param1.startsWith(data->sk)) {
 			// Because of the implementation of the krm* functions, we expect changes in pairs, [begin,end)
@@ -3251,7 +3275,8 @@ class StorageUpdater {
 			bool matchesThisServer = serverTagKey == data->thisServerID;
 			bool matchesTssPair = data->isTss() ? serverTagKey == data->tssPairID.get() : false;
 			if ((m.type == MutationRef::SetValue && !data->isTss() && !matchesThisServer) ||
-			    (m.type == MutationRef::ClearRange && (matchesThisServer || (data->isTss() && matchesTssPair)))) {
+			    (m.type == MutationRef::ClearRange &&
+			     ((!data->isTSSInQuarantine() && matchesThisServer) || (data->isTss() && matchesTssPair)))) {
 				throw worker_removed();
 			}
 			if (!data->isTss() && m.type == MutationRef::ClearRange && data->ssPairID.present() &&
@@ -3267,12 +3292,32 @@ class StorageUpdater {
 			data->primaryLocality = BinaryReader::fromStringRef<int8_t>(m.param2, Unversioned());
 			auto& mLV = data->addVersionToMutationLog(data->data().getLatestVersion());
 			data->addMutationToMutationLog(mLV, MutationRef(MutationRef::SetValue, persistPrimaryLocality, m.param2));
-		} else if (m.type == MutationRef::SetValue && m.param1.substr(1).startsWith(tssMappingKeys.begin)) {
+		} else if (m.param1.substr(1).startsWith(tssMappingKeys.begin) &&
+		           (m.type == MutationRef::SetValue || m.type == MutationRef::ClearRange)) {
 			if (!data->isTss()) {
 				UID ssId = Codec<UID>::unpack(Tuple::unpack(m.param1.substr(1).removePrefix(tssMappingKeys.begin)));
-				UID tssId = Codec<UID>::unpack(Tuple::unpack(m.param2));
 				ASSERT(ssId == data->thisServerID);
-				data->setSSWithTssPair(tssId);
+				if (m.type == MutationRef::SetValue) {
+					UID tssId = Codec<UID>::unpack(Tuple::unpack(m.param2));
+					data->setSSWithTssPair(tssId);
+				} else {
+					data->clearSSWithTssPair();
+				}
+			}
+		} else if (m.param1.substr(1).startsWith(tssQuarantineKeys.begin) &&
+		           (m.type == MutationRef::SetValue || m.type == MutationRef::ClearRange)) {
+			if (data->isTss()) {
+				UID ssId = decodeTssQuarantineKey(m.param1.substr(1));
+				ASSERT(ssId == data->thisServerID);
+				if (m.type == MutationRef::SetValue) {
+					TEST(true); // Putting TSS in quarantine
+					TraceEvent(SevWarn, "TSSQuarantineStart", data->thisServerID);
+					data->startTssQuarantine();
+				} else {
+					TraceEvent(SevWarn, "TSSQuarantineStop", data->thisServerID);
+					// dipose of this TSS
+					throw worker_removed();
+				}
 			}
 		} else {
 			ASSERT(false); // Unknown private mutation
@@ -3519,14 +3564,22 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 				Span span("SS:update"_loc, { spanContext });
 				span.addTag("key"_sr, msg.param1);
 
+				// Drop non-private mutations if TSS fault injection is enabled in simulation, or if this is a TSS in
+				// quarantine.
 				if (g_network->isSimulated() && data->isTss() &&
 				    g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations &&
 				    data->tssFaultInjectTime.present() && data->tssFaultInjectTime.get() < now() &&
-				    (msg.type == MutationRef::SetValue || msg.type == MutationRef::ClearRange) && msg.param1.size() &&
-				    msg.param1[0] != 0xff && deterministicRandom()->random01() < 0.05) {
+				    (msg.type == MutationRef::SetValue || msg.type == MutationRef::ClearRange) &&
+				    (msg.param1.size() < 2 || msg.param1[0] != 0xff || msg.param1[1] != 0xff) &&
+				    deterministicRandom()->random01() < 0.05) {
 					TraceEvent(SevWarnAlways, "TSSInjectDropMutation", data->thisServerID)
 					    .detail("Mutation", msg.toString())
 					    .detail("Version", cloneCursor2->version().toString());
+				} else if (data->isTSSInQuarantine() &&
+				           (msg.param1.size() < 2 || msg.param1[0] != 0xff || msg.param1[1] != 0xff)) {
+					TraceEvent("TSSQuarantineDropMutation", data->thisServerID)
+					    .suppressFor(10.0)
+					    .detail("Version", cloneCursor2->version().toString());
 				} else if (ver != invalidVersion) { // This change belongs to a version < minVersion
 					DEBUG_MUTATION("SSPeek", ver, msg).detail("ServerID", data->thisServerID);
 					if (ver == 1) {
@@ -3885,6 +3938,11 @@ void StorageServerDisk::makeVersionDurable(Version version) {
 	//     .detail("ToVersion", version);
 }
 
+// Update data->storage to persist tss quarantine state
+void StorageServerDisk::makeTssQuarantineDurable() {
+	storage->set(KeyValueRef(persistTssQuarantine, LiteralStringRef("1")));
+}
+
 void StorageServerDisk::changeLogProtocol(Version version, ProtocolVersion protocol) {
 	data->addMutationToMutationLogOrStorage(
 	    version,
@@ -4001,6 +4059,7 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 	state Future<Optional<Value>> fFormat = storage->readValue(persistFormat.key);
 	state Future<Optional<Value>> fID = storage->readValue(persistID);
 	state Future<Optional<Value>> ftssPairID = storage->readValue(persistTssPairID);
+	state Future<Optional<Value>> fTssQuarantine = storage->readValue(persistTssQuarantine);
 	state Future<Optional<Value>> fVersion = storage->readValue(persistVersion);
 	state Future<Optional<Value>> fLogProtocol = storage->readValue(persistLogProtocol);
 	state Future<Optional<Value>> fPrimaryLocality = storage->readValue(persistPrimaryLocality);
@@ -4013,7 +4072,7 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 	    restoreByteSample(data, storage, byteSampleSampleRecovered, startByteSampleRestore.getFuture());
 
 	TraceEvent("ReadingDurableState", data->thisServerID);
-	wait(waitForAll(std::vector{ fFormat, fID, ftssPairID, fVersion, fLogProtocol, fPrimaryLocality }));
+	wait(waitForAll(std::vector{ fFormat, fID, ftssPairID, fTssQuarantine, fVersion, fLogProtocol, fPrimaryLocality }));
 	wait(waitForAll(std::vector{ fShardAssigned, fShardAvailable }));
 	wait(byteSampleSampleRecovered.getFuture());
 	TraceEvent("RestoringDurableState", data->thisServerID);
@@ -4037,6 +4096,14 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 		data->setTssPair(BinaryReader::fromStringRef<UID>(ftssPairID.get().get(), Unversioned()));
 	}
 
+	// It's a bit sketchy to rely on an untrusted storage engine to persist its quarantine state when the quarantine
+	// state means the storage engine already had a durability or correctness error, but it should get re-quarantined
+	// very quickly because of a mismatch if it starts trying to do things again
+	if (fTssQuarantine.get().present()) {
+		TEST(true); // TSS restarted while quarantined
+		data->tssInQuarantine = true;
+	}
+
 	data->sk = serverKeysPrefixFor((data->tssPairID.present()) ? data->tssPairID.get() : data->thisServerID)
 	               .withPrefix(systemKeys.begin); // FFFF/serverKeys/[this server]/
 
@@ -4058,6 +4125,7 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 		                     ? allKeys.end
 		                     : available[availableLoc + 1].key.removePrefix(persistShardAvailableKeys.begin));
 		ASSERT(!keys.empty());
+
 		bool nowAvailable = available[availableLoc].value != LiteralStringRef("0");
 		/*if(nowAvailable)
 		  TraceEvent("AvailableShard", data->thisServerID).detail("RangeBegin", keys.begin).detail("RangeEnd", keys.end);*/
@@ -4735,6 +4803,7 @@ bool storageServerTerminated(StorageServer& self, IKeyValueStore* persistentData
 	if (e.code() == error_code_please_reboot) {
 		// do nothing.
 	} else if (e.code() == error_code_worker_removed || e.code() == error_code_recruitment_failed) {
+		// SOMEDAY: could close instead of dispose if tss in quarantine gets removed so it could still be investigated?
 		persistentData->dispose();
 	} else {
 		persistentData->close();
@@ -4965,7 +5034,9 @@ ACTOR Future<Void> replaceTSSInterface(StorageServer* self, StorageServerInterfa
 			tr->set(serverListKeyFor(ssi.id()), serverListValue(ssi));
 
 			// add itself back to tss mapping
-			tssMapDB.set(tr, self->tssPairID.get(), ssi.id());
+			if (!self->isTSSInQuarantine()) {
+				tssMapDB.set(tr, self->tssPairID.get(), ssi.id());
+			}
 
 			wait(tr->commit());
 			self->tag = myTag;

From 4093c52638884160704f129e4a1958d0c2f35a50 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Thu, 10 Jun 2021 18:46:44 +0000
Subject: [PATCH 240/740] TSS downgrade changes

---
 fdbserver/SimulatedCluster.actor.cpp              | 5 ++++-
 fdbserver/tester.actor.cpp                        | 4 +++-
 tests/restarting/to_6.3.10/CycleTestRestart-1.txt | 1 +
 tests/restarting/to_6.3.10/CycleTestRestart-2.txt | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index 4acc41d5d60..beb482e44db 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -937,7 +937,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	}
 
 	int tssCount = 0;
-	if (!testConfig.simpleConfig && deterministicRandom()->random01() < 0.25) {
+	if (!testConfig.simpleConfig && !testConfig.disableTss && deterministicRandom()->random01() < 0.25) {
 		// 1 or 2 tss
 		tssCount = deterministicRandom()->randomInt(1, 3);
 	}
@@ -1726,6 +1726,9 @@ void checkTestConf(const char* testFile, TestConfig* testConfig) {
 		if (attrib == "restartInfoLocation") {
 			testConfig->isFirstTestInRestart = true;
 		}
+		if (attrib == "disableTss") {
+			sscanf(value.c_str(), "%d", &testConfig->disableTss);
+		}
 	}
 
 	ifs.close();
diff --git a/fdbserver/tester.actor.cpp b/fdbserver/tester.actor.cpp
index 7b2505bd03c..c3307d4b556 100644
--- a/fdbserver/tester.actor.cpp
+++ b/fdbserver/tester.actor.cpp
@@ -1046,7 +1046,9 @@ std::map<std::string, std::function<void(const std::string&)>> testSpecGlobalKey
 	{ "storageEngineExcludeTypes",
 	  [](const std::string& value) { TraceEvent("TestParserTest").detail("ParsedStorageEngineExcludeTypes", ""); } },
 	{ "maxTLogVersion",
-	  [](const std::string& value) { TraceEvent("TestParserTest").detail("ParsedMaxTLogVersion", ""); } }
+	  [](const std::string& value) { TraceEvent("TestParserTest").detail("ParsedMaxTLogVersion", ""); } },
+	{ "disableTss",
+	  [](const std::string& value) { TraceEvent("TestParserTest").detail("ParsedDisableTSS", ""); } }
 };
 
 std::map<std::string, std::function<void(const std::string& value, TestSpec* spec)>> testSpecTestKeys = {
diff --git a/tests/restarting/to_6.3.10/CycleTestRestart-1.txt b/tests/restarting/to_6.3.10/CycleTestRestart-1.txt
index fe2a95fd46c..942326c177c 100644
--- a/tests/restarting/to_6.3.10/CycleTestRestart-1.txt
+++ b/tests/restarting/to_6.3.10/CycleTestRestart-1.txt
@@ -1,5 +1,6 @@
 storageEngineExcludeTypes=-1,-2
 maxTLogVersion=6
+disableTss=true
 testTitle=Clogged
     clearAfterTest=false
     testName=Cycle
diff --git a/tests/restarting/to_6.3.10/CycleTestRestart-2.txt b/tests/restarting/to_6.3.10/CycleTestRestart-2.txt
index 8af5b923929..d518e14f18e 100644
--- a/tests/restarting/to_6.3.10/CycleTestRestart-2.txt
+++ b/tests/restarting/to_6.3.10/CycleTestRestart-2.txt
@@ -1,5 +1,6 @@
 storageEngineExcludeTypes=-1,-2
 maxTLogVersion=6
+disableTss=true
 testTitle=Clogged
     runSetup=false
     testName=Cycle

From 9ee69a2d40a3200af5b775b8864062c48a6531d0 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 11 Jun 2021 10:07:55 -0500
Subject: [PATCH 241/740] Adding TSS Quarantine to docs and updating from PR
 suggestions

---
 .../sphinx/source/command-line-interface.rst   | 18 ++++++++++++++++++
 documentation/sphinx/source/tss.rst            | 17 +++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/documentation/sphinx/source/command-line-interface.rst b/documentation/sphinx/source/command-line-interface.rst
index 3811e16a3b4..39950e68268 100644
--- a/documentation/sphinx/source/command-line-interface.rst
+++ b/documentation/sphinx/source/command-line-interface.rst
@@ -503,3 +503,21 @@ Disables writing from ``fdbcli`` (the default). In this mode, attempting to set
 ``writemode on``
 
 Enables writing from ``fdbcli``.
+
+tssq
+----
+
+Utility commands for handling quarantining Testing Storage Servers. For more information on this, see :ref:`testing-storage-server`.
+
+``tssq start <StorageUID>``
+
+Manually quarantines a TSS process, if it is not already quarantined.
+
+``tssq stop <StorageUID>``
+
+Removes a TSS process from quarantine, disposing of the TSS and allowing Data Distribution to recruit a new storage process on the worker.
+
+``tssq list``:
+
+Lists the storage UIDs of all TSS processes currently in quarantine.
+
diff --git a/documentation/sphinx/source/tss.rst b/documentation/sphinx/source/tss.rst
index 928b7d73abe..7d271905325 100644
--- a/documentation/sphinx/source/tss.rst
+++ b/documentation/sphinx/source/tss.rst
@@ -17,7 +17,7 @@ The TSS feature allows FoundationDB to run an "untrusted" storage engine (the *t
 
 This allows a FoundationDB cluster operator to validate the correctness and performance of a different storage engine on the exact cluster workload before migrating data to the different storage engine.
 
-A Testing Storage Server is paired to a normal Storage Server. Both servers in the pair recieve the exact same requests, and contain the exact same data. The SS and TSS' responses are compared to ensure that they match, and performance metrics are recorded for the pair.
+A Testing Storage Server is paired to a normal Storage Server. Both servers in a new pair start empty and take on exactly the same data and serve exactly the same read requests. The SS and TSS responses are compared client-side to ensure that they match, and performance metrics are recorded for the pair.
 
 Configuring TSS
 ===============
@@ -57,9 +57,14 @@ Quarantined TSS
 If a *TSS Mismatch* is detected for a given TSS, instead of killing the TSS, it will be put into a *quarantined* state. In this state, the TSS doesn't respond to any data requests, but is still recruited on the worker, preventing a new storage process from replacing it.
 This is so that the cluster operator can investigate the storage engine file of the TSS's *testing storage engine* to determine the cause of the data inconsistency.
 
-You can also manually quarantine a TSS, or dispose of a quarantined TSS once you're done investigating using the FDB :ref:`command line interface <command-line-interface>`.
+You can also manually quarantine a TSS, or dispose of a quarantined TSS once you're done investigating using the ``tssq`` command in the FDB :ref:`command line interface <command-line-interface>`.
 
-TODO include exact commands once implemented.
+The typical flow of operations would be
+
+* ``tssq start <StorageUID>``: manually quarantines a TSS process, if it is not already quarantined.
+* ``tssq list``: lists all TSS processes currently in quarantine to see if any were automatically quarantined.
+* Investigate the quarantined TSS to determine the cause of the mismatch.
+* ``tssq stop <StorageUID>``: remove a TSS process from quarantine, disposing of the TSS and allowing Data Distribution to recruit a new storage process on the worker.
 
 The Storage Consistency Check will also check TSS processes against the rest of that shard's team, and fail if there is a mismatch, but it will not automatically quarantine the offending TSS.
 
@@ -112,4 +117,8 @@ Caveats
 
 Despite its usefulness, the TSS feature does not give a perfect performance comparison of the storage engine(s) under test.
 
-Because it is only enabled on a small percentage of the cluster and only compares single storage processes for the same workload, it may miss potential aggregate performance problems, such as the testing storage engine overall consuming more cpu/memory. It is not a substitute for full-cluster performance and correctness testing or simulation testing.
+Because it is only enabled on a small percentage of the cluster and only compares single storage processes for the same workload, it may miss potential aggregate performance problems, such as the testing storage engine overall consuming more cpu/memory, especially on a host with many storage instances.
+
+TSS testing using the recommended small number of TSS pairs may also miss performance pathologies from workloads not experienced by the specific storage teams with TSS pairs in their membership.
+
+TSS testing is not a substitute for full-cluster performance and correctness testing or simulation testing.
\ No newline at end of file

From 5df9b2ca70b35b1a3f4d658aa37e11010a5f9f33 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 11 Jun 2021 10:37:49 -0500
Subject: [PATCH 242/740] Adding comments and a quarantine case I forgot

---
 fdbserver/ApplyMetadataMutation.cpp | 5 +++--
 fdbserver/MoveKeys.actor.cpp        | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index 1a1e314a36e..f7dc855d125 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -52,7 +52,7 @@ void applyMetadataMutations(SpanID const& spanContext,
                             Arena& arena,
                             VectorRef<MutationRef> const& mutations,
                             IKeyValueStore* txnStateStore,
-                            LogPushData* toCommit,
+                            LogPushData* toCommit, // non-null if these mutations were part of a new commit handled by this commit proxy
                             bool& confChange,
                             Reference<ILogSystem> logSystem,
                             Version popVersion,
@@ -66,7 +66,8 @@ void applyMetadataMutations(SpanID const& spanContext,
                             std::map<UID, Reference<StorageInfo>>* storageCache,
                             std::map<Tag, Version>* tag_popped,
                             std::unordered_map<UID, StorageServerInterface>* tssMapping,
-                            bool initialCommit) {
+                            bool initialCommit // true if the mutations were already written to the txnStateStore as part of recovery
+) {
 	// std::map<keyRef, vector<uint16_t>> cacheRangeInfo;
 	std::map<KeyRef, MutationRef> cachedRangeInfo;
 
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index 59e1c13261c..aadc7ff998c 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -1253,7 +1253,14 @@ ACTOR Future<Void> removeStorageServer(Database cx,
 					TraceEvent(SevError, "TSSIdentityMappingEnabled");
 					tssMapDB.erase(tr, serverID);
 				} else if (tssPairID.present()) {
+					// remove the TSS from the mapping
 					tssMapDB.erase(tr, tssPairID.get());
+					// remove the TSS from quarantine, if it was in quarantine
+					Key tssQuarantineKey = tssQuarantineKeyFor(serverID);
+					Optional<Value> tssInQuarantine = wait(tr->get(tssQuarantineKey));
+					if (tssInQuarantine.present()) {
+						tr->clear(tssQuarantineKeyFor(serverID));
+					}
 				}
 
 				retry = true;

From f11ca79e5f424de5b73f342f310c102993818607 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Wed, 16 Jun 2021 17:12:40 -0500
Subject: [PATCH 243/740] Fixing some merge issues with TSS on 7.0

---
 fdbcli/fdbcli.actor.cpp               | 2 +-
 fdbserver/CommitProxyServer.actor.cpp | 3 +--
 fdbserver/SimulatedCluster.actor.cpp  | 4 ++--
 fdbserver/TesterInterface.actor.h     | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 48ec5a00d79..bb92bcbf293 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -493,7 +493,7 @@ void initHelp() {
 	helpMap["configure"] = CommandHelp(
 	    "configure [new|tss]"
 	    "<single|double|triple|three_data_hall|three_datacenter|ssd|memory|memory-radixtree-beta|proxies=<PROXIES>|"
-	    "commit_proxies=<COMMIT_PROXIES>|grv_proxies=<GRV_PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*",
+	    "commit_proxies=<COMMIT_PROXIES>|grv_proxies=<GRV_PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*"
 	    "count=<TSS_COUNT>",
 	    "change the database configuration",
 	    "The `new' option, if present, initializes a new database with the given configuration rather than changing "
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index f2e7c78fd49..65654f35db7 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1275,8 +1275,7 @@ ACTOR Future<Void> reply(CommitBatchContext* self) {
 	// self->committedVersion by reporting commit version first before updating self->committedVersion. Otherwise, a
 	// client may get a commit version that the master is not aware of, and next GRV request may get a version less than
 	// self->committedVersion.
-	TEST(pProxyCommitData->committedVersion.get() >
-	     self->commitVersion); // A later version was reported committed first
+	TEST(pProxyCommitData->committedVersion.get() > self->commitVersion); // A later version was reported committed first
 	if (self->commitVersion >= pProxyCommitData->committedVersion.get()) {
 		wait(pProxyCommitData->master.reportLiveCommittedVersion.getReply(
 		    ReportRawCommittedVersionRequest(self->commitVersion,
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index beb482e44db..b817c9bfc99 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -937,7 +937,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	}
 
 	int tssCount = 0;
-	if (!testConfig.simpleConfig && !testConfig.disableTss && deterministicRandom()->random01() < 0.25) {
+	if (!simple && !testConfig.disableTss && deterministicRandom()->random01() < 0.25) {
 		// 1 or 2 tss
 		tssCount = deterministicRandom()->randomInt(1, 3);
 	}
@@ -1265,7 +1265,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	tssCount =
 	    std::max(0, std::min(tssCount, (db.usableRegions * (machine_count / datacenters) - replication_type) / 2));
 
-	if (!testConfig.config.present() && tssCount > 0) {
+	if (tssCount > 0) {
 		std::string confStr = format("tss_count:=%d tss_storage_engine:=%d", tssCount, db.storageServerStoreType);
 		set_config(confStr);
 		double tssRandom = deterministicRandom()->random01();
diff --git a/fdbserver/TesterInterface.actor.h b/fdbserver/TesterInterface.actor.h
index e1bed55d406..a1dfa07be3e 100644
--- a/fdbserver/TesterInterface.actor.h
+++ b/fdbserver/TesterInterface.actor.h
@@ -110,6 +110,7 @@ struct TestConfig {
 	bool startIncompatibleProcess = false;
 	int logAntiQuorum = -1;
 	bool isFirstTestInRestart;
+	bool disableTss;
 	// Storage Engine Types: Verify match with SimulationConfig::generateNormalConfig
 	//	0 = "ssd"
 	//	1 = "memory"

From 1f7d0f1e67024157f02b0962e1ef6ee100b83c6b Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 16 Jun 2021 15:26:27 -0700
Subject: [PATCH 244/740] added a knob to disable streaming reads for data
 distribution

---
 fdbserver/Knobs.cpp               |  1 +
 fdbserver/Knobs.h                 |  1 +
 fdbserver/storageserver.actor.cpp | 38 ++++++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index 30ae8569cc0..70a70cb3432 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -577,6 +577,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( FUTURE_VERSION_DELAY,                                  1.0 );
 	init( STORAGE_LIMIT_BYTES,                                500000 );
 	init( BUGGIFY_LIMIT_BYTES,                                  1000 );
+	init( FETCH_USING_STREAMING,                                true ); if( randomize && BUGGIFY ) FETCH_USING_STREAMING = false; //Determines if fetch keys uses streaming reads
 	init( FETCH_BLOCK_BYTES,                                     2e6 );
 	init( FETCH_KEYS_PARALLELISM_BYTES,                          4e6 ); if( randomize && BUGGIFY ) FETCH_KEYS_PARALLELISM_BYTES = 3e6;
 	init( FETCH_KEYS_PARALLELISM,                                  2 );
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index b890e8c49b6..069ce0d52d6 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -504,6 +504,7 @@ class ServerKnobs : public Knobs {
 	double FUTURE_VERSION_DELAY;
 	int STORAGE_LIMIT_BYTES;
 	int BUGGIFY_LIMIT_BYTES;
+	bool FETCH_USING_STREAMING;
 	int FETCH_BLOCK_BYTES;
 	int FETCH_KEYS_PARALLELISM_BYTES;
 	int FETCH_KEYS_PARALLELISM;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 30a1a6b203f..7543204c284 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2651,6 +2651,40 @@ class FetchKeysMetricReporter {
 	}
 };
 
+ACTOR Future<Void> tryGetRange(PromiseStream<RangeResult> results, Transaction* tr, KeyRange keys) {
+	state KeySelectorRef begin = firstGreaterOrEqual(keys.begin);
+	state KeySelectorRef end = firstGreaterOrEqual(keys.end);
+
+	try {
+		loop {
+			GetRangeLimits limits(GetRangeLimits::ROW_LIMIT_UNLIMITED, SERVER_KNOBS->FETCH_BLOCK_BYTES);
+			limits.minRows = 0;
+			state RangeResult rep = wait(tr->getRange(begin, end, limits, true));
+			if (!rep.more) {
+				rep.readThrough = keys.end;
+			}
+			results.send(rep);
+
+			if (!rep.more) {
+				results.sendError(end_of_stream());
+				return Void();
+			}
+
+			if (rep.readThrough.present()) {
+				begin = firstGreaterOrEqual(rep.readThrough.get());
+			} else {
+				begin = firstGreaterThan(rep.end()[-1].key);
+			}
+		}
+	} catch (Error& e) {
+		if (e.code() == error_code_actor_cancelled) {
+			throw;
+		}
+		results.sendError(e);
+		throw;
+	}
+}
+
 ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 	state const UID fetchKeysID = deterministicRandom()->randomUniqueID();
 	state TraceInterval interval("FetchKeys");
@@ -2731,7 +2765,9 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 			tr.setVersion(fetchVersion);
 			tr.info.taskID = TaskPriority::FetchKeys;
 			state PromiseStream<RangeResult> results;
-			state Future<Void> hold = tr.getRangeStream(results, keys, GetRangeLimits(), true);
+			state Future<Void> hold = SERVER_KNOBS->FETCH_USING_STREAMING
+			                              ? tr.getRangeStream(results, keys, GetRangeLimits(), true)
+			                              : tryGetRange(results, &tr, keys);
 			state Key nfk = keys.begin;
 
 			try {

From bd7f7d546e8dccb849854226a3625e461db4f796 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Thu, 17 Jun 2021 10:44:17 -0700
Subject: [PATCH 245/740] 6.3.15 release notes.

---
 .../sphinx/source/release-notes/release-notes-630.rst     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-630.rst b/documentation/sphinx/source/release-notes/release-notes-630.rst
index ca6a8fd029a..44db8d8a77a 100644
--- a/documentation/sphinx/source/release-notes/release-notes-630.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-630.rst
@@ -3,6 +3,14 @@ Release Notes
 #############
 
 
+6.3.15
+======
+* Added several counters to the ``MasterMetrics`` trace event to count the number of requests of each type received. `(PR #4829) <https://github.com/apple/foundationdb/pull/4829>`_
+* Added ``RecoveryCount`` to trace events when a transaction log begins. `(PR #4944) <https://github.com/apple/foundationdb/pull/4944>`_
+* Added metrics to compare the bandwidth used by data distributions and updates. `(PR #4907) <https://github.com/apple/foundationdb/pull/4907>`_
+* Batch transactions could be throttled with an error when the latency between ratekeeper and some proxies was high. `(PR #4932) <https://github.com/apple/foundationdb/pull/4932>`_
+* Fix accounting issue that could cause higher priority GRV requests to be rejected after many batch priority requests have been rejected on a proxy. `(PR #4932) <https://github.com/apple/foundationdb/pull/4932>`_
+
 6.3.14
 ======
 * Fixed fdbbackup start command that automatically configures database with backup workers to only do so when using partitioned logs. `(PR #4863) <https://github.com/apple/foundationdb/pull/4863>`_

From 7102c80320b644beb2e611b9de40825a4bc88378 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 11 May 2021 00:05:08 +0000
Subject: [PATCH 246/740] Add  command line support

---
 .gitignore                          |  2 +-
 fdbcli/fdbcli.actor.cpp             | 13 +++++++++----
 fdbclient/DatabaseConfiguration.cpp | 11 +++++++----
 fdbclient/DatabaseConfiguration.h   |  3 +++
 fdbclient/ManagementAPI.actor.cpp   |  8 ++++++++
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b74cc1f7c5..f555965fab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ bindings/java/foundationdb-client*.jar
 bindings/java/foundationdb-tests*.jar
 bindings/java/fdb-java-*-sources.jar
 packaging/msi/FDBInstaller.msi
-
+builds/
 # Generated source, build, and packaging files
 *.g.cpp
 *.g.h
diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index bb92bcbf293..52db6b5deb9 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -493,8 +493,9 @@ void initHelp() {
 	helpMap["configure"] = CommandHelp(
 	    "configure [new|tss]"
 	    "<single|double|triple|three_data_hall|three_datacenter|ssd|memory|memory-radixtree-beta|proxies=<PROXIES>|"
-	    "commit_proxies=<COMMIT_PROXIES>|grv_proxies=<GRV_PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*"
-	    "count=<TSS_COUNT>",
+	    "commit_proxies=<COMMIT_PROXIES>|grv_proxies=<GRV_PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*|"
+	    "count=<TSS_COUNT>|",
+	    "perpetual_storage_wiggle=<WIGGLE_SPEED>",
 	    "change the database configuration",
 	    "The `new' option, if present, initializes a new database with the given configuration rather than changing "
 	    "the configuration of an existing one. When used, both a redundancy mode and a storage engine must be "
@@ -518,8 +519,11 @@ void initHelp() {
 	    "1, or set to -1 which restores the number of GRV proxies to the default value.\n\nlogs=<LOGS>: Sets the "
 	    "desired number of log servers in the cluster. Must be at least 1, or set to -1 which restores the number of "
 	    "logs to the default value.\n\nresolvers=<RESOLVERS>: Sets the desired number of resolvers in the cluster. "
-	    "Must be at least 1, or set to -1 which restores the number of resolvers to the default value.\n\nSee the "
-	    "FoundationDB Administration Guide for more information.");
+	    "Must be at least 1, or set to -1 which restores the number of resolvers to the default value.\n\n"
+	    "perpetual_storage_wiggle=<WIGGLE_SPEED>: Set the value speed (a.k.a., the number of processes that the Data "
+	    "Distributor should wiggle at a time). Currently, only 0 and 1 are supported. The value 0 means to disable the "
+	    "perpetual storage wiggle.\n\n"
+	    "See the FoundationDB Administration Guide for more information.");
 	helpMap["fileconfigure"] = CommandHelp(
 	    "fileconfigure [new] <FILENAME>",
 	    "change the database configuration from a file",
@@ -2845,6 +2849,7 @@ void configureGenerator(const char* text, const char* line, std::vector<std::str
 		                   "grv_proxies=",
 		                   "logs=",
 		                   "resolvers=",
+		                   "perpetual_storage_wiggle=",
 		                   nullptr };
 	arrayGenerator(text, line, opts, lc);
 }
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index f3bca22ec83..26f2fa64970 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -44,6 +44,7 @@ void DatabaseConfiguration::resetInternal() {
 	remoteDesiredTLogCount = -1;
 	remoteTLogReplicationFactor = repopulateRegionAntiQuorum = 0;
 	backupWorkerEnabled = false;
+	perpetualStorageWiggleSpeed = 0;
 }
 
 void parse(int* i, ValueRef const& v) {
@@ -195,9 +196,9 @@ bool DatabaseConfiguration::isValid() const {
 	      getDesiredRemoteLogs() >= 1 && remoteTLogReplicationFactor >= 0 && repopulateRegionAntiQuorum >= 0 &&
 	      repopulateRegionAntiQuorum <= 1 && usableRegions >= 1 && usableRegions <= 2 && regions.size() <= 2 &&
 	      (usableRegions == 1 || regions.size() == 2) && (regions.size() == 0 || regions[0].priority >= 0) &&
-	      (regions.size() == 0 ||
-	       tLogPolicy->info() !=
-	           "dcid^2 x zoneid^2 x 1"))) { // We cannot specify regions with three_datacenter replication
+	      (regions.size() == 0 || tLogPolicy->info() != "dcid^2 x zoneid^2 x 1") &&
+	      // We cannot specify regions with three_datacenter replication
+	      (perpetualStorageWiggleSpeed == 0 || perpetualStorageWiggleSpeed == 1))) {
 		return false;
 	}
 	std::set<Key> dcIds;
@@ -387,7 +388,7 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const {
 	}
 
 	result["backup_worker_enabled"] = (int32_t)backupWorkerEnabled;
-
+	result["perpetual_storage_wiggle"] = perpetualStorageWiggleSpeed;
 	return result;
 }
 
@@ -539,6 +540,8 @@ bool DatabaseConfiguration::setInternal(KeyRef key, ValueRef value) {
 		parse(&repopulateRegionAntiQuorum, value);
 	} else if (ck == LiteralStringRef("regions")) {
 		parse(&regions, value);
+	} else if (ck == LiteralStringRef("perpetual_storage_wiggle")) {
+		parse(&perpetualStorageWiggleSpeed, value);
 	} else {
 		return false;
 	}
diff --git a/fdbclient/DatabaseConfiguration.h b/fdbclient/DatabaseConfiguration.h
index fb3064f7000..0df45ce2284 100644
--- a/fdbclient/DatabaseConfiguration.h
+++ b/fdbclient/DatabaseConfiguration.h
@@ -243,6 +243,9 @@ struct DatabaseConfiguration {
 	int32_t repopulateRegionAntiQuorum;
 	std::vector<RegionInfo> regions;
 
+	// Perpetual Storage Setting
+	int32_t perpetualStorageWiggleSpeed;
+
 	// Excluded servers (no state should be here)
 	bool isExcludedServer(NetworkAddressList) const;
 	std::set<AddressExclusion> getExcludedServers() const;
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index 21a41216d29..876236f855c 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -141,6 +141,14 @@ std::map<std::string, std::string> configForToken(std::string const& mode) {
 			    BinaryWriter::toValue(regionObj, IncludeVersion(ProtocolVersion::withRegionConfiguration())).toString();
 		}
 
+		if (key == "perpetual_storage_wiggle" && isInteger(value)) {
+			int ppWiggle = atoi(value.c_str());
+			if (ppWiggle >= 2 || ppWiggle < 0) {
+				printf("Error: Only 0 and 1 are valid values of perpetual_storage_wiggle at present.\n");
+				return out;
+			}
+			out[p + key] = value;
+		}
 		return out;
 	}
 

From d7bed45d3b17553e559ed49c5232776d47b90618 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 17 May 2021 20:22:27 +0000
Subject: [PATCH 247/740] fix perpetualStorageWiggleKey

---
 fdbclient/SystemData.cpp | 3 +++
 fdbclient/SystemData.h   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index db765152f0d..d10d8353b5b 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -626,6 +626,9 @@ ProcessClass decodeProcessClassValue(ValueRef const& value) {
 const KeyRangeRef configKeys(LiteralStringRef("\xff/conf/"), LiteralStringRef("\xff/conf0"));
 const KeyRef configKeysPrefix = configKeys.begin;
 
+const KeyRef perpetualStorageWiggleKey(LiteralStringRef("\xff/conf/perpetual_storage_wiggle"));
+const KeyRef wigglingStorageServerKey(LiteralStringRef("\xff/storageWiggleUID"));
+
 const KeyRef triggerDDTeamInfoPrintKey(LiteralStringRef("\xff/triggerDDTeamInfoPrint"));
 
 const KeyRangeRef excludedServersKeys(LiteralStringRef("\xff/conf/excluded/"), LiteralStringRef("\xff/conf/excluded0"));
diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h
index 03a8ef27f19..cd0bced69c0 100644
--- a/fdbclient/SystemData.h
+++ b/fdbclient/SystemData.h
@@ -206,6 +206,8 @@ UID decodeProcessClassKeyOld(KeyRef const& key);
 extern const KeyRangeRef configKeys;
 extern const KeyRef configKeysPrefix;
 
+extern const KeyRef perpetualStorageWiggleKey;
+extern const KeyRef wigglingStorageServerKey;
 // Change the value of this key to anything and that will trigger detailed data distribution team info log.
 extern const KeyRef triggerDDTeamInfoPrintKey;
 

From 58c1452012ff18af56c864c2bd1cbe569a25aa18 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 19 May 2021 23:52:16 +0000
Subject: [PATCH 248/740] fix Schema check error

---
 fdbclient/Schemas.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 492d8b00059..040d055154b 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -757,6 +757,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
          "grv_proxies":1,
          "backup_worker_enabled":1,
          "proxies":6
+         "perpetual_storage_wiggle":0
       },
       "data":{
          "least_operating_space_bytes_log_server":0,

From fab287b36bd2e0664fe2a8bb30ade506dc4fda3b Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 20 May 2021 00:06:53 +0000
Subject: [PATCH 249/740] change UID to PID meaning Process ID

---
 fdbclient/SystemData.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index d10d8353b5b..5c61f324c99 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -627,7 +627,7 @@ const KeyRangeRef configKeys(LiteralStringRef("\xff/conf/"), LiteralStringRef("\
 const KeyRef configKeysPrefix = configKeys.begin;
 
 const KeyRef perpetualStorageWiggleKey(LiteralStringRef("\xff/conf/perpetual_storage_wiggle"));
-const KeyRef wigglingStorageServerKey(LiteralStringRef("\xff/storageWiggleUID"));
+const KeyRef wigglingStorageServerKey(LiteralStringRef("\xff/storageWigglePID"));
 
 const KeyRef triggerDDTeamInfoPrintKey(LiteralStringRef("\xff/triggerDDTeamInfoPrint"));
 

From 7a0a907f1ba8caee069547409287e2c209330fb7 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 20 May 2021 03:32:15 +0000
Subject: [PATCH 250/740] add pid2server_info to maintain Process id set

---
 fdbserver/DataDistribution.actor.cpp | 167 ++++++++++++++++++++++++++-
 1 file changed, 166 insertions(+), 1 deletion(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index aaaa8943481..4ce60b5e0ec 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -615,6 +615,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	std::map<UID, Reference<TCServerInfo>> server_info;
 	std::map<UID, Reference<TCServerInfo>> tss_info_by_pair;
 	std::map<UID, Reference<TCServerInfo>> server_and_tss_info; // TODO could replace this with an efficient way to do a read-only concatenation of 2 data structures? 
+	std::map<Key, std::vector<Reference<TCServerInfo>>> pid2server_info; // some process may serve as multiple storage servers
 	std::map<Key, int> lagging_zones; // zone to number of storage servers lagging
 	AsyncVar<bool> disableFailingLaggingServers;
 
@@ -2458,7 +2459,11 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		    processClass,
 		    includedDCs.empty() ||
 		        std::find(includedDCs.begin(), includedDCs.end(), newServer.locality.dcId()) != includedDCs.end(),
-		    storageServerSet);
+		    storageServerSet,
+		    addedVersion);
+		ASSERT(r->lastKnownInterface.locality.processId().present());
+		StringRef pid = r->lastKnownInterface.locality.processId().get();
+		pid2server_info[pid].push_back(r);
 
 		if (newServer.isTss()) {
 			tss_info_by_pair[newServer.tssPairID.get()] = r;
@@ -2668,6 +2673,19 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 
 		// ASSERT( !shardsAffectedByTeamFailure->getServersForTeam( t ) for all t in teams that contain removedServer )
 		Reference<TCServerInfo> removedServerInfo = server_info[removedServer];
+		// Step: Remove TCServerInfo from pid2server_info
+		ASSERT(removedServerInfo->lastKnownInterface.locality.processId().present());
+		StringRef pid = removedServerInfo->lastKnownInterface.locality.processId().get();
+		auto& info_vec = pid2server_info[pid];
+		for (size_t i = 0; i < info_vec.size(); ++i) {
+			if (info_vec[i] == removedServerInfo) {
+				info_vec[i--] = info_vec.back();
+				info_vec.pop_back();
+			}
+		}
+		if (info_vec.size() == 0) {
+			pid2server_info.erase(pid);
+		}
 
 		// Step: Remove server team that relate to removedServer
 		// Find all servers with which the removedServer shares teams
@@ -3796,6 +3814,152 @@ ACTOR Future<vector<std::pair<StorageServerInterface, ProcessClass>>> getServerL
 	return results;
 }
 
+// Iterator over each storage process to do storage wiggle
+ACTOR Future<Void> perpetualStorageWiggleIterator(FutureStream<Void> stopSignal,
+                                                  FutureStream<Void> finishStorageWiggleSignal,
+                                                  DDTeamCollection* teamCollection) {
+	state ReadYourWritesTransaction tr(teamCollection->cx);
+
+	loop choose {
+		when(waitNext(stopSignal)) { break; }
+		when(waitNext(finishStorageWiggleSignal)) {
+			// set the next SS UID
+			tr.reset();
+			loop {
+				try {
+					tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+					Optional<Value> value = wait(tr.get(wigglingStorageServerKey));
+					if (value.present()) {
+						auto nextIt = teamCollection->pid2server_info.upper_bound(value.get());
+						if (nextIt == teamCollection->pid2server_info.end()) {
+							tr.set(wigglingStorageServerKey, teamCollection->pid2server_info.begin()->first);
+						} else {
+							tr.set(wigglingStorageServerKey, nextIt->first);
+						}
+					} else {
+						// initialize the value of to the smallest SS ID
+						tr.set(wigglingStorageServerKey, teamCollection->pid2server_info.begin()->first);
+					}
+					wait(tr.commit());
+					break;
+				} catch (Error& e) {
+					wait(tr.onError(e));
+				}
+			}
+		}
+	}
+
+	return Void();
+}
+
+ACTOR Future<Future<Void>> watchPerpetualStoragePIDChange(Database cx, Promise<Value> pid) {
+	state ReadYourWritesTransaction tr(cx);
+	state Future<Void> watchFuture;
+	loop {
+		try {
+			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+			Optional<Standalone<StringRef>> value = wait(tr.get(wigglingStorageServerKey));
+			if (value.present()) {
+				pid.send(value.get());
+			}
+			watchFuture = tr.watch(wigglingStorageServerKey);
+			wait(tr.commit());
+			break;
+		} catch (Error& e) {
+			wait(tr.onError(e));
+		}
+	}
+	return watchFuture;
+}
+// Watch the value of current wiggling storage process and do wiggling works
+ACTOR Future<Void> perpetualStorageWiggler(FutureStream<Void> stopSignal,
+                                           PromiseStream<Void> finishStorageWiggleSignal,
+                                           DDTeamCollection* self,
+                                           const DDEnabledState* ddEnabledState) {
+	state Promise<Value> pidPromise;
+	state Future<Void> watchFuture;
+	wait(store(watchFuture, watchPerpetualStoragePIDChange(self->cx, pidPromise)));
+
+	loop choose {
+		when(waitNext(stopSignal)) { break; }
+		when(wait(watchFuture)) { wait(store(watchFuture, watchPerpetualStoragePIDChange(self->cx, pidPromise))); }
+		when(state Value pid = wait(pidPromise.getFuture())) {
+			pidPromise.reset();
+			if (self->pid2server_info.count(pid) != 0) {
+				std::vector<Future<Void>> moveFutures;
+				for (auto& info : self->pid2server_info[pid]) {
+					AddressExclusion addr(info->lastKnownInterface.address().ip);
+					if (self->excludedServers.count(addr) &&
+					    self->excludedServers.get(addr) != DDTeamCollection::Status::NONE) {
+						continue; // don't override the value set by actor trackExcludedServer
+					}
+					self->excludedServers.set(addr, DDTeamCollection::Status::WIGGLING);
+					moveFutures.push_back(
+					    waitForAllDataRemoved(self->cx, info->lastKnownInterface.id(), info->addedVersion, self));
+				}
+				// wait for all data is moved from this process
+				if (!moveFutures.empty()) {
+					self->restartRecruiting.trigger();
+					wait(waitForAllReady(moveFutures));
+				}
+
+				// re-include wiggling storage servers
+				for (auto& info : self->pid2server_info[pid]) {
+					AddressExclusion addr(info->lastKnownInterface.address().ip);
+					if (!self->excludedServers.count(addr) ||
+					    self->excludedServers.get(addr) != DDTeamCollection::Status::WIGGLING) {
+						continue;
+					}
+					self->excludedServers.set(addr, DDTeamCollection::Status::NONE);
+				}
+			}
+
+			// finish Wiggle this process
+			finishStorageWiggleSignal.send(Void());
+		}
+	}
+	return Void();
+}
+
+ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollection,
+                                                 const DDEnabledState* ddEnabledState) {
+	state int speed = 0;
+	state PromiseStream<Void> stopWiggleSignal;
+	state PromiseStream<Void> finishStorageWiggleSignal;
+	state SignalableActorCollection collection;
+
+	loop {
+		state ReadYourWritesTransaction tr(teamCollection->cx);
+		loop {
+			try {
+				tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+				Optional<Standalone<StringRef>> value = wait(tr.get(perpetualStorageWiggleKey));
+
+				if (value.present()) {
+					speed = std::stoi(value.get().toString());
+				}
+				state Future<Void> watchFuture = tr.watch(perpetualStorageWiggleKey);
+				wait(tr.commit());
+
+				ASSERT(speed == 1 || speed == 0);
+				if (speed == 1) {
+					collection.add(perpetualStorageWiggleIterator(
+					    stopWiggleSignal.getFuture(), finishStorageWiggleSignal.getFuture(), teamCollection));
+					finishStorageWiggleSignal.send(Void());
+					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
+				} else {
+					stopWiggleSignal.send(Void());
+					wait(collection.signalAndReset());
+					TraceEvent("PerpetualStorageWiggleClose", teamCollection->distributorId);
+				}
+				wait(watchFuture);
+				break;
+			} catch (Error& e) {
+				wait(tr.onError(e));
+			}
+		}
+	}
+}
 // The serverList system keyspace keeps the StorageServerInterface for each serverID. Storage server's storeType
 // and serverID are decided by the server's filename. By parsing storage server file's filename on each disk, process on
 // each machine creates the TCServer with the correct serverID and StorageServerInterface.
@@ -5130,6 +5294,7 @@ ACTOR Future<Void> dataDistributionTeamCollection(Reference<DDTeamCollection> te
 		self->addActor.send(trackExcludedServers(self));
 		self->addActor.send(monitorHealthyTeams(self));
 		self->addActor.send(waitHealthyZoneChange(self));
+		self->addActor.send(monitorPerpetualStorageWiggle(self, ddEnabledState));
 
 		// SOMEDAY: Monitor FF/serverList for (new) servers that aren't in allServers and add or remove them
 

From 39a8ff66dd2ea6a1ee0aee08bfedd7a75b801c35 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 20 May 2021 23:31:08 +0000
Subject: [PATCH 251/740] add perpetualStorageWiggler

---
 fdbserver/DataDistribution.actor.cpp      | 177 ++++++++++++++++------
 fdbserver/DataDistribution.actor.h        |   1 +
 fdbserver/DataDistributionQueue.actor.cpp |   4 +
 fdbserver/Knobs.cpp                       |   1 +
 fdbserver/Knobs.h                         |   1 +
 5 files changed, 140 insertions(+), 44 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 4ce60b5e0ec..169c37d078d 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -51,9 +51,11 @@ class TCMachineTeamInfo;
 
 ACTOR Future<Void> checkAndRemoveInvalidLocalityAddr(DDTeamCollection* self);
 ACTOR Future<Void> removeWrongStoreType(DDTeamCollection* self);
+ACTOR Future<Void> waitForAllDataRemoved(Database cx, UID serverID, Version addedVersion, DDTeamCollection* teams);
 
 struct TCServerInfo : public ReferenceCounted<TCServerInfo> {
 	UID id;
+	Version addedVersion; // Read version when this Server is added
 	DDTeamCollection* collection;
 	StorageServerInterface lastKnownInterface;
 	ProcessClass lastKnownClass;
@@ -82,10 +84,12 @@ struct TCServerInfo : public ReferenceCounted<TCServerInfo> {
 	             DDTeamCollection* collection,
 	             ProcessClass processClass,
 	             bool inDesiredDC,
-	             Reference<LocalitySet> storageServerSet)
+	             Reference<LocalitySet> storageServerSet,
+	             Version addedVersion = 0)
 	  : id(ssi.id()), collection(collection), lastKnownInterface(ssi), lastKnownClass(processClass),
 	    dataInFlightToServer(0), onInterfaceChanged(interfaceChanged.getFuture()), onRemoved(removed.getFuture()),
-	    inDesiredDC(inDesiredDC), storeType(KeyValueStoreType::END), onTSSPairRemoved(Never()) {
+	    inDesiredDC(inDesiredDC), storeType(KeyValueStoreType::END), onTSSPairRemoved(Never()),
+	    addedVersion(addedVersion) {
 		if (!ssi.isTss()) {
 			localityEntry = ((LocalityMap<UID>*)storageServerSet.getPtr())->add(ssi.locality, &id);
 		}
@@ -362,15 +366,17 @@ class TCTeamInfo final : public ReferenceCounted<TCTeamInfo>, public IDataDistri
 };
 
 struct ServerStatus {
+	bool isWiggling;
 	bool isFailed;
 	bool isUndesired;
 	bool isWrongConfiguration;
 	bool initialized; // AsyncMap erases default constructed objects
 	LocalityData locality;
-	ServerStatus() : isFailed(true), isUndesired(false), isWrongConfiguration(false), initialized(false) {}
+	ServerStatus()
+	  : isWiggling(false), isFailed(true), isUndesired(false), isWrongConfiguration(false), initialized(false) {}
 	ServerStatus(bool isFailed, bool isUndesired, LocalityData const& locality)
 	  : isFailed(isFailed), isUndesired(isUndesired), locality(locality), isWrongConfiguration(false),
-	    initialized(true) {}
+	    initialized(true), isWiggling(false) {}
 	bool isUnhealthy() const { return isFailed || isUndesired; }
 	const char* toString() const { return isFailed ? "Failed" : isUndesired ? "Undesired" : "Healthy"; }
 
@@ -592,7 +598,7 @@ Future<Void> teamTracker(struct DDTeamCollection* const& self,
 struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	// clang-format off
 	enum { REQUESTING_WORKER = 0, GETTING_WORKER = 1, GETTING_STORAGE = 2 };
-	enum class Status { NONE = 0, EXCLUDED = 1, FAILED = 2 };
+	enum class Status { NONE = 0, WIGGLING = 1, EXCLUDED = 2, FAILED = 3};
 
 	// addActor: add to actorCollection so that when an actor has error, the ActorCollection can catch the error.
 	// addActor is used to create the actorCollection when the dataDistributionTeamCollection is created
@@ -679,6 +685,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 
 	AsyncTrigger printDetailedTeamsInfo;
 	PromiseStream<GetMetricsRequest> getShardMetrics;
+	PromiseStream<Promise<int>> getUnhealthyRelocationCount;
 	Promise<UID> removeFailedServer;
 
 	void resetLocalitySet() {
@@ -718,7 +725,8 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	                 bool primary,
 	                 Reference<AsyncVar<bool>> processingUnhealthy,
 	                 PromiseStream<GetMetricsRequest> getShardMetrics,
-	                 Promise<UID> removeFailedServer)
+	                 Promise<UID> removeFailedServer,
+	                 PromiseStream<Promise<int>> getUnhealthyRelocationCount)
 	  : cx(cx), distributorId(distributorId), lock(lock), output(output),
 	    shardsAffectedByTeamFailure(shardsAffectedByTeamFailure), doBuildTeams(true), lastBuildTeamsFailed(false),
 	    teamBuilder(Void()), badTeamRemover(Void()), checkInvalidLocalities(Void()), wrongStoreTypeRemover(Void()),
@@ -733,7 +741,8 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	    zeroHealthyTeams(zeroHealthyTeams), zeroOptimalTeams(true), primary(primary), isTssRecruiting(false),
 	    medianAvailableSpace(SERVER_KNOBS->MIN_AVAILABLE_SPACE_RATIO), lastMedianAvailableSpaceUpdate(0),
 	    processingUnhealthy(processingUnhealthy), lowestUtilizationTeam(0), highestUtilizationTeam(0),
-	    getShardMetrics(getShardMetrics), removeFailedServer(removeFailedServer) {
+	    getShardMetrics(getShardMetrics), removeFailedServer(removeFailedServer),
+	    getUnhealthyRelocationCount(getUnhealthyRelocationCount) {
 		if (!primary || configuration.usableRegions == 1) {
 			TraceEvent("DDTrackerStarting", distributorId).detail("State", "Inactive").trackLatest("DDTrackerStarting");
 		}
@@ -2800,6 +2809,42 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		    .detail("MachineTeams", machineTeams.size())
 		    .detail("DesiredTeamsPerServer", SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER);
 	}
+
+	std::vector<Future<Void>> excludeStorageWigglingServers(const Value& pid) {
+		std::vector<Future<Void>> moveFutures;
+		if (this->pid2server_info.count(pid) != 0) {
+			for (auto& info : this->pid2server_info[pid]) {
+				AddressExclusion addr(info->lastKnownInterface.address().ip);
+				if (this->excludedServers.count(addr) &&
+				    this->excludedServers.get(addr) != DDTeamCollection::Status::NONE) {
+					continue; // don't overwrite the value set by actor trackExcludedServer
+				}
+				this->excludedServers.set(addr, DDTeamCollection::Status::WIGGLING);
+				moveFutures.push_back(
+				    waitForAllDataRemoved(this->cx, info->lastKnownInterface.id(), info->addedVersion, this));
+			}
+			if (!moveFutures.empty()) {
+				this->restartRecruiting.trigger();
+			}
+		}
+		return moveFutures;
+	}
+
+	void includeStorageWigglingServers(const Value& pid) {
+		bool included = false;
+		for (auto& info : this->pid2server_info[pid]) {
+			AddressExclusion addr(info->lastKnownInterface.address().ip);
+			if (!this->excludedServers.count(addr) ||
+			    this->excludedServers.get(addr) != DDTeamCollection::Status::WIGGLING) {
+				continue;
+			}
+			included = true;
+			this->excludedServers.set(addr, DDTeamCollection::Status::NONE);
+		}
+		if (included) {
+			this->restartRecruiting.trigger();
+		}
+	}
 };
 
 TCServerInfo::~TCServerInfo() {
@@ -3441,6 +3486,7 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 			state vector<Future<Void>> change;
 			bool anyUndesired = false;
 			bool anyWrongConfiguration = false;
+			bool anyWigglingServer = false;
 			int serversLeft = 0;
 
 			for (const UID& uid : team->getServerIDs()) {
@@ -3455,6 +3501,9 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 				if (status.isWrongConfiguration) {
 					anyWrongConfiguration = true;
 				}
+				if (status.isWiggling) {
+					anyWigglingServer = true;
+				}
 			}
 
 			if (serversLeft == 0) {
@@ -3472,7 +3521,8 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 			}
 			change.push_back(self->zeroHealthyTeams->onChange());
 
-			bool healthy = !badTeam && !anyUndesired && serversLeft == self->configuration.storageTeamSize;
+			bool healthy =
+			    !badTeam && !anyUndesired && serversLeft == self->configuration.storageTeamSize && !anyWigglingServer;
 			team->setHealthy(healthy); // Unhealthy teams won't be chosen by bestTeam
 			bool optimal = team->isOptimal() && healthy;
 			bool containsFailed = teamContainsFailedServer(self, team);
@@ -3580,6 +3630,8 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 					}
 				} else if (anyUndesired) {
 					team->setPriority(SERVER_KNOBS->PRIORITY_TEAM_CONTAINS_UNDESIRED_SERVER);
+				} else if (anyWigglingServer) {
+					team->setPriority(SERVER_KNOBS->PRIORITY_PERPETUAL_STORAGE_WIGGLE);
 				} else {
 					team->setPriority(SERVER_KNOBS->PRIORITY_TEAM_HEALTHY);
 				}
@@ -3610,7 +3662,9 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 
 				lastZeroHealthy =
 				    self->zeroHealthyTeams->get(); // set this again in case it changed from this teams health changing
-				if ((self->initialFailureReactionDelay.isReady() && !self->zeroHealthyTeams->get()) || containsFailed) {
+				if ((self->initialFailureReactionDelay.isReady() && !self->zeroHealthyTeams->get()) || containsFailed ||
+				    anyWigglingServer) {
+
 					vector<KeyRange> shards = self->shardsAffectedByTeamFailure->getShardsFor(
 					    ShardsAffectedByTeamFailure::Team(team->getServerIDs(), self->primary));
 
@@ -3878,46 +3932,68 @@ ACTOR Future<Void> perpetualStorageWiggler(FutureStream<Void> stopSignal,
                                            const DDEnabledState* ddEnabledState) {
 	state Promise<Value> pidPromise;
 	state Future<Void> watchFuture;
+	state Future<Void> moveFinishFuture = Never();
+	state Debouncer pauseWiggle(SERVER_KNOBS->DEBOUNCE_RECRUITING_DELAY);
+	state AsyncTrigger restart;
+	state Future<Void> ddQueueCheck = delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow);
+
+	state Value pid;
 	wait(store(watchFuture, watchPerpetualStoragePIDChange(self->cx, pidPromise)));
 
 	loop choose {
 		when(waitNext(stopSignal)) { break; }
 		when(wait(watchFuture)) { wait(store(watchFuture, watchPerpetualStoragePIDChange(self->cx, pidPromise))); }
-		when(state Value pid = wait(pidPromise.getFuture())) {
+		when(wait(store(pid, pidPromise.getFuture()))) {
 			pidPromise.reset();
-			if (self->pid2server_info.count(pid) != 0) {
-				std::vector<Future<Void>> moveFutures;
-				for (auto& info : self->pid2server_info[pid]) {
-					AddressExclusion addr(info->lastKnownInterface.address().ip);
-					if (self->excludedServers.count(addr) &&
-					    self->excludedServers.get(addr) != DDTeamCollection::Status::NONE) {
-						continue; // don't override the value set by actor trackExcludedServer
-					}
-					self->excludedServers.set(addr, DDTeamCollection::Status::WIGGLING);
-					moveFutures.push_back(
-					    waitForAllDataRemoved(self->cx, info->lastKnownInterface.id(), info->addedVersion, self));
-				}
-				// wait for all data is moved from this process
-				if (!moveFutures.empty()) {
-					self->restartRecruiting.trigger();
-					wait(waitForAllReady(moveFutures));
-				}
-
-				// re-include wiggling storage servers
-				for (auto& info : self->pid2server_info[pid]) {
-					AddressExclusion addr(info->lastKnownInterface.address().ip);
-					if (!self->excludedServers.count(addr) ||
-					    self->excludedServers.get(addr) != DDTeamCollection::Status::WIGGLING) {
-						continue;
-					}
-					self->excludedServers.set(addr, DDTeamCollection::Status::NONE);
-				}
+			if (self->healthyTeamCount <= 1) { // pre-check health status
+				pauseWiggle.trigger();
+			} else {
+				auto fv = self->excludeStorageWigglingServers(pid);
+				moveFinishFuture = waitForAll(fv);
+				TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
+				    .detail("ProcessId", pid)
+				    .detail("StorageCount", fv.size());
+			}
+		}
+		when(wait(restart.onTrigger())) {
+			auto fv = self->excludeStorageWigglingServers(pid);
+			moveFinishFuture = waitForAll(fv);
+			TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
+			    .detail("ProcessId", pid)
+			    .detail("StorageCount", fv.size());
+		}
+		when(wait(moveFinishFuture)) {
+			moveFinishFuture = Never();
+			self->includeStorageWigglingServers(pid);
+			finishStorageWiggleSignal.send(Void());
+			TraceEvent("PerpetualStorageWiggleFinish", self->distributorId).detail("ProcessId", pid);
+			pid = Value();
+		}
+		when(wait(self->zeroHealthyTeams->onChange())) {
+			if (self->zeroHealthyTeams->get()) {
+				pauseWiggle.trigger();
 			}
+		}
+		when(wait(ddQueueCheck)) {
+			Promise<int> countp;
+			self->getUnhealthyRelocationCount.send(countp);
+			int count = wait(countp.getFuture());
 
-			// finish Wiggle this process
-			finishStorageWiggleSignal.send(Void());
+			if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD) {
+				pauseWiggle.trigger();
+			} else if (count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && self->healthyTeamCount > 1) {
+				restart.trigger();
+			}
+			ddQueueCheck = delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow);
+		}
+		when(wait(pauseWiggle.onTrigger())) {
+			moveFinishFuture = Never();
+			self->includeStorageWigglingServers(pid);
+			TraceEvent("PerpetualStorageWigglePause", self->distributorId).detail("ProcessId", pid);
 		}
 	}
+
+	self->includeStorageWigglingServers(pid);
 	return Void();
 }
 
@@ -3945,6 +4021,8 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 				if (speed == 1) {
 					collection.add(perpetualStorageWiggleIterator(
 					    stopWiggleSignal.getFuture(), finishStorageWiggleSignal.getFuture(), teamCollection));
+					collection.add(perpetualStorageWiggler(
+					    stopWiggleSignal.getFuture(), finishStorageWiggleSignal, teamCollection, ddEnabledState));
 					finishStorageWiggleSignal.send(Void());
 					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
 				} else {
@@ -4370,7 +4448,12 @@ ACTOR Future<Void> storageServerTracker(
 				otherChanges.push_back(self->excludedServers.onChange(testAddr));
 			}
 
-			if (worstStatus != DDTeamCollection::Status::NONE) {
+			if (worstStatus == DDTeamCollection::Status::WIGGLING) {
+				TraceEvent("WigglingStorageServer", self->distributorId)
+				    .detail("Server", server->id)
+				    .detail("Address", worstAddr.toString());
+				status.isWiggling = true;
+			} else if (worstStatus != DDTeamCollection::Status::NONE) {
 				TraceEvent(SevWarn, "UndesiredStorageServer", self->distributorId)
 				    .detail("Server", server->id)
 				    .detail("Excluded", worstAddr.toString());
@@ -5658,6 +5741,7 @@ ACTOR Future<Void> dataDistribution(Reference<DataDistributorData> self,
 			state PromiseStream<RelocateShard> output;
 			state PromiseStream<RelocateShard> input;
 			state PromiseStream<Promise<int64_t>> getAverageShardBytes;
+			state PromiseStream<Promise<int>> getUnhealthyRelocationCount;
 			state PromiseStream<GetMetricsRequest> getShardMetrics;
 			state Reference<AsyncVar<bool>> processingUnhealthy(new AsyncVar<bool>(false));
 			state Promise<Void> readyToStart;
@@ -5741,6 +5825,7 @@ ACTOR Future<Void> dataDistribution(Reference<DataDistributorData> self,
 			                                                          shardsAffectedByTeamFailure,
 			                                                          lock,
 			                                                          getAverageShardBytes,
+			                                                          getUnhealthyRelocationCount,
 			                                                          self->ddId,
 			                                                          storageTeamSize,
 			                                                          configuration.storageTeamSize,
@@ -5765,7 +5850,8 @@ ACTOR Future<Void> dataDistribution(Reference<DataDistributorData> self,
 			    true,
 			    processingUnhealthy,
 			    getShardMetrics,
-			    removeFailedServer);
+			    removeFailedServer,
+			    getUnhealthyRelocationCount);
 			teamCollectionsPtrs.push_back(primaryTeamCollection.getPtr());
 			if (configuration.usableRegions > 1) {
 				remoteTeamCollection =
@@ -5782,7 +5868,8 @@ ACTOR Future<Void> dataDistribution(Reference<DataDistributorData> self,
 				                                    false,
 				                                    processingUnhealthy,
 				                                    getShardMetrics,
-				                                    removeFailedServer);
+				                                    removeFailedServer,
+				                                    getUnhealthyRelocationCount);
 				teamCollectionsPtrs.push_back(remoteTeamCollection.getPtr());
 				remoteTeamCollection->teamCollections = teamCollectionsPtrs;
 				actors.push_back(
@@ -6256,7 +6343,8 @@ std::unique_ptr<DDTeamCollection> testTeamCollection(int teamSize,
 	                                                           true,
 	                                                           makeReference<AsyncVar<bool>>(false),
 	                                                           PromiseStream<GetMetricsRequest>(),
-	                                                           Promise<UID>()));
+	                                                           Promise<UID>(),
+	                                                           PromiseStream<Promise<int>>()));
 
 	for (int id = 1; id <= processCount; ++id) {
 		UID uid(id, 0);
@@ -6298,7 +6386,8 @@ std::unique_ptr<DDTeamCollection> testMachineTeamCollection(int teamSize,
 	                                                           true,
 	                                                           makeReference<AsyncVar<bool>>(false),
 	                                                           PromiseStream<GetMetricsRequest>(),
-	                                                           Promise<UID>()));
+	                                                           Promise<UID>(),
+	                                                           PromiseStream<Promise<int>>()));
 
 	for (int id = 1; id <= processCount; id++) {
 		UID uid(id, 0);
diff --git a/fdbserver/DataDistribution.actor.h b/fdbserver/DataDistribution.actor.h
index 39697837560..1139bddb8e4 100644
--- a/fdbserver/DataDistribution.actor.h
+++ b/fdbserver/DataDistribution.actor.h
@@ -263,6 +263,7 @@ ACTOR Future<Void> dataDistributionQueue(Database cx,
                                          Reference<ShardsAffectedByTeamFailure> shardsAffectedByTeamFailure,
                                          MoveKeysLock lock,
                                          PromiseStream<Promise<int64_t>> getAverageShardBytes,
+                                         PromiseStream<Promise<int>> getUnhealthyRelocationCount,
                                          UID distributorId,
                                          int teamSize,
                                          int singleRegionTeamSize,
diff --git a/fdbserver/DataDistributionQueue.actor.cpp b/fdbserver/DataDistributionQueue.actor.cpp
index f7b0d465c78..92ca7d170cd 100644
--- a/fdbserver/DataDistributionQueue.actor.cpp
+++ b/fdbserver/DataDistributionQueue.actor.cpp
@@ -1550,6 +1550,7 @@ ACTOR Future<Void> dataDistributionQueue(Database cx,
                                          Reference<ShardsAffectedByTeamFailure> shardsAffectedByTeamFailure,
                                          MoveKeysLock lock,
                                          PromiseStream<Promise<int64_t>> getAverageShardBytes,
+                                         PromiseStream<Promise<int>> getUnhealthyRelocationCount,
                                          UID distributorId,
                                          int teamSize,
                                          int singleRegionTeamSize,
@@ -1679,6 +1680,9 @@ ACTOR Future<Void> dataDistributionQueue(Database cx,
 				}
 				when(wait(self.error.getFuture())) {} // Propagate errors from dataDistributionRelocator
 				when(wait(waitForAll(balancingFutures))) {}
+				when(Promise<int> r = waitNext(getUnhealthyRelocationCount.getFuture())) {
+					r.send(self.unhealthyRelocations);
+				}
 			}
 		}
 	} catch (Error& e) {
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index 1a7483fddb1..6c2af8d55f2 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -131,6 +131,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( PRIORITY_RECOVER_MOVE,                                 110 );
 	init( PRIORITY_REBALANCE_UNDERUTILIZED_TEAM,                 120 );
 	init( PRIORITY_REBALANCE_OVERUTILIZED_TEAM,                  121 );
+	init( PRIORITY_PERPETUAL_STORAGE_WIGGLE,                     140 );
 	init( PRIORITY_TEAM_HEALTHY,                                 140 );
 	init( PRIORITY_TEAM_CONTAINS_UNDESIRED_SERVER,               150 );
 	init( PRIORITY_TEAM_REDUNDANT,                               200 );
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 3761e9b3692..d3cd88e1639 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -133,6 +133,7 @@ class ServerKnobs : public Knobs {
 	int PRIORITY_RECOVER_MOVE;
 	int PRIORITY_REBALANCE_UNDERUTILIZED_TEAM;
 	int PRIORITY_REBALANCE_OVERUTILIZED_TEAM;
+	int PRIORITY_PERPETUAL_STORAGE_WIGGLE;
 	int PRIORITY_TEAM_HEALTHY;
 	int PRIORITY_TEAM_CONTAINS_UNDESIRED_SERVER;
 	int PRIORITY_TEAM_REDUNDANT;

From 7b5fd9198422f7eed0765182b3e7c2183b77f3a4 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 20 May 2021 23:32:06 +0000
Subject: [PATCH 252/740] add knob

---
 fdbserver/Knobs.cpp | 1 +
 fdbserver/Knobs.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index 6c2af8d55f2..7bbc743c061 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -254,6 +254,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( DD_TEAMS_INFO_PRINT_INTERVAL,                           60 ); if( randomize && BUGGIFY ) DD_TEAMS_INFO_PRINT_INTERVAL = 10;
 	init( DD_TEAMS_INFO_PRINT_YIELD_COUNT,                       100 ); if( randomize && BUGGIFY ) DD_TEAMS_INFO_PRINT_YIELD_COUNT = deterministicRandom()->random01() * 1000 + 1;
 	init( DD_TEAM_ZERO_SERVER_LEFT_LOG_DELAY,                    120 ); if( randomize && BUGGIFY ) DD_TEAM_ZERO_SERVER_LEFT_LOG_DELAY = 5;
+	init( DD_STORAGE_WIGGLE_PAUSE_THRESHOLD,                       1 ); if( randomize && BUGGIFY ) DD_STORAGE_WIGGLE_PAUSE_THRESHOLD = 10;
 
 	// TeamRemover
 	init( TR_FLAG_DISABLE_MACHINE_TEAM_REMOVER,                false ); if( randomize && BUGGIFY ) TR_FLAG_DISABLE_MACHINE_TEAM_REMOVER = deterministicRandom()->random01() < 0.1 ? true : false; // false by default. disable the consistency check when it's true
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index d3cd88e1639..8a95cda0923 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -204,6 +204,7 @@ class ServerKnobs : public Knobs {
 	int DD_TEAMS_INFO_PRINT_INTERVAL;
 	int DD_TEAMS_INFO_PRINT_YIELD_COUNT;
 	int DD_TEAM_ZERO_SERVER_LEFT_LOG_DELAY;
+	int DD_STORAGE_WIGGLE_PAUSE_THRESHOLD; // How many unhealthy relocations are ongoing will pause storage wiggle
 
 	// TeamRemover to remove redundant teams
 	bool TR_FLAG_DISABLE_MACHINE_TEAM_REMOVER; // disable the machineTeamRemover actor

From 097c354a3ecc67c6211903cd96d5cddbd039320e Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 24 May 2021 19:11:28 +0000
Subject: [PATCH 253/740] fix iterator bug

---
 fdbserver/DataDistribution.actor.cpp | 73 ++++++++++++++++------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 169c37d078d..360bfe8f116 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -624,6 +624,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	std::map<Key, std::vector<Reference<TCServerInfo>>> pid2server_info; // some process may serve as multiple storage servers
 	std::map<Key, int> lagging_zones; // zone to number of storage servers lagging
 	AsyncVar<bool> disableFailingLaggingServers;
+	AsyncTrigger canStartStorageWiggling;
 
 	// machine_info has all machines info; key must be unique across processes on the same machine
 	std::map<Standalone<StringRef>, Reference<TCMachineInfo>> machine_info;
@@ -2467,12 +2468,13 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		    this,
 		    processClass,
 		    includedDCs.empty() ||
-		        std::find(includedDCs.begin(), includedDCs.end(), newServer.locality.dcId()) != includedDCs.end(),
+			std::find(includedDCs.begin(), includedDCs.end(), newServer.locality.dcId()) != includedDCs.end(),
 		    storageServerSet,
 		    addedVersion);
 		ASSERT(r->lastKnownInterface.locality.processId().present());
 		StringRef pid = r->lastKnownInterface.locality.processId().get();
 		pid2server_info[pid].push_back(r);
+		canStartStorageWiggling.trigger();
 
 		if (newServer.isTss()) {
 			tss_info_by_pair[newServer.tssPairID.get()] = r;
@@ -3868,39 +3870,50 @@ ACTOR Future<vector<std::pair<StorageServerInterface, ProcessClass>>> getServerL
 	return results;
 }
 
-// Iterator over each storage process to do storage wiggle
-ACTOR Future<Void> perpetualStorageWiggleIterator(FutureStream<Void> stopSignal,
-                                                  FutureStream<Void> finishStorageWiggleSignal,
-                                                  DDTeamCollection* teamCollection) {
+ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection, bool* success) {
 	state ReadYourWritesTransaction tr(teamCollection->cx);
-
-	loop choose {
-		when(waitNext(stopSignal)) { break; }
-		when(waitNext(finishStorageWiggleSignal)) {
-			// set the next SS UID
-			tr.reset();
-			loop {
-				try {
-					tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-					Optional<Value> value = wait(tr.get(wigglingStorageServerKey));
-					if (value.present()) {
-						auto nextIt = teamCollection->pid2server_info.upper_bound(value.get());
-						if (nextIt == teamCollection->pid2server_info.end()) {
-							tr.set(wigglingStorageServerKey, teamCollection->pid2server_info.begin()->first);
-						} else {
-							tr.set(wigglingStorageServerKey, nextIt->first);
-						}
+	loop {
+		try {
+			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+			Optional<Value> value = wait(tr.get(wigglingStorageServerKey));
+			if (teamCollection->pid2server_info.empty()) {
+				tr.set(wigglingStorageServerKey, LiteralStringRef("0"));
+				*success = false;
+			} else {
+				ValueRef pid = teamCollection->pid2server_info.begin()->first;
+				if (value.present()) {
+					auto nextIt = teamCollection->pid2server_info.upper_bound(value.get());
+					if (nextIt == teamCollection->pid2server_info.end()) {
+						tr.set(wigglingStorageServerKey, pid);
 					} else {
-						// initialize the value of to the smallest SS ID
-						tr.set(wigglingStorageServerKey, teamCollection->pid2server_info.begin()->first);
+						tr.set(wigglingStorageServerKey, nextIt->first);
 					}
-					wait(tr.commit());
-					break;
-				} catch (Error& e) {
-					wait(tr.onError(e));
+				} else {
+					tr.set(wigglingStorageServerKey, pid);
 				}
+				*success = true;
+			}
+			wait(tr.commit());
+			break;
+		} catch (Error& e) {
+			wait(tr.onError(e));
+		}
+	}
+	return Void();
+}
+// Iterator over each storage process to do storage wiggle
+ACTOR Future<Void> perpetualStorageWiggleIterator(FutureStream<Void> stopSignal,
+						  FutureStream<Void> finishStorageWiggleSignal,
+						  DDTeamCollection* teamCollection) {
+	state bool isWiggling = false;
+	loop choose {
+		when(waitNext(stopSignal)) { break; }
+		when(wait(teamCollection->canStartStorageWiggling.onTrigger())) {
+			if (!isWiggling) {
+				wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
 			}
 		}
+		when(waitNext(finishStorageWiggleSignal)) { wait(updateNextWigglingStoragePID(teamCollection, &isWiggling)); }
 	}
 
 	return Void();
@@ -4021,8 +4034,8 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 				if (speed == 1) {
 					collection.add(perpetualStorageWiggleIterator(
 					    stopWiggleSignal.getFuture(), finishStorageWiggleSignal.getFuture(), teamCollection));
-					collection.add(perpetualStorageWiggler(
-					    stopWiggleSignal.getFuture(), finishStorageWiggleSignal, teamCollection, ddEnabledState));
+//					collection.add(perpetualStorageWiggler(
+//					    stopWiggleSignal.getFuture(), finishStorageWiggleSignal, teamCollection, ddEnabledState));
 					finishStorageWiggleSignal.send(Void());
 					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
 				} else {

From 614f3341b5d6051b4508a7776c67d7d0a485cfc0 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 24 May 2021 19:30:25 +0000
Subject: [PATCH 254/740] close perpetual wiggling in QuietDatabase

---
 fdbserver/QuietDatabase.actor.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index 9bb55388b72..bc635af4468 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -580,6 +580,25 @@ ACTOR Future<Void> reconfigureAfter(Database cx,
 	return Void();
 }
 
+// The quiet database check (which runs at the end of every test) will always time out due to active data movement.
+// To get around this, quiet Database will disable the perpetual wiggle in the setup phase and then enable it again
+// after it’s done.
+ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, Value value) {
+    state ReadYourWritesTransaction tr(cx);
+    loop {
+        try {
+            tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+            tr.set(perpetualStorageWiggleKey, value);
+            wait(tr.commit());
+            break;
+        }
+        catch (Error& e) {
+            wait(tr.onError(e));
+        }
+    }
+    return Void();
+}
+
 ACTOR Future<Void> waitForQuietDatabase(Database cx,
                                         Reference<AsyncVar<ServerDBInfo>> dbInfo,
                                         std::string phase,
@@ -590,7 +609,7 @@ ACTOR Future<Void> waitForQuietDatabase(Database cx,
                                         int64_t maxPoppedVersionLag = 30e6) {
 	state Future<Void> reconfig =
 	    reconfigureAfter(cx, 100 + (deterministicRandom()->random01() * 100), dbInfo, "QuietDatabase");
-
+	state Future<Void> disableWiggling = setPerpetualStorageWiggle(cx, LiteralStringRef("0"));
 	auto traceMessage = "QuietDatabase" + phase + "Begin";
 	TraceEvent(traceMessage.c_str());
 

From 0aaf22cfb03ed3cf187f6d79e3dc316158828660 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 25 May 2021 18:43:08 +0000
Subject: [PATCH 255/740] merge master, fix promise callback bug

---
 .gitignore                           |  1 +
 fdbserver/DataDistribution.actor.cpp | 43 +++++++++++++++-------------
 fdbserver/SimulatedCluster.actor.cpp |  3 ++
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index f555965fab3..bb16f145de7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ bindings/java/foundationdb-tests*.jar
 bindings/java/fdb-java-*-sources.jar
 packaging/msi/FDBInstaller.msi
 builds/
+cmake-build-debug/
 # Generated source, build, and packaging files
 *.g.cpp
 *.g.h
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 360bfe8f116..6d229d8d88e 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -2468,7 +2468,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		    this,
 		    processClass,
 		    includedDCs.empty() ||
-			std::find(includedDCs.begin(), includedDCs.end(), newServer.locality.dcId()) != includedDCs.end(),
+		        std::find(includedDCs.begin(), includedDCs.end(), newServer.locality.dcId()) != includedDCs.end(),
 		    storageServerSet,
 		    addedVersion);
 		ASSERT(r->lastKnownInterface.locality.processId().present());
@@ -3880,7 +3880,7 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 				tr.set(wigglingStorageServerKey, LiteralStringRef("0"));
 				*success = false;
 			} else {
-				ValueRef pid = teamCollection->pid2server_info.begin()->first;
+				Value pid = teamCollection->pid2server_info.begin()->first;
 				if (value.present()) {
 					auto nextIt = teamCollection->pid2server_info.upper_bound(value.get());
 					if (nextIt == teamCollection->pid2server_info.end()) {
@@ -3891,7 +3891,6 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 				} else {
 					tr.set(wigglingStorageServerKey, pid);
 				}
-				*success = true;
 			}
 			wait(tr.commit());
 			break;
@@ -3902,18 +3901,22 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 	return Void();
 }
 // Iterator over each storage process to do storage wiggle
-ACTOR Future<Void> perpetualStorageWiggleIterator(FutureStream<Void> stopSignal,
-						  FutureStream<Void> finishStorageWiggleSignal,
-						  DDTeamCollection* teamCollection) {
+ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
+                                                  AsyncTrigger* finishStorageWiggleSignal,
+                                                  DDTeamCollection* teamCollection) {
 	state bool isWiggling = false;
 	loop choose {
-		when(waitNext(stopSignal)) { break; }
+		when(wait(stopSignal->onTrigger())) { break; }
 		when(wait(teamCollection->canStartStorageWiggling.onTrigger())) {
 			if (!isWiggling) {
+				isWiggling = true;
 				wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
 			}
 		}
-		when(waitNext(finishStorageWiggleSignal)) { wait(updateNextWigglingStoragePID(teamCollection, &isWiggling)); }
+		when(wait(finishStorageWiggleSignal->onTrigger())) {
+			isWiggling = true;
+			wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
+		}
 	}
 
 	return Void();
@@ -3939,8 +3942,8 @@ ACTOR Future<Future<Void>> watchPerpetualStoragePIDChange(Database cx, Promise<V
 	return watchFuture;
 }
 // Watch the value of current wiggling storage process and do wiggling works
-ACTOR Future<Void> perpetualStorageWiggler(FutureStream<Void> stopSignal,
-                                           PromiseStream<Void> finishStorageWiggleSignal,
+ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
+                                           AsyncTrigger* finishStorageWiggleSignal,
                                            DDTeamCollection* self,
                                            const DDEnabledState* ddEnabledState) {
 	state Promise<Value> pidPromise;
@@ -3954,7 +3957,7 @@ ACTOR Future<Void> perpetualStorageWiggler(FutureStream<Void> stopSignal,
 	wait(store(watchFuture, watchPerpetualStoragePIDChange(self->cx, pidPromise)));
 
 	loop choose {
-		when(waitNext(stopSignal)) { break; }
+		when(wait(stopSignal->onTrigger())) { break; }
 		when(wait(watchFuture)) { wait(store(watchFuture, watchPerpetualStoragePIDChange(self->cx, pidPromise))); }
 		when(wait(store(pid, pidPromise.getFuture()))) {
 			pidPromise.reset();
@@ -3978,7 +3981,7 @@ ACTOR Future<Void> perpetualStorageWiggler(FutureStream<Void> stopSignal,
 		when(wait(moveFinishFuture)) {
 			moveFinishFuture = Never();
 			self->includeStorageWigglingServers(pid);
-			finishStorageWiggleSignal.send(Void());
+			finishStorageWiggleSignal->trigger();
 			TraceEvent("PerpetualStorageWiggleFinish", self->distributorId).detail("ProcessId", pid);
 			pid = Value();
 		}
@@ -4013,8 +4016,8 @@ ACTOR Future<Void> perpetualStorageWiggler(FutureStream<Void> stopSignal,
 ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollection,
                                                  const DDEnabledState* ddEnabledState) {
 	state int speed = 0;
-	state PromiseStream<Void> stopWiggleSignal;
-	state PromiseStream<Void> finishStorageWiggleSignal;
+	state AsyncTrigger stopWiggleSignal;
+	state AsyncTrigger finishStorageWiggleSignal;
 	state SignalableActorCollection collection;
 
 	loop {
@@ -4032,14 +4035,14 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 
 				ASSERT(speed == 1 || speed == 0);
 				if (speed == 1) {
-					collection.add(perpetualStorageWiggleIterator(
-					    stopWiggleSignal.getFuture(), finishStorageWiggleSignal.getFuture(), teamCollection));
-//					collection.add(perpetualStorageWiggler(
-//					    stopWiggleSignal.getFuture(), finishStorageWiggleSignal, teamCollection, ddEnabledState));
-					finishStorageWiggleSignal.send(Void());
+					collection.add(
+					    perpetualStorageWiggleIterator(&stopWiggleSignal, &finishStorageWiggleSignal, teamCollection));
+					collection.add(perpetualStorageWiggler(
+					    &stopWiggleSignal, &finishStorageWiggleSignal, teamCollection, ddEnabledState));
+					finishStorageWiggleSignal.trigger();
 					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
 				} else {
-					stopWiggleSignal.send(Void());
+					stopWiggleSignal.trigger();
 					wait(collection.signalAndReset());
 					TraceEvent("PerpetualStorageWiggleClose", teamCollection->distributorId);
 				}
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index b817c9bfc99..96526678e51 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -949,6 +949,9 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 	//	}
 	//	set_config("memory");
 	//  set_config("memory-radixtree-beta");
+
+	set_config("perpetual_storage_wiggle=1");
+
 	if (simple) {
 		db.desiredTLogCount = 1;
 		db.commitProxyCount = 1;

From 1a0b633ca752b106bf15bbbb2cd74337604eb359 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 25 May 2021 20:25:21 +0000
Subject: [PATCH 256/740] fix promise bug

---
 fdbserver/DataDistribution.actor.cpp | 42 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 6d229d8d88e..7568b5683e7 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -3902,7 +3902,7 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 }
 // Iterator over each storage process to do storage wiggle
 ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
-                                                  AsyncTrigger* finishStorageWiggleSignal,
+                                                  FutureStream<Void> finishStorageWiggleSignal,
                                                   DDTeamCollection* teamCollection) {
 	state bool isWiggling = false;
 	loop choose {
@@ -3913,7 +3913,7 @@ ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
 				wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
 			}
 		}
-		when(wait(finishStorageWiggleSignal->onTrigger())) {
+		when(waitNext(finishStorageWiggleSignal)) {
 			isWiggling = true;
 			wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
 		}
@@ -3922,15 +3922,16 @@ ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
 	return Void();
 }
 
-ACTOR Future<Future<Void>> watchPerpetualStoragePIDChange(Database cx, Promise<Value> pid) {
+ACTOR Future<std::pair<Future<Void>, Value>>  watchPerpetualStoragePIDChange(Database cx) {
 	state ReadYourWritesTransaction tr(cx);
 	state Future<Void> watchFuture;
+	state Value ret;
 	loop {
 		try {
 			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-			Optional<Standalone<StringRef>> value = wait(tr.get(wigglingStorageServerKey));
+			Optional<Value> value = wait(tr.get(wigglingStorageServerKey));
 			if (value.present()) {
-				pid.send(value.get());
+				ret = value.get();
 			}
 			watchFuture = tr.watch(wigglingStorageServerKey);
 			wait(tr.commit());
@@ -3939,28 +3940,27 @@ ACTOR Future<Future<Void>> watchPerpetualStoragePIDChange(Database cx, Promise<V
 			wait(tr.onError(e));
 		}
 	}
-	return watchFuture;
+	return std::make_pair(watchFuture, ret);
 }
 // Watch the value of current wiggling storage process and do wiggling works
 ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
-                                           AsyncTrigger* finishStorageWiggleSignal,
+                                           PromiseStream<Void> finishStorageWiggleSignal,
                                            DDTeamCollection* self,
                                            const DDEnabledState* ddEnabledState) {
-	state Promise<Value> pidPromise;
+	state Value pid;
 	state Future<Void> watchFuture;
 	state Future<Void> moveFinishFuture = Never();
 	state Debouncer pauseWiggle(SERVER_KNOBS->DEBOUNCE_RECRUITING_DELAY);
 	state AsyncTrigger restart;
 	state Future<Void> ddQueueCheck = delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow);
 
-	state Value pid;
-	wait(store(watchFuture, watchPerpetualStoragePIDChange(self->cx, pidPromise)));
+    state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self->cx));
+    watchFuture = res.first;
+    pid = std::move(res.second);
 
 	loop choose {
 		when(wait(stopSignal->onTrigger())) { break; }
-		when(wait(watchFuture)) { wait(store(watchFuture, watchPerpetualStoragePIDChange(self->cx, pidPromise))); }
-		when(wait(store(pid, pidPromise.getFuture()))) {
-			pidPromise.reset();
+		when(wait(watchFuture)) {
 			if (self->healthyTeamCount <= 1) { // pre-check health status
 				pauseWiggle.trigger();
 			} else {
@@ -3970,7 +3970,11 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				    .detail("ProcessId", pid)
 				    .detail("StorageCount", fv.size());
 			}
-		}
+
+            wait(store(res, watchPerpetualStoragePIDChange(self->cx)));
+            watchFuture = res.first;
+            pid = std::move(res.second);
+        }
 		when(wait(restart.onTrigger())) {
 			auto fv = self->excludeStorageWigglingServers(pid);
 			moveFinishFuture = waitForAll(fv);
@@ -3981,7 +3985,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 		when(wait(moveFinishFuture)) {
 			moveFinishFuture = Never();
 			self->includeStorageWigglingServers(pid);
-			finishStorageWiggleSignal->trigger();
+			finishStorageWiggleSignal.send(Void());
 			TraceEvent("PerpetualStorageWiggleFinish", self->distributorId).detail("ProcessId", pid);
 			pid = Value();
 		}
@@ -4017,7 +4021,7 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
                                                  const DDEnabledState* ddEnabledState) {
 	state int speed = 0;
 	state AsyncTrigger stopWiggleSignal;
-	state AsyncTrigger finishStorageWiggleSignal;
+	state PromiseStream<Void> finishStorageWiggleSignal;
 	state SignalableActorCollection collection;
 
 	loop {
@@ -4036,10 +4040,10 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 				ASSERT(speed == 1 || speed == 0);
 				if (speed == 1) {
 					collection.add(
-					    perpetualStorageWiggleIterator(&stopWiggleSignal, &finishStorageWiggleSignal, teamCollection));
+					    perpetualStorageWiggleIterator(&stopWiggleSignal, finishStorageWiggleSignal.getFuture(), teamCollection));
 					collection.add(perpetualStorageWiggler(
-					    &stopWiggleSignal, &finishStorageWiggleSignal, teamCollection, ddEnabledState));
-					finishStorageWiggleSignal.trigger();
+					    &stopWiggleSignal, finishStorageWiggleSignal, teamCollection, ddEnabledState));
+					finishStorageWiggleSignal.send(Void());
 					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
 				} else {
 					stopWiggleSignal.trigger();

From 411459c2eebe77bfdf59b59e7aadb950464ced3f Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 25 May 2021 21:20:24 +0000
Subject: [PATCH 257/740] change quietdatabase

---
 fdbclient/NativeAPI.actor.cpp     | 16 ++++++++++++++++
 fdbclient/NativeAPI.actor.h       |  5 +++++
 fdbserver/QuietDatabase.actor.cpp | 19 -------------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 22e0ebbe32b..fd03f2e638b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -5880,3 +5880,19 @@ Future<Void> DatabaseContext::createSnapshot(StringRef uid, StringRef snapshot_c
 	}
 	return createSnapshotActor(this, UID::fromString(uid_str), snapshot_command);
 }
+
+ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, Value value) {
+    state ReadYourWritesTransaction tr(cx);
+    loop {
+        try {
+            tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+            tr.set(perpetualStorageWiggleKey, value);
+            wait(tr.commit());
+            break;
+        }
+        catch (Error& e) {
+            wait(tr.onError(e));
+        }
+    }
+    return Void();
+}
\ No newline at end of file
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 6ba14764dec..60ae18014a8 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -407,5 +407,10 @@ ACTOR Future<bool> checkSafeExclusions(Database cx, vector<AddressExclusion> exc
 inline uint64_t getWriteOperationCost(uint64_t bytes) {
 	return bytes / std::max(1, CLIENT_KNOBS->WRITE_COST_BYTE_FACTOR) + 1;
 }
+
+// The quiet database check (which runs at the end of every test) will always time out due to active data movement.
+// To get around this, quiet Database will disable the perpetual wiggle in the setup phase.
+ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, Value value);
+
 #include "flow/unactorcompiler.h"
 #endif
diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index bc635af4468..6293b8301df 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -580,25 +580,6 @@ ACTOR Future<Void> reconfigureAfter(Database cx,
 	return Void();
 }
 
-// The quiet database check (which runs at the end of every test) will always time out due to active data movement.
-// To get around this, quiet Database will disable the perpetual wiggle in the setup phase and then enable it again
-// after it’s done.
-ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, Value value) {
-    state ReadYourWritesTransaction tr(cx);
-    loop {
-        try {
-            tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-            tr.set(perpetualStorageWiggleKey, value);
-            wait(tr.commit());
-            break;
-        }
-        catch (Error& e) {
-            wait(tr.onError(e));
-        }
-    }
-    return Void();
-}
-
 ACTOR Future<Void> waitForQuietDatabase(Database cx,
                                         Reference<AsyncVar<ServerDBInfo>> dbInfo,
                                         std::string phase,

From 13c03f1fa2bda4df4a9eb5573cc14d74929e2c43 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 25 May 2021 21:29:25 +0000
Subject: [PATCH 258/740] simulation setting

---
 fdbserver/SimulatedCluster.actor.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index 96526678e51..d115bee7e87 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -941,16 +941,21 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 		// 1 or 2 tss
 		tssCount = deterministicRandom()->randomInt(1, 3);
 	}
-
-	//	if (deterministicRandom()->random01() < 0.5) {
-	//		set_config("ssd");
-	//	} else {
-	//		set_config("memory");
-	//	}
-	//	set_config("memory");
-	//  set_config("memory-radixtree-beta");
-
-	set_config("perpetual_storage_wiggle=1");
+	
+//	if (deterministicRandom()->random01() < 0.5) {
+//		set_config("ssd");
+//	} else {
+//		set_config("memory");
+//	}
+//	set_config("memory");
+//	set_config("memory-radixtree-beta");
+	
+	if (deterministicRandom()->random01() < 0.5) {
+        	set_config("perpetual_storage_wiggle=0");
+	} else {
+        	set_config("perpetual_storage_wiggle=1");
+	}
+// 	set_config("perpetual_storage_wiggle=1");
 
 	if (simple) {
 		db.desiredTLogCount = 1;

From 4035a7aba2f679d1cade28836b63ed03b7c5091b Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 26 May 2021 17:06:35 +0000
Subject: [PATCH 259/740] fix wiggler logic bug

---
 fdbserver/DataDistribution.actor.cpp | 136 ++++++++++++++++-----------
 1 file changed, 82 insertions(+), 54 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 7568b5683e7..452c8e8a42d 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -3904,7 +3904,10 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
                                                   FutureStream<Void> finishStorageWiggleSignal,
                                                   DDTeamCollection* teamCollection) {
-	state bool isWiggling = false;
+	state bool isWiggling = true;
+	// initialize PID
+	wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
+
 	loop choose {
 		when(wait(stopSignal->onTrigger())) { break; }
 		when(wait(teamCollection->canStartStorageWiggling.onTrigger())) {
@@ -3922,7 +3925,7 @@ ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
 	return Void();
 }
 
-ACTOR Future<std::pair<Future<Void>, Value>>  watchPerpetualStoragePIDChange(Database cx) {
+ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(Database cx) {
 	state ReadYourWritesTransaction tr(cx);
 	state Future<Void> watchFuture;
 	state Value ret;
@@ -3952,64 +3955,90 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 	state Future<Void> moveFinishFuture = Never();
 	state Debouncer pauseWiggle(SERVER_KNOBS->DEBOUNCE_RECRUITING_DELAY);
 	state AsyncTrigger restart;
-	state Future<Void> ddQueueCheck = delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow);
-
-    state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self->cx));
-    watchFuture = res.first;
-    pid = std::move(res.second);
+	state Future<Void> ddQueueCheck = delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
+	state int movingCount = 0;
+	state bool isPaused = false;
+
+	state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self->cx));
+	watchFuture = res.first;
+	pid = std::move(res.second);
+
+	// start with the initial pid
+	if (self->healthyTeamCount > 1) { // pre-check health status
+		auto fv = self->excludeStorageWigglingServers(pid);
+		movingCount = fv.size();
+		moveFinishFuture = waitForAll(fv);
+		TraceEvent("PerpetualStorageWiggleInitialStart", self->distributorId)
+		    .detail("ProcessId", pid)
+		    .detail("StorageCount", movingCount);
+	} else {
+		isPaused = true;
+		TraceEvent("PerpetualStorageWiggleInitialPause", self->distributorId).detail("ProcessId", pid);
+	}
 
-	loop choose {
-		when(wait(stopSignal->onTrigger())) { break; }
-		when(wait(watchFuture)) {
-			if (self->healthyTeamCount <= 1) { // pre-check health status
-				pauseWiggle.trigger();
-			} else {
+	loop {
+		choose {
+			when(wait(stopSignal->onTrigger())) { break; }
+			when(wait(watchFuture)) {
+				// read new pid and set the next watch Future
+				wait(store(res, watchPerpetualStoragePIDChange(self->cx)));
+				watchFuture = res.first;
+				pid = std::move(res.second);
+
+				if (self->healthyTeamCount <= 1) { // pre-check health status
+					pauseWiggle.trigger();
+				}
+				else {
+					auto fv = self->excludeStorageWigglingServers(pid);
+					movingCount = fv.size();
+					moveFinishFuture = waitForAll(fv);
+					TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
+					    .detail("ProcessId", pid)
+					    .detail("StorageCount", movingCount);
+				}
+			}
+			when(wait(restart.onTrigger())) {
 				auto fv = self->excludeStorageWigglingServers(pid);
 				moveFinishFuture = waitForAll(fv);
-				TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
+				TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
 				    .detail("ProcessId", pid)
 				    .detail("StorageCount", fv.size());
+				isPaused = false;
 			}
-
-            wait(store(res, watchPerpetualStoragePIDChange(self->cx)));
-            watchFuture = res.first;
-            pid = std::move(res.second);
-        }
-		when(wait(restart.onTrigger())) {
-			auto fv = self->excludeStorageWigglingServers(pid);
-			moveFinishFuture = waitForAll(fv);
-			TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
-			    .detail("ProcessId", pid)
-			    .detail("StorageCount", fv.size());
-		}
-		when(wait(moveFinishFuture)) {
-			moveFinishFuture = Never();
-			self->includeStorageWigglingServers(pid);
-			finishStorageWiggleSignal.send(Void());
-			TraceEvent("PerpetualStorageWiggleFinish", self->distributorId).detail("ProcessId", pid);
-			pid = Value();
-		}
-		when(wait(self->zeroHealthyTeams->onChange())) {
-			if (self->zeroHealthyTeams->get()) {
-				pauseWiggle.trigger();
+			when(wait(moveFinishFuture)) {
+				moveFinishFuture = Never();
+				self->includeStorageWigglingServers(pid);
+				TraceEvent("PerpetualStorageWiggleFinish", self->distributorId)
+				    .detail("ProcessId", pid)
+				    .detail("StorageCount", movingCount);
+				pid = Value();
+                finishStorageWiggleSignal.send(Void());
+            }
+			when(wait(self->zeroHealthyTeams->onChange())) {
+				if (self->zeroHealthyTeams->get() && !isPaused) {
+					pauseWiggle.trigger();
+				}
 			}
-		}
-		when(wait(ddQueueCheck)) {
-			Promise<int> countp;
-			self->getUnhealthyRelocationCount.send(countp);
-			int count = wait(countp.getFuture());
+			when(wait(ddQueueCheck)) {
+				Promise<int> countp;
+				self->getUnhealthyRelocationCount.send(countp);
+				int count = wait(countp.getFuture());
 
-			if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD) {
-				pauseWiggle.trigger();
-			} else if (count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && self->healthyTeamCount > 1) {
-				restart.trigger();
+				if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && !isPaused) {
+					pauseWiggle.trigger();
+				} else if (count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && self->healthyTeamCount > 1) {
+					restart.trigger();
+				}
+				ddQueueCheck = delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
+			}
+			when(wait(pauseWiggle.onTrigger())) {
+				isPaused = true;
+				moveFinishFuture = Never();
+				self->includeStorageWigglingServers(pid);
+				TraceEvent("PerpetualStorageWigglePause", self->distributorId)
+				    .detail("ProcessId", pid)
+				    .detail("StorageCount", movingCount);
 			}
-			ddQueueCheck = delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow);
-		}
-		when(wait(pauseWiggle.onTrigger())) {
-			moveFinishFuture = Never();
-			self->includeStorageWigglingServers(pid);
-			TraceEvent("PerpetualStorageWigglePause", self->distributorId).detail("ProcessId", pid);
 		}
 	}
 
@@ -4039,11 +4068,10 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 
 				ASSERT(speed == 1 || speed == 0);
 				if (speed == 1) {
-					collection.add(
-					    perpetualStorageWiggleIterator(&stopWiggleSignal, finishStorageWiggleSignal.getFuture(), teamCollection));
+					collection.add(perpetualStorageWiggleIterator(
+					    &stopWiggleSignal, finishStorageWiggleSignal.getFuture(), teamCollection));
 					collection.add(perpetualStorageWiggler(
 					    &stopWiggleSignal, finishStorageWiggleSignal, teamCollection, ddEnabledState));
-					finishStorageWiggleSignal.send(Void());
 					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
 				} else {
 					stopWiggleSignal.trigger();

From 24f487cb8ed29a167893a0dc2aff771cedd3051c Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 2 Jun 2021 06:12:45 +0000
Subject: [PATCH 260/740] solve recruiting conflict with TSS

---
 fdbserver/DataDistribution.actor.cpp | 108 +++++++++++++++++----------
 fdbserver/SimulatedCluster.actor.cpp |   2 +-
 2 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 452c8e8a42d..01311989c03 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -625,6 +625,8 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	std::map<Key, int> lagging_zones; // zone to number of storage servers lagging
 	AsyncVar<bool> disableFailingLaggingServers;
 	AsyncTrigger canStartStorageWiggling;
+	Optional<Key> wigglingPid; // Process id of current wiggling storage server;
+	bool clearWigglingPidAfterRecruitment = false;
 
 	// machine_info has all machines info; key must be unique across processes on the same machine
 	std::map<Standalone<StringRef>, Reference<TCMachineInfo>> machine_info;
@@ -652,6 +654,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 
 	bool isTssRecruiting; // If tss recruiting is waiting on a pair, don't consider DD recruiting for the purposes of QuietDB
 
+	// WIGGLING if an address is under storage wiggling.
 	// EXCLUDED if an address is in the excluded list in the database.
 	// FAILED if an address is permanently failed.
 	// NONE by default.  Updated asynchronously (eventually)
@@ -2471,10 +2474,6 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		        std::find(includedDCs.begin(), includedDCs.end(), newServer.locality.dcId()) != includedDCs.end(),
 		    storageServerSet,
 		    addedVersion);
-		ASSERT(r->lastKnownInterface.locality.processId().present());
-		StringRef pid = r->lastKnownInterface.locality.processId().get();
-		pid2server_info[pid].push_back(r);
-		canStartStorageWiggling.trigger();
 
 		if (newServer.isTss()) {
 			tss_info_by_pair[newServer.tssPairID.get()] = r;
@@ -2486,6 +2485,11 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 			server_info[newServer.id()] = r;
 			// Establish the relation between server and machine
 			checkAndCreateMachine(r);
+			// Add storage server to pid map
+			ASSERT(r->lastKnownInterface.locality.processId().present());
+			StringRef pid = r->lastKnownInterface.locality.processId().get();
+			pid2server_info[pid].push_back(r);
+			canStartStorageWiggling.trigger();
 		}
 
 		r->tracker =
@@ -2812,7 +2816,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		    .detail("DesiredTeamsPerServer", SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER);
 	}
 
-	std::vector<Future<Void>> excludeStorageWigglingServers(const Value& pid) {
+	std::vector<Future<Void>> excludeStorageServersForWiggle(const Value& pid) {
 		std::vector<Future<Void>> moveFutures;
 		if (this->pid2server_info.count(pid) != 0) {
 			for (auto& info : this->pid2server_info[pid]) {
@@ -2832,7 +2836,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		return moveFutures;
 	}
 
-	void includeStorageWigglingServers(const Value& pid) {
+	void includeStorageServersForWiggle(const Value& pid) {
 		bool included = false;
 		for (auto& info : this->pid2server_info[pid]) {
 			AddressExclusion addr(info->lastKnownInterface.address().ip);
@@ -3950,30 +3954,32 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
                                            PromiseStream<Void> finishStorageWiggleSignal,
                                            DDTeamCollection* self,
                                            const DDEnabledState* ddEnabledState) {
-	state Value pid;
 	state Future<Void> watchFuture;
 	state Future<Void> moveFinishFuture = Never();
 	state Debouncer pauseWiggle(SERVER_KNOBS->DEBOUNCE_RECRUITING_DELAY);
 	state AsyncTrigger restart;
-	state Future<Void> ddQueueCheck = delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
+	state Future<Void> ddQueueCheck =
+	    delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
 	state int movingCount = 0;
 	state bool isPaused = false;
 
 	state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self->cx));
 	watchFuture = res.first;
-	pid = std::move(res.second);
-
+	self->wigglingPid = Optional<Key>(res.second);
+	self->clearWigglingPidAfterRecruitment = false;
+	
 	// start with the initial pid
 	if (self->healthyTeamCount > 1) { // pre-check health status
-		auto fv = self->excludeStorageWigglingServers(pid);
+		auto fv = self->excludeStorageServersForWiggle(self->wigglingPid.get());
 		movingCount = fv.size();
 		moveFinishFuture = waitForAll(fv);
 		TraceEvent("PerpetualStorageWiggleInitialStart", self->distributorId)
-		    .detail("ProcessId", pid)
+		    .detail("ProcessId", self->wigglingPid.get())
 		    .detail("StorageCount", movingCount);
 	} else {
 		isPaused = true;
-		TraceEvent("PerpetualStorageWiggleInitialPause", self->distributorId).detail("ProcessId", pid);
+		TraceEvent("PerpetualStorageWiggleInitialPause", self->distributorId)
+		    .detail("ProcessId", self->wigglingPid.get());
 	}
 
 	loop {
@@ -3983,13 +3989,13 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				// read new pid and set the next watch Future
 				wait(store(res, watchPerpetualStoragePIDChange(self->cx)));
 				watchFuture = res.first;
-				pid = std::move(res.second);
+				self->wigglingPid = Optional<Key>(res.second);
+				StringRef pid = self->wigglingPid.get();
 
 				if (self->healthyTeamCount <= 1) { // pre-check health status
 					pauseWiggle.trigger();
-				}
-				else {
-					auto fv = self->excludeStorageWigglingServers(pid);
+				} else {
+					auto fv = self->excludeStorageServersForWiggle(pid);
 					movingCount = fv.size();
 					moveFinishFuture = waitForAll(fv);
 					TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
@@ -3998,7 +4004,9 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				}
 			}
 			when(wait(restart.onTrigger())) {
-				auto fv = self->excludeStorageWigglingServers(pid);
+				StringRef pid = self->wigglingPid.get();
+
+				auto fv = self->excludeStorageServersForWiggle(pid);
 				moveFinishFuture = waitForAll(fv);
 				TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
 				    .detail("ProcessId", pid)
@@ -4006,14 +4014,17 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				isPaused = false;
 			}
 			when(wait(moveFinishFuture)) {
+				StringRef pid = self->wigglingPid.get();
+
 				moveFinishFuture = Never();
-				self->includeStorageWigglingServers(pid);
+				self->includeStorageServersForWiggle(pid);
 				TraceEvent("PerpetualStorageWiggleFinish", self->distributorId)
-				    .detail("ProcessId", pid)
+				    .detail("ProcessId", pid.toString())
 				    .detail("StorageCount", movingCount);
-				pid = Value();
-                finishStorageWiggleSignal.send(Void());
-            }
+
+				self->wigglingPid.reset();
+				finishStorageWiggleSignal.send(Void());
+			}
 			when(wait(self->zeroHealthyTeams->onChange())) {
 				if (self->zeroHealthyTeams->get() && !isPaused) {
 					pauseWiggle.trigger();
@@ -4026,15 +4037,18 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 
 				if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && !isPaused) {
 					pauseWiggle.trigger();
-				} else if (count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && self->healthyTeamCount > 1) {
+				} else if (count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && self->healthyTeamCount > 1 &&
+				           isPaused) {
 					restart.trigger();
 				}
 				ddQueueCheck = delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
 			}
 			when(wait(pauseWiggle.onTrigger())) {
+				StringRef pid = self->wigglingPid.get();
+
 				isPaused = true;
 				moveFinishFuture = Never();
-				self->includeStorageWigglingServers(pid);
+				self->includeStorageServersForWiggle(pid);
 				TraceEvent("PerpetualStorageWigglePause", self->distributorId)
 				    .detail("ProcessId", pid)
 				    .detail("StorageCount", movingCount);
@@ -4042,7 +4056,11 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 		}
 	}
 
-	self->includeStorageWigglingServers(pid);
+	if(self->wigglingPid.present()) {
+		self->includeStorageServersForWiggle(self->wigglingPid.get());
+		self->clearWigglingPidAfterRecruitment = true;
+	}
+
 	return Void();
 }
 
@@ -4496,18 +4514,19 @@ ACTOR Future<Void> storageServerTracker(
 				otherChanges.push_back(self->excludedServers.onChange(testAddr));
 			}
 
-			if (worstStatus == DDTeamCollection::Status::WIGGLING) {
-				TraceEvent("WigglingStorageServer", self->distributorId)
-				    .detail("Server", server->id)
-				    .detail("Address", worstAddr.toString());
-				status.isWiggling = true;
-			} else if (worstStatus != DDTeamCollection::Status::NONE) {
+			if (worstStatus != DDTeamCollection::Status::NONE) {
 				TraceEvent(SevWarn, "UndesiredStorageServer", self->distributorId)
 				    .detail("Server", server->id)
 				    .detail("Excluded", worstAddr.toString());
 				status.isUndesired = true;
 				status.isWrongConfiguration = true;
-				if (worstStatus == DDTeamCollection::Status::FAILED && !isTss) {
+
+				if (worstStatus == DDTeamCollection::Status::WIGGLING && !isTss) {
+					status.isWiggling = true;
+					TraceEvent("PerpetualWigglingStorageServer", self->distributorId)
+					    .detail("Server", server->id)
+					    .detail("Address", worstAddr.toString());
+				} else if (worstStatus == DDTeamCollection::Status::FAILED && !isTss) {
 					TraceEvent(SevWarn, "FailedServerRemoveKeys", self->distributorId)
 					    .detail("Server", server->id)
 					    .detail("Excluded", worstAddr.toString());
@@ -5199,7 +5218,20 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						    .detail("NumExistingSS", numExistingSS);
 					}
 
-					if (hasHealthyTeam && !tssState->active && tssToRecruit > 0) {
+					// check whether this candidate is a process under perpetual wiggling, but be paused because of
+					// unhealthy cluster status. For the data on this server is not completely moved to other team, it
+					// cannot be recruited as TSS. Otherwise, there's probability of data losing.
+					bool notForTSS = false;
+					if (self->wigglingPid.present() &&
+					    candidateWorker.worker.locality.keyProcessId == self->wigglingPid.get()) {
+						notForTSS = true;
+
+						if(self->clearWigglingPidAfterRecruitment) {
+							self->wigglingPid.reset();
+						}
+					}
+
+					if (hasHealthyTeam && !tssState->active && tssToRecruit > 0 && !notForTSS) {
 						TraceEvent("TSS_Recruit", self->distributorId)
 						    .detail("Stage", "HoldTSS")
 						    .detail("Addr", candidateSSAddr.toString())
@@ -5213,7 +5245,7 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						self->addActor.send(initializeStorage(self, candidateWorker, ddEnabledState, true, tssState));
 						checkTss = self->initialFailureReactionDelay;
 					} else {
-						if (tssState->active && tssState->inDataZone(candidateWorker.worker.locality)) {
+						if (!notForTSS && tssState->active && tssState->inDataZone(candidateWorker.worker.locality)) {
 							TEST(true); // TSS recruits pair in same dc/datahall
 							self->isTssRecruiting = false;
 							TraceEvent("TSS_Recruit", self->distributorId)
@@ -5225,8 +5257,8 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 							// successfully started recruitment of pair, reset tss recruitment state
 							tssState = makeReference<TSSPairState>();
 						} else {
-							TEST(tssState->active); // TSS recruitment skipped potential pair because it's in a
-							                        // different dc/datahall
+							TEST(tssState->active || notForTSS); // TSS recruitment skipped potential pair because it's in a
+							                        // different dc/datahall or is a paused wiggling process
 							self->addActor.send(initializeStorage(
 							    self, candidateWorker, ddEnabledState, false, makeReference<TSSPairState>()));
 						}
@@ -6612,4 +6644,4 @@ TEST_CASE("/DataDistribution/AddTeamsBestOf/NotEnoughServers") {
 	ASSERT(result == 8);
 
 	return Void();
-}
\ No newline at end of file
+}
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index d115bee7e87..8f4db1b48ab 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -941,7 +941,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 		// 1 or 2 tss
 		tssCount = deterministicRandom()->randomInt(1, 3);
 	}
-	
+
 //	if (deterministicRandom()->random01() < 0.5) {
 //		set_config("ssd");
 //	} else {

From 84db5623dd2b1ba02d3f9db94f21d27ffbb65978 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 2 Jun 2021 16:31:47 +0000
Subject: [PATCH 261/740] fix memory bug

---
 fdbserver/DataDistribution.actor.cpp | 35 +++++++++++++++-------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 01311989c03..8ea80e8fdda 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -4004,16 +4004,18 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				}
 			}
 			when(wait(restart.onTrigger())) {
-				StringRef pid = self->wigglingPid.get();
-
-				auto fv = self->excludeStorageServersForWiggle(pid);
-				moveFinishFuture = waitForAll(fv);
-				TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
-				    .detail("ProcessId", pid)
-				    .detail("StorageCount", fv.size());
-				isPaused = false;
+                if(self->wigglingPid.present()) {
+					StringRef pid = self->wigglingPid.get();
+                    auto fv = self->excludeStorageServersForWiggle(pid);
+                    moveFinishFuture = waitForAll(fv);
+                    TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
+                        .detail("ProcessId", pid)
+                        .detail("StorageCount", fv.size());
+                    isPaused = false;
+				}
 			}
 			when(wait(moveFinishFuture)) {
+				ASSERT(self->wigglingPid.present());
 				StringRef pid = self->wigglingPid.get();
 
 				moveFinishFuture = Never();
@@ -4044,14 +4046,15 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				ddQueueCheck = delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
 			}
 			when(wait(pauseWiggle.onTrigger())) {
-				StringRef pid = self->wigglingPid.get();
-
-				isPaused = true;
-				moveFinishFuture = Never();
-				self->includeStorageServersForWiggle(pid);
-				TraceEvent("PerpetualStorageWigglePause", self->distributorId)
-				    .detail("ProcessId", pid)
-				    .detail("StorageCount", movingCount);
+                if(self->wigglingPid.present()) {
+					StringRef pid = self->wigglingPid.get();
+					isPaused = true;
+					moveFinishFuture = Never();
+					self->includeStorageServersForWiggle(pid);
+					TraceEvent("PerpetualStorageWigglePause", self->distributorId)
+					    .detail("ProcessId", pid)
+					    .detail("StorageCount", movingCount);
+				}
 			}
 		}
 	}

From ac38696c5ff1f5480fabafeb5404dc412b2a764a Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 2 Jun 2021 18:49:01 +0000
Subject: [PATCH 262/740] add comments for new actors

---
 fdbserver/DataDistribution.actor.cpp | 54 +++++++++++++++++++---------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 8ea80e8fdda..02d5425e069 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -2816,6 +2816,9 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		    .detail("DesiredTeamsPerServer", SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER);
 	}
 
+	// Adds storage servers held on process of which the Process Id is “pid” into excludeServers which prevent
+	// recruiting the wiggling storage servers and let teamTracker start to move data off the affected teams;
+	// Return a vector of futures wait for all data is moved to other teams.
 	std::vector<Future<Void>> excludeStorageServersForWiggle(const Value& pid) {
 		std::vector<Future<Void>> moveFutures;
 		if (this->pid2server_info.count(pid) != 0) {
@@ -2836,6 +2839,8 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		return moveFutures;
 	}
 
+	// Include storage servers held on process of which the Process Id is “pid” by setting their status from `WIGGLING`
+	// to `NONE`. The storage recruiter will recruit them as new storage servers
 	void includeStorageServersForWiggle(const Value& pid) {
 		bool included = false;
 		for (auto& info : this->pid2server_info[pid]) {
@@ -3874,6 +3879,9 @@ ACTOR Future<vector<std::pair<StorageServerInterface, ProcessClass>>> getServerL
 	return results;
 }
 
+// Create a transaction reading the value of `wigglingStorageServerKey` and update it to the next Process ID according
+// to a sorted PID set maintained by the data distributor. If now no storage server exists, success should be set to
+// false, and the new Process ID is 0.
 ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection, bool* success) {
 	state ReadYourWritesTransaction tr(teamCollection->cx);
 	loop {
@@ -3895,6 +3903,7 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 				} else {
 					tr.set(wigglingStorageServerKey, pid);
 				}
+				*success = true;
 			}
 			wait(tr.commit());
 			break;
@@ -3904,7 +3913,10 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 	}
 	return Void();
 }
-// Iterator over each storage process to do storage wiggle
+
+// Iterate over each storage process to do storage wiggle. After initializing the first Process ID, it waits a signal
+// from `perpetualStorageWiggler` indicating the wiggling of current process is finished. Then it writes the next
+// Process ID to a system key: `wigglingStorageServerKey` to show the next process to wiggle.
 ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
                                                   FutureStream<Void> finishStorageWiggleSignal,
                                                   DDTeamCollection* teamCollection) {
@@ -3929,6 +3941,8 @@ ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
 	return Void();
 }
 
+// Watch the value change of `wigglingStorageServerKey`.
+// Return the watch future and the current value of `wigglingStorageServerKey`.
 ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(Database cx) {
 	state ReadYourWritesTransaction tr(cx);
 	state Future<Void> watchFuture;
@@ -3949,7 +3963,11 @@ ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(Data
 	}
 	return std::make_pair(watchFuture, ret);
 }
-// Watch the value of current wiggling storage process and do wiggling works
+
+// Watches the value (pid) change of \xff/storageWigglePID, and adds storage servers held on process of which the
+// Process Id is “pid” into excludeServers which prevent recruiting the wiggling storage servers and let teamTracker
+// start to move data off the affected teams. The wiggling process of current storage servers will be paused if the
+// cluster is unhealthy and restarted once the cluster is healthy again.
 ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
                                            PromiseStream<Void> finishStorageWiggleSignal,
                                            DDTeamCollection* self,
@@ -3967,7 +3985,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 	watchFuture = res.first;
 	self->wigglingPid = Optional<Key>(res.second);
 	self->clearWigglingPidAfterRecruitment = false;
-	
+
 	// start with the initial pid
 	if (self->healthyTeamCount > 1) { // pre-check health status
 		auto fv = self->excludeStorageServersForWiggle(self->wigglingPid.get());
@@ -4004,14 +4022,14 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				}
 			}
 			when(wait(restart.onTrigger())) {
-                if(self->wigglingPid.present()) {
+				if (self->wigglingPid.present()) {
 					StringRef pid = self->wigglingPid.get();
-                    auto fv = self->excludeStorageServersForWiggle(pid);
-                    moveFinishFuture = waitForAll(fv);
-                    TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
-                        .detail("ProcessId", pid)
-                        .detail("StorageCount", fv.size());
-                    isPaused = false;
+					auto fv = self->excludeStorageServersForWiggle(pid);
+					moveFinishFuture = waitForAll(fv);
+					TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
+					    .detail("ProcessId", pid)
+					    .detail("StorageCount", fv.size());
+					isPaused = false;
 				}
 			}
 			when(wait(moveFinishFuture)) {
@@ -4032,7 +4050,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 					pauseWiggle.trigger();
 				}
 			}
-			when(wait(ddQueueCheck)) {
+			when(wait(ddQueueCheck)) { // check health status periodically
 				Promise<int> countp;
 				self->getUnhealthyRelocationCount.send(countp);
 				int count = wait(countp.getFuture());
@@ -4046,7 +4064,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				ddQueueCheck = delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
 			}
 			when(wait(pauseWiggle.onTrigger())) {
-                if(self->wigglingPid.present()) {
+				if (self->wigglingPid.present()) {
 					StringRef pid = self->wigglingPid.get();
 					isPaused = true;
 					moveFinishFuture = Never();
@@ -4059,7 +4077,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 		}
 	}
 
-	if(self->wigglingPid.present()) {
+	if (self->wigglingPid.present()) {
 		self->includeStorageServersForWiggle(self->wigglingPid.get());
 		self->clearWigglingPidAfterRecruitment = true;
 	}
@@ -4067,6 +4085,9 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 	return Void();
 }
 
+// This coroutine sets a watch to monitor the value change of `perpetualStorageWiggleKey` which is controlled by command
+// `configure perpetual_storage_wiggle=$value` if the value is 0, this actor start 2 actors,
+// `perpetualStorageWiggleIterator` and `perpetualStorageWiggler`. Otherwise, it sends stop signal to them.
 ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollection,
                                                  const DDEnabledState* ddEnabledState) {
 	state int speed = 0;
@@ -5229,7 +5250,7 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 					    candidateWorker.worker.locality.keyProcessId == self->wigglingPid.get()) {
 						notForTSS = true;
 
-						if(self->clearWigglingPidAfterRecruitment) {
+						if (self->clearWigglingPidAfterRecruitment) {
 							self->wigglingPid.reset();
 						}
 					}
@@ -5260,8 +5281,9 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 							// successfully started recruitment of pair, reset tss recruitment state
 							tssState = makeReference<TSSPairState>();
 						} else {
-							TEST(tssState->active || notForTSS); // TSS recruitment skipped potential pair because it's in a
-							                        // different dc/datahall or is a paused wiggling process
+							TEST(tssState->active ||
+							     notForTSS); // TSS recruitment skipped potential pair because it's in a
+							                 // different dc/datahall or is a paused wiggling process
 							self->addActor.send(initializeStorage(
 							    self, candidateWorker, ddEnabledState, false, makeReference<TSSPairState>()));
 						}

From c517003c149392f6f33be087aaa4b33ae9564742 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 2 Jun 2021 23:15:04 +0000
Subject: [PATCH 263/740] comment modification; wait perpetual wiggling close

---
 fdbclient/NativeAPI.actor.cpp        |  2 ++
 fdbserver/DataDistribution.actor.cpp | 14 +++++++-------
 fdbserver/QuietDatabase.actor.cpp    |  4 +++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index fd03f2e638b..a45f4bc4d5b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -5886,6 +5886,8 @@ ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, Value value) {
     loop {
         try {
             tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+            tr.setOption(FDBTransactionOptions::LOCK_AWARE);
+
             tr.set(perpetualStorageWiggleKey, value);
             wait(tr.commit());
             break;
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 02d5425e069..c998e381a17 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -4086,7 +4086,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 }
 
 // This coroutine sets a watch to monitor the value change of `perpetualStorageWiggleKey` which is controlled by command
-// `configure perpetual_storage_wiggle=$value` if the value is 0, this actor start 2 actors,
+// `configure perpetual_storage_wiggle=$value` if the value is 1, this actor start 2 actors,
 // `perpetualStorageWiggleIterator` and `perpetualStorageWiggler`. Otherwise, it sends stop signal to them.
 ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollection,
                                                  const DDEnabledState* ddEnabledState) {
@@ -5244,18 +5244,18 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 
 					// check whether this candidate is a process under perpetual wiggling, but be paused because of
 					// unhealthy cluster status. For the data on this server is not completely moved to other team, it
-					// cannot be recruited as TSS. Otherwise, there's probability of data losing.
-					bool notForTSS = false;
+					// cannot be recruited as TSS. Otherwise, there's probability of data-lose.
+					bool canBeTSS = true;
 					if (self->wigglingPid.present() &&
 					    candidateWorker.worker.locality.keyProcessId == self->wigglingPid.get()) {
-						notForTSS = true;
+						canBeTSS = false;
 
 						if (self->clearWigglingPidAfterRecruitment) {
 							self->wigglingPid.reset();
 						}
 					}
 
-					if (hasHealthyTeam && !tssState->active && tssToRecruit > 0 && !notForTSS) {
+					if (hasHealthyTeam && !tssState->active && tssToRecruit > 0 && canBeTSS) {
 						TraceEvent("TSS_Recruit", self->distributorId)
 						    .detail("Stage", "HoldTSS")
 						    .detail("Addr", candidateSSAddr.toString())
@@ -5269,7 +5269,7 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						self->addActor.send(initializeStorage(self, candidateWorker, ddEnabledState, true, tssState));
 						checkTss = self->initialFailureReactionDelay;
 					} else {
-						if (!notForTSS && tssState->active && tssState->inDataZone(candidateWorker.worker.locality)) {
+						if (canBeTSS && tssState->active && tssState->inDataZone(candidateWorker.worker.locality)) {
 							TEST(true); // TSS recruits pair in same dc/datahall
 							self->isTssRecruiting = false;
 							TraceEvent("TSS_Recruit", self->distributorId)
@@ -5282,7 +5282,7 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 							tssState = makeReference<TSSPairState>();
 						} else {
 							TEST(tssState->active ||
-							     notForTSS); // TSS recruitment skipped potential pair because it's in a
+							     !canBeTSS); // TSS recruitment skipped potential pair because it's in a
 							                 // different dc/datahall or is a paused wiggling process
 							self->addActor.send(initializeStorage(
 							    self, candidateWorker, ddEnabledState, false, makeReference<TSSPairState>()));
diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index 6293b8301df..d315d6bab80 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -590,7 +590,9 @@ ACTOR Future<Void> waitForQuietDatabase(Database cx,
                                         int64_t maxPoppedVersionLag = 30e6) {
 	state Future<Void> reconfig =
 	    reconfigureAfter(cx, 100 + (deterministicRandom()->random01() * 100), dbInfo, "QuietDatabase");
-	state Future<Void> disableWiggling = setPerpetualStorageWiggle(cx, LiteralStringRef("0"));
+
+	wait(setPerpetualStorageWiggle(cx, LiteralStringRef("0")));
+
 	auto traceMessage = "QuietDatabase" + phase + "Begin";
 	TraceEvent(traceMessage.c_str());
 

From 59c4c47b358d8ba17b5ffc5d03177afaf4793259 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 3 Jun 2021 19:57:44 +0000
Subject: [PATCH 264/740] better api

---
 fdbclient/NativeAPI.actor.cpp | 8 +++++---
 fdbclient/NativeAPI.actor.h   | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index a45f4bc4d5b..73fc9552633 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -5881,14 +5881,16 @@ Future<Void> DatabaseContext::createSnapshot(StringRef uid, StringRef snapshot_c
 	return createSnapshotActor(this, UID::fromString(uid_str), snapshot_command);
 }
 
-ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, Value value) {
+ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, bool enable, bool lock_aware) {
     state ReadYourWritesTransaction tr(cx);
     loop {
         try {
             tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-            tr.setOption(FDBTransactionOptions::LOCK_AWARE);
+			if(lock_aware) {
+				tr.setOption(FDBTransactionOptions::LOCK_AWARE);
+			}
 
-            tr.set(perpetualStorageWiggleKey, value);
+            tr.set(perpetualStorageWiggleKey, enable ? LiteralStringRef("1") : LiteralStringRef("0"));
             wait(tr.commit());
             break;
         }
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 60ae18014a8..38c3e1df548 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -408,9 +408,7 @@ inline uint64_t getWriteOperationCost(uint64_t bytes) {
 	return bytes / std::max(1, CLIENT_KNOBS->WRITE_COST_BYTE_FACTOR) + 1;
 }
 
-// The quiet database check (which runs at the end of every test) will always time out due to active data movement.
-// To get around this, quiet Database will disable the perpetual wiggle in the setup phase.
-ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, Value value);
+ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, bool enable, bool lock_aware = false);
 
 #include "flow/unactorcompiler.h"
 #endif

From fa1240b5e6b6d126563130401f2c3d6de0059ab3 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 3 Jun 2021 19:58:28 +0000
Subject: [PATCH 265/740] add code coverage mark

---
 fdbserver/DataDistribution.actor.cpp | 54 +++++++++-------------------
 fdbserver/QuietDatabase.actor.cpp    |  6 ++--
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index c998e381a17..b9e3edc2834 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -624,9 +624,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	std::map<Key, std::vector<Reference<TCServerInfo>>> pid2server_info; // some process may serve as multiple storage servers
 	std::map<Key, int> lagging_zones; // zone to number of storage servers lagging
 	AsyncVar<bool> disableFailingLaggingServers;
-	AsyncTrigger canStartStorageWiggling;
 	Optional<Key> wigglingPid; // Process id of current wiggling storage server;
-	bool clearWigglingPidAfterRecruitment = false;
 
 	// machine_info has all machines info; key must be unique across processes on the same machine
 	std::map<Standalone<StringRef>, Reference<TCMachineInfo>> machine_info;
@@ -2489,7 +2487,6 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 			ASSERT(r->lastKnownInterface.locality.processId().present());
 			StringRef pid = r->lastKnownInterface.locality.processId().get();
 			pid2server_info[pid].push_back(r);
-			canStartStorageWiggling.trigger();
 		}
 
 		r->tracker =
@@ -3880,9 +3877,8 @@ ACTOR Future<vector<std::pair<StorageServerInterface, ProcessClass>>> getServerL
 }
 
 // Create a transaction reading the value of `wigglingStorageServerKey` and update it to the next Process ID according
-// to a sorted PID set maintained by the data distributor. If now no storage server exists, success should be set to
-// false, and the new Process ID is 0.
-ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection, bool* success) {
+// to a sorted PID set maintained by the data distributor. If now no storage server exists, the new Process ID is 0.
+ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection) {
 	state ReadYourWritesTransaction tr(teamCollection->cx);
 	loop {
 		try {
@@ -3890,7 +3886,6 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 			Optional<Value> value = wait(tr.get(wigglingStorageServerKey));
 			if (teamCollection->pid2server_info.empty()) {
 				tr.set(wigglingStorageServerKey, LiteralStringRef("0"));
-				*success = false;
 			} else {
 				Value pid = teamCollection->pid2server_info.begin()->first;
 				if (value.present()) {
@@ -3903,7 +3898,6 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 				} else {
 					tr.set(wigglingStorageServerKey, pid);
 				}
-				*success = true;
 			}
 			wait(tr.commit());
 			break;
@@ -3920,21 +3914,13 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
                                                   FutureStream<Void> finishStorageWiggleSignal,
                                                   DDTeamCollection* teamCollection) {
-	state bool isWiggling = true;
 	// initialize PID
-	wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
+	wait(updateNextWigglingStoragePID(teamCollection));
 
 	loop choose {
 		when(wait(stopSignal->onTrigger())) { break; }
-		when(wait(teamCollection->canStartStorageWiggling.onTrigger())) {
-			if (!isWiggling) {
-				isWiggling = true;
-				wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
-			}
-		}
 		when(waitNext(finishStorageWiggleSignal)) {
-			isWiggling = true;
-			wait(updateNextWigglingStoragePID(teamCollection, &isWiggling));
+			wait(updateNextWigglingStoragePID(teamCollection));
 		}
 	}
 
@@ -3984,10 +3970,11 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 	state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self->cx));
 	watchFuture = res.first;
 	self->wigglingPid = Optional<Key>(res.second);
-	self->clearWigglingPidAfterRecruitment = false;
 
 	// start with the initial pid
 	if (self->healthyTeamCount > 1) { // pre-check health status
+		TEST(true); // start the first wiggling
+
 		auto fv = self->excludeStorageServersForWiggle(self->wigglingPid.get());
 		movingCount = fv.size();
 		moveFinishFuture = waitForAll(fv);
@@ -4013,6 +4000,8 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				if (self->healthyTeamCount <= 1) { // pre-check health status
 					pauseWiggle.trigger();
 				} else {
+					TEST(true); // start wiggling
+
 					auto fv = self->excludeStorageServersForWiggle(pid);
 					movingCount = fv.size();
 					moveFinishFuture = waitForAll(fv);
@@ -4023,6 +4012,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 			}
 			when(wait(restart.onTrigger())) {
 				if (self->wigglingPid.present()) {
+					TEST(true); // restart paused wiggling
 					StringRef pid = self->wigglingPid.get();
 					auto fv = self->excludeStorageServersForWiggle(pid);
 					moveFinishFuture = waitForAll(fv);
@@ -4033,6 +4023,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				}
 			}
 			when(wait(moveFinishFuture)) {
+				TEST(true); // finish wiggling this process
 				ASSERT(self->wigglingPid.present());
 				StringRef pid = self->wigglingPid.get();
 
@@ -4065,6 +4056,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 			}
 			when(wait(pauseWiggle.onTrigger())) {
 				if (self->wigglingPid.present()) {
+					TEST(true); // paused because cluster is unhealthy
 					StringRef pid = self->wigglingPid.get();
 					isPaused = true;
 					moveFinishFuture = Never();
@@ -4079,7 +4071,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 
 	if (self->wigglingPid.present()) {
 		self->includeStorageServersForWiggle(self->wigglingPid.get());
-		self->clearWigglingPidAfterRecruitment = true;
+		self->wigglingPid.reset();
 	}
 
 	return Void();
@@ -5242,20 +5234,7 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						    .detail("NumExistingSS", numExistingSS);
 					}
 
-					// check whether this candidate is a process under perpetual wiggling, but be paused because of
-					// unhealthy cluster status. For the data on this server is not completely moved to other team, it
-					// cannot be recruited as TSS. Otherwise, there's probability of data-lose.
-					bool canBeTSS = true;
-					if (self->wigglingPid.present() &&
-					    candidateWorker.worker.locality.keyProcessId == self->wigglingPid.get()) {
-						canBeTSS = false;
-
-						if (self->clearWigglingPidAfterRecruitment) {
-							self->wigglingPid.reset();
-						}
-					}
-
-					if (hasHealthyTeam && !tssState->active && tssToRecruit > 0 && canBeTSS) {
+					if (hasHealthyTeam && !tssState->active && tssToRecruit > 0) {
 						TraceEvent("TSS_Recruit", self->distributorId)
 						    .detail("Stage", "HoldTSS")
 						    .detail("Addr", candidateSSAddr.toString())
@@ -5269,7 +5248,7 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 						self->addActor.send(initializeStorage(self, candidateWorker, ddEnabledState, true, tssState));
 						checkTss = self->initialFailureReactionDelay;
 					} else {
-						if (canBeTSS && tssState->active && tssState->inDataZone(candidateWorker.worker.locality)) {
+						if (tssState->active && tssState->inDataZone(candidateWorker.worker.locality)) {
 							TEST(true); // TSS recruits pair in same dc/datahall
 							self->isTssRecruiting = false;
 							TraceEvent("TSS_Recruit", self->distributorId)
@@ -5281,9 +5260,8 @@ ACTOR Future<Void> storageRecruiter(DDTeamCollection* self,
 							// successfully started recruitment of pair, reset tss recruitment state
 							tssState = makeReference<TSSPairState>();
 						} else {
-							TEST(tssState->active ||
-							     !canBeTSS); // TSS recruitment skipped potential pair because it's in a
-							                 // different dc/datahall or is a paused wiggling process
+							TEST(tssState->active); // TSS recruitment skipped potential pair because it's in a
+							                        // different dc/datahall
 							self->addActor.send(initializeStorage(
 							    self, candidateWorker, ddEnabledState, false, makeReference<TSSPairState>()));
 						}
diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index d315d6bab80..c475e505bae 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -591,8 +591,6 @@ ACTOR Future<Void> waitForQuietDatabase(Database cx,
 	state Future<Void> reconfig =
 	    reconfigureAfter(cx, 100 + (deterministicRandom()->random01() * 100), dbInfo, "QuietDatabase");
 
-	wait(setPerpetualStorageWiggle(cx, LiteralStringRef("0")));
-
 	auto traceMessage = "QuietDatabase" + phase + "Begin";
 	TraceEvent(traceMessage.c_str());
 
@@ -600,6 +598,10 @@ ACTOR Future<Void> waitForQuietDatabase(Database cx,
 	if (g_network->isSimulated())
 		wait(delay(5.0));
 
+	// The quiet database check (which runs at the end of every test) will always time out due to active data movement.
+	// To get around this, quiet Database will disable the perpetual wiggle in the setup phase.
+	wait(setPerpetualStorageWiggle(cx, false, true));
+
 	// Require 3 consecutive successful quiet database checks spaced 2 second apart
 	state int numSuccesses = 0;
 

From 5eac87dfb3e72797c992b66b5a083b37ac211842 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Fri, 4 Jun 2021 18:35:35 +0000
Subject: [PATCH 266/740] add comment

---
 fdbclient/NativeAPI.actor.h          |  2 ++
 fdbserver/DataDistribution.actor.cpp | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 38c3e1df548..2955a792dd5 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -408,6 +408,8 @@ inline uint64_t getWriteOperationCost(uint64_t bytes) {
 	return bytes / std::max(1, CLIENT_KNOBS->WRITE_COST_BYTE_FACTOR) + 1;
 }
 
+// Create a transaction to set the value of system key \xff/conf/perpetual_storage_wiggle. If enable == true, the value
+// will be 1. Otherwise, the value will be 0.
 ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, bool enable, bool lock_aware = false);
 
 #include "flow/unactorcompiler.h"
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index b9e3edc2834..78e65ac3db0 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -3461,6 +3461,7 @@ bool teamContainsFailedServer(DDTeamCollection* self, Reference<TCTeamInfo> team
 ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> team, bool badTeam, bool redundantTeam) {
 	state int lastServersLeft = team->size();
 	state bool lastAnyUndesired = false;
+	state bool lastAnyWigglingServer = false;
 	state bool logTeamEvents =
 	    g_network->isSimulated() || !badTeam || team->size() <= self->configuration.storageTeamSize;
 	state bool lastReady = false;
@@ -3569,13 +3570,15 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 			}
 
 			if (serversLeft != lastServersLeft || anyUndesired != lastAnyUndesired ||
-			    anyWrongConfiguration != lastWrongConfiguration || recheck) { // NOTE: do not check wrongSize
+			    anyWrongConfiguration != lastWrongConfiguration || anyWigglingServer != lastAnyWigglingServer ||
+			    recheck) { // NOTE: do not check wrongSize
 				if (logTeamEvents) {
 					TraceEvent("ServerTeamHealthChanged", self->distributorId)
 					    .detail("ServerTeam", team->getDesc())
 					    .detail("ServersLeft", serversLeft)
 					    .detail("LastServersLeft", lastServersLeft)
 					    .detail("ContainsUndesiredServer", anyUndesired)
+					    .detail("ContainsWigglingServer", anyWigglingServer)
 					    .detail("HealthyTeamsCount", self->healthyTeamCount)
 					    .detail("IsWrongConfiguration", anyWrongConfiguration);
 				}
@@ -3617,6 +3620,7 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 				lastServersLeft = serversLeft;
 				lastAnyUndesired = anyUndesired;
 				lastWrongConfiguration = anyWrongConfiguration;
+				lastAnyWigglingServer = anyWigglingServer;
 
 				state int lastPriority = team->getPriority();
 				if (team->size() == 0) {
@@ -3670,8 +3674,7 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 
 				lastZeroHealthy =
 				    self->zeroHealthyTeams->get(); // set this again in case it changed from this teams health changing
-				if ((self->initialFailureReactionDelay.isReady() && !self->zeroHealthyTeams->get()) || containsFailed ||
-				    anyWigglingServer) {
+				if ((self->initialFailureReactionDelay.isReady() && !self->zeroHealthyTeams->get()) || containsFailed) {
 
 					vector<KeyRange> shards = self->shardsAffectedByTeamFailure->getShardsFor(
 					    ShardsAffectedByTeamFailure::Team(team->getServerIDs(), self->primary));
@@ -3919,9 +3922,7 @@ ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
 
 	loop choose {
 		when(wait(stopSignal->onTrigger())) { break; }
-		when(waitNext(finishStorageWiggleSignal)) {
-			wait(updateNextWigglingStoragePID(teamCollection));
-		}
+		when(waitNext(finishStorageWiggleSignal)) { wait(updateNextWigglingStoragePID(teamCollection)); }
 	}
 
 	return Void();

From 5f9b86844dd78a88f6c26ed6af9d786e007990ca Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Fri, 11 Jun 2021 22:58:05 +0000
Subject: [PATCH 267/740] Revert "Revert "Properly set simulation test for
 perpetual storage wiggle and bug fixing""

This reverts commit ad576e8c2022b1e9ff92ce3adbf5086e317b9353.
---
 fdbserver/DataDistribution.actor.cpp          | 200 ++++++++++++------
 fdbserver/DataDistributionQueue.actor.cpp     |   2 +-
 fdbserver/Knobs.cpp                           |   2 +-
 fdbserver/tester.actor.cpp                    |  18 ++
 .../workloads/ConsistencyCheck.actor.cpp      |   1 +
 fdbserver/workloads/workloads.actor.h         |  10 +-
 6 files changed, 164 insertions(+), 69 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 78e65ac3db0..96d34bc9afa 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -52,6 +52,7 @@ class TCMachineTeamInfo;
 ACTOR Future<Void> checkAndRemoveInvalidLocalityAddr(DDTeamCollection* self);
 ACTOR Future<Void> removeWrongStoreType(DDTeamCollection* self);
 ACTOR Future<Void> waitForAllDataRemoved(Database cx, UID serverID, Version addedVersion, DDTeamCollection* teams);
+bool _exclusionSafetyCheck(vector<UID>& excludeServerIDs, DDTeamCollection* teamCollection);
 
 struct TCServerInfo : public ReferenceCounted<TCServerInfo> {
 	UID id;
@@ -374,14 +375,16 @@ struct ServerStatus {
 	LocalityData locality;
 	ServerStatus()
 	  : isWiggling(false), isFailed(true), isUndesired(false), isWrongConfiguration(false), initialized(false) {}
-	ServerStatus(bool isFailed, bool isUndesired, LocalityData const& locality)
+	ServerStatus(bool isFailed, bool isUndesired, bool isWiggling, LocalityData const& locality)
 	  : isFailed(isFailed), isUndesired(isUndesired), locality(locality), isWrongConfiguration(false),
-	    initialized(true), isWiggling(false) {}
+	    initialized(true), isWiggling(isWiggling) {}
 	bool isUnhealthy() const { return isFailed || isUndesired; }
-	const char* toString() const { return isFailed ? "Failed" : isUndesired ? "Undesired" : "Healthy"; }
+	const char* toString() const {
+		return isFailed ? "Failed" : isUndesired ? "Undesired" : isWiggling ? "Wiggling" : "Healthy";
+	}
 
 	bool operator==(ServerStatus const& r) const {
-		return isFailed == r.isFailed && isUndesired == r.isUndesired &&
+		return isFailed == r.isFailed && isUndesired == r.isUndesired && isWiggling == r.isWiggling &&
 		       isWrongConfiguration == r.isWrongConfiguration && locality == r.locality && initialized == r.initialized;
 	}
 	bool operator!=(ServerStatus const& r) const { return !(*this == r); }
@@ -619,9 +622,11 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	int64_t unhealthyServers;
 	std::map<int,int> priority_teams;
 	std::map<UID, Reference<TCServerInfo>> server_info;
+
 	std::map<UID, Reference<TCServerInfo>> tss_info_by_pair;
 	std::map<UID, Reference<TCServerInfo>> server_and_tss_info; // TODO could replace this with an efficient way to do a read-only concatenation of 2 data structures? 
-	std::map<Key, std::vector<Reference<TCServerInfo>>> pid2server_info; // some process may serve as multiple storage servers
+    std::map<Key, std::vector<Reference<TCServerInfo>>> pid2server_info; // some process may serve as multiple storage servers
+    std::vector<AddressExclusion> wiggle_addresses; // collection of wiggling servers' address
 	std::map<Key, int> lagging_zones; // zone to number of storage servers lagging
 	AsyncVar<bool> disableFailingLaggingServers;
 	Optional<Key> wigglingPid; // Process id of current wiggling storage server;
@@ -2825,6 +2830,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 				    this->excludedServers.get(addr) != DDTeamCollection::Status::NONE) {
 					continue; // don't overwrite the value set by actor trackExcludedServer
 				}
+				this->wiggle_addresses.push_back(addr);
 				this->excludedServers.set(addr, DDTeamCollection::Status::WIGGLING);
 				moveFutures.push_back(
 				    waitForAllDataRemoved(this->cx, info->lastKnownInterface.id(), info->addedVersion, this));
@@ -2836,19 +2842,19 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 		return moveFutures;
 	}
 
-	// Include storage servers held on process of which the Process Id is “pid” by setting their status from `WIGGLING`
+	// Include wiggled storage servers by setting their status from `WIGGLING`
 	// to `NONE`. The storage recruiter will recruit them as new storage servers
-	void includeStorageServersForWiggle(const Value& pid) {
+	void includeStorageServersForWiggle() {
 		bool included = false;
-		for (auto& info : this->pid2server_info[pid]) {
-			AddressExclusion addr(info->lastKnownInterface.address().ip);
-			if (!this->excludedServers.count(addr) ||
-			    this->excludedServers.get(addr) != DDTeamCollection::Status::WIGGLING) {
+		for (auto& address : this->wiggle_addresses) {
+			if (!this->excludedServers.count(address) ||
+			    this->excludedServers.get(address) != DDTeamCollection::Status::WIGGLING) {
 				continue;
 			}
 			included = true;
-			this->excludedServers.set(addr, DDTeamCollection::Status::NONE);
+			this->excludedServers.set(address, DDTeamCollection::Status::NONE);
 		}
+		this->wiggle_addresses.clear();
 		if (included) {
 			this->restartRecruiting.trigger();
 		}
@@ -3530,8 +3536,7 @@ ACTOR Future<Void> teamTracker(DDTeamCollection* self, Reference<TCTeamInfo> tea
 			}
 			change.push_back(self->zeroHealthyTeams->onChange());
 
-			bool healthy =
-			    !badTeam && !anyUndesired && serversLeft == self->configuration.storageTeamSize && !anyWigglingServer;
+			bool healthy = !badTeam && !anyUndesired && serversLeft == self->configuration.storageTeamSize;
 			team->setHealthy(healthy); // Unhealthy teams won't be chosen by bestTeam
 			bool optimal = team->isOptimal() && healthy;
 			bool containsFailed = teamContainsFailedServer(self, team);
@@ -3828,10 +3833,12 @@ ACTOR Future<Void> trackExcludedServers(DDTeamCollection* self) {
 
 			// Reset and reassign self->excludedServers based on excluded, but we only
 			// want to trigger entries that are different
-			// Do not retrigger and double-overwrite failed servers
+			// Do not retrigger and double-overwrite failed or wiggling servers
 			auto old = self->excludedServers.getKeys();
 			for (const auto& o : old) {
-				if (!excluded.count(o) && !failed.count(o)) {
+				if (!excluded.count(o) && !failed.count(o) &&
+				    !(self->excludedServers.count(o) &&
+				      self->excludedServers.get(o) == DDTeamCollection::Status::WIGGLING)) {
 					self->excludedServers.set(o, DDTeamCollection::Status::NONE);
 				}
 			}
@@ -3883,6 +3890,7 @@ ACTOR Future<vector<std::pair<StorageServerInterface, ProcessClass>>> getServerL
 // to a sorted PID set maintained by the data distributor. If now no storage server exists, the new Process ID is 0.
 ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection) {
 	state ReadYourWritesTransaction tr(teamCollection->cx);
+	state Value writeValue = LiteralStringRef("0");
 	loop {
 		try {
 			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
@@ -3895,11 +3903,14 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 					auto nextIt = teamCollection->pid2server_info.upper_bound(value.get());
 					if (nextIt == teamCollection->pid2server_info.end()) {
 						tr.set(wigglingStorageServerKey, pid);
+						writeValue = pid;
 					} else {
 						tr.set(wigglingStorageServerKey, nextIt->first);
+						writeValue = nextIt->first;
 					}
 				} else {
 					tr.set(wigglingStorageServerKey, pid);
+					writeValue = pid;
 				}
 			}
 			wait(tr.commit());
@@ -3908,6 +3919,9 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 			wait(tr.onError(e));
 		}
 	}
+	TraceEvent(SevDebug, "PerpetualNextWigglingStoragePID", teamCollection->distributorId)
+	    .detail("WriteValue", writeValue);
+
 	return Void();
 }
 
@@ -3917,9 +3931,6 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
                                                   FutureStream<Void> finishStorageWiggleSignal,
                                                   DDTeamCollection* teamCollection) {
-	// initialize PID
-	wait(updateNextWigglingStoragePID(teamCollection));
-
 	loop choose {
 		when(wait(stopSignal->onTrigger())) { break; }
 		when(waitNext(finishStorageWiggleSignal)) { wait(updateNextWigglingStoragePID(teamCollection)); }
@@ -3930,8 +3941,8 @@ ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
 
 // Watch the value change of `wigglingStorageServerKey`.
 // Return the watch future and the current value of `wigglingStorageServerKey`.
-ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(Database cx) {
-	state ReadYourWritesTransaction tr(cx);
+ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(DDTeamCollection* self) {
+	state ReadYourWritesTransaction tr(self->cx);
 	state Future<Void> watchFuture;
 	state Value ret;
 	loop {
@@ -3959,7 +3970,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
                                            PromiseStream<Void> finishStorageWiggleSignal,
                                            DDTeamCollection* self,
                                            const DDEnabledState* ddEnabledState) {
-	state Future<Void> watchFuture;
+	state Future<Void> watchFuture = Never();
 	state Future<Void> moveFinishFuture = Never();
 	state Debouncer pauseWiggle(SERVER_KNOBS->DEBOUNCE_RECRUITING_DELAY);
 	state AsyncTrigger restart;
@@ -3967,13 +3978,16 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 	    delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
 	state int movingCount = 0;
 	state bool isPaused = false;
-
-	state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self->cx));
-	watchFuture = res.first;
+	state vector<UID> excludedServerIds;
+	state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self));
+	ASSERT(!self->wigglingPid.present()); // only single process wiggle is allowed
 	self->wigglingPid = Optional<Key>(res.second);
 
 	// start with the initial pid
-	if (self->healthyTeamCount > 1) { // pre-check health status
+	for (const auto& info : self->pid2server_info[self->wigglingPid.get()]) {
+		excludedServerIds.push_back(info->id);
+	}
+	if (self->teams.size() > 1 && _exclusionSafetyCheck(excludedServerIds, self)) { // pre-check health status
 		TEST(true); // start the first wiggling
 
 		auto fv = self->excludeStorageServersForWiggle(self->wigglingPid.get());
@@ -3992,15 +4006,20 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 		choose {
 			when(wait(stopSignal->onTrigger())) { break; }
 			when(wait(watchFuture)) {
+				ASSERT(!self->wigglingPid.present()); // the previous wiggle must be finished
+				watchFuture = Never();
+
 				// read new pid and set the next watch Future
-				wait(store(res, watchPerpetualStoragePIDChange(self->cx)));
-				watchFuture = res.first;
+				wait(store(res, watchPerpetualStoragePIDChange(self)));
 				self->wigglingPid = Optional<Key>(res.second);
 				StringRef pid = self->wigglingPid.get();
 
-				if (self->healthyTeamCount <= 1) { // pre-check health status
-					pauseWiggle.trigger();
-				} else {
+				// pre-check health status
+				excludedServerIds.clear();
+				for (const auto& info : self->pid2server_info[self->wigglingPid.get()]) {
+					excludedServerIds.push_back(info->id);
+				}
+				if (self->teams.size() > 1 && _exclusionSafetyCheck(excludedServerIds, self)) {
 					TEST(true); // start wiggling
 
 					auto fv = self->excludeStorageServersForWiggle(pid);
@@ -4009,6 +4028,8 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 					TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
 					    .detail("ProcessId", pid)
 					    .detail("StorageCount", movingCount);
+				} else {
+					pauseWiggle.trigger();
 				}
 			}
 			when(wait(restart.onTrigger())) {
@@ -4029,12 +4050,13 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				StringRef pid = self->wigglingPid.get();
 
 				moveFinishFuture = Never();
-				self->includeStorageServersForWiggle(pid);
+				self->includeStorageServersForWiggle();
 				TraceEvent("PerpetualStorageWiggleFinish", self->distributorId)
 				    .detail("ProcessId", pid.toString())
 				    .detail("StorageCount", movingCount);
 
 				self->wigglingPid.reset();
+				watchFuture = res.first;
 				finishStorageWiggleSignal.send(Void());
 			}
 			when(wait(self->zeroHealthyTeams->onChange())) {
@@ -4049,11 +4071,11 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 
 				if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && !isPaused) {
 					pauseWiggle.trigger();
-				} else if (count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && self->healthyTeamCount > 1 &&
-				           isPaused) {
+				} else if (isPaused && count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD &&
+				           self->teams.size() > 1 && _exclusionSafetyCheck(excludedServerIds, self)) {
 					restart.trigger();
 				}
-				ddQueueCheck = delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
+				ddQueueCheck = delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow);
 			}
 			when(wait(pauseWiggle.onTrigger())) {
 				if (self->wigglingPid.present()) {
@@ -4061,7 +4083,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 					StringRef pid = self->wigglingPid.get();
 					isPaused = true;
 					moveFinishFuture = Never();
-					self->includeStorageServersForWiggle(pid);
+					self->includeStorageServersForWiggle();
 					TraceEvent("PerpetualStorageWigglePause", self->distributorId)
 					    .detail("ProcessId", pid)
 					    .detail("StorageCount", movingCount);
@@ -4071,7 +4093,9 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 	}
 
 	if (self->wigglingPid.present()) {
-		self->includeStorageServersForWiggle(self->wigglingPid.get());
+		self->includeStorageServersForWiggle();
+		TraceEvent("PerpetualStorageWiggleExitingPause", self->distributorId)
+		    .detail("ProcessId", self->wigglingPid.get());
 		self->wigglingPid.reset();
 	}
 
@@ -4087,7 +4111,7 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 	state AsyncTrigger stopWiggleSignal;
 	state PromiseStream<Void> finishStorageWiggleSignal;
 	state SignalableActorCollection collection;
-
+	state bool started = false;
 	loop {
 		state ReadYourWritesTransaction tr(teamCollection->cx);
 		loop {
@@ -4102,16 +4126,18 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 				wait(tr.commit());
 
 				ASSERT(speed == 1 || speed == 0);
-				if (speed == 1) {
+				if (speed == 1 && !started) {
 					collection.add(perpetualStorageWiggleIterator(
 					    &stopWiggleSignal, finishStorageWiggleSignal.getFuture(), teamCollection));
 					collection.add(perpetualStorageWiggler(
 					    &stopWiggleSignal, finishStorageWiggleSignal, teamCollection, ddEnabledState));
 					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
-				} else {
+					started = true;
+				} else if (speed == 0 && started) {
 					stopWiggleSignal.trigger();
 					wait(collection.signalAndReset());
 					TraceEvent("PerpetualStorageWiggleClose", teamCollection->distributorId);
+					started = false;
 				}
 				wait(watchFuture);
 				break;
@@ -4409,7 +4435,7 @@ ACTOR Future<Void> storageServerTracker(
     bool isTss) {
 
 	state Future<Void> failureTracker;
-	state ServerStatus status(false, false, server->lastKnownInterface.locality);
+	state ServerStatus status(false, false, false, server->lastKnownInterface.locality);
 	state bool lastIsUnhealthy = false;
 	state Future<Void> metricsTracker = serverMetricsPolling(server);
 
@@ -4426,6 +4452,7 @@ ACTOR Future<Void> storageServerTracker(
 		loop {
 			status.isUndesired = !self->disableFailingLaggingServers.get() && server->ssVersionTooFarBehind.get();
 			status.isWrongConfiguration = false;
+			status.isWiggling = false;
 			hasWrongDC = !isCorrectDC(self, server);
 			hasInvalidLocality =
 			    !self->isValidLocality(self->configuration.storagePolicy, server->lastKnownInterface.locality);
@@ -4505,10 +4532,21 @@ ACTOR Future<Void> storageServerTracker(
 				status.isWrongConfiguration = true;
 			}
 
+			// An invalid wiggle server should set itself the right status. Otherwise, it cannot be re-included by
+			// wiggler.
+			auto invalidWiggleServer =
+			    [](const AddressExclusion& addr, const DDTeamCollection* tc, const TCServerInfo* server) {
+				    return server->lastKnownInterface.locality.processId() != tc->wigglingPid;
+			    };
 			// If the storage server is in the excluded servers list, it is undesired
 			NetworkAddress a = server->lastKnownInterface.address();
 			AddressExclusion worstAddr(a.ip, a.port);
 			DDTeamCollection::Status worstStatus = self->excludedServers.get(worstAddr);
+
+			if (worstStatus == DDTeamCollection::Status::WIGGLING && invalidWiggleServer(worstAddr, self, server)) {
+				self->excludedServers.set(worstAddr, DDTeamCollection::Status::NONE);
+				worstStatus = DDTeamCollection::Status::NONE;
+			}
 			otherChanges.push_back(self->excludedServers.onChange(worstAddr));
 
 			for (int i = 0; i < 3; i++) {
@@ -4524,6 +4562,12 @@ ACTOR Future<Void> storageServerTracker(
 				else if (i == 2)
 					testAddr = AddressExclusion(server->lastKnownInterface.secondaryAddress().get().ip);
 				DDTeamCollection::Status testStatus = self->excludedServers.get(testAddr);
+
+				if (testStatus == DDTeamCollection::Status::WIGGLING && invalidWiggleServer(testAddr, self, server)) {
+					self->excludedServers.set(testAddr, DDTeamCollection::Status::NONE);
+					testStatus = DDTeamCollection::Status::NONE;
+				}
+
 				if (testStatus > worstStatus) {
 					worstStatus = testStatus;
 					worstAddr = testAddr;
@@ -4542,6 +4586,7 @@ ACTOR Future<Void> storageServerTracker(
 					status.isWiggling = true;
 					TraceEvent("PerpetualWigglingStorageServer", self->distributorId)
 					    .detail("Server", server->id)
+					    .detail("ProcessId", server->lastKnownInterface.locality.processId())
 					    .detail("Address", worstAddr.toString());
 				} else if (worstStatus == DDTeamCollection::Status::FAILED && !isTss) {
 					TraceEvent(SevWarn, "FailedServerRemoveKeys", self->distributorId)
@@ -4606,11 +4651,14 @@ ACTOR Future<Void> storageServerTracker(
 					bool localityChanged = server->lastKnownInterface.locality != newInterface.first.locality;
 					bool machineLocalityChanged = server->lastKnownInterface.locality.zoneId().get() !=
 					                              newInterface.first.locality.zoneId().get();
+					bool processIdChanged = server->lastKnownInterface.locality.processId().get() !=
+					                        newInterface.first.locality.processId().get();
 					TraceEvent("StorageServerInterfaceChanged", self->distributorId)
 					    .detail("ServerID", server->id)
 					    .detail("NewWaitFailureToken", newInterface.first.waitFailure.getEndpoint().token)
 					    .detail("OldWaitFailureToken", server->lastKnownInterface.waitFailure.getEndpoint().token)
 					    .detail("LocalityChanged", localityChanged)
+					    .detail("ProcessIdChanged", processIdChanged)
 					    .detail("MachineLocalityChanged", machineLocalityChanged);
 
 					server->lastKnownInterface = newInterface.first;
@@ -4655,6 +4703,20 @@ ACTOR Future<Void> storageServerTracker(
 							ASSERT(destMachine.isValid());
 						}
 
+						// update pid2server_info if the process id has changed
+						if (processIdChanged) {
+							self->pid2server_info[newInterface.first.locality.processId().get()].push_back(
+							    self->server_info[server->id]);
+							// delete the old one
+							auto& old_infos =
+							    self->pid2server_info[server->lastKnownInterface.locality.processId().get()];
+							for (int i = 0; i < old_infos.size(); ++i) {
+								if (old_infos[i].getPtr() == server) {
+									std::swap(old_infos[i--], old_infos.back());
+									old_infos.pop_back();
+								}
+							}
+						}
 						// Ensure the server's server team belong to a machine team, and
 						// Get the newBadTeams due to the locality change
 						vector<Reference<TCTeamInfo>> newBadTeams;
@@ -4701,7 +4763,8 @@ ACTOR Future<Void> storageServerTracker(
 					interfaceChanged = server->onInterfaceChanged;
 					// Old failureTracker for the old interface will be actorCancelled since the handler of the old
 					// actor now points to the new failure monitor actor.
-					status = ServerStatus(status.isFailed, status.isUndesired, server->lastKnownInterface.locality);
+					status = ServerStatus(
+					    status.isFailed, status.isUndesired, status.isWiggling, server->lastKnownInterface.locality);
 
 					// self->traceTeamCollectionInfo();
 					recordTeamCollectionInfo = true;
@@ -5461,8 +5524,10 @@ ACTOR Future<Void> dataDistributionTeamCollection(Reference<DDTeamCollection> te
 		self->addActor.send(trackExcludedServers(self));
 		self->addActor.send(monitorHealthyTeams(self));
 		self->addActor.send(waitHealthyZoneChange(self));
-		self->addActor.send(monitorPerpetualStorageWiggle(self, ddEnabledState));
 
+		if (self->primary) { // the primary dc also handle the satellite dc's perpetual wiggling
+			self->addActor.send(monitorPerpetualStorageWiggle(self, ddEnabledState));
+		}
 		// SOMEDAY: Monitor FF/serverList for (new) servers that aren't in allServers and add or remove them
 
 		loop choose {
@@ -6214,6 +6279,30 @@ ACTOR Future<Void> ddSnapCreate(DistributorSnapRequest snapReq,
 	return Void();
 }
 
+// Find size of set intersection of excludeServerIDs and serverIDs on each team and see if the leftover team is valid
+bool _exclusionSafetyCheck(vector<UID>& excludeServerIDs, DDTeamCollection* teamCollection) {
+	std::sort(excludeServerIDs.begin(), excludeServerIDs.end());
+	for (const auto& team : teamCollection->teams) {
+		vector<UID> teamServerIDs = team->getServerIDs();
+		std::sort(teamServerIDs.begin(), teamServerIDs.end());
+		TraceEvent(SevDebug, "DDExclusionSafetyCheck", teamCollection->distributorId)
+		    .detail("Excluding", describe(excludeServerIDs))
+		    .detail("Existing", team->getDesc());
+		// Find size of set intersection of both vectors and see if the leftover team is valid
+		vector<UID> intersectSet(teamServerIDs.size());
+		auto it = std::set_intersection(excludeServerIDs.begin(),
+		                                excludeServerIDs.end(),
+		                                teamServerIDs.begin(),
+		                                teamServerIDs.end(),
+		                                intersectSet.begin());
+		intersectSet.resize(it - intersectSet.begin());
+		if (teamServerIDs.size() - intersectSet.size() < SERVER_KNOBS->DD_EXCLUDE_MIN_REPLICAS) {
+			return false;
+		}
+	}
+	return true;
+}
+
 ACTOR Future<Void> ddExclusionSafetyCheck(DistributorExclusionSafetyCheckRequest req,
                                           Reference<DataDistributorData> self,
                                           Database cx) {
@@ -6243,26 +6332,7 @@ ACTOR Future<Void> ddExclusionSafetyCheck(DistributorExclusionSafetyCheckRequest
 			}
 		}
 	}
-	std::sort(excludeServerIDs.begin(), excludeServerIDs.end());
-	for (const auto& team : self->teamCollection->teams) {
-		vector<UID> teamServerIDs = team->getServerIDs();
-		std::sort(teamServerIDs.begin(), teamServerIDs.end());
-		TraceEvent(SevDebug, "DDExclusionSafetyCheck", self->ddId)
-		    .detail("Excluding", describe(excludeServerIDs))
-		    .detail("Existing", team->getDesc());
-		// Find size of set intersection of both vectors and see if the leftover team is valid
-		vector<UID> intersectSet(teamServerIDs.size());
-		auto it = std::set_intersection(excludeServerIDs.begin(),
-		                                excludeServerIDs.end(),
-		                                teamServerIDs.begin(),
-		                                teamServerIDs.end(),
-		                                intersectSet.begin());
-		intersectSet.resize(it - intersectSet.begin());
-		if (teamServerIDs.size() - intersectSet.size() < SERVER_KNOBS->DD_EXCLUDE_MIN_REPLICAS) {
-			reply.safe = false;
-			break;
-		}
-	}
+	reply.safe = _exclusionSafetyCheck(excludeServerIDs, self->teamCollection);
 	TraceEvent("DDExclusionSafetyCheckFinish", self->ddId);
 	req.reply.send(reply);
 	return Void();
@@ -6439,7 +6509,7 @@ std::unique_ptr<DDTeamCollection> testTeamCollection(int teamSize,
 		interface.locality.set(LiteralStringRef("data_hall"), Standalone<StringRef>(std::to_string(id % 3)));
 		collection->server_info[uid] = makeReference<TCServerInfo>(
 		    interface, collection.get(), ProcessClass(), true, collection->storageServerSet);
-		collection->server_status.set(uid, ServerStatus(false, false, interface.locality));
+		collection->server_status.set(uid, ServerStatus(false, false, false, interface.locality));
 		collection->checkAndCreateMachine(collection->server_info[uid]);
 	}
 
@@ -6496,7 +6566,7 @@ std::unique_ptr<DDTeamCollection> testMachineTeamCollection(int teamSize,
 		collection->server_info[uid] = makeReference<TCServerInfo>(
 		    interface, collection.get(), ProcessClass(), true, collection->storageServerSet);
 
-		collection->server_status.set(uid, ServerStatus(false, false, interface.locality));
+		collection->server_status.set(uid, ServerStatus(false, false, false, interface.locality));
 	}
 
 	int totalServerIndex = collection->constructMachinesFromServers();
diff --git a/fdbserver/DataDistributionQueue.actor.cpp b/fdbserver/DataDistributionQueue.actor.cpp
index 92ca7d170cd..38bc586c665 100644
--- a/fdbserver/DataDistributionQueue.actor.cpp
+++ b/fdbserver/DataDistributionQueue.actor.cpp
@@ -993,7 +993,7 @@ ACTOR Future<Void> dataDistributionRelocator(DDQueueData* self, RelocateData rd,
 				allHealthy = true;
 				anyWithSource = false;
 				bestTeams.clear();
-				// Get team from teamCollections in diffrent DCs and find the best one
+				// Get team from teamCollections in different DCs and find the best one
 				while (tciIndex < self->teamCollections.size()) {
 					double inflightPenalty = SERVER_KNOBS->INFLIGHT_PENALTY_HEALTHY;
 					if (rd.healthPriority == SERVER_KNOBS->PRIORITY_TEAM_UNHEALTHY ||
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index 7bbc743c061..d5217949734 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -131,7 +131,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( PRIORITY_RECOVER_MOVE,                                 110 );
 	init( PRIORITY_REBALANCE_UNDERUTILIZED_TEAM,                 120 );
 	init( PRIORITY_REBALANCE_OVERUTILIZED_TEAM,                  121 );
-	init( PRIORITY_PERPETUAL_STORAGE_WIGGLE,                     140 );
+	init( PRIORITY_PERPETUAL_STORAGE_WIGGLE,                     139 );
 	init( PRIORITY_TEAM_HEALTHY,                                 140 );
 	init( PRIORITY_TEAM_CONTAINS_UNDESIRED_SERVER,               150 );
 	init( PRIORITY_TEAM_REDUNDANT,                               200 );
diff --git a/fdbserver/tester.actor.cpp b/fdbserver/tester.actor.cpp
index c3307d4b556..c912235f2e0 100644
--- a/fdbserver/tester.actor.cpp
+++ b/fdbserver/tester.actor.cpp
@@ -889,6 +889,7 @@ ACTOR Future<Void> checkConsistency(Database cx,
 	StringRef performTSSCheck = LiteralStringRef("false");
 	if (doQuiescentCheck) {
 		performQuiescent = LiteralStringRef("true");
+		spec.restorePerpetualWiggleSetting = false;
 	}
 	if (doCacheCheck) {
 		performCacheCheck = LiteralStringRef("true");
@@ -1398,6 +1399,8 @@ ACTOR Future<Void> runTests(Reference<AsyncVar<Optional<struct ClusterController
 	state bool useDB = false;
 	state bool waitForQuiescenceBegin = false;
 	state bool waitForQuiescenceEnd = false;
+	state bool restorePerpetualWiggleSetting = false;
+	state bool perpetualWiggleEnabled = false;
 	state double startDelay = 0.0;
 	state double databasePingDelay = 1e9;
 	state ISimulator::BackupAgentType simBackupAgents = ISimulator::BackupAgentType::NoBackupAgents;
@@ -1412,6 +1415,8 @@ ACTOR Future<Void> runTests(Reference<AsyncVar<Optional<struct ClusterController
 			waitForQuiescenceBegin = true;
 		if (iter->waitForQuiescenceEnd)
 			waitForQuiescenceEnd = true;
+		if (iter->restorePerpetualWiggleSetting)
+			restorePerpetualWiggleSetting = true;
 		startDelay = std::max(startDelay, iter->startDelay);
 		databasePingDelay = std::min(databasePingDelay, iter->databasePingDelay);
 		if (iter->simBackupAgents != ISimulator::BackupAgentType::NoBackupAgents)
@@ -1450,6 +1455,15 @@ ACTOR Future<Void> runTests(Reference<AsyncVar<Optional<struct ClusterController
 		} catch (Error& e) {
 			TraceEvent(SevError, "TestFailure").error(e).detail("Reason", "Unable to set starting configuration");
 		}
+		if (restorePerpetualWiggleSetting) {
+			std::string_view confView(reinterpret_cast<const char*>(startingConfiguration.begin()),
+			                          startingConfiguration.size());
+			const std::string setting = "perpetual_storage_wiggle:=";
+			auto pos = confView.find(setting);
+			if (pos != confView.npos && confView.at(pos + setting.size()) == '1') {
+				perpetualWiggleEnabled = true;
+			}
+		}
 	}
 
 	if (useDB && waitForQuiescenceBegin) {
@@ -1465,6 +1479,10 @@ ACTOR Future<Void> runTests(Reference<AsyncVar<Optional<struct ClusterController
 			TraceEvent("QuietDatabaseStartExternalError").error(e);
 			throw;
 		}
+
+		if (perpetualWiggleEnabled) { // restore the enabled perpetual storage wiggle setting
+			wait(setPerpetualStorageWiggle(cx, true, true));
+		}
 	}
 
 	TraceEvent("TestsExpectedToPass").detail("Count", tests.size());
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index ab20b3041d7..19e5b78d28a 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -1777,6 +1777,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				if (!found) {
 					TraceEvent("ConsistencyCheck_NoStorage")
 					    .detail("Address", addr)
+					    .detail("ProcessId", workers[i].interf.locality.processId())
 					    .detail("ProcessClassEqualToStorageClass",
 					            (int)(workers[i].processClass == ProcessClass::StorageClass));
 					missingStorage.push_back(workers[i].interf.locality.dcId());
diff --git a/fdbserver/workloads/workloads.actor.h b/fdbserver/workloads/workloads.actor.h
index d85e3469b57..fa3fb625716 100644
--- a/fdbserver/workloads/workloads.actor.h
+++ b/fdbserver/workloads/workloads.actor.h
@@ -159,6 +159,7 @@ class TestSpec {
 		simConnectionFailuresDisableDuration = 0;
 		simBackupAgents = ISimulator::BackupAgentType::NoBackupAgents;
 		simDrAgents = ISimulator::BackupAgentType::NoBackupAgents;
+		restorePerpetualWiggleSetting = true;
 	}
 	TestSpec(StringRef title,
 	         bool dump,
@@ -169,8 +170,8 @@ class TestSpec {
 	  : title(title), dumpAfterTest(dump), clearAfterTest(clear), startDelay(startDelay), useDB(useDB), timeout(600),
 	    databasePingDelay(databasePingDelay), runConsistencyCheck(g_network->isSimulated()),
 	    runConsistencyCheckOnCache(false), runConsistencyCheckOnTSS(false), waitForQuiescenceBegin(true),
-	    waitForQuiescenceEnd(true), simCheckRelocationDuration(false), simConnectionFailuresDisableDuration(0),
-	    simBackupAgents(ISimulator::BackupAgentType::NoBackupAgents),
+	    waitForQuiescenceEnd(true), restorePerpetualWiggleSetting(true), simCheckRelocationDuration(false),
+	    simConnectionFailuresDisableDuration(0), simBackupAgents(ISimulator::BackupAgentType::NoBackupAgents),
 	    simDrAgents(ISimulator::BackupAgentType::NoBackupAgents) {
 		phases = TestWorkload::SETUP | TestWorkload::EXECUTION | TestWorkload::CHECK | TestWorkload::METRICS;
 		if (databasePingDelay < 0)
@@ -191,6 +192,11 @@ class TestSpec {
 	bool runConsistencyCheckOnTSS;
 	bool waitForQuiescenceBegin;
 	bool waitForQuiescenceEnd;
+	bool restorePerpetualWiggleSetting; // whether set perpetual_storage_wiggle as the value after run
+	                                      // QuietDatabase. QuietDatabase always disables perpetual storage wiggle on
+	                                      // purpose. If waitForQuiescenceBegin == true and we want to keep perpetual
+	                                      // storage wiggle the same setting as before during testing, this value should
+	                                      // be set true.
 
 	bool simCheckRelocationDuration; // If set to true, then long duration relocations generate SevWarnAlways messages.
 	                                 // Once any workload sets this to true, it will be true for the duration of the

From 1e59362493f4016c0156990cf466ec614b60107a Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Fri, 11 Jun 2021 23:00:44 +0000
Subject: [PATCH 268/740] check healthy team count, dd queue and disk space;
 code refactor

---
 fdbserver/DataDistribution.actor.cpp | 148 ++++++++++++---------------
 1 file changed, 65 insertions(+), 83 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 96d34bc9afa..eff2c83553e 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -630,6 +630,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	std::map<Key, int> lagging_zones; // zone to number of storage servers lagging
 	AsyncVar<bool> disableFailingLaggingServers;
 	Optional<Key> wigglingPid; // Process id of current wiggling storage server;
+    Reference<AsyncVar<bool>> pauseWiggle;
 
 	// machine_info has all machines info; key must be unique across processes on the same machine
 	std::map<Standalone<StringRef>, Reference<TCMachineInfo>> machine_info;
@@ -655,6 +656,8 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 	int optimalTeamCount;
 	AsyncVar<bool> zeroOptimalTeams;
 
+    bool bestTeamStuck = false;
+
 	bool isTssRecruiting; // If tss recruiting is waiting on a pair, don't consider DD recruiting for the purposes of QuietDB
 
 	// WIGGLING if an address is under storage wiggling.
@@ -1007,8 +1010,14 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 				}
 
 				// Log BestTeamStuck reason when we have healthy teams but they do not have healthy free space
-				if (g_network->isSimulated() && randomTeams.empty() && !self->zeroHealthyTeams->get()) {
-					TraceEvent(SevWarn, "GetTeamReturnEmpty").detail("HealthyTeams", self->healthyTeamCount);
+				if (randomTeams.empty() && !self->zeroHealthyTeams->get()) {
+					self->bestTeamStuck = true;
+					if(g_network->isSimulated()) {
+						TraceEvent(SevWarn, "GetTeamReturnEmpty").detail("HealthyTeams", self->healthyTeamCount);
+					}
+				}
+				else {
+					self->bestTeamStuck = false;
 				}
 
 				for (int i = 0; i < randomTeams.size(); i++) {
@@ -3962,6 +3971,25 @@ ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(DDTe
 	return std::make_pair(watchFuture, ret);
 }
 
+// periodically check whether the cluster is healthy if we continue perpetual wiggle
+ACTOR Future<Void> clusterHealthCheckForPerpetualWiggle(DDTeamCollection* self) {
+	loop {
+        Promise<int> countp;
+        self->getUnhealthyRelocationCount.send(countp);
+        int count = wait(countp.getFuture());
+		// pause wiggle when
+		// a. DDQueue is busy with unhealthy relocation request
+		// b. no healthy team
+		// c. the overall disk space is not enough
+        if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD || self->healthyTeamCount == 0 || self->bestTeamStuck) {
+            self->pauseWiggle->set(true);
+        }
+        else {
+            self->pauseWiggle->set(false);
+        }
+        wait(delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow));
+    }
+}
 // Watches the value (pid) change of \xff/storageWigglePID, and adds storage servers held on process of which the
 // Process Id is “pid” into excludeServers which prevent recruiting the wiggling storage servers and let teamTracker
 // start to move data off the affected teams. The wiggling process of current storage servers will be paused if the
@@ -3972,56 +4000,31 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
                                            const DDEnabledState* ddEnabledState) {
 	state Future<Void> watchFuture = Never();
 	state Future<Void> moveFinishFuture = Never();
-	state Debouncer pauseWiggle(SERVER_KNOBS->DEBOUNCE_RECRUITING_DELAY);
-	state AsyncTrigger restart;
-	state Future<Void> ddQueueCheck =
-	    delay(SERVER_KNOBS->DD_ZERO_HEALTHY_TEAM_DELAY, TaskPriority::DataDistributionLow);
+	state Future<Void> ddQueueCheck = clusterHealthCheckForPerpetualWiggle(self);
 	state int movingCount = 0;
-	state bool isPaused = false;
 	state vector<UID> excludedServerIds;
 	state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self));
 	ASSERT(!self->wigglingPid.present()); // only single process wiggle is allowed
 	self->wigglingPid = Optional<Key>(res.second);
 
-	// start with the initial pid
-	for (const auto& info : self->pid2server_info[self->wigglingPid.get()]) {
-		excludedServerIds.push_back(info->id);
-	}
-	if (self->teams.size() > 1 && _exclusionSafetyCheck(excludedServerIds, self)) { // pre-check health status
-		TEST(true); // start the first wiggling
-
-		auto fv = self->excludeStorageServersForWiggle(self->wigglingPid.get());
-		movingCount = fv.size();
-		moveFinishFuture = waitForAll(fv);
-		TraceEvent("PerpetualStorageWiggleInitialStart", self->distributorId)
-		    .detail("ProcessId", self->wigglingPid.get())
-		    .detail("StorageCount", movingCount);
-	} else {
-		isPaused = true;
-		TraceEvent("PerpetualStorageWiggleInitialPause", self->distributorId)
-		    .detail("ProcessId", self->wigglingPid.get());
-	}
-
 	loop {
-		choose {
-			when(wait(stopSignal->onTrigger())) { break; }
-			when(wait(watchFuture)) {
-				ASSERT(!self->wigglingPid.present()); // the previous wiggle must be finished
-				watchFuture = Never();
-
-				// read new pid and set the next watch Future
-				wait(store(res, watchPerpetualStoragePIDChange(self)));
-				self->wigglingPid = Optional<Key>(res.second);
-				StringRef pid = self->wigglingPid.get();
-
-				// pre-check health status
+		if (self->wigglingPid.present()) {
+			StringRef pid = self->wigglingPid.get();
+			if (self->pauseWiggle->get()) {
+				TEST(true); // paused because cluster is unhealthy
+				moveFinishFuture = Never();
+				self->includeStorageServersForWiggle();
+				TraceEvent("PerpetualStorageWigglePause", self->distributorId)
+				    .detail("ProcessId", pid)
+				    .detail("StorageCount", movingCount);
+			} else {
+				// pre-check whether wiggling chosen servers still satisfy replica requirement
 				excludedServerIds.clear();
 				for (const auto& info : self->pid2server_info[self->wigglingPid.get()]) {
 					excludedServerIds.push_back(info->id);
 				}
-				if (self->teams.size() > 1 && _exclusionSafetyCheck(excludedServerIds, self)) {
+				if (_exclusionSafetyCheck(excludedServerIds, self)) {
 					TEST(true); // start wiggling
-
 					auto fv = self->excludeStorageServersForWiggle(pid);
 					movingCount = fv.size();
 					moveFinishFuture = waitForAll(fv);
@@ -4029,20 +4032,24 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 					    .detail("ProcessId", pid)
 					    .detail("StorageCount", movingCount);
 				} else {
-					pauseWiggle.trigger();
+					TEST(true); // skip wiggling current process
+					TraceEvent("PerpetualStorageWiggleSkip", self->distributorId).detail("ProcessId", pid.toString());
+
+					self->wigglingPid.reset();
+					watchFuture = res.first;
+					finishStorageWiggleSignal.send(Void());
 				}
 			}
-			when(wait(restart.onTrigger())) {
-				if (self->wigglingPid.present()) {
-					TEST(true); // restart paused wiggling
-					StringRef pid = self->wigglingPid.get();
-					auto fv = self->excludeStorageServersForWiggle(pid);
-					moveFinishFuture = waitForAll(fv);
-					TraceEvent("PerpetualStorageWiggleRestart", self->distributorId)
-					    .detail("ProcessId", pid)
-					    .detail("StorageCount", fv.size());
-					isPaused = false;
-				}
+		}
+		
+		choose {
+			when(wait(stopSignal->onTrigger())) { break; }
+			when(wait(watchFuture)) {
+				ASSERT(!self->wigglingPid.present()); // the previous wiggle must be finished
+				watchFuture = Never();
+				// read new pid and set the next watch Future
+				wait(store(res, watchPerpetualStoragePIDChange(self)));
+				self->wigglingPid = Optional<Key>(res.second);
 			}
 			when(wait(moveFinishFuture)) {
 				TEST(true); // finish wiggling this process
@@ -4059,36 +4066,8 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				watchFuture = res.first;
 				finishStorageWiggleSignal.send(Void());
 			}
-			when(wait(self->zeroHealthyTeams->onChange())) {
-				if (self->zeroHealthyTeams->get() && !isPaused) {
-					pauseWiggle.trigger();
-				}
-			}
-			when(wait(ddQueueCheck)) { // check health status periodically
-				Promise<int> countp;
-				self->getUnhealthyRelocationCount.send(countp);
-				int count = wait(countp.getFuture());
-
-				if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && !isPaused) {
-					pauseWiggle.trigger();
-				} else if (isPaused && count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD &&
-				           self->teams.size() > 1 && _exclusionSafetyCheck(excludedServerIds, self)) {
-					restart.trigger();
-				}
-				ddQueueCheck = delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow);
-			}
-			when(wait(pauseWiggle.onTrigger())) {
-				if (self->wigglingPid.present()) {
-					TEST(true); // paused because cluster is unhealthy
-					StringRef pid = self->wigglingPid.get();
-					isPaused = true;
-					moveFinishFuture = Never();
-					self->includeStorageServersForWiggle();
-					TraceEvent("PerpetualStorageWigglePause", self->distributorId)
-					    .detail("ProcessId", pid)
-					    .detail("StorageCount", movingCount);
-				}
-			}
+			when(wait(ddQueueCheck)) {}
+			when(wait(self->pauseWiggle->onChange())) {}
 		}
 	}
 
@@ -4112,7 +4091,9 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 	state PromiseStream<Void> finishStorageWiggleSignal;
 	state SignalableActorCollection collection;
 	state bool started = false;
-	loop {
+    teamCollection->pauseWiggle = makeReference<AsyncVar<bool>>(true);
+
+    loop {
 		state ReadYourWritesTransaction tr(teamCollection->cx);
 		loop {
 			try {
@@ -4138,6 +4119,7 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 					wait(collection.signalAndReset());
 					TraceEvent("PerpetualStorageWiggleClose", teamCollection->distributorId);
 					started = false;
+					teamCollection->pauseWiggle->set(true);
 				}
 				wait(watchFuture);
 				break;

From b0f92f7c1531f1b71b5aba7bdbdf8dac13e66d7b Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 14 Jun 2021 23:00:02 +0000
Subject: [PATCH 269/740] code format

---
 fdbserver/DataDistribution.actor.cpp | 33 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index eff2c83553e..0bcf4263e16 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -1012,11 +1012,10 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 				// Log BestTeamStuck reason when we have healthy teams but they do not have healthy free space
 				if (randomTeams.empty() && !self->zeroHealthyTeams->get()) {
 					self->bestTeamStuck = true;
-					if(g_network->isSimulated()) {
+					if (g_network->isSimulated()) {
 						TraceEvent(SevWarn, "GetTeamReturnEmpty").detail("HealthyTeams", self->healthyTeamCount);
 					}
-				}
-				else {
+				} else {
 					self->bestTeamStuck = false;
 				}
 
@@ -3974,21 +3973,21 @@ ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(DDTe
 // periodically check whether the cluster is healthy if we continue perpetual wiggle
 ACTOR Future<Void> clusterHealthCheckForPerpetualWiggle(DDTeamCollection* self) {
 	loop {
-        Promise<int> countp;
-        self->getUnhealthyRelocationCount.send(countp);
-        int count = wait(countp.getFuture());
+		Promise<int> countp;
+		self->getUnhealthyRelocationCount.send(countp);
+		int count = wait(countp.getFuture());
 		// pause wiggle when
 		// a. DDQueue is busy with unhealthy relocation request
 		// b. no healthy team
 		// c. the overall disk space is not enough
-        if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD || self->healthyTeamCount == 0 || self->bestTeamStuck) {
-            self->pauseWiggle->set(true);
-        }
-        else {
-            self->pauseWiggle->set(false);
-        }
-        wait(delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow));
-    }
+		if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD || self->healthyTeamCount == 0 ||
+		    self->bestTeamStuck) {
+			self->pauseWiggle->set(true);
+		} else {
+			self->pauseWiggle->set(false);
+		}
+		wait(delay(SERVER_KNOBS->CHECK_TEAM_DELAY, TaskPriority::DataDistributionLow));
+	}
 }
 // Watches the value (pid) change of \xff/storageWigglePID, and adds storage servers held on process of which the
 // Process Id is “pid” into excludeServers which prevent recruiting the wiggling storage servers and let teamTracker
@@ -4041,7 +4040,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				}
 			}
 		}
-		
+
 		choose {
 			when(wait(stopSignal->onTrigger())) { break; }
 			when(wait(watchFuture)) {
@@ -4091,9 +4090,9 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 	state PromiseStream<Void> finishStorageWiggleSignal;
 	state SignalableActorCollection collection;
 	state bool started = false;
-    teamCollection->pauseWiggle = makeReference<AsyncVar<bool>>(true);
+	teamCollection->pauseWiggle = makeReference<AsyncVar<bool>>(true);
 
-    loop {
+	loop {
 		state ReadYourWritesTransaction tr(teamCollection->cx);
 		loop {
 			try {

From 27d0b4741fe8caa5c8a067fe31c3c712d4f3b990 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 16 Jun 2021 05:30:58 +0000
Subject: [PATCH 270/740] code refactor;change stopSignal;

---
 fdbserver/DataDistribution.actor.cpp | 43 ++++++++++++++++------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 0bcf4263e16..8d336fce6e4 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -3936,12 +3936,17 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 // Iterate over each storage process to do storage wiggle. After initializing the first Process ID, it waits a signal
 // from `perpetualStorageWiggler` indicating the wiggling of current process is finished. Then it writes the next
 // Process ID to a system key: `wigglingStorageServerKey` to show the next process to wiggle.
-ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncTrigger* stopSignal,
+ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncVar<bool>* stopSignal,
                                                   FutureStream<Void> finishStorageWiggleSignal,
                                                   DDTeamCollection* teamCollection) {
-	loop choose {
-		when(wait(stopSignal->onTrigger())) { break; }
-		when(waitNext(finishStorageWiggleSignal)) { wait(updateNextWigglingStoragePID(teamCollection)); }
+	loop {
+		choose {
+			when(wait(stopSignal->onChange())) {}
+			when(waitNext(finishStorageWiggleSignal)) { wait(updateNextWigglingStoragePID(teamCollection)); }
+		}
+		if (stopSignal->get()) {
+			break;
+		}
 	}
 
 	return Void();
@@ -3993,7 +3998,7 @@ ACTOR Future<Void> clusterHealthCheckForPerpetualWiggle(DDTeamCollection* self)
 // Process Id is “pid” into excludeServers which prevent recruiting the wiggling storage servers and let teamTracker
 // start to move data off the affected teams. The wiggling process of current storage servers will be paused if the
 // cluster is unhealthy and restarted once the cluster is healthy again.
-ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
+ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
                                            PromiseStream<Void> finishStorageWiggleSignal,
                                            DDTeamCollection* self,
                                            const DDEnabledState* ddEnabledState) {
@@ -4033,22 +4038,21 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				} else {
 					TEST(true); // skip wiggling current process
 					TraceEvent("PerpetualStorageWiggleSkip", self->distributorId).detail("ProcessId", pid.toString());
-
-					self->wigglingPid.reset();
-					watchFuture = res.first;
-					finishStorageWiggleSignal.send(Void());
+					moveFinishFuture = Void();
 				}
 			}
 		}
 
 		choose {
-			when(wait(stopSignal->onTrigger())) { break; }
 			when(wait(watchFuture)) {
 				ASSERT(!self->wigglingPid.present()); // the previous wiggle must be finished
 				watchFuture = Never();
 				// read new pid and set the next watch Future
 				wait(store(res, watchPerpetualStoragePIDChange(self)));
 				self->wigglingPid = Optional<Key>(res.second);
+
+				// random delay
+				wait(delayJittered(5.0, TaskPriority::DataDistributionLow));
 			}
 			when(wait(moveFinishFuture)) {
 				TEST(true); // finish wiggling this process
@@ -4065,8 +4069,11 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 				watchFuture = res.first;
 				finishStorageWiggleSignal.send(Void());
 			}
-			when(wait(ddQueueCheck)) {}
-			when(wait(self->pauseWiggle->onChange())) {}
+			when(wait(ddQueueCheck || self->pauseWiggle->onChange() || stopSignal->onChange())) {}
+		}
+
+		if (stopSignal->get()) {
+			break;
 		}
 	}
 
@@ -4086,10 +4093,9 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncTrigger* stopSignal,
 ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollection,
                                                  const DDEnabledState* ddEnabledState) {
 	state int speed = 0;
-	state AsyncTrigger stopWiggleSignal;
+	state AsyncVar<bool> stopWiggleSignal(false);
 	state PromiseStream<Void> finishStorageWiggleSignal;
 	state SignalableActorCollection collection;
-	state bool started = false;
 	teamCollection->pauseWiggle = makeReference<AsyncVar<bool>>(true);
 
 	loop {
@@ -4106,18 +4112,17 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 				wait(tr.commit());
 
 				ASSERT(speed == 1 || speed == 0);
-				if (speed == 1 && !started) {
+				if (speed == 1 && stopWiggleSignal.get()) { // avoid duplicated start
+					stopWiggleSignal.set(false);
 					collection.add(perpetualStorageWiggleIterator(
 					    &stopWiggleSignal, finishStorageWiggleSignal.getFuture(), teamCollection));
 					collection.add(perpetualStorageWiggler(
 					    &stopWiggleSignal, finishStorageWiggleSignal, teamCollection, ddEnabledState));
 					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
-					started = true;
-				} else if (speed == 0 && started) {
-					stopWiggleSignal.trigger();
+				} else if (speed == 0 && !stopWiggleSignal.get()) {
+					stopWiggleSignal.set(true);
 					wait(collection.signalAndReset());
 					TraceEvent("PerpetualStorageWiggleClose", teamCollection->distributorId);
-					started = false;
 					teamCollection->pauseWiggle->set(true);
 				}
 				wait(watchFuture);

From 83edeafaaf871e3659977fc75cc0ffba1a22e29a Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 17 Jun 2021 20:20:39 +0000
Subject: [PATCH 271/740] update json schemas

---
 documentation/sphinx/source/mr-status-json-schemas.rst.inc | 3 ++-
 fdbclient/Schemas.cpp                                      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index db6d2470208..34ffcfc4c53 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -703,7 +703,8 @@
          "auto_logs":3,
          "backup_worker_enabled":1,
          "commit_proxies":5, // this field will be absent if a value has not been explicitly set
-         "proxies":6 // this field will be absent if a value has not been explicitly set
+         "proxies":6, // this field will be absent if a value has not been explicitly set
+         "perpetual_storage_wiggle": 0
       },
       "data":{
          "least_operating_space_bytes_log_server":0,
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 040d055154b..0b4757357cc 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -20,6 +20,7 @@
 
 #include "fdbclient/Schemas.h"
 
+// NOTE: also change mr-status-json-schemas.rst.inc
 const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
 {
    "cluster":{

From b1cbbdcbcff5ec24a53d0475585a08a0bd3306f0 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 17 Jun 2021 20:59:47 +0000
Subject: [PATCH 272/740] adjust default value of stopWiggleSignal; better
 trace logic

---
 fdbserver/DataDistribution.actor.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 8d336fce6e4..836968f9f05 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -4093,7 +4093,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
 ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollection,
                                                  const DDEnabledState* ddEnabledState) {
 	state int speed = 0;
-	state AsyncVar<bool> stopWiggleSignal(false);
+	state AsyncVar<bool> stopWiggleSignal(true);
 	state PromiseStream<Void> finishStorageWiggleSignal;
 	state SignalableActorCollection collection;
 	teamCollection->pauseWiggle = makeReference<AsyncVar<bool>>(true);
@@ -4119,11 +4119,13 @@ ACTOR Future<Void> monitorPerpetualStorageWiggle(DDTeamCollection* teamCollectio
 					collection.add(perpetualStorageWiggler(
 					    &stopWiggleSignal, finishStorageWiggleSignal, teamCollection, ddEnabledState));
 					TraceEvent("PerpetualStorageWiggleOpen", teamCollection->distributorId);
-				} else if (speed == 0 && !stopWiggleSignal.get()) {
-					stopWiggleSignal.set(true);
-					wait(collection.signalAndReset());
+				} else if (speed == 0) {
+					if (!stopWiggleSignal.get()) {
+						stopWiggleSignal.set(true);
+						wait(collection.signalAndReset());
+						teamCollection->pauseWiggle->set(true);
+					}
 					TraceEvent("PerpetualStorageWiggleClose", teamCollection->distributorId);
-					teamCollection->pauseWiggle->set(true);
 				}
 				wait(watchFuture);
 				break;

From 5a6a4431b07ad0c6767b41fe0caf0814b515adb1 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Fri, 18 Jun 2021 02:58:24 +0000
Subject: [PATCH 273/740] manual fix

---
 fdbcli/fdbcli.actor.cpp | 2 +-
 fdbclient/Schemas.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 52db6b5deb9..fad2bbd4ca2 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -494,7 +494,7 @@ void initHelp() {
 	    "configure [new|tss]"
 	    "<single|double|triple|three_data_hall|three_datacenter|ssd|memory|memory-radixtree-beta|proxies=<PROXIES>|"
 	    "commit_proxies=<COMMIT_PROXIES>|grv_proxies=<GRV_PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*|"
-	    "count=<TSS_COUNT>|",
+	    "count=<TSS_COUNT>|"
 	    "perpetual_storage_wiggle=<WIGGLE_SPEED>",
 	    "change the database configuration",
 	    "The `new' option, if present, initializes a new database with the given configuration rather than changing "
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 0b4757357cc..b23e95f11ef 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -757,7 +757,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
          "commit_proxies":5,
          "grv_proxies":1,
          "backup_worker_enabled":1,
-         "proxies":6
+         "proxies":6,
          "perpetual_storage_wiggle":0
       },
       "data":{

From 01c5026c9b9ce3a42d05c33da44671d09ae9fe67 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Thu, 17 Jun 2021 19:13:07 +0000
Subject: [PATCH 274/740] remove unnecessary version check in fdbcli

---
 fdbcli/fdbcli.actor.cpp | 44 ++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index a3578a95d4b..5c68362fc25 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -3659,11 +3659,8 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 						printf("\n");
 					} else if (tokencmp(tokens[1], "all")) {
 						for (auto it : address_interface) {
-							if (db->apiVersionAtLeast(700))
-								BinaryReader::fromStringRef<ClientWorkerInterface>(it.second.first, IncludeVersion())
-								    .reboot.send(RebootRequest());
-							else
-								tr->set(LiteralStringRef("\xff\xff/reboot_worker"), it.second.first);
+							BinaryReader::fromStringRef<ClientWorkerInterface>(it.second.first, IncludeVersion())
+							    .reboot.send(RebootRequest());
 						}
 						if (address_interface.size() == 0) {
 							fprintf(stderr,
@@ -3683,13 +3680,9 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 
 						if (!is_error) {
 							for (int i = 1; i < tokens.size(); i++) {
-								if (db->apiVersionAtLeast(700))
-									BinaryReader::fromStringRef<ClientWorkerInterface>(
-									    address_interface[tokens[i]].first, IncludeVersion())
-									    .reboot.send(RebootRequest());
-								else
-									tr->set(LiteralStringRef("\xff\xff/reboot_worker"),
-									        address_interface[tokens[i]].first);
+								BinaryReader::fromStringRef<ClientWorkerInterface>(address_interface[tokens[i]].first,
+								                                                   IncludeVersion())
+								    .reboot.send(RebootRequest());
 							}
 							printf("Attempted to kill %zu processes\n", tokens.size() - 1);
 						}
@@ -3746,13 +3739,9 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 								tr->setOption(FDBTransactionOptions::TIMEOUT,
 								              StringRef((uint8_t*)&timeout_ms, sizeof(int64_t)));
 								for (int i = 2; i < tokens.size(); i++) {
-									if (db->apiVersionAtLeast(700))
-										BinaryReader::fromStringRef<ClientWorkerInterface>(
-										    address_interface[tokens[i]].first, IncludeVersion())
-										    .reboot.send(RebootRequest(false, false, seconds));
-									else
-										tr->set(LiteralStringRef("\xff\xff/suspend_worker"),
-										        address_interface[tokens[i]].first);
+									BinaryReader::fromStringRef<ClientWorkerInterface>(
+									    address_interface[tokens[i]].first, IncludeVersion())
+									    .reboot.send(RebootRequest(false, false, seconds));
 								}
 								printf("Attempted to suspend %zu processes\n", tokens.size() - 2);
 							}
@@ -4087,11 +4076,8 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 						printf("\n");
 					} else if (tokencmp(tokens[1], "all")) {
 						for (auto it : address_interface) {
-							if (db->apiVersionAtLeast(700))
-								BinaryReader::fromStringRef<ClientWorkerInterface>(it.second.first, IncludeVersion())
-								    .reboot.send(RebootRequest(false, true));
-							else
-								tr->set(LiteralStringRef("\xff\xff/reboot_and_check_worker"), it.second.first);
+							BinaryReader::fromStringRef<ClientWorkerInterface>(it.second.first, IncludeVersion())
+							    .reboot.send(RebootRequest(false, true));
 						}
 						if (address_interface.size() == 0) {
 							fprintf(stderr,
@@ -4111,13 +4097,9 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 
 						if (!is_error) {
 							for (int i = 1; i < tokens.size(); i++) {
-								if (db->apiVersionAtLeast(700))
-									BinaryReader::fromStringRef<ClientWorkerInterface>(
-									    address_interface[tokens[i]].first, IncludeVersion())
-									    .reboot.send(RebootRequest(false, true));
-								else
-									tr->set(LiteralStringRef("\xff\xff/reboot_and_check_worker"),
-									        address_interface[tokens[i]].first);
+								BinaryReader::fromStringRef<ClientWorkerInterface>(address_interface[tokens[i]].first,
+								                                                   IncludeVersion())
+								    .reboot.send(RebootRequest(false, true));
 							}
 							printf("Attempted to kill and check %zu processes\n", tokens.size() - 1);
 						}

From 337d6b41423727f6306c5eeb288b8936809082a8 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Sat, 19 Jun 2021 16:57:04 +0000
Subject: [PATCH 275/740] add and remove some healthy check to solve cluster
 status oscillation when #ss is little; simplify some code

---
 fdbserver/DataDistribution.actor.cpp | 59 ++++++++++++++--------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 836968f9f05..f9525f04917 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -3898,29 +3898,27 @@ ACTOR Future<vector<std::pair<StorageServerInterface, ProcessClass>>> getServerL
 // to a sorted PID set maintained by the data distributor. If now no storage server exists, the new Process ID is 0.
 ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection) {
 	state ReadYourWritesTransaction tr(teamCollection->cx);
-	state Value writeValue = LiteralStringRef("0");
+	state Value writeValue;
 	loop {
 		try {
 			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 			Optional<Value> value = wait(tr.get(wigglingStorageServerKey));
 			if (teamCollection->pid2server_info.empty()) {
-				tr.set(wigglingStorageServerKey, LiteralStringRef("0"));
+				writeValue = LiteralStringRef("");
 			} else {
 				Value pid = teamCollection->pid2server_info.begin()->first;
 				if (value.present()) {
 					auto nextIt = teamCollection->pid2server_info.upper_bound(value.get());
 					if (nextIt == teamCollection->pid2server_info.end()) {
-						tr.set(wigglingStorageServerKey, pid);
 						writeValue = pid;
 					} else {
-						tr.set(wigglingStorageServerKey, nextIt->first);
 						writeValue = nextIt->first;
 					}
 				} else {
-					tr.set(wigglingStorageServerKey, pid);
 					writeValue = pid;
 				}
 			}
+			tr.set(wigglingStorageServerKey, writeValue);
 			wait(tr.commit());
 			break;
 		} catch (Error& e) {
@@ -3942,7 +3940,14 @@ ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncVar<bool>* stopSignal,
 	loop {
 		choose {
 			when(wait(stopSignal->onChange())) {}
-			when(waitNext(finishStorageWiggleSignal)) { wait(updateNextWigglingStoragePID(teamCollection)); }
+			when(waitNext(finishStorageWiggleSignal)) {
+				// there must not have other teams to place wiggled data
+				while (teamCollection->server_info.size() <= teamCollection->configuration.storageTeamSize ||
+				       teamCollection->machine_info.size() < teamCollection->configuration.storageTeamSize) {
+					wait(delayJittered(SERVER_KNOBS->CHECK_TEAM_DELAY));
+				}
+				wait(updateNextWigglingStoragePID(teamCollection));
+			}
 		}
 		if (stopSignal->get()) {
 			break;
@@ -3976,17 +3981,23 @@ ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(DDTe
 }
 
 // periodically check whether the cluster is healthy if we continue perpetual wiggle
-ACTOR Future<Void> clusterHealthCheckForPerpetualWiggle(DDTeamCollection* self) {
+ACTOR Future<Void> clusterHealthCheckForPerpetualWiggle(DDTeamCollection* self, int* extraTeamCount) {
 	loop {
 		Promise<int> countp;
 		self->getUnhealthyRelocationCount.send(countp);
 		int count = wait(countp.getFuture());
 		// pause wiggle when
 		// a. DDQueue is busy with unhealthy relocation request
-		// b. no healthy team
+		// b. healthy teams are not enough
 		// c. the overall disk space is not enough
-		if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD || self->healthyTeamCount == 0 ||
+		if (count >= SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD || self->healthyTeamCount <= *extraTeamCount ||
 		    self->bestTeamStuck) {
+			// if we pause wiggle not because the reason a, increase extraTeamCount. This helps avoid oscillation
+			// between pause and non-pause status.
+			if (count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && !self->pauseWiggle->get()) {
+				*extraTeamCount = std::min(*extraTeamCount + 1,
+				                           SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER * (int)self->server_info.size());
+			}
 			self->pauseWiggle->set(true);
 		} else {
 			self->pauseWiggle->set(false);
@@ -4004,9 +4015,9 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
                                            const DDEnabledState* ddEnabledState) {
 	state Future<Void> watchFuture = Never();
 	state Future<Void> moveFinishFuture = Never();
-	state Future<Void> ddQueueCheck = clusterHealthCheckForPerpetualWiggle(self);
+	state int extraTeamCount = 0;
+	state Future<Void> ddQueueCheck = clusterHealthCheckForPerpetualWiggle(self, &extraTeamCount);
 	state int movingCount = 0;
-	state vector<UID> excludedServerIds;
 	state std::pair<Future<Void>, Value> res = wait(watchPerpetualStoragePIDChange(self));
 	ASSERT(!self->wigglingPid.present()); // only single process wiggle is allowed
 	self->wigglingPid = Optional<Key>(res.second);
@@ -4022,24 +4033,13 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
 				    .detail("ProcessId", pid)
 				    .detail("StorageCount", movingCount);
 			} else {
-				// pre-check whether wiggling chosen servers still satisfy replica requirement
-				excludedServerIds.clear();
-				for (const auto& info : self->pid2server_info[self->wigglingPid.get()]) {
-					excludedServerIds.push_back(info->id);
-				}
-				if (_exclusionSafetyCheck(excludedServerIds, self)) {
-					TEST(true); // start wiggling
-					auto fv = self->excludeStorageServersForWiggle(pid);
-					movingCount = fv.size();
-					moveFinishFuture = waitForAll(fv);
-					TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
-					    .detail("ProcessId", pid)
-					    .detail("StorageCount", movingCount);
-				} else {
-					TEST(true); // skip wiggling current process
-					TraceEvent("PerpetualStorageWiggleSkip", self->distributorId).detail("ProcessId", pid.toString());
-					moveFinishFuture = Void();
-				}
+				TEST(true); // start wiggling
+				auto fv = self->excludeStorageServersForWiggle(pid);
+				movingCount = fv.size();
+				moveFinishFuture = waitForAll(fv);
+				TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
+				    .detail("ProcessId", pid)
+				    .detail("StorageCount", movingCount);
 			}
 		}
 
@@ -4068,6 +4068,7 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
 				self->wigglingPid.reset();
 				watchFuture = res.first;
 				finishStorageWiggleSignal.send(Void());
+				extraTeamCount = std::max(0, extraTeamCount - 1);
 			}
 			when(wait(ddQueueCheck || self->pauseWiggle->onChange() || stopSignal->onChange())) {}
 		}

From b3bc9b948293cde1d69d125f84ae8b46eff33138 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 21 Jun 2021 05:18:19 +0000
Subject: [PATCH 276/740] wait remove

---
 fdbserver/DataDistribution.actor.cpp      | 14 +++++++++-----
 fdbserver/DataDistributionQueue.actor.cpp |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index f9525f04917..a436fae0dfd 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -2840,8 +2840,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
 				}
 				this->wiggle_addresses.push_back(addr);
 				this->excludedServers.set(addr, DDTeamCollection::Status::WIGGLING);
-				moveFutures.push_back(
-				    waitForAllDataRemoved(this->cx, info->lastKnownInterface.id(), info->addedVersion, this));
+				moveFutures.push_back(info->onRemoved);
 			}
 			if (!moveFutures.empty()) {
 				this->restartRecruiting.trigger();
@@ -3982,6 +3981,7 @@ ACTOR Future<std::pair<Future<Void>, Value>> watchPerpetualStoragePIDChange(DDTe
 
 // periodically check whether the cluster is healthy if we continue perpetual wiggle
 ACTOR Future<Void> clusterHealthCheckForPerpetualWiggle(DDTeamCollection* self, int* extraTeamCount) {
+	state int pausePenalty = 1;
 	loop {
 		Promise<int> countp;
 		self->getUnhealthyRelocationCount.send(countp);
@@ -3994,9 +3994,9 @@ ACTOR Future<Void> clusterHealthCheckForPerpetualWiggle(DDTeamCollection* self,
 		    self->bestTeamStuck) {
 			// if we pause wiggle not because the reason a, increase extraTeamCount. This helps avoid oscillation
 			// between pause and non-pause status.
-			if (count < SERVER_KNOBS->DD_STORAGE_WIGGLE_PAUSE_THRESHOLD && !self->pauseWiggle->get()) {
-				*extraTeamCount = std::min(*extraTeamCount + 1,
-				                           SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER * (int)self->server_info.size());
+			if ((self->healthyTeamCount <= *extraTeamCount || self->bestTeamStuck) && !self->pauseWiggle->get()) {
+				*extraTeamCount = std::min(*extraTeamCount + pausePenalty, (int)self->teams.size());
+				pausePenalty = std::min(pausePenalty * 2, (int)self->teams.size());
 			}
 			self->pauseWiggle->set(true);
 		} else {
@@ -4031,6 +4031,8 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
 				self->includeStorageServersForWiggle();
 				TraceEvent("PerpetualStorageWigglePause", self->distributorId)
 				    .detail("ProcessId", pid)
+				    .detail("ExtraHealthyTeamCount", extraTeamCount)
+				    .detail("HealthyTeamCount", self->healthyTeamCount)
 				    .detail("StorageCount", movingCount);
 			} else {
 				TEST(true); // start wiggling
@@ -4039,6 +4041,8 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
 				moveFinishFuture = waitForAll(fv);
 				TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
 				    .detail("ProcessId", pid)
+				    .detail("ExtraHealthyTeamCount", extraTeamCount)
+				    .detail("HealthyTeamCount", self->healthyTeamCount)
 				    .detail("StorageCount", movingCount);
 			}
 		}
diff --git a/fdbserver/DataDistributionQueue.actor.cpp b/fdbserver/DataDistributionQueue.actor.cpp
index 38bc586c665..b4c0899913d 100644
--- a/fdbserver/DataDistributionQueue.actor.cpp
+++ b/fdbserver/DataDistributionQueue.actor.cpp
@@ -1662,6 +1662,8 @@ ACTOR Future<Void> dataDistributionQueue(Database cx,
 					            self.priority_relocations[SERVER_KNOBS->PRIORITY_REBALANCE_UNDERUTILIZED_TEAM])
 					    .detail("PriorityRebalanceOverutilizedTeam",
 					            self.priority_relocations[SERVER_KNOBS->PRIORITY_REBALANCE_OVERUTILIZED_TEAM])
+					    .detail("PriorityStorageWiggle",
+					            self.priority_relocations[SERVER_KNOBS->PRIORITY_PERPETUAL_STORAGE_WIGGLE])
 					    .detail("PriorityTeamHealthy", self.priority_relocations[SERVER_KNOBS->PRIORITY_TEAM_HEALTHY])
 					    .detail("PriorityTeamContainsUndesiredServer",
 					            self.priority_relocations[SERVER_KNOBS->PRIORITY_TEAM_CONTAINS_UNDESIRED_SERVER])

From 03e15769241ccfb3bb7199ae34396a4321fb3dfa Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 21 Jun 2021 06:55:34 +0000
Subject: [PATCH 277/740] TEST condition

---
 fdbserver/DataDistribution.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index a436fae0dfd..66330f6d059 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -4059,9 +4059,9 @@ ACTOR Future<Void> perpetualStorageWiggler(AsyncVar<bool>* stopSignal,
 				wait(delayJittered(5.0, TaskPriority::DataDistributionLow));
 			}
 			when(wait(moveFinishFuture)) {
-				TEST(true); // finish wiggling this process
 				ASSERT(self->wigglingPid.present());
 				StringRef pid = self->wigglingPid.get();
+				TEST(pid != LiteralStringRef("")); // finish wiggling this process
 
 				moveFinishFuture = Never();
 				self->includeStorageServersForWiggle();

From ea01e855278c97b71f8fb0a272c6cdafe5fd8db3 Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Fri, 11 Jun 2021 14:48:06 -0700
Subject: [PATCH 278/740] Histograms for storage server write path components.

---
 fdbserver/StorageMetrics.actor.h  |  8 +++++
 fdbserver/storageserver.actor.cpp | 49 ++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/fdbserver/StorageMetrics.actor.h b/fdbserver/StorageMetrics.actor.h
index 397127f0981..c96a6c70ee6 100644
--- a/fdbserver/StorageMetrics.actor.h
+++ b/fdbserver/StorageMetrics.actor.h
@@ -31,6 +31,14 @@ const StringRef STORAGESERVER_HISTOGRAM_GROUP = LiteralStringRef("StorageServer"
 const StringRef FETCH_KEYS_LATENCY_HISTOGRAM = LiteralStringRef("FetchKeysLatency");
 const StringRef FETCH_KEYS_BYTES_HISTOGRAM = LiteralStringRef("FetchKeysSize");
 const StringRef FETCH_KEYS_BYTES_PER_SECOND_HISTOGRAM = LiteralStringRef("FetchKeysBandwidth");
+const StringRef TLOG_CURSOR_READS_LATENCY_HISTOGRAM = LiteralStringRef("TLogCursorReadsLatency");
+const StringRef SS_VERSION_LOCK_LATENCY_HISTOGRAM = LiteralStringRef("SSVersionLockLatency");
+const StringRef EAGER_READS_LATENCY_HISTOGRAM = LiteralStringRef("EagerReadsLatency");
+const StringRef FETCH_KEYS_PTREE_UPDATES_LATENCY_HISTOGRAM = LiteralStringRef("FetchKeysPTreeUpdatesLatency");
+const StringRef TLOG_MSGS_PTREE_UPDATES_LATENCY_HISTOGRAM = LiteralStringRef("TLogMsgsPTreeUpdatesLatency");
+const StringRef STORAGE_UPDATES_DURABLE_LATENCY_HISTOGRAM = LiteralStringRef("StorageUpdatesDurableLatency");
+const StringRef STORAGE_COMMIT_LATENCY_HISTOGRAM = LiteralStringRef("StorageCommitLatency");
+const StringRef SS_DURABLE_VERSION_UPDATE_LATENCY_HISTOGRAM = LiteralStringRef("SSDurableVersionUpdateLatency");
 
 struct StorageMetricSample {
 	IndexedSet<Key, int64_t> sample;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 9aa421d4a1a..07a46225d6f 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -364,6 +364,15 @@ struct StorageServer {
 		                                      Histogram::Unit::bytes_per_second)) {}
 	} fetchKeysHistograms;
 
+	Reference<Histogram> tlogCursorReadsLatencyHistogram;
+	Reference<Histogram> ssVersionLockLatencyHistogram;
+	Reference<Histogram> eagerReadsLatencyHistogram;
+	Reference<Histogram> fetchKeysPTreeUpdatesLatencyHistogram;
+	Reference<Histogram> tLogMsgsPTreeUpdatesLatencyHistogram;
+	Reference<Histogram> storageUpdatesDurableLatencyHistogram;
+	Reference<Histogram> storageCommitLatencyHistogram;
+	Reference<Histogram> ssDurableVersionUpdateLatencyHistogram;
+
 	// watch map operations
 	Reference<ServerWatchMetadata> getWatchMetadata(KeyRef key) const;
 	KeyRef setWatchMetadata(Reference<ServerWatchMetadata> metadata);
@@ -780,7 +789,31 @@ struct StorageServer {
 	    counters(this), tag(invalidTag), maxQueryQueue(0), thisServerID(ssi.id()), tssInQuarantine(false),
 	    readQueueSizeMetric(LiteralStringRef("StorageServer.ReadQueueSize")), behind(false), versionBehind(false),
 	    byteSampleClears(false, LiteralStringRef("\xff\xff\xff")), noRecentUpdates(false), lastUpdate(now()),
-	    poppedAllAfter(std::numeric_limits<Version>::max()), cpuUsage(0.0), diskUsage(0.0) {
+	    poppedAllAfter(std::numeric_limits<Version>::max()), cpuUsage(0.0), diskUsage(0.0),
+	    tlogCursorReadsLatencyHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
+	                                                            TLOG_CURSOR_READS_LATENCY_HISTOGRAM,
+	                                                            Histogram::Unit::microseconds)),
+	    ssVersionLockLatencyHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
+	                                                          SS_VERSION_LOCK_LATENCY_HISTOGRAM,
+	                                                          Histogram::Unit::microseconds)),
+	    eagerReadsLatencyHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
+	                                                       EAGER_READS_LATENCY_HISTOGRAM,
+	                                                       Histogram::Unit::microseconds)),
+	    fetchKeysPTreeUpdatesLatencyHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
+	                                                                  FETCH_KEYS_PTREE_UPDATES_LATENCY_HISTOGRAM,
+	                                                                  Histogram::Unit::microseconds)),
+	    tLogMsgsPTreeUpdatesLatencyHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
+	                                                                 TLOG_MSGS_PTREE_UPDATES_LATENCY_HISTOGRAM,
+	                                                                 Histogram::Unit::microseconds)),
+	    storageUpdatesDurableLatencyHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
+	                                                                  STORAGE_UPDATES_DURABLE_LATENCY_HISTOGRAM,
+	                                                                  Histogram::Unit::microseconds)),
+	    storageCommitLatencyHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
+	                                                          STORAGE_COMMIT_LATENCY_HISTOGRAM,
+	                                                          Histogram::Unit::microseconds)),
+	    ssDurableVersionUpdateLatencyHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
+	                                                                   SS_DURABLE_VERSION_UPDATE_LATENCY_HISTOGRAM,
+	                                                                   Histogram::Unit::microseconds)) {
 		version.initMetric(LiteralStringRef("StorageServer.Version"), counters.cc.id);
 		oldestVersion.initMetric(LiteralStringRef("StorageServer.OldestVersion"), counters.cc.id);
 		durableVersion.initMetric(LiteralStringRef("StorageServer.DurableVersion"), counters.cc.id);
@@ -3397,12 +3430,14 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 
 		state Reference<ILogSystem::IPeekCursor> cursor = data->logCursor;
 
+		state double beforeTLogCursorReads = now();
 		loop {
 			wait(cursor->getMore());
 			if (!cursor->isExhausted()) {
 				break;
 			}
 		}
+		data->tlogCursorReadsLatencyHistogram->sampleSeconds(now() - beforeTLogCursorReads);
 		if (cursor->popped() > 0) {
 			throw worker_removed();
 		}
@@ -3422,6 +3457,7 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 			    .detailf("From", "%016llx", debug_lastLoadBalanceResultEndpointToken)
 			    .detail("Duration", now() - start)
 			    .detail("Version", data->version.get());
+		data->ssVersionLockLatencyHistogram->sampleSeconds(now() - start);
 
 		start = now();
 		state UpdateEagerReadInfo eager;
@@ -3492,6 +3528,7 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 			// selectively
 			eager = UpdateEagerReadInfo();
 		}
+		data->eagerReadsLatencyHistogram->sampleSeconds(now() - start);
 
 		if (now() - start > 0.1)
 			TraceEvent("SSSlowTakeLock2", data->thisServerID)
@@ -3511,6 +3548,7 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 		state bool injectedChanges = false;
 		state int changeNum = 0;
 		state int mutationBytes = 0;
+		state double beforeFetchKeysUpdates = now();
 		for (; changeNum < fii.changes.size(); changeNum++) {
 			state int mutationNum = 0;
 			state VerUpdateRef* pUpdate = &fii.changes[changeNum];
@@ -3524,10 +3562,12 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 				}
 			}
 		}
+		data->fetchKeysPTreeUpdatesLatencyHistogram->sampleSeconds(now() - beforeFetchKeysUpdates);
 
 		state Version ver = invalidVersion;
 		cloneCursor2->setProtocolVersion(data->logProtocol);
 		state SpanID spanContext = SpanID();
+		state double beforeTLogMsgsUpdates = now();
 		for (; cloneCursor2->hasMessage(); cloneCursor2->nextMessage()) {
 			if (mutationBytes > SERVER_KNOBS->DESIRED_UPDATE_BYTES) {
 				mutationBytes = 0;
@@ -3620,6 +3660,7 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 					    .detail("Version", cloneCursor2->version().toString());
 			}
 		}
+		data->tLogMsgsPTreeUpdatesLatencyHistogram->sampleSeconds(now() - beforeTLogMsgsUpdates);
 
 		if (ver != invalidVersion) {
 			data->lastVersionWithData = ver;
@@ -3740,6 +3781,7 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
 		state int64_t bytesLeft = SERVER_KNOBS->STORAGE_COMMIT_BYTES;
 
 		// Write mutations to storage until we reach the desiredVersion or have written too much (bytesleft)
+		state double beforeStorageUpdates = now();
 		loop {
 			state bool done = data->storage.makeVersionMutationsDurable(newOldestVersion, desiredVersion, bytesLeft);
 			// We want to forget things from these data structures atomically with changing oldestVersion (and "before",
@@ -3757,8 +3799,10 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
 		// Set the new durable version as part of the outstanding change set, before commit
 		if (startOldestVersion != newOldestVersion)
 			data->storage.makeVersionDurable(newOldestVersion);
+		data->storageUpdatesDurableLatencyHistogram->sampleSeconds(now() - beforeStorageUpdates);
 
 		debug_advanceMaxCommittedVersion(data->thisServerID, newOldestVersion);
+		state double beforeStorageCommit = now();
 		state Future<Void> durable = data->storage.commit();
 		state Future<Void> durableDelay = Void();
 
@@ -3767,6 +3811,7 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
 		}
 
 		wait(ioTimeoutError(durable, SERVER_KNOBS->MAX_STORAGE_COMMIT_TIME));
+		data->storageCommitLatencyHistogram->sampleSeconds(now() - beforeStorageCommit);
 
 		debug_advanceMinCommittedVersion(data->thisServerID, newOldestVersion);
 
@@ -3791,6 +3836,7 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
 		// Taking and releasing the durableVersionLock ensures that no eager reads both begin before the commit was
 		// effective and are applied after we change the durable version. Also ensure that we have to lock while calling
 		// changeDurableVersion, because otherwise the latest version of mutableData might be partially loaded.
+		state double beforeSSDurableVersionUpdate = now();
 		wait(data->durableVersionLock.take());
 		data->popVersion(data->durableVersion.get() + 1);
 
@@ -3803,6 +3849,7 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
 		}
 
 		data->durableVersionLock.release();
+		data->ssDurableVersionUpdateLatencyHistogram->sampleSeconds(now() - beforeSSDurableVersionUpdate);
 
 		//TraceEvent("StorageServerDurable", data->thisServerID).detail("Version", newOldestVersion);
 

From fac3b91c1a3c931326eac429ede206c20654fa37 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 18 Jun 2021 12:10:50 -0500
Subject: [PATCH 279/740] Don't inject TSS faults if speedUpSimulation is set

---
 fdbserver/QuietDatabase.actor.cpp              | 11 ++++-------
 fdbserver/storageserver.actor.cpp              | 16 +++++++++++++---
 fdbserver/workloads/ConsistencyCheck.actor.cpp |  7 ++-----
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index 9bb55388b72..54b25298002 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -308,13 +308,10 @@ ACTOR Future<int64_t> getMaxStorageServerQueueSize(Database cx, Reference<AsyncV
 			    .detail("SS", servers[i].id());
 			throw attribute_not_found();
 		}
-		// Ignore TSS in add delay mode since it can purposefully freeze forever
-		if (!servers[i].isTss() || !g_network->isSimulated() ||
-		    g_simulator.tssMode != ISimulator::TSSMode::EnabledAddDelay) {
-			messages.push_back(timeoutError(itr->second.eventLogRequest.getReply(EventLogRequest(
-			                                    StringRef(servers[i].id().toString() + "/StorageMetrics"))),
-			                                1.0));
-		}
+
+		messages.push_back(timeoutError(itr->second.eventLogRequest.getReply(
+		                                    EventLogRequest(StringRef(servers[i].id().toString() + "/StorageMetrics"))),
+		                                1.0));
 	}
 
 	wait(waitForAll(messages));
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 9aa421d4a1a..626422d8f5f 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3357,6 +3357,15 @@ class StorageUpdater {
 	}
 };
 
+ACTOR Future<Void> tssDelayForever() {
+	loop {
+		wait(delay(5.0));
+		if (g_simulator.speedUpSimulation) {
+			return Void();
+		}
+	}
+}
+
 ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 	state double start;
 	try {
@@ -3377,12 +3386,13 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 		}
 
 		if (g_network->isSimulated() && data->isTss() && g_simulator.tssMode == ISimulator::TSSMode::EnabledAddDelay &&
-		    data->tssFaultInjectTime.present() && data->tssFaultInjectTime.get() < now()) {
+		    !g_simulator.speedUpSimulation && data->tssFaultInjectTime.present() &&
+		    data->tssFaultInjectTime.get() < now()) {
 			if (deterministicRandom()->random01() < 0.01) {
 				TraceEvent(SevWarnAlways, "TSSInjectDelayForever", data->thisServerID);
 				// small random chance to just completely get stuck here, each tss should eventually hit this in this
 				// mode
-				wait(Never());
+				wait(tssDelayForever());
 			} else {
 				// otherwise pause for part of a second
 				double delayTime = deterministicRandom()->random01();
@@ -3566,7 +3576,7 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 
 				// Drop non-private mutations if TSS fault injection is enabled in simulation, or if this is a TSS in
 				// quarantine.
-				if (g_network->isSimulated() && data->isTss() &&
+				if (g_network->isSimulated() && data->isTss() && !g_simulator.speedUpSimulation &&
 				    g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations &&
 				    data->tssFaultInjectTime.present() && data->tssFaultInjectTime.get() < now() &&
 				    (msg.type == MutationRef::SetValue || msg.type == MutationRef::ClearRange) &&
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index ab20b3041d7..83ed22e8466 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -1497,11 +1497,8 @@ struct ConsistencyCheckWorkload : TestWorkload {
 								    .detail("IsTSS", storageServerInterfaces[j].isTss() ? "True" : "False")
 								    .error(e);
 
-								// All shards should be available in quiscence
-								if (self->performQuiescentChecks &&
-								    ((g_network->isSimulated() &&
-								      g_simulator.tssMode != ISimulator::TSSMode::EnabledAddDelay) ||
-								     !storageServerInterfaces[j].isTss())) {
+								// All shards should be available in quiescence
+								if (self->performQuiescentChecks && !storageServerInterfaces[j].isTss()) {
 									self->testFailure("Storage server unavailable");
 									return false;
 								}

From 304580765ad2706e1643afa55b7f758bfd28e5e4 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 21 Jun 2021 10:29:29 -0700
Subject: [PATCH 280/740] cherry pick release notes onto 7.0

---
 .../sphinx/source/release-notes/release-notes-700.rst  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-700.rst b/documentation/sphinx/source/release-notes/release-notes-700.rst
index 7fc256b221b..c59031a1db9 100644
--- a/documentation/sphinx/source/release-notes/release-notes-700.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-700.rst
@@ -23,13 +23,15 @@ Performance
 
 Reliability
 -----------
-
-
+* Improved worker recruitment logic to avoid unnecessary recoveries when processes are added or removed from a cluster. `(PR #4695) <https://github.com/apple/foundationdb/pull/4695>`_ `(PR #4631) <https://github.com/apple/foundationdb/pull/4631>`_ `(PR #4509) <https://github.com/apple/foundationdb/pull/4509>`_
+* Log class processes are prioritized above transaction class proceses for becoming tlogs. `(PR #4509) <https://github.com/apple/foundationdb/pull/4509>`_ 
 
 Fixes
 -----
-
-
+* Fixed a rare crash on the cluster controller when using multi-region configurations. `(PR #4547) <https://github.com/apple/foundationdb/pull/4547>`_ 
+* Using the ``exclude failed`` command could leave the data distributor in a state where it cannot complete relocations. `(PR #4495) <https://github.com/apple/foundationdb/pull/4495>`_ 
+* Fixed a rare crash that could happen on the sequencer during recovery. `(PR #4548) <https://github.com/apple/foundationdb/pull/4548>`_ 
+* When configured with ``usable_regions=2``, a cluster would not fail over to a region which contained only storage class processes. `(PR #4599) <https://github.com/apple/foundationdb/pull/4599>`_ 
 
 Status
 ------

From e69c8926d2129dac108ba7a47744dbcd37a45fe9 Mon Sep 17 00:00:00 2001
From: Zhe Wang <zhewang@Zhes-MacBook-Pro.local>
Date: Fri, 18 Jun 2021 20:59:48 -0500
Subject: [PATCH 281/740] add trace event to recovery_transaction step in
 recovery

---
 fdbserver/masterserver.actor.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index 97953ce1a3b..c0d1d31d2ff 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -294,7 +294,9 @@ ACTOR Future<Void> newCommitProxies(Reference<MasterData> self, RecruitFromConfi
 		req.recoveryCount = self->cstate.myDBState.recoveryCount + 1;
 		req.recoveryTransactionVersion = self->recoveryTransactionVersion;
 		req.firstProxy = i == 0;
-		TraceEvent("CommitProxyReplies", self->dbgid).detail("WorkerID", recr.commitProxies[i].id());
+		TraceEvent("CommitProxyReplies", self->dbgid)
+			.detail("WorkerID", recr.commitProxies[i].id())
+			.detail("FirstProxy", req.firstProxy ? "True" : "False");
 		initializationReplies.push_back(
 		    transformErrors(throwErrorOr(recr.commitProxies[i].commitProxy.getReplyUnlessFailedFor(
 		                        req, SERVER_KNOBS->TLOG_TIMEOUT, SERVER_KNOBS->MASTER_FAILURE_SLOPE_DURING_RECOVERY)),
@@ -945,6 +947,10 @@ ACTOR Future<Void> sendInitialCommitToResolvers(Reference<MasterData> self) {
 		wait(yield());
 	}
 	wait(waitForAll(txnReplies));
+	TraceEvent("RecoveryInternal", self->dbgid)
+		.detail("StatusCode", RecoveryStatus::recovery_transaction)
+		.detail("Status", RecoveryStatus::names[RecoveryStatus::recovery_transaction])
+		.detail("Step", "SentTxnStateStoreToCommitProxies");
 
 	vector<Future<ResolveTransactionBatchReply>> replies;
 	for (auto& r : self->resolvers) {
@@ -957,6 +963,10 @@ ACTOR Future<Void> sendInitialCommitToResolvers(Reference<MasterData> self) {
 	}
 
 	wait(waitForAll(replies));
+	TraceEvent("RecoveryInternal", self->dbgid)
+		.detail("StatusCode", RecoveryStatus::recovery_transaction)
+		.detail("Status", RecoveryStatus::names[RecoveryStatus::recovery_transaction])
+		.detail("Step", "InitializedAllResolvers");
 	return Void();
 }
 

From ec2ace798cd2c0e35131a3bbd96810353b8b8bdf Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Fri, 18 Jun 2021 10:59:36 -0700
Subject: [PATCH 282/740] Cherry pick #5000 to release-7.0

---
 documentation/sphinx/source/api-general.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/api-general.rst b/documentation/sphinx/source/api-general.rst
index 55ecb5c25e5..05c15bedc07 100644
--- a/documentation/sphinx/source/api-general.rst
+++ b/documentation/sphinx/source/api-general.rst
@@ -132,10 +132,17 @@ If you suspect that a client process's workload may be saturating the network th
 Multi-threaded Client
 =====================
 
-FoundationDB client library can start multiple worker threads for each version of client that is loaded. Every single cluster will be serviced by one of the client threads. If the client is connected to only one cluster, exactly one thread would be active and the rest will remain idle. Hence, using this feature is useful when the client is actively using more than one cluster.
+FoundationDB client library can start multiple worker threads for each version of client that is loaded.
+
+Currently, each database object is associated with exactly one of the threads, so a user would need at least ``N`` database objects to make use of ``N`` threads. Additionally, some language bindings (e.g. the python bindings) cache database objects by cluster file, so users may need multiple cluster files to make use of multiple threads. This may be improved in the future.
 
 Clients can be configured to use worker-threads by setting the ``FDBNetworkOptions::CLIENT_THREADS_PER_VERSION`` option.
 
+.. warning::
+  In order to use the multi-threaded client feature, you must configure at
+  least one external client. See :ref:`multi-version client API
+  <multi-version-client-api>` for how to configure an external client.
+
 .. _client-trace-logging:
 
 Client trace logging

From a23ff11930de69262646bc3791fc0fab89f60c30 Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Wed, 28 Apr 2021 17:46:45 -0700
Subject: [PATCH 283/740] Adding TraceEvent when a worker is removed from
 cluster controller.

---
 fdbserver/ClusterController.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 43b6e768b0a..013e8a43ae2 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -3093,6 +3093,7 @@ ACTOR Future<Void> workerAvailabilityWatch(WorkerInterface worker,
 				cluster->removedDBInfoEndpoints.insert(worker.updateServerDBInfo.getEndpoint());
 				cluster->id_worker.erase(worker.locality.processId());
 				cluster->updateWorkerList.set(worker.locality.processId(), Optional<ProcessData>());
+				TraceEvent("ClusterFailedWorker", cluster->id).detail("WorkerProcessId", worker.locality.processId());
 				return Void();
 			}
 		}

From 4e298c3f2bb2a5a91d35f39dde0463fb5ed4c206 Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Fri, 30 Apr 2021 01:42:54 -0700
Subject: [PATCH 284/740] Added worker network address and process class
 details to trace log.

---
 fdbserver/ClusterController.actor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 013e8a43ae2..c467076066d 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -3093,7 +3093,10 @@ ACTOR Future<Void> workerAvailabilityWatch(WorkerInterface worker,
 				cluster->removedDBInfoEndpoints.insert(worker.updateServerDBInfo.getEndpoint());
 				cluster->id_worker.erase(worker.locality.processId());
 				cluster->updateWorkerList.set(worker.locality.processId(), Optional<ProcessData>());
-				TraceEvent("ClusterFailedWorker", cluster->id).detail("WorkerProcessId", worker.locality.processId());
+				TraceEvent("ClusterControllerWorkerFailed", cluster->id)
+					.detail("WorkerProcessId", worker.locality.processId())
+					.detail("WorkerProcessClass", failedWorkerInfo.details.processClass.toString())
+					.detail("WorkerAddress", worker.address());
 				return Void();
 			}
 		}

From c8472b1d05a6f22ebcad251ef0dc53a2b969299f Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Fri, 30 Apr 2021 14:35:01 -0700
Subject: [PATCH 285/740] Rename of variables in trace event.

---
 fdbserver/ClusterController.actor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index c467076066d..4ec68cdd337 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -3094,9 +3094,9 @@ ACTOR Future<Void> workerAvailabilityWatch(WorkerInterface worker,
 				cluster->id_worker.erase(worker.locality.processId());
 				cluster->updateWorkerList.set(worker.locality.processId(), Optional<ProcessData>());
 				TraceEvent("ClusterControllerWorkerFailed", cluster->id)
-					.detail("WorkerProcessId", worker.locality.processId())
-					.detail("WorkerProcessClass", failedWorkerInfo.details.processClass.toString())
-					.detail("WorkerAddress", worker.address());
+					.detail("ProcessId", worker.locality.processId())
+					.detail("ProcessClass", failedWorkerInfo.details.processClass.toString())
+					.detail("Address", worker.address());
 				return Void();
 			}
 		}

From 03640c91557c4338d4afd26dc83323c0c635703c Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Thu, 6 May 2021 17:04:25 -0700
Subject: [PATCH 286/740] Using failedWorkerInfo before its gets erased

---
 fdbserver/ClusterController.actor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 4ec68cdd337..d628fb3f8d0 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -3090,13 +3090,13 @@ ACTOR Future<Void> workerAvailabilityWatch(WorkerInterface worker,
 				if (worker.locality.processId() == cluster->masterProcessId) {
 					cluster->masterProcessId = Optional<Key>();
 				}
-				cluster->removedDBInfoEndpoints.insert(worker.updateServerDBInfo.getEndpoint());
-				cluster->id_worker.erase(worker.locality.processId());
-				cluster->updateWorkerList.set(worker.locality.processId(), Optional<ProcessData>());
 				TraceEvent("ClusterControllerWorkerFailed", cluster->id)
 					.detail("ProcessId", worker.locality.processId())
 					.detail("ProcessClass", failedWorkerInfo.details.processClass.toString())
 					.detail("Address", worker.address());
+				cluster->removedDBInfoEndpoints.insert(worker.updateServerDBInfo.getEndpoint());
+				cluster->id_worker.erase(worker.locality.processId());
+				cluster->updateWorkerList.set(worker.locality.processId(), Optional<ProcessData>());
 				return Void();
 			}
 		}

From baf96a3e63bbd4d8179cf190bfa3f8bc60e132d3 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 21 Jun 2021 22:48:11 +0000
Subject: [PATCH 287/740] add documentation

---
 documentation/sphinx/source/command-line-interface.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/sphinx/source/command-line-interface.rst b/documentation/sphinx/source/command-line-interface.rst
index 39950e68268..5837090a7b7 100644
--- a/documentation/sphinx/source/command-line-interface.rst
+++ b/documentation/sphinx/source/command-line-interface.rst
@@ -70,6 +70,8 @@ The ``new`` option, if present, initializes a new database with the given config
 
 The ``tss`` option, if present, changes the Testing Storage Server (TSS) configuration for a cluster. When used for the first time, both a count and a storage engine must be specified. For more details, see :ref:`testing-storage-server`.
 
+The ``perpetual_storag_wiggle`` option, if present, switch on/off perpetual storage wiggle. The value speed will be the number of processes that the Data Distributor should wiggle at a time. Currently FDB only support up to 1. So any value different than 0 or 1 will return an error.
+
 redundancy mode
 ^^^^^^^^^^^^^^^
 

From 97124ac90d166fdfffdb3e9eb39cbb94874c0070 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Tue, 22 Jun 2021 01:34:25 +0000
Subject: [PATCH 288/740] Create a separate documentation page for special keys
 under api references

---
 documentation/sphinx/source/api-reference.rst |   1 +
 .../sphinx/source/developer-guide.rst         | 238 -----------------
 documentation/sphinx/source/special-keys.rst  | 239 ++++++++++++++++++
 3 files changed, 240 insertions(+), 238 deletions(-)
 create mode 100644 documentation/sphinx/source/special-keys.rst

diff --git a/documentation/sphinx/source/api-reference.rst b/documentation/sphinx/source/api-reference.rst
index 1b3c69857cd..e74d9627b6e 100644
--- a/documentation/sphinx/source/api-reference.rst
+++ b/documentation/sphinx/source/api-reference.rst
@@ -16,3 +16,4 @@ The following documents give detailed descriptions of the API for each language:
    Go API <https://godoc.org/github.com/apple/foundationdb/bindings/go/src/fdb>
    api-c
    api-error-codes
+   special-keys
diff --git a/documentation/sphinx/source/developer-guide.rst b/documentation/sphinx/source/developer-guide.rst
index fa66977520b..af2ff736f8d 100644
--- a/documentation/sphinx/source/developer-guide.rst
+++ b/documentation/sphinx/source/developer-guide.rst
@@ -757,240 +757,6 @@ If you only need to detect the *fact* of a change, and your response doesn't dep
 .. _developer-guide-peformance-considerations:
 
 
-Special keys
-============
-
-Keys starting with the bytes ``\xff\xff`` are called "special" keys, and they are materialized when read. :doc:`\\xff\\xff/status/json <mr-status>` is an example of a special key.
-As of api version 630, additional features have been exposed as special keys and are available to read as ranges instead of just individual keys. Additionally, the special keys are now organized into "modules".
-
-Read-only modules
------------------
-
-A module is loosely defined as a key range in the special key space where a user can expect similar behavior from reading any key in that range.
-By default, users will see a ``special_keys_no_module_found`` error if they read from a range not contained in a module.
-The error indicates the read would always return an empty set of keys if it proceeded. This could be caused by typo in the keys to read.
-Users will also (by default) see a ``special_keys_cross_module_read`` error if their read spans a module boundary.
-The error is to save the user from the surprise of seeing the behavior of multiple modules in the same read.
-Users may opt out of these restrictions by setting the ``special_key_space_relaxed`` transaction option.
-
-Each special key that existed before api version 630 is its own module. These are
-
-#. ``\xff\xff/cluster_file_path`` See :ref:`cluster file client access <cluster-file-client-access>`
-#. ``\xff\xff/cluster_file_path`` See :ref:`cluster file client access <cluster-file-client-access>`
-#. ``\xff\xff/status/json`` See :doc:`Machine-readable status <mr-status>`
-
-Prior to api version 630, it was also possible to read a range starting at
-``\xff\xff/worker_interfaces``. This is mostly an implementation detail of fdbcli,
-but it's available in api version 630 as a module with prefix ``\xff\xff/worker_interfaces/``.
-
-Api version 630 includes two new modules with prefixes
-``\xff\xff/transaction/`` (information about the current transaction), and
-``\xff\xff/metrics/`` (various metrics, not transactional).
-
-Transaction module
-------------------
-
-Reads from the transaction module generally do not require an rpc and only inspect in-memory state for the current transaction.
-
-There are three sets of keys exposed by the transaction module, and each set uses the same encoding, so let's first describe that encoding.
-
-Let's say we have a set of keys represented as intervals of the form ``begin1 <= k < end1 && begin2 <= k < end2 && ...``.
-It could be the case that some of the intervals overlap, e.g. if ``begin1 <= begin2 < end1``, or are adjacent, e.g. if ``end1 == begin2``.
-If we merge all overlapping/adjacent intervals then sort, we end up with a canonical representation of this set of keys.
-
-We encode this canonical set as ordered key value pairs like this::
-
-  <namespace><begin1> -> "1"
-  <namespace><end1> -> "0"
-  <namespace><begin2> -> "1"
-  <namespace><end2> -> "0"
-  ...
-
-Python example::
-
-  >>> tr = db.create_transaction()
-  >>> tr.add_read_conflict_key('foo')
-  >>> tr.add_read_conflict_range('bar/', 'bar0')
-  >>> for k, v in tr.get_range_startswith('\xff\xff/transaction/read_conflict_range/'):
-  ...     print(k, v)
-  ...
-  ('\xff\xff/transaction/read_conflict_range/bar/', '1')
-  ('\xff\xff/transaction/read_conflict_range/bar0', '0')
-  ('\xff\xff/transaction/read_conflict_range/foo', '1')
-  ('\xff\xff/transaction/read_conflict_range/foo\x00', '0')
-
-For read-your-writes transactions, this canonical encoding of conflict ranges
-is already available in memory, and so requesting small ranges is
-correspondingly cheaper than large ranges.
-
-For transactions with read-your-writes disabled, this canonical encoding is computed on
-every read, so you're paying the full cost in CPU time whether or not you
-request a small range.
-
-The namespaces for sets of keys are
-
-#. ``\xff\xff/transaction/read_conflict_range/`` This is the set of keys that will be used for read conflict detection. If another transaction writes to any of these keys after this transaction's read version, then this transaction won't commit.
-#. ``\xff\xff/transaction/write_conflict_range/`` This is the set of keys that will be used for write conflict detection. Keys in this range may cause other transactions which read these keys to abort if this transaction commits.
-#. ``\xff\xff/transaction/conflicting_keys/`` If this transaction failed due to a conflict, it must be the case that some transaction attempted [#conflicting_keys]_ to commit with a write conflict range that intersects this transaction's read conflict range. This is the subset of your read conflict range that actually intersected a write conflict from another transaction.
-
-Caveats
-~~~~~~~
-
-#. ``\xff\xff/transaction/read_conflict_range/`` The conflict range for a read is sometimes not known until that read completes (e.g. range reads with limits, key selectors). When you read from these special keys, the returned future first blocks until all pending reads are complete so it can give an accurate response.
-#. ``\xff\xff/transaction/write_conflict_range/`` The conflict range range for a ``set_versionstamped_key`` atomic op is not known until commit time. You'll get an approximate range (the actual range will be a subset of the approximate range) until the precise range is known.
-#. ``\xff\xff/transaction/conflicting_keys/`` Since using this feature costs server (i.e., commit proxy and resolver) resources, it's disabled by default. You must opt in by setting the ``report_conflicting_keys`` transaction option.
-
-Metrics module
---------------
-
-Reads in the metrics module are not transactional and may require rpcs to complete.
-
-``\xff\xff/metrics/data_distribution_stats/<begin>`` represent stats about the shard that begins at ``<begin>``
-
-  >>> for k, v in db.get_range_startswith('\xff\xff/metrics/data_distribution_stats/', limit=3):
-  ...     print(k, v)
-  ...
-  ('\xff\xff/metrics/data_distribution_stats/', '{"shard_bytes":3828000}')
-  ('\xff\xff/metrics/data_distribution_stats/mako00079', '{"shard_bytes":2013000}')
-  ('\xff\xff/metrics/data_distribution_stats/mako00126', '{"shard_bytes":3201000}')
-
-========================= ======== ===============
-**Field**                 **Type** **Description**
-------------------------- -------- ---------------
-shard_bytes               number   An estimate of the sum of kv sizes for this shard.
-========================= ======== ===============
-
-Keys starting with ``\xff\xff/metrics/health/`` represent stats about the health of the cluster, suitable for application-level throttling.
-Some of this information is also available in ``\xff\xff/status/json``, but these keys are significantly cheaper (in terms of server resources) to read.
-
-  >>> for k, v in db.get_range_startswith('\xff\xff/metrics/health/'):
-  ...     print(k, v)
-  ...
-  ('\xff\xff/metrics/health/aggregate', '{"batch_limited":false,"limiting_storage_durability_lag":5000000,"limiting_storage_queue":1000,"tps_limit":483988.66315011407,"worst_storage_durability_lag":5000001,"worst_storage_queue":2036,"worst_log_queue":300}')
-  ('\xff\xff/metrics/health/log/e639a9ad0373367784cc550c615c469b', '{"log_queue":300}')
-  ('\xff\xff/metrics/health/storage/ab2ce4caf743c9c1ae57063629c6678a', '{"cpu_usage":2.398696781487125,"disk_usage":0.059995917598039405,"storage_durability_lag":5000001,"storage_queue":2036}')
-
-``\xff\xff/metrics/health/aggregate``
-
-Aggregate stats about cluster health. Reading this key alone is slightly cheaper than reading any of the per-process keys.
-
-=================================== ======== ===============
-**Field**                           **Type** **Description**
------------------------------------ -------- ---------------
-batch_limited                       boolean  Whether or not the cluster is limiting batch priority transactions
-limiting_storage_durability_lag     number   storage_durability_lag that ratekeeper is using to determing throttling (see the description for storage_durability_lag)
-limiting_storage_queue              number   storage_queue that ratekeeper is using to determing throttling (see the description for storage_queue)
-tps_limit                           number   The rate at which normal priority transactions are allowed to start
-worst_storage_durability_lag        number   See the description for storage_durability_lag
-worst_storage_queue                 number   See the description for storage_queue
-worst_log_queue                     number   See the description for log_queue
-=================================== ======== ===============
-
-``\xff\xff/metrics/health/log/<id>``
-
-Stats about the health of a particular transaction log process
-
-========================= ======== ===============
-**Field**                 **Type** **Description**
-------------------------- -------- ---------------
-log_queue                 number   The number of bytes of mutations that need to be stored in memory on this transaction log process
-========================= ======== ===============
-
-``\xff\xff/metrics/health/storage/<id>``
-
-Stats about the health of a particular storage process
-
-========================== ======== ===============
-**Field**                  **Type** **Description**
--------------------------- -------- ---------------
-cpu_usage                  number   The cpu percentage used by this storage process
-disk_usage                 number   The disk IO percentage used by this storage process
-storage_durability_lag     number   The difference between the newest version and the durable version on this storage process. On a lightly loaded cluster this will stay just above 5000000 [#max_read_transaction_life_versions]_.
-storage_queue              number   The number of bytes of mutations that need to be stored in memory on this storage process
-========================== ======== ===============
-
-Caveats
-~~~~~~~
-
-#. ``\xff\xff/metrics/health/`` These keys may return data that's several seconds old, and the data may not be available for a brief period during recovery. This will be indicated by the keys being absent.
-
-
-Read/write modules
-------------------
-
-As of api version 700, some modules in the special key space allow writes as
-well as reads. In these modules, a user can expect that mutations (i.e. sets,
-clears, etc) do not have side-effects outside of the current transaction
-until commit is called (the same is true for writes to the normal key space).
-A user can also expect the effects on commit to be atomic. Reads to
-special keys may require reading system keys (whose format is an implementation
-detail), and for those reads appropriate read conflict ranges are added on
-the underlying system keys.
-
-Writes to read/write modules in the special key space are disabled by
-default. Use the ``special_key_space_enable_writes`` transaction option to
-enable them [#special_key_space_enable_writes]_.
-
-
-.. _special-key-space-management-module:
-
-Management module
-~~~~~~~~~~~~~~~~~
-
-The management module is for temporary cluster configuration changes. For
-example, in order to safely remove a process from the cluster, one can add an
-exclusion to the ``\xff\xff/management/excluded/`` key prefix that matches
-that process, and wait for necessary data to be moved away.
-
-#. ``\xff\xff/management/excluded/<exclusion>`` Read/write. Indicates that the cluster should move data away from processes matching ``<exclusion>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
-#. ``\xff\xff/management/failed/<exclusion>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
-#. ``\xff\xff/management/in_progress_exclusion/<address>`` Read-only. Indicates that the process matching ``<address>`` matches an exclusion, but still has necessary data and can't yet be safely removed.
-#. ``\xff\xff/management/options/excluded/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excluded/<exclusion>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
-#. ``\xff\xff/management/options/failed/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failed/<exclusion>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
-#. ``\xff\xff/management/min_required_commit_version`` Read/write. Changing this key will change the corresponding system key ``\xff/minRequiredCommitVersion = [[Version]]``. The value of this special key is the literal text of the underlying ``Version``, which is ``int64_t``. If you set the key with a value failed to be parsed as ``int64_t``, ``special_keys_api_failure`` will be thrown. In addition, the given ``Version`` should be larger than the current read version and smaller than the upper bound(``2**63-1-version_per_second*3600*24*365*1000``). Otherwise, ``special_keys_api_failure`` is thrown. For more details, see help text of ``fdbcli`` command ``advanceversion``.
-#. ``\xff\xff/management/profiling/<client_txn_sample_rate|client_txn_size_limit>`` Read/write. Changing these two keys will change the corresponding system keys ``\xff\x02/fdbClientInfo/<client_txn_sample_rate|client_txn_size_limit>``, respectively. The value of ``\xff\xff/management/client_txn_sample_rate`` is a literal text of ``double``, and the value of ``\xff\xff/management/client_txn_size_limit`` is a literal text of ``int64_t``. A special value ``default`` can be set to or read from these two keys, representing the client profiling is disabled. In addition, ``clear`` in this range is not allowed. For more details, see help text of ``fdbcli`` command ``profile client``.
-#. ``\xff\xff/management/maintenance/<zone_id> := <seconds>`` Read/write. Set/clear a key in this range will change the corresponding system key ``\xff\x02/healthyZone``. The value is a literal text of a non-negative ``double`` which represents the remaining time for the zone to be in maintenance. Commiting with an invalid value will throw ``special_keys_api_failure``. Only one zone is allowed to be in maintenance at the same time. Setting a new key in the range will override the old one and the transaction will throw ``special_keys_api_failure`` error if more than one zone is given. For more details, see help text of ``fdbcli`` command ``maintenance``.
-   In addition, a special key ``\xff\xff/management/maintenance/IgnoreSSFailures`` in the range, if set, will disable datadistribution for storage server failures.
-   It is doing the same thing as the fdbcli command ``datadistribution disable ssfailure``.
-   Maintenance mode will be unable to use until the key is cleared, which is the same as the fdbcli command ``datadistribution enable ssfailure``.
-   While the key is set, any commit that tries to set a key in the range will fail with the ``special_keys_api_failure`` error.
-#. ``\xff\xff/management/data_distribution/<mode|rebalance_ignored>`` Read/write. Changing these two keys will change the two corresponding system keys ``\xff/dataDistributionMode`` and ``\xff\x02/rebalanceDDIgnored``. The value of ``\xff\xff/management/data_distribution/mode`` is a literal text of ``0`` (disable) or ``1`` (enable). Transactions committed with invalid values will throw ``special_keys_api_failure`` . The value of ``\xff\xff/management/data_distribution/rebalance_ignored`` is empty. If present, it means data distribution is disabled for rebalance. Any transaction committed with non-empty value for this key will throw ``special_keys_api_failure``. For more details, see help text of ``fdbcli`` command ``datadistribution``.
-#. ``\xff\xff/management/consistency_check_suspended`` Read/write. Set or read this key will set or read the underlying system key ``\xff\x02/ConsistencyCheck/Suspend``. The value of this special key is unused thus if present, will be empty. In particular, if the key exists, then consistency is suspended. For more details, see help text of ``fdbcli`` command ``consistencycheck``.
-#. ``\xff\xff/management/db_locked`` Read/write. A single key that can be read and modified. Set the key will lock the database and clear the key will unlock. If the database is already locked, then the commit will fail with the ``special_keys_api_failure`` error. For more details, see help text of ``fdbcli`` command ``lock`` and ``unlock``.
-#. ``\xff\xff/management/auto_coordinators`` Read-only. A single key, if read, will return a set of processes which is able to satisfy the current redundency level and serve as new coordinators. The return value is formatted as a comma delimited string of network addresses of coordinators, i.e. ``<ip:port>,<ip:port>,...,<ip:port>``.
-
-An exclusion is syntactically either an ip address (e.g. ``127.0.0.1``), or
-an ip address and port (e.g. ``127.0.0.1:4500``). If no port is specified,
-then all processes on that host match the exclusion.
-
-Configuration module
-~~~~~~~~~~~~~~~~~~~~
-
-The configuration module is for changing the cluster configuration.
-For example, you can change a process type or update coordinators by manipulating related special keys through transactions.
-
-#. ``\xff\xff/configuration/process/class_type/<address> := <class_type>`` Read/write. Reading keys in the range will retrieve processes' class types. Setting keys in the range will update processes' class types. The process matching ``<address>`` will be assigned to the given class type if the commit is successful. The valid class types are ``storage``, ``transaction``, ``resolution``, etc. A full list of class type can be found via ``fdbcli`` command ``help setclass``. Clearing keys is forbidden in the range. Instead, you can set the type as ``default``, which will clear the assigned class type if existing. For more details, see help text of ``fdbcli`` command ``setclass``.
-#. ``\xff\xff/configuration/process/class_source/<address> := <class_source>`` Read-only. Reading keys in the range will retrieve processes' class source. The class source is one of ``command_line``, ``configure_auto``, ``set_class`` and ``invalid``, indicating the source that the process's class type comes from.
-#. ``\xff\xff/configuration/coordinators/processes := <ip:port>,<ip:port>,...,<ip:port>`` Read/write. A single key, if read, will return a comma delimited string of coordinators' network addresses. Thus to provide a new set of cooridinators, set the key with a correct formatted string of new coordinators' network addresses. As there's always the need to have coordinators, clear on the key is forbidden and a transaction will fail with the ``special_keys_api_failure`` error if the clear is committed. For more details, see help text of ``fdbcli`` command ``coordinators``.
-#. ``\xff\xff/configuration/coordinators/cluster_description := <new_description>`` Read/write. A single key, if read, will return the cluster description. Thus modifying the key will update the cluster decription. The new description needs to match ``[A-Za-z0-9_]+``, otherwise, the ``special_keys_api_failure`` error will be thrown. In addition, clear on the key is meaningless thus forbidden. For more details, see help text of ``fdbcli`` command ``coordinators``.
-
-The ``<address>`` here is the network address of the corresponding process. Thus the general form is ``ip:port``.
-
-Error message module
-~~~~~~~~~~~~~~~~~~~~
-
-Each module written to validates the transaction before committing, and this
-validation failing is indicated by a ``special_keys_api_failure`` error.
-More detailed information about why this validation failed can be accessed through the ``\xff\xff/error_message`` key, whose value is a json document with the following schema.
-
-========================== ======== ===============
-**Field**                  **Type** **Description**
--------------------------- -------- ---------------
-retriable                  boolean  Whether or not this operation might succeed if retried
-command                    string   The fdbcli command corresponding to this operation
-message                    string   Help text explaining the reason this operation failed
-========================== ======== ===============
-
 Performance considerations
 ==========================
 
@@ -1189,7 +955,3 @@ The trickiest errors are non-retryable errors. ``Transaction.on_error`` will ret
 If you see one of those errors, the best way of action is to fail the client.
 
 At a first glance this looks very similar to an ``commit_unknown_result``. However, these errors lack the one guarantee ``commit_unknown_result`` still gives to the user: if the commit has already been sent to the database, the transaction could get committed at a later point in time. This means that if you retry the transaction, your new transaction might race with the old transaction. While this technically doesn't violate any consistency guarantees, abandoning a transaction means that there are no causality guaranatees.
-
-.. [#conflicting_keys] In practice, the transaction probably committed successfully. However, if you're running multiple resolvers then it's possible for a transaction to cause another to abort even if it doesn't commit successfully.
-.. [#max_read_transaction_life_versions] The number 5000000 comes from the server knob MAX_READ_TRANSACTION_LIFE_VERSIONS
-.. [#special_key_space_enable_writes] Enabling this option enables other transaction options, such as ``ACCESS_SYSTEM_KEYS``. This may change in the future.
diff --git a/documentation/sphinx/source/special-keys.rst b/documentation/sphinx/source/special-keys.rst
new file mode 100644
index 00000000000..385bd14c6c7
--- /dev/null
+++ b/documentation/sphinx/source/special-keys.rst
@@ -0,0 +1,239 @@
+.. _special-keys:
+
+============
+Special keys
+============
+
+Keys starting with the bytes ``\xff\xff`` are called "special" keys, and they are materialized when read. :doc:`\\xff\\xff/status/json <mr-status>` is an example of a special key.
+As of api version 630, additional features have been exposed as special keys and are available to read as ranges instead of just individual keys. Additionally, the special keys are now organized into "modules".
+
+Read-only modules
+=================
+
+A module is loosely defined as a key range in the special key space where a user can expect similar behavior from reading any key in that range.
+By default, users will see a ``special_keys_no_module_found`` error if they read from a range not contained in a module.
+The error indicates the read would always return an empty set of keys if it proceeded. This could be caused by typo in the keys to read.
+Users will also (by default) see a ``special_keys_cross_module_read`` error if their read spans a module boundary.
+The error is to save the user from the surprise of seeing the behavior of multiple modules in the same read.
+Users may opt out of these restrictions by setting the ``special_key_space_relaxed`` transaction option.
+
+Each special key that existed before api version 630 is its own module. These are
+
+#. ``\xff\xff/cluster_file_path`` See :ref:`cluster file client access <cluster-file-client-access>`
+#. ``\xff\xff/status/json`` See :doc:`Machine-readable status <mr-status>`
+
+Prior to api version 630, it was also possible to read a range starting at
+``\xff\xff/worker_interfaces``. This is mostly an implementation detail of fdbcli,
+but it's available in api version 630 as a module with prefix ``\xff\xff/worker_interfaces/``.
+
+Api version 630 includes two new modules with prefixes
+``\xff\xff/transaction/`` (information about the current transaction), and
+``\xff\xff/metrics/`` (various metrics, not transactional).
+
+Transaction module
+------------------
+
+Reads from the transaction module generally do not require an rpc and only inspect in-memory state for the current transaction.
+
+There are three sets of keys exposed by the transaction module, and each set uses the same encoding, so let's first describe that encoding.
+
+Let's say we have a set of keys represented as intervals of the form ``begin1 <= k < end1 && begin2 <= k < end2 && ...``.
+It could be the case that some of the intervals overlap, e.g. if ``begin1 <= begin2 < end1``, or are adjacent, e.g. if ``end1 == begin2``.
+If we merge all overlapping/adjacent intervals then sort, we end up with a canonical representation of this set of keys.
+
+We encode this canonical set as ordered key value pairs like this::
+
+  <namespace><begin1> -> "1"
+  <namespace><end1> -> "0"
+  <namespace><begin2> -> "1"
+  <namespace><end2> -> "0"
+  ...
+
+Python example::
+
+  >>> tr = db.create_transaction()
+  >>> tr.add_read_conflict_key('foo')
+  >>> tr.add_read_conflict_range('bar/', 'bar0')
+  >>> for k, v in tr.get_range_startswith('\xff\xff/transaction/read_conflict_range/'):
+  ...     print(k, v)
+  ...
+  ('\xff\xff/transaction/read_conflict_range/bar/', '1')
+  ('\xff\xff/transaction/read_conflict_range/bar0', '0')
+  ('\xff\xff/transaction/read_conflict_range/foo', '1')
+  ('\xff\xff/transaction/read_conflict_range/foo\x00', '0')
+
+For read-your-writes transactions, this canonical encoding of conflict ranges
+is already available in memory, and so requesting small ranges is
+correspondingly cheaper than large ranges.
+
+For transactions with read-your-writes disabled, this canonical encoding is computed on
+every read, so you're paying the full cost in CPU time whether or not you
+request a small range.
+
+The namespaces for sets of keys are
+
+#. ``\xff\xff/transaction/read_conflict_range/`` This is the set of keys that will be used for read conflict detection. If another transaction writes to any of these keys after this transaction's read version, then this transaction won't commit.
+#. ``\xff\xff/transaction/write_conflict_range/`` This is the set of keys that will be used for write conflict detection. Keys in this range may cause other transactions which read these keys to abort if this transaction commits.
+#. ``\xff\xff/transaction/conflicting_keys/`` If this transaction failed due to a conflict, it must be the case that some transaction attempted [#conflicting_keys]_ to commit with a write conflict range that intersects this transaction's read conflict range. This is the subset of your read conflict range that actually intersected a write conflict from another transaction.
+
+Caveats
+~~~~~~~
+
+#. ``\xff\xff/transaction/read_conflict_range/`` The conflict range for a read is sometimes not known until that read completes (e.g. range reads with limits, key selectors). When you read from these special keys, the returned future first blocks until all pending reads are complete so it can give an accurate response.
+#. ``\xff\xff/transaction/write_conflict_range/`` The conflict range range for a ``set_versionstamped_key`` atomic op is not known until commit time. You'll get an approximate range (the actual range will be a subset of the approximate range) until the precise range is known.
+#. ``\xff\xff/transaction/conflicting_keys/`` Since using this feature costs server (i.e., commit proxy and resolver) resources, it's disabled by default. You must opt in by setting the ``report_conflicting_keys`` transaction option.
+
+Metrics module
+--------------
+
+Reads in the metrics module are not transactional and may require rpcs to complete.
+
+``\xff\xff/metrics/data_distribution_stats/<begin>`` represent stats about the shard that begins at ``<begin>``
+
+  >>> for k, v in db.get_range_startswith('\xff\xff/metrics/data_distribution_stats/', limit=3):
+  ...     print(k, v)
+  ...
+  ('\xff\xff/metrics/data_distribution_stats/', '{"shard_bytes":3828000}')
+  ('\xff\xff/metrics/data_distribution_stats/mako00079', '{"shard_bytes":2013000}')
+  ('\xff\xff/metrics/data_distribution_stats/mako00126', '{"shard_bytes":3201000}')
+
+========================= ======== ===============
+**Field**                 **Type** **Description**
+------------------------- -------- ---------------
+shard_bytes               number   An estimate of the sum of kv sizes for this shard.
+========================= ======== ===============
+
+Keys starting with ``\xff\xff/metrics/health/`` represent stats about the health of the cluster, suitable for application-level throttling.
+Some of this information is also available in ``\xff\xff/status/json``, but these keys are significantly cheaper (in terms of server resources) to read.
+
+  >>> for k, v in db.get_range_startswith('\xff\xff/metrics/health/'):
+  ...     print(k, v)
+  ...
+  ('\xff\xff/metrics/health/aggregate', '{"batch_limited":false,"limiting_storage_durability_lag":5000000,"limiting_storage_queue":1000,"tps_limit":483988.66315011407,"worst_storage_durability_lag":5000001,"worst_storage_queue":2036,"worst_log_queue":300}')
+  ('\xff\xff/metrics/health/log/e639a9ad0373367784cc550c615c469b', '{"log_queue":300}')
+  ('\xff\xff/metrics/health/storage/ab2ce4caf743c9c1ae57063629c6678a', '{"cpu_usage":2.398696781487125,"disk_usage":0.059995917598039405,"storage_durability_lag":5000001,"storage_queue":2036}')
+
+``\xff\xff/metrics/health/aggregate``
+
+Aggregate stats about cluster health. Reading this key alone is slightly cheaper than reading any of the per-process keys.
+
+=================================== ======== ===============
+**Field**                           **Type** **Description**
+----------------------------------- -------- ---------------
+batch_limited                       boolean  Whether or not the cluster is limiting batch priority transactions
+limiting_storage_durability_lag     number   storage_durability_lag that ratekeeper is using to determing throttling (see the description for storage_durability_lag)
+limiting_storage_queue              number   storage_queue that ratekeeper is using to determing throttling (see the description for storage_queue)
+tps_limit                           number   The rate at which normal priority transactions are allowed to start
+worst_storage_durability_lag        number   See the description for storage_durability_lag
+worst_storage_queue                 number   See the description for storage_queue
+worst_log_queue                     number   See the description for log_queue
+=================================== ======== ===============
+
+``\xff\xff/metrics/health/log/<id>``
+
+Stats about the health of a particular transaction log process
+
+========================= ======== ===============
+**Field**                 **Type** **Description**
+------------------------- -------- ---------------
+log_queue                 number   The number of bytes of mutations that need to be stored in memory on this transaction log process
+========================= ======== ===============
+
+``\xff\xff/metrics/health/storage/<id>``
+
+Stats about the health of a particular storage process
+
+========================== ======== ===============
+**Field**                  **Type** **Description**
+-------------------------- -------- ---------------
+cpu_usage                  number   The cpu percentage used by this storage process
+disk_usage                 number   The disk IO percentage used by this storage process
+storage_durability_lag     number   The difference between the newest version and the durable version on this storage process. On a lightly loaded cluster this will stay just above 5000000 [#max_read_transaction_life_versions]_.
+storage_queue              number   The number of bytes of mutations that need to be stored in memory on this storage process
+========================== ======== ===============
+
+Caveats
+~~~~~~~
+
+#. ``\xff\xff/metrics/health/`` These keys may return data that's several seconds old, and the data may not be available for a brief period during recovery. This will be indicated by the keys being absent.
+
+
+Read/write modules
+==================
+
+As of api version 700, some modules in the special key space allow writes as
+well as reads. In these modules, a user can expect that mutations (i.e. sets,
+clears, etc) do not have side-effects outside of the current transaction
+until commit is called (the same is true for writes to the normal key space).
+A user can also expect the effects on commit to be atomic. Reads to
+special keys may require reading system keys (whose format is an implementation
+detail), and for those reads appropriate read conflict ranges are added on
+the underlying system keys.
+
+Writes to read/write modules in the special key space are disabled by
+default. Use the ``special_key_space_enable_writes`` transaction option to
+enable them [#special_key_space_enable_writes]_.
+
+
+.. _special-key-space-management-module:
+
+Management module
+-----------------
+
+The management module is for temporary cluster configuration changes. For
+example, in order to safely remove a process from the cluster, one can add an
+exclusion to the ``\xff\xff/management/excluded/`` key prefix that matches
+that process, and wait for necessary data to be moved away.
+
+#. ``\xff\xff/management/excluded/<exclusion>`` Read/write. Indicates that the cluster should move data away from processes matching ``<exclusion>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/failed/<exclusion>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/in_progress_exclusion/<address>`` Read-only. Indicates that the process matching ``<address>`` matches an exclusion, but still has necessary data and can't yet be safely removed.
+#. ``\xff\xff/management/options/excluded/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excluded/<exclusion>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+#. ``\xff\xff/management/options/failed/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failed/<exclusion>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+#. ``\xff\xff/management/min_required_commit_version`` Read/write. Changing this key will change the corresponding system key ``\xff/minRequiredCommitVersion = [[Version]]``. The value of this special key is the literal text of the underlying ``Version``, which is ``int64_t``. If you set the key with a value failed to be parsed as ``int64_t``, ``special_keys_api_failure`` will be thrown. In addition, the given ``Version`` should be larger than the current read version and smaller than the upper bound(``2**63-1-version_per_second*3600*24*365*1000``). Otherwise, ``special_keys_api_failure`` is thrown. For more details, see help text of ``fdbcli`` command ``advanceversion``.
+#. ``\xff\xff/management/profiling/<client_txn_sample_rate|client_txn_size_limit>`` Read/write. Changing these two keys will change the corresponding system keys ``\xff\x02/fdbClientInfo/<client_txn_sample_rate|client_txn_size_limit>``, respectively. The value of ``\xff\xff/management/client_txn_sample_rate`` is a literal text of ``double``, and the value of ``\xff\xff/management/client_txn_size_limit`` is a literal text of ``int64_t``. A special value ``default`` can be set to or read from these two keys, representing the client profiling is disabled. In addition, ``clear`` in this range is not allowed. For more details, see help text of ``fdbcli`` command ``profile client``.
+#. ``\xff\xff/management/maintenance/<zone_id> := <seconds>`` Read/write. Set/clear a key in this range will change the corresponding system key ``\xff\x02/healthyZone``. The value is a literal text of a non-negative ``double`` which represents the remaining time for the zone to be in maintenance. Commiting with an invalid value will throw ``special_keys_api_failure``. Only one zone is allowed to be in maintenance at the same time. Setting a new key in the range will override the old one and the transaction will throw ``special_keys_api_failure`` error if more than one zone is given. For more details, see help text of ``fdbcli`` command ``maintenance``.
+   In addition, a special key ``\xff\xff/management/maintenance/IgnoreSSFailures`` in the range, if set, will disable datadistribution for storage server failures.
+   It is doing the same thing as the fdbcli command ``datadistribution disable ssfailure``.
+   Maintenance mode will be unable to use until the key is cleared, which is the same as the fdbcli command ``datadistribution enable ssfailure``.
+   While the key is set, any commit that tries to set a key in the range will fail with the ``special_keys_api_failure`` error.
+#. ``\xff\xff/management/data_distribution/<mode|rebalance_ignored>`` Read/write. Changing these two keys will change the two corresponding system keys ``\xff/dataDistributionMode`` and ``\xff\x02/rebalanceDDIgnored``. The value of ``\xff\xff/management/data_distribution/mode`` is a literal text of ``0`` (disable) or ``1`` (enable). Transactions committed with invalid values will throw ``special_keys_api_failure`` . The value of ``\xff\xff/management/data_distribution/rebalance_ignored`` is empty. If present, it means data distribution is disabled for rebalance. Any transaction committed with non-empty value for this key will throw ``special_keys_api_failure``. For more details, see help text of ``fdbcli`` command ``datadistribution``.
+#. ``\xff\xff/management/consistency_check_suspended`` Read/write. Set or read this key will set or read the underlying system key ``\xff\x02/ConsistencyCheck/Suspend``. The value of this special key is unused thus if present, will be empty. In particular, if the key exists, then consistency is suspended. For more details, see help text of ``fdbcli`` command ``consistencycheck``.
+#. ``\xff\xff/management/db_locked`` Read/write. A single key that can be read and modified. Set the key will lock the database and clear the key will unlock. If the database is already locked, then the commit will fail with the ``special_keys_api_failure`` error. For more details, see help text of ``fdbcli`` command ``lock`` and ``unlock``.
+#. ``\xff\xff/management/auto_coordinators`` Read-only. A single key, if read, will return a set of processes which is able to satisfy the current redundency level and serve as new coordinators. The return value is formatted as a comma delimited string of network addresses of coordinators, i.e. ``<ip:port>,<ip:port>,...,<ip:port>``.
+
+An exclusion is syntactically either an ip address (e.g. ``127.0.0.1``), or
+an ip address and port (e.g. ``127.0.0.1:4500``). If no port is specified,
+then all processes on that host match the exclusion.
+
+Configuration module
+--------------------
+
+The configuration module is for changing the cluster configuration.
+For example, you can change a process type or update coordinators by manipulating related special keys through transactions.
+
+#. ``\xff\xff/configuration/process/class_type/<address> := <class_type>`` Read/write. Reading keys in the range will retrieve processes' class types. Setting keys in the range will update processes' class types. The process matching ``<address>`` will be assigned to the given class type if the commit is successful. The valid class types are ``storage``, ``transaction``, ``resolution``, etc. A full list of class type can be found via ``fdbcli`` command ``help setclass``. Clearing keys is forbidden in the range. Instead, you can set the type as ``default``, which will clear the assigned class type if existing. For more details, see help text of ``fdbcli`` command ``setclass``.
+#. ``\xff\xff/configuration/process/class_source/<address> := <class_source>`` Read-only. Reading keys in the range will retrieve processes' class source. The class source is one of ``command_line``, ``configure_auto``, ``set_class`` and ``invalid``, indicating the source that the process's class type comes from.
+#. ``\xff\xff/configuration/coordinators/processes := <ip:port>,<ip:port>,...,<ip:port>`` Read/write. A single key, if read, will return a comma delimited string of coordinators' network addresses. Thus to provide a new set of cooridinators, set the key with a correct formatted string of new coordinators' network addresses. As there's always the need to have coordinators, clear on the key is forbidden and a transaction will fail with the ``special_keys_api_failure`` error if the clear is committed. For more details, see help text of ``fdbcli`` command ``coordinators``.
+#. ``\xff\xff/configuration/coordinators/cluster_description := <new_description>`` Read/write. A single key, if read, will return the cluster description. Thus modifying the key will update the cluster decription. The new description needs to match ``[A-Za-z0-9_]+``, otherwise, the ``special_keys_api_failure`` error will be thrown. In addition, clear on the key is meaningless thus forbidden. For more details, see help text of ``fdbcli`` command ``coordinators``.
+
+The ``<address>`` here is the network address of the corresponding process. Thus the general form is ``ip:port``.
+
+Error message module
+--------------------
+
+Each module written to validates the transaction before committing, and this
+validation failing is indicated by a ``special_keys_api_failure`` error.
+More detailed information about why this validation failed can be accessed through the ``\xff\xff/error_message`` key, whose value is a json document with the following schema.
+
+========================== ======== ===============
+**Field**                  **Type** **Description**
+-------------------------- -------- ---------------
+retriable                  boolean  Whether or not this operation might succeed if retried
+command                    string   The fdbcli command corresponding to this operation
+message                    string   Help text explaining the reason this operation failed
+========================== ======== ===============
+
+.. [#conflicting_keys] In practice, the transaction probably committed successfully. However, if you're running multiple resolvers then it's possible for a transaction to cause another to abort even if it doesn't commit successfully.
+.. [#max_read_transaction_life_versions] The number 5000000 comes from the server knob MAX_READ_TRANSACTION_LIFE_VERSIONS
+.. [#special_key_space_enable_writes] Enabling this option enables other transaction options, such as ``ACCESS_SYSTEM_KEYS``. This may change in the future.

From 8d5e773c1efbd97178186faaab5771c372e0d8c0 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 22 Jun 2021 04:44:54 +0000
Subject: [PATCH 289/740] add documentation page

---
 documentation/sphinx/source/operations.rst    |  3 +
 .../source/perpetual-storage-wiggle.rst       | 56 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 documentation/sphinx/source/perpetual-storage-wiggle.rst

diff --git a/documentation/sphinx/source/operations.rst b/documentation/sphinx/source/operations.rst
index 3621f52366e..9b01b73e908 100644
--- a/documentation/sphinx/source/operations.rst
+++ b/documentation/sphinx/source/operations.rst
@@ -28,6 +28,8 @@ Ready to operate an externally accessible FoundationDB cluster? You'll find what
 
 * :doc:`tss` gives an overview of the Testing Storage Server feature of FoundationDB, which allows you to safely run an untrusted storage engine in a production cluster.
 
+* :doc:`perpetual-storage-wiggle` gives an overview of Perpetual Storage Wiggle feature about how to use it.
+
 .. toctree::
  :maxdepth: 2
  :titlesonly:
@@ -44,3 +46,4 @@ Ready to operate an externally accessible FoundationDB cluster? You'll find what
  platforms
  transaction-tagging
  tss
+ perpetual-storage-wiggle
diff --git a/documentation/sphinx/source/perpetual-storage-wiggle.rst b/documentation/sphinx/source/perpetual-storage-wiggle.rst
new file mode 100644
index 00000000000..89e450ecf7c
--- /dev/null
+++ b/documentation/sphinx/source/perpetual-storage-wiggle.rst
@@ -0,0 +1,56 @@
+.. _perpetual-storage-wiggle:
+
+############################
+Perpetual Storage Wiggle
+############################
+
+.. include:: guide-common.rst.inc
+
+This document covers the concept and usage of perpetual storage wiggle.
+
+.. _perpetual-storage-wiggle-introduction:
+
+Summary
+============
+Perpetual storage wiggle is a feature that lets the data distributor is forced to constantly build new storage teams when the cluster is healthy. On a high-level note, the process is like this:
+
+Order storage servers by process id. For each storage server n:
+
+a. Exclude storage server n.
+
+b. Wait until all data has been moved off the storage server.
+
+c. Include storage n
+
+Goto a.
+
+With a perpetual wiggle, storage migrations will be much less impactful. The wiggler will detect the healthy status based on healthy teams, available disk space and the number of unhealthy relocations. It will pause the wiggle until the cluster is healthy again.
+
+Configuration
+=============
+
+You can configure TSS via the FDB :ref:`command line interface <command-line-interface>`.
+
+Example commands
+----------------
+
+Open perpetual storage wiggle: ``configure perpetual_storage_wiggle=1``.
+
+Disable perpetual storage wiggle on the cluster: ``configure perpetual_storage_wiggle=0``.
+
+Monitor
+=======
+
+The ``status`` command in the FDB :ref:`command line interface <command-line-interface>` will show the current perpetual_storage_wiggle value.
+
+Trace Events
+----------------------
+``PerpetualStorageWiggleOpen`` shows up when you switch on perpetual storage wiggle, while ``PerpetualStorageWiggleClose`` appears when you turn it off;
+
+``PerpetualStorageWiggleStart`` event means the wiggler start wiggling 1 process, it also contains the process id of the wiggling process how many healthy teams we has now. It's worthy to note ``ExtraHealthyTeamCount`` that indicates how many healthy team we need to restart the paused wiggler and ``HealthyTeamCount``. If ``ExtraHealthyTeamCount`` keep being larger than team count, then you may need to add more storage server.
+
+``PerpetualStorageWigglePause`` event shows up when the wiggler pause because it detect the cluster is unhealthy;
+
+``PerpetualStorageWiggleFinish`` event indicates the wiggle is done on current process.
+
+In ``MovingData`` event, the field ``PriorityStorageWiggle`` shows how many relocations are in the queue because storage wiggle.

From f8734d638b5289a2945f1993e49126b350ef7910 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 21 Jun 2021 23:35:26 -0700
Subject: [PATCH 290/740] Update command-line-interface.rst

---
 documentation/sphinx/source/command-line-interface.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/documentation/sphinx/source/command-line-interface.rst b/documentation/sphinx/source/command-line-interface.rst
index 5837090a7b7..78fd074db0f 100644
--- a/documentation/sphinx/source/command-line-interface.rst
+++ b/documentation/sphinx/source/command-line-interface.rst
@@ -70,8 +70,6 @@ The ``new`` option, if present, initializes a new database with the given config
 
 The ``tss`` option, if present, changes the Testing Storage Server (TSS) configuration for a cluster. When used for the first time, both a count and a storage engine must be specified. For more details, see :ref:`testing-storage-server`.
 
-The ``perpetual_storag_wiggle`` option, if present, switch on/off perpetual storage wiggle. The value speed will be the number of processes that the Data Distributor should wiggle at a time. Currently FDB only support up to 1. So any value different than 0 or 1 will return an error.
-
 redundancy mode
 ^^^^^^^^^^^^^^^
 
@@ -114,7 +112,7 @@ For recommendations on appropriate values for process types in large clusters, s
 perpetual storage wiggle
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-Set the value speed (a.k.a., the number of processes that the Data Distributor should wiggle at a time). Currently, only 0 and 1 are supported. The value 0 means to disable the perpetual storage wiggle.
+Set the value speed (a.k.a., the number of processes that the Data Distributor should wiggle at a time). Currently, only 0 and 1 are supported. The value 0 means to disable the perpetual storage wiggle. For more details, see :ref:`perpetual-storage-wiggle`.
 
 consistencycheck
 ----------------

From 4ddb92eb1da67e51673e8ee42ed575b43813eb9f Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 22 Jun 2021 10:17:22 -0700
Subject: [PATCH 291/740] Update perpetual-storage-wiggle.rst

---
 documentation/sphinx/source/perpetual-storage-wiggle.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/sphinx/source/perpetual-storage-wiggle.rst b/documentation/sphinx/source/perpetual-storage-wiggle.rst
index 89e450ecf7c..0b082037532 100644
--- a/documentation/sphinx/source/perpetual-storage-wiggle.rst
+++ b/documentation/sphinx/source/perpetual-storage-wiggle.rst
@@ -12,7 +12,7 @@ This document covers the concept and usage of perpetual storage wiggle.
 
 Summary
 ============
-Perpetual storage wiggle is a feature that lets the data distributor is forced to constantly build new storage teams when the cluster is healthy. On a high-level note, the process is like this:
+Perpetual storage wiggle is a feature that forces the data distributor to constantly build new storage teams when the cluster is healthy. On a high-level note, the process is like this:
 
 Order storage servers by process id. For each storage server n:
 
@@ -22,7 +22,7 @@ b. Wait until all data has been moved off the storage server.
 
 c. Include storage n
 
-Goto a.
+Goto a to wiggle the next storage process with different process id.
 
 With a perpetual wiggle, storage migrations will be much less impactful. The wiggler will detect the healthy status based on healthy teams, available disk space and the number of unhealthy relocations. It will pause the wiggle until the cluster is healthy again.
 

From 047c1c1162c40c7a4a2400ca063b0d7ad07247ea Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Tue, 22 Jun 2021 10:31:14 -0700
Subject: [PATCH 292/740] Add a few ProxyStats fields.

1. Add the count of # of getRateInfo() and # of leaseTimeout;
2. Add SystemGRVQueueSize, DefaultGRVQueueSize and BatchGRVQueueSize.
---
 fdbserver/GrvProxyServer.actor.cpp | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp
index 04bc8dec960..b87b0e65a6e 100644
--- a/fdbserver/GrvProxyServer.actor.cpp
+++ b/fdbserver/GrvProxyServer.actor.cpp
@@ -36,6 +36,8 @@ struct GrvProxyStats {
 	Counter txnBatchPriorityStartIn, txnBatchPriorityStartOut;
 	Counter txnDefaultPriorityStartIn, txnDefaultPriorityStartOut;
 	Counter txnThrottled;
+	Counter updatesFromRatekeeper, leaseTimeouts;
+	int systemGRVQueueSize, defaultGRVQueueSize, batchGRVQueueSize;
 	double transactionRateAllowed, batchTransactionRateAllowed;
 	double transactionLimit, batchTransactionLimit;
 	// how much of the GRV requests queue was processed in one attempt to hand out read version.
@@ -89,12 +91,13 @@ struct GrvProxyStats {
 	    txnBatchPriorityStartOut("TxnBatchPriorityStartOut", cc),
 	    txnDefaultPriorityStartIn("TxnDefaultPriorityStartIn", cc),
 	    txnDefaultPriorityStartOut("TxnDefaultPriorityStartOut", cc), txnThrottled("TxnThrottled", cc),
-	    transactionRateAllowed(0), batchTransactionRateAllowed(0), transactionLimit(0), batchTransactionLimit(0),
-	    percentageOfDefaultGRVQueueProcessed(0), percentageOfBatchGRVQueueProcessed(0),
-	    defaultTxnGRVTimeInQueue("DefaultTxnGRVTimeInQueue",
-	                             id,
-	                             SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-	                             SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+	    updatesFromRatekeeper("UpdatesFromRatekeeper", cc), leaseTimeouts("LeaseTimeouts", cc), systemGRVQueueSize(0),
+	    defaultGRVQueueSize(0), batchGRVQueueSize(0), transactionRateAllowed(0), batchTransactionRateAllowed(0),
+	    transactionLimit(0), batchTransactionLimit(0), percentageOfDefaultGRVQueueProcessed(0),
+	    percentageOfBatchGRVQueueProcessed(0), defaultTxnGRVTimeInQueue("DefaultTxnGRVTimeInQueue",
+	                                                                    id,
+	                                                                    SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+	                                                                    SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 	    batchTxnGRVTimeInQueue("BatchTxnGRVTimeInQueue",
 	                           id,
 	                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
@@ -109,6 +112,9 @@ struct GrvProxyStats {
 	                          SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 	    grvLatencyBands("GRVLatencyBands", id, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
 		// The rate at which the limit(budget) is allowed to grow.
+		specialCounter(cc, "SystemGRVQueueSize", [this]() { return this->systemGRVQueueSize; });
+		specialCounter(cc, "DefaultGRVQueueSize", [this]() { return this->defaultGRVQueueSize; });
+		specialCounter(cc, "BatchGRVQueueSize", [this]() { return this->batchGRVQueueSize; });
 		specialCounter(
 		    cc, "SystemAndDefaultTxnRateAllowed", [this]() { return int64_t(this->transactionRateAllowed); });
 		specialCounter(
@@ -267,6 +273,7 @@ ACTOR Future<Void> healthMetricsRequestServer(GrvProxyInterface grvProxy,
 	}
 }
 
+// Get transaction rate info from RateKeeper.
 ACTOR Future<Void> getRate(UID myID,
                            Reference<AsyncVar<ServerDBInfo>> db,
                            int64_t* inTransactionCount,
@@ -320,6 +327,7 @@ ACTOR Future<Void> getRate(UID myID,
 			batchTransactionRateInfo->setRate(rep.batchTransactionRate);
 			stats->transactionRateAllowed = rep.transactionRate;
 			stats->batchTransactionRateAllowed = rep.batchTransactionRate;
+			++stats->updatesFromRatekeeper;
 			//TraceEvent("GrvProxyRate", myID).detail("Rate", rep.transactionRate).detail("BatchRate", rep.batchTransactionRate).detail("Lease", rep.leaseDuration).detail("ReleasedTransactions", *inTransactionCount - lastTC);
 			lastTC = *inTransactionCount;
 			leaseTimeout = delay(rep.leaseDuration);
@@ -339,6 +347,7 @@ ACTOR Future<Void> getRate(UID myID,
 		when(wait(leaseTimeout)) {
 			transactionRateInfo->disable();
 			batchTransactionRateInfo->disable();
+			++stats->leaseTimeouts;
 			TraceEvent(SevWarn, "GrvProxyRateLeaseExpired", myID).suppressFor(5.0);
 			//TraceEvent("GrvProxyRate", myID).detail("Rate", 0.0).detail("BatchRate", 0.0).detail("Lease", 0);
 			leaseTimeout = Never();
@@ -390,14 +399,17 @@ ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>>
 				} else if (req.priority == TransactionPriority::DEFAULT) {
 					if (!batchQueue->empty()) {
 						dropRequestFromQueue(batchQueue, stats);
+						--stats->batchGRVQueueSize;
 					} else {
 						canBeQueued = false;
 					}
 				} else {
 					if (!batchQueue->empty()) {
 						dropRequestFromQueue(batchQueue, stats);
+						--stats->batchGRVQueueSize;
 					} else if (!defaultQueue->empty()) {
 						dropRequestFromQueue(defaultQueue, stats);
+						--stats->defaultGRVQueueSize;
 					} else {
 						canBeQueued = false;
 					}
@@ -427,12 +439,14 @@ ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>>
 					++stats->txnRequestIn;
 					stats->txnStartIn += req.transactionCount;
 					stats->txnSystemPriorityStartIn += req.transactionCount;
+					++stats->systemGRVQueueSize;
 					systemQueue->push_back(req);
 					systemQueue->span.addParent(req.spanContext);
 				} else if (req.priority >= TransactionPriority::DEFAULT) {
 					++stats->txnRequestIn;
 					stats->txnStartIn += req.transactionCount;
 					stats->txnDefaultPriorityStartIn += req.transactionCount;
+					++stats->defaultGRVQueueSize;
 					defaultQueue->push_back(req);
 					defaultQueue->span.addParent(req.spanContext);
 				} else {
@@ -445,6 +459,7 @@ ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>>
 						++stats->txnRequestIn;
 						stats->txnStartIn += req.transactionCount;
 						stats->txnBatchPriorityStartIn += req.transactionCount;
+						++stats->batchGRVQueueSize;
 						batchQueue->push_back(req);
 						batchQueue->span.addParent(req.spanContext);
 					}
@@ -791,12 +806,15 @@ ACTOR static Future<Void> transactionStarter(GrvProxyInterface proxy,
 			double currentTime = g_network->timer();
 			if (req.priority >= TransactionPriority::IMMEDIATE) {
 				systemTransactionsStarted[req.flags & 1] += tc;
+				--grvProxyData->stats.systemGRVQueueSize;
 			} else if (req.priority >= TransactionPriority::DEFAULT) {
 				defaultPriTransactionsStarted[req.flags & 1] += tc;
 				grvProxyData->stats.defaultTxnGRVTimeInQueue.addMeasurement(currentTime - req.requestTime());
+				--grvProxyData->stats.defaultGRVQueueSize;
 			} else {
 				batchPriTransactionsStarted[req.flags & 1] += tc;
 				grvProxyData->stats.batchTxnGRVTimeInQueue.addMeasurement(currentTime - req.requestTime());
+				--grvProxyData->stats.batchGRVQueueSize;
 			}
 
 			start[req.flags & 1].push_back(std::move(req));

From cd5d07d21e83ac87f2431f8908f19368b5eb39d6 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 18 Jun 2021 09:26:28 -0500
Subject: [PATCH 293/740] Added TSS to 7.0 release notes

---
 documentation/sphinx/source/release-notes/release-notes-700.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-700.rst b/documentation/sphinx/source/release-notes/release-notes-700.rst
index 7fc256b221b..29f5598ed58 100644
--- a/documentation/sphinx/source/release-notes/release-notes-700.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-700.rst
@@ -11,6 +11,7 @@ Features
 --------
 * Added a new API in all bindings that can be used to get a list of split points that will split the given range into (roughly) equally sized chunks. `(PR #3394) <https://github.com/apple/foundationdb/pull/3394>`_
 * Added support for writing backup files directly to Azure blob storage. This is not yet performance tested on large-scale clusters. `(PR #3961) <https://github.com/apple/foundationdb/pull/3961>`_
+* Added the Testing Storage Server (TSS), which allows FoundationDB to run an "untrusted" storage engine with identical workload to the current storage engine, with zero impact on durability or correctness, and minimal impact on performance. `(Documentation) <https://github.com/apple/foundationdb/blob/master/documentation/sphinx/source/tss.rst>`_ `(PR #4556) <https://github.com/apple/foundationdb/pull/4556>`_
 
 Performance
 -----------

From 1c8b824662bd337f7ba43c9a172ce507e740a484 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 23 Jun 2021 05:49:55 +0000
Subject: [PATCH 294/740] add knob

---
 fdbserver/DataDistribution.actor.cpp | 11 +++++++----
 fdbserver/Knobs.cpp                  |  1 +
 fdbserver/Knobs.h                    |  1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 66330f6d059..2b4c8ec4cad 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -3936,14 +3936,17 @@ ACTOR Future<Void> updateNextWigglingStoragePID(DDTeamCollection* teamCollection
 ACTOR Future<Void> perpetualStorageWiggleIterator(AsyncVar<bool>* stopSignal,
                                                   FutureStream<Void> finishStorageWiggleSignal,
                                                   DDTeamCollection* teamCollection) {
+	state int lastFinishTime = now();
 	loop {
 		choose {
 			when(wait(stopSignal->onChange())) {}
 			when(waitNext(finishStorageWiggleSignal)) {
-				// there must not have other teams to place wiggled data
-				while (teamCollection->server_info.size() <= teamCollection->configuration.storageTeamSize ||
-				       teamCollection->machine_info.size() < teamCollection->configuration.storageTeamSize) {
-					wait(delayJittered(SERVER_KNOBS->CHECK_TEAM_DELAY));
+				state bool takeRest = true; // delay to avoid delete and update ServerList too frequently
+				while (takeRest) {
+					wait(delayJittered(SERVER_KNOBS->PERPETUAL_WIGGLE_DELAY));
+					// there must not have other teams to place wiggled data
+					takeRest = teamCollection->server_info.size() <= teamCollection->configuration.storageTeamSize ||
+						   teamCollection->machine_info.size() < teamCollection->configuration.storageTeamSize;
 				}
 				wait(updateNextWigglingStoragePID(teamCollection));
 			}
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
index d5217949734..bc13e7200e1 100644
--- a/fdbserver/Knobs.cpp
+++ b/fdbserver/Knobs.cpp
@@ -211,6 +211,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( ALL_DATA_REMOVED_DELAY,                                1.0 );
 	init( INITIAL_FAILURE_REACTION_DELAY,                       30.0 ); if( randomize && BUGGIFY ) INITIAL_FAILURE_REACTION_DELAY = 0.0;
 	init( CHECK_TEAM_DELAY,                                     30.0 );
+	init( PERPETUAL_WIGGLE_DELAY,                               50.0 );
 	init( LOG_ON_COMPLETION_DELAY,         DD_QUEUE_LOGGING_INTERVAL );
 	init( BEST_TEAM_MAX_TEAM_TRIES,                               10 );
 	init( BEST_TEAM_OPTION_COUNT,                                  4 );
diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h
index 8a95cda0923..8efefbd9a16 100644
--- a/fdbserver/Knobs.h
+++ b/fdbserver/Knobs.h
@@ -161,6 +161,7 @@ class ServerKnobs : public Knobs {
 	double ALL_DATA_REMOVED_DELAY;
 	double INITIAL_FAILURE_REACTION_DELAY;
 	double CHECK_TEAM_DELAY;
+	double PERPETUAL_WIGGLE_DELAY;
 	double LOG_ON_COMPLETION_DELAY;
 	int BEST_TEAM_MAX_TEAM_TRIES;
 	int BEST_TEAM_OPTION_COUNT;

From 6d1c7f67c95dc9d9d91ad27e6332a2ef7842d752 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Wed, 23 Jun 2021 09:10:50 -0700
Subject: [PATCH 295/740] Update
 documentation/sphinx/source/perpetual-storage-wiggle.rst

Co-authored-by: Josh Slocum <josh.slocum@snowflake.com>
---
 documentation/sphinx/source/perpetual-storage-wiggle.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/perpetual-storage-wiggle.rst b/documentation/sphinx/source/perpetual-storage-wiggle.rst
index 0b082037532..aa4741e1768 100644
--- a/documentation/sphinx/source/perpetual-storage-wiggle.rst
+++ b/documentation/sphinx/source/perpetual-storage-wiggle.rst
@@ -29,7 +29,7 @@ With a perpetual wiggle, storage migrations will be much less impactful. The wig
 Configuration
 =============
 
-You can configure TSS via the FDB :ref:`command line interface <command-line-interface>`.
+You can configure the Perpetual Storage Wiggle via the FDB :ref:`command line interface <command-line-interface>`.
 
 Example commands
 ----------------

From 0a12fc6ea9fccd7baeafb4bd11338393d5784645 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Thu, 24 Jun 2021 14:05:49 -0700
Subject: [PATCH 296/740] Merge pull request #5060 from
 sfc-gh-ljoswiak/docs/special-keys-global-config-tracing

Add documentation for global configuration and tracing special key space modules
---
 documentation/sphinx/source/api-reference.rst |   1 +
 .../sphinx/source/global-configuration.rst    | 130 ++++++++++++++++++
 documentation/sphinx/source/special-keys.rst  |  21 +++
 3 files changed, 152 insertions(+)
 create mode 100644 documentation/sphinx/source/global-configuration.rst

diff --git a/documentation/sphinx/source/api-reference.rst b/documentation/sphinx/source/api-reference.rst
index e74d9627b6e..eedb54954e0 100644
--- a/documentation/sphinx/source/api-reference.rst
+++ b/documentation/sphinx/source/api-reference.rst
@@ -17,3 +17,4 @@ The following documents give detailed descriptions of the API for each language:
    api-c
    api-error-codes
    special-keys
+   global-configuration
diff --git a/documentation/sphinx/source/global-configuration.rst b/documentation/sphinx/source/global-configuration.rst
new file mode 100644
index 00000000000..aad4c31d933
--- /dev/null
+++ b/documentation/sphinx/source/global-configuration.rst
@@ -0,0 +1,130 @@
+.. _global-configuration:
+.. default-domain:: cpp
+.. highlight:: cpp
+
+====================
+Global Configuration
+====================
+
+The global configuration framework is an eventually consistent configuration
+mechanism to efficiently make runtime changes to all clients and servers. It
+works by broadcasting updates made to the global configuration key space,
+relying on individual machines to store existing configuration in-memory.
+
+The global configuration framework provides a key-value interface to all
+processes and clients in a FoundationDB cluster.
+
+The global configuration framework is internal to FoundationDB and clients will
+usually have no need to interact with it. The API is provided here for
+reference.
+
+Reading data
+------------
+
+The global configuration framework is exposed through the
+``GlobalConfig::globalConfig()`` static function. There are separate ways to
+read a value, depending on if it is an object or a primitive.
+
+.. function:: template<class T> const T get(KeyRef name, T defaultVal)
+
+   Returns the value associated with ``name`` stored in global configuration,
+   or ``defaultVal`` if no key matching ``name`` exists. This templated
+   function is enabled only when the ``std::is_arithmetic<T>`` specialization
+   returns true.
+
+   .. code-block:: cpp
+   
+      auto& config = GlobalConfig::globalConfig();
+      double value = config.get<double>("path/to/key", 1.0);
+
+.. function:: const Reference<ConfigValue> get(KeyRef name)
+
+   Returns the value associated with ``name`` stored in global configuration.
+
+   .. code-block:: cpp
+   
+      auto& config = GlobalConfig::globalConfig();
+      auto configValue = config.get("path/to/key");
+   
+      // Check if value exists
+      ASSERT(configValue.value.has_value());
+      // Cast to correct type
+      auto str = std::any_cast<StringRef>(configValue.value);
+
+.. function:: const std::map<KeyRef, Reference<ConfigValue>> get(KeyRangeRef range)
+
+   Returns all values in the specified range.
+
+.. type:: ConfigValue
+
+   Holds a global configuration value and the arena where it lives. ::
+
+     struct ConfigValue : ReferenceCounted<ConfigValue> {
+        Arena arena;
+        std::any value;
+     }
+
+   ``arena``
+       The arena where the value (and the associated key) lives in memory.
+
+   ``value``
+       The stored value.
+
+Writing data
+------------
+
+Writing data to global configuration is done using transactions written to the
+special key space range ``\xff\xff/global_config/ - \xff\xff/global_config/0``.
+Values must always be encoded according to the :ref:`api-python-tuple-layer`.
+
+.. code-block:: cpp
+
+   // In GlobalConfig.actor.h
+   extern const KeyRef myGlobalConfigKey;
+   // In GlobalConfig.actor.cpp
+   const KeyRef myGlobalConfigKey = LiteralStringRef("config/key");
+   
+   // When you want to set the value..
+   Tuple value = Tuple().appendDouble(1.5);
+   
+   FDBTransaction* tr = ...;
+   tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
+   tr->set(GlobalConfig::prefixedKey(myGlobalConfigKey), value.pack());
+   // commit transaction
+
+The client is responsible for avoiding conflicts with other global
+configuration keys. For most uses, it is recommended to create a new key space.
+For example, an application that wants to write configuration data should use
+the ``global_config/config/`` namespace, instead of storing keys in the top
+level ``global_config/`` key space.
+
+^^^^^^^^^^^^^
+Clearing data
+^^^^^^^^^^^^^
+
+Data can be removed from global configuration using standard transaction
+semantics. Submit a clear or clear range to the appropriate global
+configuration keys in the special key space to clear data.
+
+Watching data
+-------------
+
+Global configuration provides functionality to watch for changes.
+
+.. function:: Future<Void> onInitialized()
+
+   Returns a ``Future`` which will be triggered when global configuration has
+   been successfully initialized and populated with data.
+
+.. function:: Future<Void> onChange()
+
+   Returns a ``Future`` which will be triggered when any key-value pair in
+   global configuration changes.
+
+.. function:: void trigger(KeyRef key, std::function<void(std::optional<std::any>)> fn)
+
+   Registers a callback to be called when the value for global configuration
+   key ``key`` is changed. The callback function takes a single argument, an
+   optional which will be populated with the updated value when ``key`` is
+   changed, or an empty optional if the value was cleared. If the value is an
+   allocated object, its memory remains in control of global configuration.
diff --git a/documentation/sphinx/source/special-keys.rst b/documentation/sphinx/source/special-keys.rst
index 385bd14c6c7..8a4bbcd9c3e 100644
--- a/documentation/sphinx/source/special-keys.rst
+++ b/documentation/sphinx/source/special-keys.rst
@@ -234,6 +234,27 @@ command                    string   The fdbcli command corresponding to this ope
 message                    string   Help text explaining the reason this operation failed
 ========================== ======== ===============
 
+Global configuration module
+---------------------------
+
+The global configuration module provides an interface to read and write values
+to :doc:`global-configuration`. In general, clients should not read and write
+the global configuration special key space keys directly, but should instead
+use the global configuration functions.
+
+#. ``\xff\xff/global_config/<key> := <value>`` Read/write. Reading keys in the range will return a tuple decoded string representation of the value for the given key. Writing a value will update all processes in the cluster with the new key-value pair. Values must be written using the :ref:`api-python-tuple-layer`.
+
+Tracing module
+--------------
+
+The tracing module provides read and write access to a transactions' tracing
+data. Every transaction contains a unique identifier which follows the
+transaction through the system. By providing access to set this identifier,
+clients can connect FoundationDB transactions to outside events.
+
+#. ``\xff\xff/tracing/transaction_id := <transaction_id>`` Read/write. A 64-bit integer transaction ID which follows the transaction as it moves through FoundationDB. All transactions are assigned a random transaction ID on creation, and this key can be read to surface the randomly generated ID. Alternatively, set this key to provide a custom identifier. When setting this key, provide a string in the form of a 64-bit integer, which will be automatically converted to the appropriate type.
+#. ``\xff\xff/tracing/token := <tracing_enabled>`` Read/write. Set to true/false to enable or disable tracing for the transaction, respectively. If read, returns a 64-bit integer set to 0 if tracing has been disabled, or a random 64-bit integer otherwise (this integers value has no meaning to the client other than to determine whether the transaction will be traced).
+
 .. [#conflicting_keys] In practice, the transaction probably committed successfully. However, if you're running multiple resolvers then it's possible for a transaction to cause another to abort even if it doesn't commit successfully.
 .. [#max_read_transaction_life_versions] The number 5000000 comes from the server knob MAX_READ_TRANSACTION_LIFE_VERSIONS
 .. [#special_key_space_enable_writes] Enabling this option enables other transaction options, such as ``ACCESS_SYSTEM_KEYS``. This may change in the future.

From 9dabbd5fa80b848da12c1ab1d74cd0e42130031a Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 25 Jun 2021 16:02:45 -0700
Subject: [PATCH 297/740] cherry pick ref count of parallel stream into 7.0

---
 fdbclient/ParallelStream.actor.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/fdbclient/ParallelStream.actor.h b/fdbclient/ParallelStream.actor.h
index e25c7ee52d7..efe677ade3f 100644
--- a/fdbclient/ParallelStream.actor.h
+++ b/fdbclient/ParallelStream.actor.h
@@ -35,7 +35,7 @@
 // in order.
 template <class T>
 class ParallelStream {
-	BoundedFlowLock semaphore;
+	Reference<BoundedFlowLock> semaphore;
 	struct FragmentConstructorTag {
 		explicit FragmentConstructorTag() = default;
 	};
@@ -43,14 +43,14 @@ class ParallelStream {
 public:
 	// A Fragment is a single stream that will get results to be merged back into the main output stream
 	class Fragment : public ReferenceCounted<Fragment> {
-		ParallelStream* parallelStream;
+		Reference<BoundedFlowLock> semaphore;
 		PromiseStream<T> stream;
 		BoundedFlowLock::Releaser releaser;
 		friend class ParallelStream;
 
 	public:
-		Fragment(ParallelStream* parallelStream, int64_t permitNumber, FragmentConstructorTag)
-		  : parallelStream(parallelStream), releaser(&parallelStream->semaphore, permitNumber) {}
+		Fragment(Reference<BoundedFlowLock> semaphore, int64_t permitNumber, FragmentConstructorTag)
+		  : semaphore(semaphore), releaser(semaphore.getPtr(), permitNumber) {}
 		template <class U>
 		void send(U&& value) {
 			stream.send(std::forward<U>(value));
@@ -105,14 +105,15 @@ class ParallelStream {
 		}
 	}
 
-	ParallelStream(PromiseStream<T> results, size_t bufferLimit) : results(results), semaphore(1, bufferLimit) {
+	ParallelStream(PromiseStream<T> results, size_t bufferLimit) : results(results) {
+		semaphore = makeReference<BoundedFlowLock>(1, bufferLimit);
 		flusher = flushToClient(this);
 	}
 
 	// Creates a fragment to get merged into the main output stream
 	ACTOR static Future<Fragment*> createFragmentImpl(ParallelStream<T>* self) {
-		int64_t permitNumber = wait(self->semaphore.take());
-		auto fragment = makeReference<Fragment>(self, permitNumber, FragmentConstructorTag());
+		int64_t permitNumber = wait(self->semaphore->take());
+		auto fragment = makeReference<Fragment>(self->semaphore, permitNumber, FragmentConstructorTag());
 		self->fragments.send(fragment);
 		return fragment.getPtr();
 	}

From e81595e9aefcb76b74d14ee8133abef7b50f905d Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 25 Jun 2021 16:47:05 -0700
Subject: [PATCH 298/740] fix a trace event which used fetchVersion before it
 was defined

---
 fdbserver/storageserver.actor.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index a67998eb689..b971ec68d2f 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -2833,10 +2833,6 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 
 		wait(delay(0));
 
-		TraceEvent(SevDebug, "FetchKeysUnblocked", data->thisServerID)
-		    .detail("FKID", interval.pairID)
-		    .detail("Version", fetchVersion);
-
 		// Get the history
 		state int debug_getRangeRetries = 0;
 		state int debug_nextRetryToLog = 1;
@@ -2849,6 +2845,11 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 		loop {
 			state Transaction tr(data->cx);
 			state Version fetchVersion = data->version.get();
+
+			TraceEvent(SevDebug, "FetchKeysUnblocked", data->thisServerID)
+			    .detail("FKID", interval.pairID)
+			    .detail("Version", fetchVersion);
+
 			while (!shard->updates.empty() && shard->updates[0].version <= fetchVersion)
 				shard->updates.pop_front();
 			tr.setVersion(fetchVersion);

From f22391478edb13cd27b1736b8f61ebc3d43e8c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=93=E6=A5=9A?= <xiaochu.yh@alipay.com>
Date: Mon, 28 Jun 2021 11:14:55 +0800
Subject: [PATCH 299/740] fix typo

---
 design/backup.md                        |  4 ++--
 design/backup_v2_partitioned_logs.md    |  2 +-
 design/recovery-internals.md            |  4 ++--
 design/tlog-spilling.md.html            | 10 +++++-----
 fdbserver/sqlite/sqlite3.amalgamation.c | 12 ++++++------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/design/backup.md b/design/backup.md
index 5d0c56b2865..3c846b00ca5 100644
--- a/design/backup.md
+++ b/design/backup.md
@@ -15,7 +15,7 @@
  There is no way to take snapshot. There is no way to record KV Ranges for the complete key space at a given version. For
  a keyspace a-z, its not possible to record KV range (a-z, v0), if keyspace a-z is not small enough. Instead, we can record
  KV ranges {(a-b, v0), (c-d, v1), (e-f, v2) ... (y-z, v10)}. With mutation log recorded all along, we can still use
- the simple backup-restore scheme described above on sub keyspaces seperately. Assuming we did record mutation log from
+ the simple backup-restore scheme described above on sub keyspaces separately. Assuming we did record mutation log from
  v0 to vn, that allows us to restore
 
 * Keyspace a-b to any version between v0 and vn
@@ -23,7 +23,7 @@
 * Keyspace y-z to any version between v10 and vn
 
 But, we are not interested in restoring sub keyspaces, we want to restore a-z. Well, we can restore a-z, to any
-version between v10 and vn by restoring individual sub spaces seperately.
+version between v10 and vn by restoring individual sub spaces separately.
 
 #### Key Value Ranges
 
diff --git a/design/backup_v2_partitioned_logs.md b/design/backup_v2_partitioned_logs.md
index 37686438917..c584dfc4378 100644
--- a/design/backup_v2_partitioned_logs.md
+++ b/design/backup_v2_partitioned_logs.md
@@ -249,7 +249,7 @@ This protocol was implemented after another abandoned protocol: the `startedBack
 **Pause and Resume Backups**
 The command line for pause or resume backups remains the same, but the implementation for the new backup system is different from the old one. This is because in the old backup system, both mutation logs and range logs are handled by `TaskBucket`, an asynchronous task scheduling framework that stores states in the FDB database. Thus, the old backup system simply pauses or resumes the `TaskBucket`. In the new backup system, mutation logs are generated by backup workers, thus the pause or resume command needs to tell all backup workers to pause or resume pulling mutations from TLogs. Specifically,
 
-1. The operator issues a pause or resume request that upates both the `TaskBucket` and `\xff\x02/backupPaused` key.
+1. The operator issues a pause or resume request that updates both the `TaskBucket` and `\xff\x02/backupPaused` key.
 2. Each backup worker monitors the `\xff\x02/backupPaused` key and notices the change. Then the backup worker pauses or resumes pulling from TLogs.
 
 **Backup Container Changes**
diff --git a/design/recovery-internals.md b/design/recovery-internals.md
index cf9cc0b4137..69eb8b92eeb 100644
--- a/design/recovery-internals.md
+++ b/design/recovery-internals.md
@@ -39,7 +39,7 @@ Once coordinators think there is no CC in a cluster, they will start leader elec
 
 Although only one CC can succeed in recovery, which is guaranteed by Paxos algorithm, there exist scenarios when multiple CCs can exist in a  transient time period.
 
-Scenario 1: A majority of coordinators reboot at the same time and the current running CC is still alive. When those coordinators reboot, they may likely choose a different process as CC. The new CC will start to recruit a new master and kicks off the recovery. The old CC will know the existance of the new CC when it sends heart-beat to coordinators periodically (in sub-seconds). The old CC will kill itself, once it was told by a majority of coordinators about the existance of the new CC. Old roles (say master) will commit suicide as well after the old CC dies. This prevents the cluster to have two sets of transaction systems. In summary, the cluster may have both the old CC and new CC alive in sub-seconds before the old CC confirms the existance of the new CC.
+Scenario 1: A majority of coordinators reboot at the same time and the current running CC is still alive. When those coordinators reboot, they may likely choose a different process as CC. The new CC will start to recruit a new master and kicks off the recovery. The old CC will know the existence of the new CC when it sends heart-beat to coordinators periodically (in sub-seconds). The old CC will kill itself, once it was told by a majority of coordinators about the existence of the new CC. Old roles (say master) will commit suicide as well after the old CC dies. This prevents the cluster to have two sets of transaction systems. In summary, the cluster may have both the old CC and new CC alive in sub-seconds before the old CC confirms the existence of the new CC.
 
 Scenario 2: Network partition makes the current running CC unable to connect to a majority of coordinators. Before the CC detects it, the coordinators can elect a new CC and recovery will happen. Typically, the old CC can quickly realize it cannot connect to a majority of coordinators and kill itself. In the rare situation when the old CC does not die within a short time period *and* the network partition is resolved before the old CC dies, the new CC can recruit a new master, which leads to two masters in the cluster. Only one master can succeed the recovery because only one master can lock the cstate (see Phase 2: LOCKING_CSTATE).
 
@@ -151,7 +151,7 @@ Not every FDB role participates in the recovery phases 1-3. This phase tells the
 Storage servers (SSes) are not involved in the recovery phase 1 - 3. To notify SSes about the recovery, the master commits a recovery transaction, the first transaction in the new generation, which contains the txnStateStore information. Once storage servers receive the recovery transaction, it will compare its latest data version and the recovery version, and rollback to the recovery version if its data version is newer. Note that storage servers may have newer data than the recovery version because they pre-fetch mutations from tLogs before the mutations are durable to reduce the latency to read newly written data.
 
 
-Commit proxies haven’t recovered the transaction system state and cannot accept transactions yet. The master recovers proxies’ states by sending the txnStateStore to commit proxies through commit proxies’ (`txnState`) interfaces in `sendIntialCommitToResolvers()` function. Once commit proxies have recovered their states, they can start processing transactions. The recovery transaction that was waiting on commit proxies will be processed.
+Commit proxies haven’t recovered the transaction system state and cannot accept transactions yet. The master recovers proxies’ states by sending the txnStateStore to commit proxies through commit proxies’ (`txnState`) interfaces in `sendInitialCommitToResolvers()` function. Once commit proxies have recovered their states, they can start processing transactions. The recovery transaction that was waiting on commit proxies will be processed.
 
 
 The resolvers haven’t known the recovery version either. The master needs to send the lastEpochEnd version (i.e., last commit of the previous generation) to resolvers via resolvers’ (`resolve`) interface.
diff --git a/design/tlog-spilling.md.html b/design/tlog-spilling.md.html
index 4fce3e8e90a..58bbde503e5 100644
--- a/design/tlog-spilling.md.html
+++ b/design/tlog-spilling.md.html
@@ -37,7 +37,7 @@
 maintains a copy of the commit in-memory, and maintains one queue per tag that
 indexes the location of each mutation in each commit with the specific tag,
 sequentially.  This way, responding to a peek from a storage server only
-requires sequentailly walking through the queue, and copying each mutation
+requires sequentially walking through the queue, and copying each mutation
 referenced into the response buffer.
 
 Transaction logs internally handle commits via performing two operations
@@ -366,9 +366,9 @@
 same as `end-start`, intentionally.  For this reason, the API is `(start, end)`
 and not `(start, length)`.
 
-Spilled data, when using spill-by-value, was resistent to bitrot via data being
+Spilled data, when using spill-by-value, was resistant to bitrot via data being
 checksummed interally within SQLite's B-tree.  Now that reads can be done
-directly, the responsibility for verifing data integrity falls upon the
+directly, the responsibility for verifying data integrity falls upon the
 DiskQueue.  `CheckHashes::YES` will cause the DiskQueue to use the checksum in
 each DiskQueue page to verify data integrity.  If an externally maintained
 checksums exists to verify the returned data, then `CheckHashes::NO` can be
@@ -467,7 +467,7 @@
 
 In spill-by-value, the DiskQueue only ever contained commits that were also
 held in memory, and thus recovery would need to read up to 1.5GB of data.  With
-spill-by-reference, the DiskQueue could theoretically contain terrabytes of
+spill-by-reference, the DiskQueue could theoretically contain terabytes of
 data. To keep recovery times boundedly low, FDB must still only read the
 commits that need to be loaded back into memory.
 
@@ -560,7 +560,7 @@
 
 1.  Larger disk queue file means more file to zero out in the case of recovery.
 
-    This should be negligable when fallocate `ZERO_RANGE` is available, because then it's only a metadata operation.
+    This should be negligible when fallocate `ZERO_RANGE` is available, because then it's only a metadata operation.
 
 2.  A larger file means more bisection iterations to find the first page.
 
diff --git a/fdbserver/sqlite/sqlite3.amalgamation.c b/fdbserver/sqlite/sqlite3.amalgamation.c
index acde7aa6257..2b0058be91d 100644
--- a/fdbserver/sqlite/sqlite3.amalgamation.c
+++ b/fdbserver/sqlite/sqlite3.amalgamation.c
@@ -16448,7 +16448,7 @@ static int os2Delete(
 }
 
 /*
-** Check the existance and status of a file.
+** Check the existence and status of a file.
 */
 static int os2Access(
   sqlite3_vfs *pVfs,        /* Not used on os2 */
@@ -18731,7 +18731,7 @@ static int nolockClose(sqlite3_file *id) {
 /******************************************************************************
 ************************* Begin dot-file Locking ******************************
 **
-** The dotfile locking implementation uses the existance of separate lock
+** The dotfile locking implementation uses the existence of separate lock
 ** files in order to control access to the database.  This works on just
 ** about every filesystem imaginable.  But there are serious downsides:
 **
@@ -18746,7 +18746,7 @@ static int nolockClose(sqlite3_file *id) {
 **
 ** Dotfile locking works by creating a file in the same directory as the
 ** database and with the same name but with a ".lock" extension added.
-** The existance of a lock file implies an EXCLUSIVE lock.  All other lock
+** The existence of a lock file implies an EXCLUSIVE lock.  All other lock
 ** types (SHARED, RESERVED, PENDING) are mapped into EXCLUSIVE.
 */
 
@@ -22040,7 +22040,7 @@ static int unixDelete(
 }
 
 /*
-** Test the existance of or access permissions of file zPath. The
+** Test the existence of or access permissions of file zPath. The
 ** test performed depends on the value of flags:
 **
 **     SQLITE_ACCESS_EXISTS: Return 1 if the file exists
@@ -26132,7 +26132,7 @@ static int winDelete(
 }
 
 /*
-** Check the existance and status of a file.
+** Check the existence and status of a file.
 */
 static int winAccess(
   sqlite3_vfs *pVfs,         /* Not used on win32 */
@@ -26681,7 +26681,7 @@ SQLITE_API int sqlite3_os_end(void){
 /*
 ** A bitmap is an instance of the following structure.
 **
-** This bitmap records the existance of zero or more bits
+** This bitmap records the existence of zero or more bits
 ** with values between 1 and iSize, inclusive.
 **
 ** There are three possible representations of the bitmap.

From 7a3054986f1cdd7dcc932b7e9e944ff7109ba366 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 24 Jun 2021 21:20:21 -0700
Subject: [PATCH 300/740] Add metric to track the ratio of empty messages to
 tlogs

This metric is to understand the impact of batching on empty commit messages.
If the ratio is high, it means proxy sends many empty commit messages, which
can potentially be optimized for better performance. If the ratio is low, which
means the spread factor is large, thus we need to optimize the proxy to reduce
such a factor.
---
 fdbserver/CommitProxyServer.actor.cpp |  3 +++
 fdbserver/LogSystem.h                 | 20 +++++++++++++++++++-
 fdbserver/ProxyCommitData.actor.h     |  7 +++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 65654f35db7..f4ea6599b20 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1185,6 +1185,9 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 	                                                          span.context,
 	                                                          self->debugID);
 
+	float ratio = self->toCommit.getEmptyLocationRatio();
+	pProxyCommitData->stats.commitBatchingEmptyMessageRatio.addMeasurement(ratio);
+
 	if (!self->forceRecovery) {
 		ASSERT(pProxyCommitData->latestLocalCommitBatchLogging.get() == self->localBatchNumber - 1);
 		pProxyCommitData->latestLocalCommitBatchLogging.set(self->localBatchNumber);
diff --git a/fdbserver/LogSystem.h b/fdbserver/LogSystem.h
index da2fbcf5f22..39d4a16871f 100644
--- a/fdbserver/LogSystem.h
+++ b/fdbserver/LogSystem.h
@@ -970,6 +970,7 @@ struct LogPushData : NonCopyable {
 				}
 			}
 		}
+		written = std::vector<bool>(messagesWriter.size(), false);
 	}
 
 	void addTxsTag() {
@@ -1087,13 +1088,30 @@ struct LogPushData : NonCopyable {
 		next_message_tags.clear();
 	}
 
-	Standalone<StringRef> getMessages(int loc) { return messagesWriter[loc].toValue(); }
+	Standalone<StringRef> getMessages(int loc) {
+		// Update written here because this is called less frequently.
+		Standalone<StringRef> value = messagesWriter[loc].toValue();
+		if (!written[loc]) {
+			BinaryWriter w(AssumeVersion(g_network->protocolVersion()));
+			Standalone<StringRef> v = w.toValue();
+			if (value.size() > v.size()) {
+				written[loc] = true;
+			}
+		}
+		return value;
+	}
+
+	float getEmptyLocationRatio() const {
+		auto count = std::count(written.begin(), written.end(), false);
+		return 1.0 * count / written.size();
+	}
 
 private:
 	Reference<ILogSystem> logSystem;
 	std::vector<Tag> next_message_tags;
 	std::vector<Tag> prev_tags;
 	std::vector<BinaryWriter> messagesWriter;
+	std::vector<bool> written; // if messagesWriter has written anything
 	std::vector<int> msg_locations;
 	// Stores message locations that have had span information written to them
 	// for the current transaction. Adding transaction info will reset this
diff --git a/fdbserver/ProxyCommitData.actor.h b/fdbserver/ProxyCommitData.actor.h
index 9ef0f837787..99d210bc6ec 100644
--- a/fdbserver/ProxyCommitData.actor.h
+++ b/fdbserver/ProxyCommitData.actor.h
@@ -64,6 +64,9 @@ struct ProxyStats {
 	LatencySample commitLatencySample;
 	LatencyBands commitLatencyBands;
 
+	// Ratio of tlogs receiving empty commit messages.
+	LatencySample commitBatchingEmptyMessageRatio;
+
 	LatencySample commitBatchingWindowSize;
 
 	Future<Void> logger;
@@ -102,6 +105,10 @@ struct ProxyStats {
 	                        SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 	                        SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 	    commitLatencyBands("CommitLatencyMetrics", id, SERVER_KNOBS->STORAGE_LOGGING_DELAY),
+	    commitBatchingEmptyMessageRatio("CommitBatchingEmptyMessageRatio",
+	                                    id,
+	                                    SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+	                                    SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 	    commitBatchingWindowSize("CommitBatchingWindowSize",
 	                             id,
 	                             SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,

From 03325e3ebfcdcdd26c40604c22de7d5545b5c7a4 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 28 Jun 2021 11:08:20 -0700
Subject: [PATCH 301/740] Address Dan's comments

---
 fdbserver/CommitProxyServer.actor.cpp       |  2 +-
 fdbserver/LogSystem.h                       | 24 ++++++++++++---------
 fdbserver/TagPartitionedLogSystem.actor.cpp |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index f4ea6599b20..945509b4a29 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1185,7 +1185,7 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 	                                                          span.context,
 	                                                          self->debugID);
 
-	float ratio = self->toCommit.getEmptyLocationRatio();
+	float ratio = self->toCommit.getEmptyMessageRatio();
 	pProxyCommitData->stats.commitBatchingEmptyMessageRatio.addMeasurement(ratio);
 
 	if (!self->forceRecovery) {
diff --git a/fdbserver/LogSystem.h b/fdbserver/LogSystem.h
index 39d4a16871f..60ce9ab7338 100644
--- a/fdbserver/LogSystem.h
+++ b/fdbserver/LogSystem.h
@@ -29,6 +29,8 @@
 #include "fdbserver/WorkerInterface.actor.h"
 #include "fdbclient/DatabaseConfiguration.h"
 #include "fdbserver/MutationTracking.h"
+#include "flow/Arena.h"
+#include "flow/Error.h"
 #include "flow/IndexedSet.h"
 #include "flow/Knobs.h"
 #include "fdbrpc/ReplicationPolicy.h"
@@ -970,7 +972,7 @@ struct LogPushData : NonCopyable {
 				}
 			}
 		}
-		written = std::vector<bool>(messagesWriter.size(), false);
+		isEmptyMessage = std::vector<bool>(messagesWriter.size(), false);
 	}
 
 	void addTxsTag() {
@@ -1089,21 +1091,23 @@ struct LogPushData : NonCopyable {
 	}
 
 	Standalone<StringRef> getMessages(int loc) {
-		// Update written here because this is called less frequently.
-		Standalone<StringRef> value = messagesWriter[loc].toValue();
-		if (!written[loc]) {
+		return messagesWriter[loc].toValue();
+	}
+
+	void recordEmptyMessage(int loc, const Standalone<StringRef>& value) {
+		if (!isEmptyMessage[loc]) {
 			BinaryWriter w(AssumeVersion(g_network->protocolVersion()));
 			Standalone<StringRef> v = w.toValue();
 			if (value.size() > v.size()) {
-				written[loc] = true;
+				isEmptyMessage[loc] = true;
 			}
 		}
-		return value;
 	}
 
-	float getEmptyLocationRatio() const {
-		auto count = std::count(written.begin(), written.end(), false);
-		return 1.0 * count / written.size();
+	float getEmptyMessageRatio() const {
+		auto count = std::count(isEmptyMessage.begin(), isEmptyMessage.end(), false);
+		ASSERT_WE_THINK(isEmptyMessage.size() > 0);
+		return 1.0 * count / isEmptyMessage.size();
 	}
 
 private:
@@ -1111,7 +1115,7 @@ struct LogPushData : NonCopyable {
 	std::vector<Tag> next_message_tags;
 	std::vector<Tag> prev_tags;
 	std::vector<BinaryWriter> messagesWriter;
-	std::vector<bool> written; // if messagesWriter has written anything
+	std::vector<bool> isEmptyMessage; // if messagesWriter has written anything
 	std::vector<int> msg_locations;
 	// Stores message locations that have had span information written to them
 	// for the current transaction. Adding transaction info will reset this
diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp
index dc63aabc9f8..1582e725339 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.cpp
+++ b/fdbserver/TagPartitionedLogSystem.actor.cpp
@@ -565,6 +565,7 @@ struct TagPartitionedLogSystem : ILogSystem, ReferenceCounted<TagPartitionedLogS
 				vector<Future<Void>> tLogCommitResults;
 				for (int loc = 0; loc < it->logServers.size(); loc++) {
 					Standalone<StringRef> msg = data.getMessages(location);
+					data.recordEmptyMessage(location, msg);
 					allReplies.push_back(recordPushMetrics(
 					    it->connectionResetTrackers[loc],
 					    it->logServers[loc]->get().interf().address(),

From 1a7a517349a9692c27b3dd3d2ebb674b323e93c7 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 28 Jun 2021 11:27:34 -0700
Subject: [PATCH 302/740] Merge pull request #5027 from
 sfc-gh-ngoyal/feature-release-notes-7.0-master

Consolidated 7.0 Release Notes.

From c7177514f0a06d9656f801a02d3b023a2c30e47f Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 28 Jun 2021 11:27:34 -0700
Subject: [PATCH 303/740] Merge pull request #5027 from
 sfc-gh-ngoyal/feature-release-notes-7.0-master

Consolidated 7.0 Release Notes.
---
 documentation/sphinx/source/index.rst         |  6 +++
 documentation/sphinx/source/redwood.rst       |  7 ++++
 .../release-notes/release-notes-700.rst       | 39 +++++++++++++++++--
 .../sphinx/source/request-tracing.rst         |  7 ++++
 documentation/sphinx/source/visibility.rst    | 16 ++++++++
 5 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 documentation/sphinx/source/redwood.rst
 create mode 100644 documentation/sphinx/source/request-tracing.rst
 create mode 100644 documentation/sphinx/source/visibility.rst

diff --git a/documentation/sphinx/source/index.rst b/documentation/sphinx/source/index.rst
index 737731d36e7..b7377bcc8b4 100644
--- a/documentation/sphinx/source/index.rst
+++ b/documentation/sphinx/source/index.rst
@@ -38,6 +38,10 @@ The latest changes are detailed in :ref:`release-notes`. The documentation has t
 
 * :doc:`administration` contains documentation on administering FoundationDB.
 
+* :doc:`redwood` contains documentation on Redwood Storage Engine.
+
+* :doc:`visibility` contains documentation related to Visibility into FoundationDB.
+
 .. toctree::
    :maxdepth: 1
    :titlesonly:
@@ -51,4 +55,6 @@ The latest changes are detailed in :ref:`release-notes`. The documentation has t
    api-reference
    tutorials
    administration
+   redwood
+   visibility
    earlier-release-notes
diff --git a/documentation/sphinx/source/redwood.rst b/documentation/sphinx/source/redwood.rst
new file mode 100644
index 00000000000..bc2f5ef9eaf
--- /dev/null
+++ b/documentation/sphinx/source/redwood.rst
@@ -0,0 +1,7 @@
+.. _redwood-storage-engine:
+
+######################
+Redwood Storage Engine
+######################
+
+.. include:: guide-common.rst.inc
diff --git a/documentation/sphinx/source/release-notes/release-notes-700.rst b/documentation/sphinx/source/release-notes/release-notes-700.rst
index 660bba2284f..8d94a5919b5 100644
--- a/documentation/sphinx/source/release-notes/release-notes-700.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-700.rst
@@ -9,9 +9,25 @@ Release Notes
 
 Features
 --------
+* First release of the Redwood Storage Engine, a BTree storage engine with higher throughput and lower write amplification than SQLite. See :ref:`Redwood Storage Engine Documentation <redwood-storage-engine>` for details.
+* Replaced committed version broadcast through proxy with centralizing live committed versions into master. `(PR #3307) <https://github.com/apple/foundationdb/pull/3307>`_
 * Added a new API in all bindings that can be used to get a list of split points that will split the given range into (roughly) equally sized chunks. `(PR #3394) <https://github.com/apple/foundationdb/pull/3394>`_
+* Introduced a new role called GRV proxy specialized for serving GRV requests to decrease GRV tail latency since we prioritize commit paths over GRV in the current proxy. The original proxy is renamed to Commit proxy. `(PR #3549) <https://github.com/apple/foundationdb/pull/3549>`_ `(PR #3772) <https://github.com/apple/foundationdb/pull/3772>`_
 * Added support for writing backup files directly to Azure blob storage. This is not yet performance tested on large-scale clusters. `(PR #3961) <https://github.com/apple/foundationdb/pull/3961>`_
+* Tag-based throttling now also takes the write path into account. `(PR #3512) <https://github.com/apple/foundationdb/pull/3512>`_
+* Added the ability to ratekeeper to throttle certain types of tags based on write hot spots in addition to read hot spots. `(PR #3571) <https://github.com/apple/foundationdb/pull/3571>`_
+* Users now have the option to make ratekeeper recommend which transaction tags should be throttled, but not actually throttle them using fdbcli. `(PR #3669) <https://github.com/apple/foundationdb/pull/3669>`_
+* Added a new ``--build_flags option`` to binaries to print build information. `(PR #3769) <https://github.com/apple/foundationdb/pull/3769>`_
+* Added ``--incremental`` option to backup and restore that allows specification of only recording mutation log files and not range files. Incremental restore also allows restoring to a non-empty destination database. `(PR #3676) <https://github.com/apple/foundationdb/pull/3676>`_
+* Added a tracing framework to track request latency through each FDB component. See :ref:`Documentation <request-tracing>` for details. `(PR #3329) <https://github.com/apple/foundationdb/pull/3329>`_
+* Added the :ref:`(Global Configuration Framework) <global-configuration>`, an eventually consistent configuration mechanism to efficiently make runtime changes to all clients and servers. `(PR #4330) <https://github.com/apple/foundationdb/pull/4330>`_
+* Added the ability to monitor and manage an fdb cluster via read/write specific special keys through transactions. See :ref:`Documentation <special-keys>` for details. `(PR #3455) <https://github.com/apple/foundationdb/pull/3455>`_
+* Added TLS support to fdbdecode for decoding mutation log files stored in blobs. `(PR #4611) <https://github.com/apple/foundationdb/pull/4611>`_
+* Added ``initial_snapshot_interval`` to fdbbackup that can specify the duration of the first inconsistent snapshot written to the backup. `(PR #4620) <https://github.com/apple/foundationdb/pull/4620>`_
+* Added ``inconsistent_snapshot_only`` to fdbbackup that ignores mutation log files and only uses range files during the restore to speedup the process. `(PR #4704) <https://github.com/apple/foundationdb/pull/4704>`_
 * Added the Testing Storage Server (TSS), which allows FoundationDB to run an "untrusted" storage engine with identical workload to the current storage engine, with zero impact on durability or correctness, and minimal impact on performance. `(Documentation) <https://github.com/apple/foundationdb/blob/master/documentation/sphinx/source/tss.rst>`_ `(PR #4556) <https://github.com/apple/foundationdb/pull/4556>`_
+* Added perpetual storage wiggle that supports less impactful B-trees recreation and data migration. These will also be used for deploying the Testing Storage Server which compares 2 storage engines' results. See :ref:`Documentation <perpetual-storage-wiggle>` for details. `(PR #4838) <https://github.com/apple/foundationdb/pull/4838>`_
+* Improved the efficiency with which storage servers replicate data between themselves. `(PR #5017) <https://github.com/apple/foundationdb/pull/5017>`_
 
 Performance
 -----------
@@ -19,29 +35,43 @@ Performance
 * Increased performance of dr_agent when copying the mutation log. The ``COPY_LOG_BLOCK_SIZE``, ``COPY_LOG_BLOCKS_PER_TASK``, ``COPY_LOG_PREFETCH_BLOCKS``, ``COPY_LOG_READ_AHEAD_BYTES`` and ``COPY_LOG_TASK_DURATION_NANOS`` knobs can be set. `(PR #3436) <https://github.com/apple/foundationdb/pull/3436>`_
 * Added multiple new microbenchmarks for PromiseStream, Reference, IRandom, and timer, as well as support for benchmarking actors. `(PR #3590) <https://github.com/apple/foundationdb/pull/3590>`_
 * Use xxhash3 for SQLite page checksums. `(PR #4075) <https://github.com/apple/foundationdb/pull/4075>`_
-* Reduced the number of connections required by the multi-version client when loading external clients. When connecting to 7.0 clusters, only one connection with version 6.2 or larger will be used. With older clusters, at most two connections with version 6.2 or larger will be used. Clients older than version 6.2 will continue to create an additional connection each. `(PR #4667) <https://github.com/apple/foundationdb/pull/4667>`_
+* fdbserver now uses jemalloc on Linux instead of the system malloc. `(PR #4222) <https://github.com/apple/foundationdb/pull/4222>`_
+* Watches have been optimized and are now significantly cheaper. `(PR #4266) <https://github.com/apple/foundationdb/pull/4266>`_ `(PR #4382 ) <https://github.com/apple/foundationdb/pull/4382>`_
+* The Coro library has been replaced with boost::coroutine2. `(PR #4242) <https://github.com/apple/foundationdb/pull/4242>`_
 * Reduce CPU overhead of load balancing on client processes. `(PR #4561) <https://github.com/apple/foundationdb/pull/4561>`_
+* Used the restored key range to filter out files for faster restore. `(PR #4568) <https://github.com/apple/foundationdb/pull/4568>`_
+* Transaction log files will be truncated by default if they are under 2GB in size. `(PR #4656) <https://github.com/apple/foundationdb/pull/4656>`_
+* Reduced the number of connections required by the multi-version client when loading external clients. When connecting to 7.0 clusters, only one connection with version 6.2 or larger will be used. With older clusters, at most two connections with version 6.2 or larger will be used. Clients older than version 6.2 will continue to create an additional connection each. `(PR #4667) <https://github.com/apple/foundationdb/pull/4667>`_
 
 Reliability
 -----------
-* Improved worker recruitment logic to avoid unnecessary recoveries when processes are added or removed from a cluster. `(PR #4695) <https://github.com/apple/foundationdb/pull/4695>`_ `(PR #4631) <https://github.com/apple/foundationdb/pull/4631>`_ `(PR #4509) <https://github.com/apple/foundationdb/pull/4509>`_
+* Backup agents now pause themselves upon a successful snapshot recovery to avoid unintentional data corruption. Operators should manually abort backup agents and clear the backup agent keyspace to avoid using the old cluster's backup configuration. `(PR #4027) <https://github.com/apple/foundationdb/pull/4027>`_
 * Log class processes are prioritized above transaction class proceses for becoming tlogs. `(PR #4509) <https://github.com/apple/foundationdb/pull/4509>`_ 
+* Improved worker recruitment logic to avoid unnecessary recoveries when processes are added or removed from a cluster. `(PR #4695) <https://github.com/apple/foundationdb/pull/4695>`_ `(PR #4631) <https://github.com/apple/foundationdb/pull/4631>`_ `(PR #4509) <https://github.com/apple/foundationdb/pull/4509>`_
 
 Fixes
 -----
-* Fixed a rare crash on the cluster controller when using multi-region configurations. `(PR #4547) <https://github.com/apple/foundationdb/pull/4547>`_ 
+* List files asynchronously so many backup files on a slow disk won't cause the backup agent to lose its lease. `(PR #3094) <https://github.com/apple/foundationdb/pull/3094>`_
+* Unknown endpoint has been tracked incorrectly and therefore showed up too frequently in our statistics. `(PR #4473) <https://github.com/apple/foundationdb/pull/4473>`_
 * Using the ``exclude failed`` command could leave the data distributor in a state where it cannot complete relocations. `(PR #4495) <https://github.com/apple/foundationdb/pull/4495>`_ 
+* Fixed a rare crash on the cluster controller when using multi-region configurations. `(PR #4547) <https://github.com/apple/foundationdb/pull/4547>`_ 
+* Fixed a memory corruption bug in the data distributor. `(PR #4535) <https://github.com/apple/foundationdb/pull/4535>`_
 * Fixed a rare crash that could happen on the sequencer during recovery. `(PR #4548) <https://github.com/apple/foundationdb/pull/4548>`_ 
+* Added a new pre-backup action when creating a backup. Backups can now either verify the range data is being saved to is empty before the backup begins (current behavior) or clear the range where data is being saved to. Fixes a ``restore_destination_not_empty`` failure after a backup retry due to ``commit_unknown_failure``. `(PR #4595) <https://github.com/apple/foundationdb/pull/4595>`_
 * When configured with ``usable_regions=2``, a cluster would not fail over to a region which contained only storage class processes. `(PR #4599) <https://github.com/apple/foundationdb/pull/4599>`_ 
+* If a restore is done using a prefix to remove and specific key ranges to restore, the key range boundaries must begin with the prefix to remove. `(PR #4684) <https://github.com/apple/foundationdb/pull/4684>`_
 
 Status
 ------
+* Added ``cluster.qos.throttled_tags`` and ``cluster.processes.*.roles.busiest_[read|write]_tag`` to report statistics on throttled tags and the busiest read or write transaction tags on each storage server. `(PR #3669) <https://github.com/apple/foundationdb/pull/3669>`_ `(PR #3696) <https://github.com/apple/foundationdb/pull/3696>`_
+* Added ``seconds_since_last_recovered`` to the ``cluster.recovery_state`` section to report how long it has been since the cluster recovered to the point where it is able to accept requests. `(PR #3759) <https://github.com/apple/foundationdb/pull/3759>`_
 * Added limiting metrics (limiting_storage_durability_lag and limiting_storage_queue) to health metrics. `(PR #4067) <https://github.com/apple/foundationdb/pull/4067>`_
+* ``min_replicas_remaining`` is now populated for all regions, thus giving a clear picture of the data replicas that exist in the database. `(PR 4515) <https://github.com/apple/foundationdb/pull/4515>`_
+* Added detailed metrics for batched transactions. `(PR #4540) <https://github.com/apple/foundationdb/pull/4540>`_
 * Added ``commit_batching_window_size`` to the proxy roles section of status to record statistics about commit batching window size on each proxy. `(PR #4735) <https://github.com/apple/foundationdb/pull/4735>`_
 * Added ``cluster.bounce_impact`` section to status to report if there will be any extra effects when bouncing the cluster, and if so, the reason for those effects. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetched_versions`` to the storage metrics section of status to report how fast a storage server is catching up in versions. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
 * Added ``fetches_from_logs`` to the storage metrics section of status to report how frequently a storage server fetches updates from transaction logs. `(PR #4770) <https://github.com/apple/foundationdb/pull/4770>`_
-* Added ``seconds_since_last_recovered`` to the ``cluster.recovery_state`` section to report how long it has been since the cluster recovered to the point where it is able to accept requests. `(PR #3759) <https://github.com/apple/foundationdb/pull/3759>`_
 
 Bindings
 --------
@@ -54,6 +84,7 @@ Bindings
 
 Other Changes
 -------------
+* Added rte_memcpy from DPDK for default usage. `(PR #3089) <https://github.com/apple/foundationdb/pull/3089/files>`_
 * When ``fdbmonitor`` dies, all of its child processes are now killed. `(PR #3841) <https://github.com/apple/foundationdb/pull/3841>`_
 * The ``foundationdb`` service installed by the RPM packages will now automatically restart ``fdbmonitor`` after 60 seconds when it fails. `(PR #3841) <https://github.com/apple/foundationdb/pull/3841>`_
 * Capture output of forked snapshot processes in trace events. `(PR #4254) <https://github.com/apple/foundationdb/pull/4254/files>`_
diff --git a/documentation/sphinx/source/request-tracing.rst b/documentation/sphinx/source/request-tracing.rst
new file mode 100644
index 00000000000..cca170ad24f
--- /dev/null
+++ b/documentation/sphinx/source/request-tracing.rst
@@ -0,0 +1,7 @@
+.. _request-tracing:
+
+#########################
+Request Tracing Framework
+#########################
+
+.. include:: guide-common.rst.inc
diff --git a/documentation/sphinx/source/visibility.rst b/documentation/sphinx/source/visibility.rst
new file mode 100644
index 00000000000..de16800ce0e
--- /dev/null
+++ b/documentation/sphinx/source/visibility.rst
@@ -0,0 +1,16 @@
+.. _visibility:
+
+####################
+Visibility Documents
+####################
+
+Curation of documents related to Visibility into FDB.
+
+* :doc:`request-tracing` walks you through request-tracing framework.
+
+.. toctree::
+ :maxdepth: 2
+ :titlesonly:
+ :hidden:
+
+ request-tracing

From 59b50c9c3e1364803dbb4626d7f6ed5878adbf33 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 28 Jun 2021 16:09:07 -0700
Subject: [PATCH 304/740] Add comments for recordEmptyMessage and
 getEmptyMessageRatio.

---
 fdbserver/LogSystem.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fdbserver/LogSystem.h b/fdbserver/LogSystem.h
index 60ce9ab7338..5aa14810de4 100644
--- a/fdbserver/LogSystem.h
+++ b/fdbserver/LogSystem.h
@@ -1094,6 +1094,8 @@ struct LogPushData : NonCopyable {
 		return messagesWriter[loc].toValue();
 	}
 
+	// Records if a tlog (specified by "loc") will receive an empty version batch message.
+	// "value" is the message returned by getMessages() call.
 	void recordEmptyMessage(int loc, const Standalone<StringRef>& value) {
 		if (!isEmptyMessage[loc]) {
 			BinaryWriter w(AssumeVersion(g_network->protocolVersion()));
@@ -1104,6 +1106,8 @@ struct LogPushData : NonCopyable {
 		}
 	}
 
+	// Returns the ratio of empty messages in this version batch.
+	// MUST be called after getMessages() and recordEmptyMessage().
 	float getEmptyMessageRatio() const {
 		auto count = std::count(isEmptyMessage.begin(), isEmptyMessage.end(), false);
 		ASSERT_WE_THINK(isEmptyMessage.size() > 0);

From bcfc94406a6b0cfbfa2f863997b326552655c38f Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 28 Jun 2021 16:19:55 -0700
Subject: [PATCH 305/740] Add tracing documentation

---
 .../sphinx/source/request-tracing.rst         | 97 +++++++++++++++++++
 documentation/sphinx/source/special-keys.rst  |  2 +
 documentation/sphinx/source/visibility.rst    | 16 +++
 fdbclient/vexillographer/fdb.options          |  2 +-
 4 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 documentation/sphinx/source/request-tracing.rst
 create mode 100644 documentation/sphinx/source/visibility.rst

diff --git a/documentation/sphinx/source/request-tracing.rst b/documentation/sphinx/source/request-tracing.rst
new file mode 100644
index 00000000000..03d2d35c50c
--- /dev/null
+++ b/documentation/sphinx/source/request-tracing.rst
@@ -0,0 +1,97 @@
+.. _request-tracing:
+
+###############
+Request Tracing
+###############
+
+The request tracing framework adds the ability to monitor transactions as they
+move through FoundationDB. Tracing provides a detailed view into where
+transactions spend time with data exported in near real-time, enabling fast
+performance debugging. The FoundationDB tracing framework is based off the
+`OpenTracing <https://opentracing.io/>`_ specification.
+
+*Disambiguation:* :ref:`Trace files <administration-managing-trace-files>` are
+local log files containing debug and error output from a local ``fdbserver``
+binary. Request tracing produces similarly named *traces* which record the
+amount of time a transaction spent in a part of the system. This document uses
+the term tracing (or trace) to refer to these request traces, not local debug
+information, unless otherwise specified.
+
+*Note*: Full request tracing capability requires at least ``TLogVersion::V6``.
+
+==============
+Recording data
+==============
+
+The request tracing framework produces no data by default. To enable collection
+of traces, specify the collection type using the ``--tracer`` command line
+option for ``fdbserver`` and the ``DISTRIBUTED_CLIENT_TRACER`` :ref:`network
+option <network-options-using-environment-variables>` for clients. Both client
+and server must have the same trace value set to perform correctly.
+
+========================= ===============
+**Option**                **Description**
+------------------------- ---------------
+none                      No tracing data is collected.
+file, logfile, log_file   Write tracing data to FDB trace files, specified with ``--logdir``.
+network_lossy             Send tracing data as UDP packets. Data is sent to ``localhost:8889``, but the default port can be changed by setting the ``TRACING_UDP_LISTENER_PORT`` knob. This option is useful if you have a log aggregation program to collect trace data.
+========================= ===============
+
+-----------
+Data format
+-----------
+
+Spans are the building blocks of traces. A span represents an operation in the
+life of a transaction, including the start and end timestamp and an operation.
+A collection of spans make up a trace, representing a single transaction. The
+tracing framework outputs individual spans, which can be reconstructed into
+traces through their parent relationships.
+
+Trace data sent as UDP packets when using the ``network_lossy`` option is
+serialized using `MessagePack <https://msgpack.org>`_. To save on the amount of
+data sent, spans are serialized as an array of length 8 (if the span has one or
+more parents), or length 7 (if the span has no parents).
+
+The fields of a span are specified below. The index at which the field appears
+in the serialized msgpack array is also specified, for those using the UDP
+collection format.
+
+================== ========= ======== ===============
+**Field**          **Index** **Type** **Description**
+------------------ --------- -------- ---------------
+Source IP:port     0         string   The IP and port of the machine where the span originated.
+Trace ID           1         uint64   The 64-bit identifier of the trace. All spans in a trace share the same trace ID.
+Span ID            2         uint64   The 64-bit identifier of the span. All spans have a unique identifier.
+Start timestamp    3         double   The timestamp when the operation represented by the span began.
+End timestamp      4         double   The timestamp when the operation represented by the span ended.
+Operation name     5         string   The name of the operation the span represents.
+Tags               6         map      User defined tags, added manually to specify additional information.
+Parent span IDs    7         vector   (Optional) A list of span IDs representing parents of this span.
+================== ========= ======== ===============
+
+^^^^^^^^^^^^^^^^^^^^^
+Multiple parent spans
+^^^^^^^^^^^^^^^^^^^^^
+
+Unlike traditional distributed tracing frameworks, FoundationDB spans can have
+multiple parents. Because many FDB transactions are batched into a single
+transaction, to continue tracing the request, the batched transaction must
+treat all its component transactions as parents.
+
+---------------
+Control options
+---------------
+
+In addition to the command line parameter described above, tracing can be set
+at a database and transaction level.
+
+Tracing can be globally disabled by setting the
+``distributed_transaction_trace_disable`` database option. It can be enabled by
+setting the ``distributed_transaction_trace_enable`` database option. If
+neither option is specified but a tracer option is set as described above,
+tracing will be enabled.
+
+Tracing can be enabled or disabled for individual transactions. The special key
+space exposes an API to set a custom trace ID for a transaction, or to disable
+tracing for the transaction. See the special key space :ref:`tracing module
+documentation <special-key-space-tracing-module>` to learn more.
diff --git a/documentation/sphinx/source/special-keys.rst b/documentation/sphinx/source/special-keys.rst
index 8a4bbcd9c3e..b16cd3c93af 100644
--- a/documentation/sphinx/source/special-keys.rst
+++ b/documentation/sphinx/source/special-keys.rst
@@ -244,6 +244,8 @@ use the global configuration functions.
 
 #. ``\xff\xff/global_config/<key> := <value>`` Read/write. Reading keys in the range will return a tuple decoded string representation of the value for the given key. Writing a value will update all processes in the cluster with the new key-value pair. Values must be written using the :ref:`api-python-tuple-layer`.
 
+.. _special-key-space-tracing-module:
+
 Tracing module
 --------------
 
diff --git a/documentation/sphinx/source/visibility.rst b/documentation/sphinx/source/visibility.rst
new file mode 100644
index 00000000000..200dea0447c
--- /dev/null
+++ b/documentation/sphinx/source/visibility.rst
@@ -0,0 +1,16 @@
+.. _visibility:
+
+####################
+Visibility Documents
+####################
+
+Curation of documents related to Visibility into FDB.
+
+* :doc:`request-tracing` provides fine-grained visibility into the flow of transactions through the system.
+
+.. toctree::
+ :maxdepth: 2
+ :titlesonly:
+ :hidden:
+
+ request-tracing
diff --git a/fdbclient/vexillographer/fdb.options b/fdbclient/vexillographer/fdb.options
index 2d3a5b57cee..4deca33242c 100644
--- a/fdbclient/vexillographer/fdb.options
+++ b/fdbclient/vexillographer/fdb.options
@@ -129,7 +129,7 @@ description is not currently required but encouraged.
             paramType="Int" paramDescription="probability expressed as a percentage between 0 and 100"
             description="Set the probability of an active CLIENT_BUGGIFY section being fired. A section will only fire if it was activated" />
     <Option name="distributed_client_tracer" code="90"
-            paramType="String" paramDescription="Distributed tracer type. Choose from none, log_file, network_async, or network_lossy"
+            paramType="String" paramDescription="Distributed tracer type. Choose from none, log_file, or network_lossy"
             description="Set a tracer to run on the client. Should be set to the same value as the tracer set on the server." />
     <Option name="supported_client_versions" code="1000"
             paramType="String" paramDescription="[release version],[source version],[protocol version];..."

From 3f1fb001598be568f46c819d6de47840bf6b4b0f Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 28 Jun 2021 16:29:30 -0700
Subject: [PATCH 306/740] Add visibility page to site map

---
 documentation/sphinx/source/index.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation/sphinx/source/index.rst b/documentation/sphinx/source/index.rst
index 737731d36e7..98f23e50dba 100644
--- a/documentation/sphinx/source/index.rst
+++ b/documentation/sphinx/source/index.rst
@@ -38,6 +38,8 @@ The latest changes are detailed in :ref:`release-notes`. The documentation has t
 
 * :doc:`administration` contains documentation on administering FoundationDB.
 
+* :doc:`visibility` contains documentation related to Visibility into FoundationDB.
+
 .. toctree::
    :maxdepth: 1
    :titlesonly:
@@ -51,4 +53,5 @@ The latest changes are detailed in :ref:`release-notes`. The documentation has t
    api-reference
    tutorials
    administration
+   visibility
    earlier-release-notes

From c9ff9c52864a0149cd44e79d9fc3c3a95c51a6e4 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 11 Jun 2021 16:20:38 -0500
Subject: [PATCH 307/740] TSS Mismatch Changes

---
 fdbclient/DatabaseContext.h          |  10 +-
 fdbclient/NativeAPI.actor.cpp        |  30 ++-
 fdbclient/StorageServerInterface.cpp | 386 ++++++++++++++-------------
 fdbclient/SystemData.cpp             |   2 +
 fdbclient/SystemData.h               |   4 +
 fdbrpc/LoadBalance.actor.h           | 139 +++++++---
 fdbrpc/TSSComparison.h               |  33 ++-
 flow/Knobs.cpp                       |   2 +
 flow/Knobs.h                         |   2 +
 flow/Trace.h                         |   8 +-
 10 files changed, 382 insertions(+), 234 deletions(-)

diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index 572f20e965d..856204d9f6a 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -275,7 +275,7 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	Future<Void> monitorProxiesInfoChange;
 	Future<Void> monitorTssInfoChange;
 	Future<Void> tssMismatchHandler;
-	PromiseStream<UID> tssMismatchStream;
+	PromiseStream<std::pair<UID, std::vector<DetailedTSSMismatch>>> tssMismatchStream;
 	Reference<CommitProxyInfo> commitProxies;
 	Reference<GrvProxyInfo> grvProxies;
 	bool proxyProvisional; // Provisional commit proxy and grv proxy are used at the same time.
@@ -429,12 +429,12 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	static const std::vector<std::string> debugTransactionTagChoices;
 	std::unordered_map<KeyRef, Reference<WatchMetadata>> watchMap;
 
-        // Adds or updates the specified (SS, TSS) pair in the TSS mapping (if not already present).
-        // Requests to the storage server will be duplicated to the TSS.
+	// Adds or updates the specified (SS, TSS) pair in the TSS mapping (if not already present).
+	// Requests to the storage server will be duplicated to the TSS.
 	void addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi);
 
-        // Removes the storage server and its TSS pair from the TSS mapping (if present).
-        // Requests to the storage server will no longer be duplicated to its pair TSS.
+	// Removes the storage server and its TSS pair from the TSS mapping (if present).
+	// Requests to the storage server will no longer be duplicated to its pair TSS.
 	void removeTssMapping(StorageServerInterface const& ssi);
 };
 
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index b20fd089602..bfe7062ca8b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -384,10 +384,11 @@ ACTOR Future<Void> databaseLogger(DatabaseContext* cx) {
 		cx->bytesPerCommit.clear();
 
 		for (const auto& it : cx->tssMetrics) {
-			// TODO could skip this tss if request counter is zero? would potentially complicate elapsed calculation
-			// though
+			// TODO could skip this whole thing if tss if request counter is zero?
+			// That would potentially complicate elapsed calculation though
 			if (it.second->mismatches.getIntervalDelta()) {
-				cx->tssMismatchStream.send(it.first);
+				cx->tssMismatchStream.send(
+				    std::pair<UID, std::vector<DetailedTSSMismatch>>(it.first, it.second->detailedMismatches));
 			}
 
 			// do error histograms as separate event
@@ -826,13 +827,15 @@ ACTOR Future<Void> monitorCacheList(DatabaseContext* self) {
 ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 	state Reference<ReadYourWritesTransaction> tr;
 	state KeyBackedMap<UID, UID> tssMapDB = KeyBackedMap<UID, UID>(tssMappingKeys.begin);
+	state KeyBackedMap<Tuple, std::string> tssMismatchDB = KeyBackedMap<Tuple, std::string>(tssMismatchKeys.begin);
 	loop {
-		state UID tssID = waitNext(cx->tssMismatchStream.getFuture());
+		// <tssid, list of detailed mismatch data>
+		state std::pair<UID, std::vector<DetailedTSSMismatch>> data = waitNext(cx->tssMismatchStream.getFuture());
 		// find ss pair id so we can remove it from the mapping
 		state UID tssPairID;
 		bool found = false;
 		for (const auto& it : cx->tssMapping) {
-			if (it.second.id() == tssID) {
+			if (it.second.id() == data.first) {
 				tssPairID = it.first;
 				found = true;
 				break;
@@ -841,7 +844,7 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 		if (found) {
 			state bool quarantine = CLIENT_KNOBS->QUARANTINE_TSS_ON_MISMATCH;
 			TraceEvent(SevWarnAlways, quarantine ? "TSS_QuarantineMismatch" : "TSS_KillMismatch")
-			    .detail("TSSID", tssID.toString());
+			    .detail("TSSID", data.first.toString());
 			TEST(quarantine); // Quarantining TSS because it got mismatch
 			TEST(!quarantine); // Killing TSS because it got mismatch
 
@@ -851,14 +854,21 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 				try {
 					tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 					tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-
 					if (quarantine) {
-						tr->set(tssQuarantineKeyFor(tssID), LiteralStringRef(""));
+						tr->set(tssQuarantineKeyFor(data.first), LiteralStringRef(""));
 					} else {
-						tr->clear(serverTagKeyFor(tssID));
+						tr->clear(serverTagKeyFor(data.first));
 					}
 					tssMapDB.erase(tr, tssPairID);
 
+					for (const DetailedTSSMismatch& d : data.second) {
+						// <tssid, time, mismatchid> -> mismatch data
+						tssMismatchDB.set(
+						    tr,
+						    Tuple().append(data.first.toString()).append(d.timestamp).append(d.mismatchId.toString()),
+						    d.traceString);
+					}
+
 					wait(tr->commit());
 
 					break;
@@ -868,7 +878,7 @@ ACTOR static Future<Void> handleTssMismatches(DatabaseContext* cx) {
 				tries++;
 				if (tries > 10) {
 					// Give up, it'll get another mismatch or a human will investigate eventually
-					TraceEvent("TSS_MismatchGaveUp").detail("TSSID", tssID.toString());
+					TraceEvent("TSS_MismatchGaveUp").detail("TSSID", data.first.toString());
 					break;
 				}
 			}
diff --git a/fdbclient/StorageServerInterface.cpp b/fdbclient/StorageServerInterface.cpp
index 79f2e2bc4b7..404322e7aa7 100644
--- a/fdbclient/StorageServerInterface.cpp
+++ b/fdbclient/StorageServerInterface.cpp
@@ -30,32 +30,31 @@ std::string traceChecksumValue(ValueRef s) {
 	return s.size() > 12 ? format("(%d)%08x", s.size(), crc32c_append(0, s.begin(), s.size())) : s.toString();
 }
 
+// point reads
 template <>
-bool TSS_doCompare(const GetValueRequest& req,
-                   const GetValueReply& src,
-                   const GetValueReply& tss,
-                   Severity traceSeverity,
-                   UID tssId) {
-	if (src.value.present() != tss.value.present() || (src.value.present() && src.value.get() != tss.value.get())) {
-		TraceEvent(traceSeverity, "TSSMismatchGetValue")
-		    .suppressFor(1.0)
-		    .detail("TSSID", tssId)
-		    .detail("Key", req.key.printable())
-		    .detail("Version", req.version)
-		    .detail("SSReply", src.value.present() ? traceChecksumValue(src.value.get()) : "missing")
-		    .detail("TSSReply", tss.value.present() ? traceChecksumValue(tss.value.get()) : "missing");
-
-		return false;
-	}
-	return true;
+bool TSS_doCompare(const GetValueReply& src, const GetValueReply& tss) {
+	return src.value.present() == tss.value.present() && (!src.value.present() || src.value.get() == tss.value.get());
+}
+
+template <>
+const char* TSS_mismatchTraceName(const GetValueRequest& req) {
+	return "TSSMismatchGetValue";
+}
+
+template <>
+void TSS_traceMismatch(TraceEvent& event,
+                       const GetValueRequest& req,
+                       const GetValueReply& src,
+                       const GetValueReply& tss) {
+	event.detail("Key", req.key.printable())
+	    .detail("Version", req.version)
+	    .detail("SSReply", src.value.present() ? traceChecksumValue(src.value.get()) : "missing")
+	    .detail("TSSReply", tss.value.present() ? traceChecksumValue(tss.value.get()) : "missing");
 }
 
+// key selector reads
 template <>
-bool TSS_doCompare(const GetKeyRequest& req,
-                   const GetKeyReply& src,
-                   const GetKeyReply& tss,
-                   Severity traceSeverity,
-                   UID tssId) {
+bool TSS_doCompare(const GetKeyReply& src, const GetKeyReply& tss) {
 	// This process is a bit complicated. Since the tss and ss can return different results if neighboring shards to
 	// req.sel.key are currently being moved, We validate that the results are the same IF the returned key selectors
 	// are final. Otherwise, we only mark the request as a mismatch if the difference between the two returned key
@@ -92,107 +91,170 @@ bool TSS_doCompare(const GetKeyRequest& req,
 		bool tssOffsetLarger = (src.sel.offset == tss.sel.offset) ? tss.sel.orEqual : src.sel.offset < tss.sel.offset;
 		matches = tssKeyLarger != tssOffsetLarger;
 	}
-	if (!matches) {
-		TraceEvent(traceSeverity, "TSSMismatchGetKey")
-		    .suppressFor(1.0)
-		    .detail("TSSID", tssId)
-		    .detail("KeySelector",
-		            format("%s%s:%d", req.sel.orEqual ? "=" : "", req.sel.getKey().printable().c_str(), req.sel.offset))
-		    .detail("Version", req.version)
-		    .detail("SSReply",
-		            format("%s%s:%d", src.sel.orEqual ? "=" : "", src.sel.getKey().printable().c_str(), src.sel.offset))
-		    .detail(
-		        "TSSReply",
-		        format("%s%s:%d", tss.sel.orEqual ? "=" : "", tss.sel.getKey().printable().c_str(), tss.sel.offset));
-	}
 	return matches;
 }
 
 template <>
-bool TSS_doCompare(const GetKeyValuesRequest& req,
-                   const GetKeyValuesReply& src,
-                   const GetKeyValuesReply& tss,
-                   Severity traceSeverity,
-                   UID tssId) {
-	if (src.more != tss.more || src.data != tss.data) {
+const char* TSS_mismatchTraceName(const GetKeyRequest& req) {
+	return "TSSMismatchGetKey";
+}
 
-		std::string ssResultsString = format("(%d)%s:\n", src.data.size(), src.more ? "+" : "");
-		for (auto& it : src.data) {
-			ssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
-		}
+template <>
+void TSS_traceMismatch(TraceEvent& event, const GetKeyRequest& req, const GetKeyReply& src, const GetKeyReply& tss) {
+	event
+	    .detail("KeySelector",
+	            format("%s%s:%d", req.sel.orEqual ? "=" : "", req.sel.getKey().printable().c_str(), req.sel.offset))
+	    .detail("Version", req.version)
+	    .detail("SSReply",
+	            format("%s%s:%d", src.sel.orEqual ? "=" : "", src.sel.getKey().printable().c_str(), src.sel.offset))
+	    .detail("TSSReply",
+	            format("%s%s:%d", tss.sel.orEqual ? "=" : "", tss.sel.getKey().printable().c_str(), tss.sel.offset));
+}
 
-		std::string tssResultsString = format("(%d)%s:\n", tss.data.size(), tss.more ? "+" : "");
-		for (auto& it : tss.data) {
-			tssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
-		}
+// range reads
+template <>
+bool TSS_doCompare(const GetKeyValuesReply& src, const GetKeyValuesReply& tss) {
+	return src.more == tss.more && src.data == tss.data;
+}
+
+template <>
+const char* TSS_mismatchTraceName(const GetKeyValuesRequest& req) {
+	return "TSSMismatchGetKeyValues";
+}
 
-		TraceEvent(traceSeverity, "TSSMismatchGetKeyValues")
-		    .suppressFor(1.0)
-		    .detail("TSSID", tssId)
-		    .detail(
-		        "Begin",
-		        format(
-		            "%s%s:%d", req.begin.orEqual ? "=" : "", req.begin.getKey().printable().c_str(), req.begin.offset))
-		    .detail("End",
-		            format("%s%s:%d", req.end.orEqual ? "=" : "", req.end.getKey().printable().c_str(), req.end.offset))
-		    .detail("Version", req.version)
-		    .detail("Limit", req.limit)
-		    .detail("LimitBytes", req.limitBytes)
-		    .detail("SSReply", ssResultsString)
-		    .detail("TSSReply", tssResultsString);
-
-		return false;
+template <>
+void TSS_traceMismatch(TraceEvent& event,
+                       const GetKeyValuesRequest& req,
+                       const GetKeyValuesReply& src,
+                       const GetKeyValuesReply& tss) {
+	std::string ssResultsString = format("(%d)%s:\n", src.data.size(), src.more ? "+" : "");
+	for (auto& it : src.data) {
+		ssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
 	}
-	return true;
+
+	std::string tssResultsString = format("(%d)%s:\n", tss.data.size(), tss.more ? "+" : "");
+	for (auto& it : tss.data) {
+		tssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
+	}
+	event
+	    .detail(
+	        "Begin",
+	        format("%s%s:%d", req.begin.orEqual ? "=" : "", req.begin.getKey().printable().c_str(), req.begin.offset))
+	    .detail("End",
+	            format("%s%s:%d", req.end.orEqual ? "=" : "", req.end.getKey().printable().c_str(), req.end.offset))
+	    .detail("Version", req.version)
+	    .detail("Limit", req.limit)
+	    .detail("LimitBytes", req.limitBytes)
+	    .detail("SSReply", ssResultsString)
+	    .detail("TSSReply", tssResultsString);
 }
 
 template <>
-bool TSS_doCompare(const WatchValueRequest& req,
-                   const WatchValueReply& src,
-                   const WatchValueReply& tss,
-                   Severity traceSeverity,
-                   UID tssId) {
-	// We duplicate watches just for load, no need to validte replies.
+bool TSS_doCompare(const WatchValueReply& src, const WatchValueReply& tss) {
+	// We duplicate watches just for load, no need to validate replies.
 	return true;
 }
 
-// no-op template specializations for metrics replies
 template <>
-bool TSS_doCompare(const WaitMetricsRequest& req,
-                   const StorageMetrics& src,
-                   const StorageMetrics& tss,
-                   Severity traceSeverity,
-                   UID tssId) {
+const char* TSS_mismatchTraceName(const WatchValueRequest& req) {
+	ASSERT(false);
+	return "";
+}
+
+template <>
+void TSS_traceMismatch(TraceEvent& event,
+                       const WatchValueRequest& req,
+                       const WatchValueReply& src,
+                       const WatchValueReply& tss) {
+	ASSERT(false);
+}
+
+// template specializations for metrics replies that should never be called because these requests aren't duplicated
+
+// storage metrics
+template <>
+bool TSS_doCompare(const StorageMetrics& src, const StorageMetrics& tss) {
+	ASSERT(false);
 	return true;
 }
 
 template <>
-bool TSS_doCompare(const SplitMetricsRequest& req,
-                   const SplitMetricsReply& src,
-                   const SplitMetricsReply& tss,
-                   Severity traceSeverity,
-                   UID tssId) {
+const char* TSS_mismatchTraceName(const WaitMetricsRequest& req) {
+	ASSERT(false);
+	return "";
+}
+
+template <>
+void TSS_traceMismatch(TraceEvent& event,
+                       const WaitMetricsRequest& req,
+                       const StorageMetrics& src,
+                       const StorageMetrics& tss) {
+	ASSERT(false);
+}
+
+// split metrics
+template <>
+bool TSS_doCompare(const SplitMetricsReply& src, const SplitMetricsReply& tss) {
+	ASSERT(false);
 	return true;
 }
 
 template <>
-bool TSS_doCompare(const ReadHotSubRangeRequest& req,
-                   const ReadHotSubRangeReply& src,
-                   const ReadHotSubRangeReply& tss,
-                   Severity traceSeverity,
-                   UID tssId) {
+const char* TSS_mismatchTraceName(const SplitMetricsRequest& req) {
+	ASSERT(false);
+	return "";
+}
+
+template <>
+void TSS_traceMismatch(TraceEvent& event,
+                       const SplitMetricsRequest& req,
+                       const SplitMetricsReply& src,
+                       const SplitMetricsReply& tss) {
+	ASSERT(false);
+}
+
+// read hot sub range
+template <>
+bool TSS_doCompare(const ReadHotSubRangeReply& src, const ReadHotSubRangeReply& tss) {
+	ASSERT(false);
 	return true;
 }
 
 template <>
-bool TSS_doCompare(const SplitRangeRequest& req,
-                   const SplitRangeReply& src,
-                   const SplitRangeReply& tss,
-                   Severity traceSeverity,
-                   UID tssId) {
+const char* TSS_mismatchTraceName(const ReadHotSubRangeRequest& req) {
+	ASSERT(false);
+	return "";
+}
+
+template <>
+void TSS_traceMismatch(TraceEvent& event,
+                       const ReadHotSubRangeRequest& req,
+                       const ReadHotSubRangeReply& src,
+                       const ReadHotSubRangeReply& tss) {
+	ASSERT(false);
+}
+
+// split range
+template <>
+bool TSS_doCompare(const SplitRangeReply& src, const SplitRangeReply& tss) {
+	ASSERT(false);
 	return true;
 }
 
+template <>
+const char* TSS_mismatchTraceName(const SplitRangeRequest& req) {
+	ASSERT(false);
+	return "";
+}
+
+template <>
+void TSS_traceMismatch(TraceEvent& event,
+                       const SplitRangeRequest& req,
+                       const SplitRangeReply& src,
+                       const SplitRangeReply& tss) {
+	ASSERT(false);
+}
+
 // only record metrics for data reads
 
 template <>
@@ -240,32 +302,20 @@ TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 	std::string s_d = "d";
 	std::string s_e = "e";
 
-	// test getValue
-	GetValueRequest gvReq;
-	gvReq.key = StringRef(s_a);
-	gvReq.version = 5;
-
 	UID tssId;
 
 	GetValueReply gvReplyMissing;
 	GetValueReply gvReplyA(Optional<Value>(StringRef(s_a)), false);
 	GetValueReply gvReplyB(Optional<Value>(StringRef(s_b)), false);
-	ASSERT(TSS_doCompare(gvReq, gvReplyMissing, gvReplyMissing, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gvReq, gvReplyA, gvReplyA, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gvReq, gvReplyB, gvReplyB, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gvReplyMissing, gvReplyMissing));
+	ASSERT(TSS_doCompare(gvReplyA, gvReplyA));
+	ASSERT(TSS_doCompare(gvReplyB, gvReplyB));
 
-	ASSERT(!TSS_doCompare(gvReq, gvReplyMissing, gvReplyA, SevInfo, tssId));
-	ASSERT(!TSS_doCompare(gvReq, gvReplyA, gvReplyB, SevInfo, tssId));
+	ASSERT(!TSS_doCompare(gvReplyMissing, gvReplyA));
+	ASSERT(!TSS_doCompare(gvReplyA, gvReplyB));
 
 	// test GetKeyValues
-	Arena a; // for all of the refs. ASAN complains if this isn't done. Could also make them all standalone i guess
-	GetKeyValuesRequest gkvReq;
-	gkvReq.begin = firstGreaterOrEqual(StringRef(a, s_a));
-	gkvReq.end = firstGreaterOrEqual(StringRef(a, s_b));
-	gkvReq.version = 5;
-	gkvReq.limit = 100;
-	gkvReq.limitBytes = 1000;
-
+	Arena a;
 	GetKeyValuesReply gkvReplyEmpty;
 	GetKeyValuesReply gkvReplyOne;
 	KeyValueRef v;
@@ -276,16 +326,11 @@ TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 	gkvReplyOneMore.data.push_back_deep(gkvReplyOneMore.arena, v);
 	gkvReplyOneMore.more = true;
 
-	ASSERT(TSS_doCompare(gkvReq, gkvReplyEmpty, gkvReplyEmpty, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkvReq, gkvReplyOne, gkvReplyOne, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkvReq, gkvReplyOneMore, gkvReplyOneMore, SevInfo, tssId));
-	ASSERT(!TSS_doCompare(gkvReq, gkvReplyEmpty, gkvReplyOne, SevInfo, tssId));
-	ASSERT(!TSS_doCompare(gkvReq, gkvReplyOne, gkvReplyOneMore, SevInfo, tssId));
-
-	// test GetKey
-	GetKeyRequest gkReq;
-	gkReq.sel = KeySelectorRef(StringRef(a, s_a), false, 1);
-	gkReq.version = 5;
+	ASSERT(TSS_doCompare(gkvReplyEmpty, gkvReplyEmpty));
+	ASSERT(TSS_doCompare(gkvReplyOne, gkvReplyOne));
+	ASSERT(TSS_doCompare(gkvReplyOneMore, gkvReplyOneMore));
+	ASSERT(!TSS_doCompare(gkvReplyEmpty, gkvReplyOne));
+	ASSERT(!TSS_doCompare(gkvReplyOne, gkvReplyOneMore));
 
 	GetKeyReply gkReplyA(KeySelectorRef(StringRef(a, s_a), false, 20), false);
 	GetKeyReply gkReplyB(KeySelectorRef(StringRef(a, s_b), false, 10), false);
@@ -294,85 +339,58 @@ TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
 	GetKeyReply gkReplyE(KeySelectorRef(StringRef(a, s_e), false, -20), false);
 
 	// identical cases
-	ASSERT(TSS_doCompare(gkReq, gkReplyA, gkReplyA, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyB, gkReplyB, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyC, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyD, gkReplyD, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyE, gkReplyE, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReplyA, gkReplyA));
+	ASSERT(TSS_doCompare(gkReplyB, gkReplyB));
+	ASSERT(TSS_doCompare(gkReplyC, gkReplyC));
+	ASSERT(TSS_doCompare(gkReplyD, gkReplyD));
+	ASSERT(TSS_doCompare(gkReplyE, gkReplyE));
 
 	// relative offset cases
-	ASSERT(TSS_doCompare(gkReq, gkReplyA, gkReplyB, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyB, gkReplyA, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyA, gkReplyC, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyA, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyB, gkReplyC, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyB, SevInfo, tssId));
-
-	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyD, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyD, gkReplyC, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyC, gkReplyE, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyE, gkReplyC, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyD, gkReplyE, SevInfo, tssId));
-	ASSERT(TSS_doCompare(gkReq, gkReplyE, gkReplyD, SevInfo, tssId));
+	ASSERT(TSS_doCompare(gkReplyA, gkReplyB));
+	ASSERT(TSS_doCompare(gkReplyB, gkReplyA));
+	ASSERT(TSS_doCompare(gkReplyA, gkReplyC));
+	ASSERT(TSS_doCompare(gkReplyC, gkReplyA));
+	ASSERT(TSS_doCompare(gkReplyB, gkReplyC));
+	ASSERT(TSS_doCompare(gkReplyC, gkReplyB));
+
+	ASSERT(TSS_doCompare(gkReplyC, gkReplyD));
+	ASSERT(TSS_doCompare(gkReplyD, gkReplyC));
+	ASSERT(TSS_doCompare(gkReplyC, gkReplyE));
+	ASSERT(TSS_doCompare(gkReplyE, gkReplyC));
+	ASSERT(TSS_doCompare(gkReplyD, gkReplyE));
+	ASSERT(TSS_doCompare(gkReplyE, gkReplyD));
 
 	// test same offset/orEqual wrong key
-	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false),
-	                      SevInfo,
-	                      tssId));
+	ASSERT(!TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false)));
 	// this could be from different shard boundaries, so don't say it's a mismatch
-	ASSERT(TSS_doCompare(gkReq,
-	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 10), false),
-	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 10), false),
-	                     SevInfo,
-	                     tssId));
+	ASSERT(TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 10), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 10), false)));
 
 	// test offsets and key difference don't match
-	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 0), false),
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 10), false),
-	                      SevInfo,
-	                      tssId));
-	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, -10), false),
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 0), false),
-	                      SevInfo,
-	                      tssId));
+	ASSERT(!TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 10), false)));
+	ASSERT(!TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, -10), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 0), false)));
 
 	// test key is next over in one shard, one found it and other didn't
 	// positive
 	// one that didn't find is +1
-	ASSERT(TSS_doCompare(gkReq,
-	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 1), false),
-	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false),
-	                     SevInfo,
-	                     tssId));
-	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 1), false),
-	                      SevInfo,
-	                      tssId));
+	ASSERT(TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 1), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false)));
+	ASSERT(!TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 1), false)));
 
 	// negative will have zero offset but not equal set
-	ASSERT(TSS_doCompare(gkReq,
-	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
-	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 0), false),
-	                     SevInfo,
-	                     tssId));
-	ASSERT(!TSS_doCompare(gkReq,
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 0), false),
-	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false),
-	                      SevInfo,
-	                      tssId));
+	ASSERT(TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_b), false, 0), false)));
+	ASSERT(!TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 0), false),
+	                      GetKeyReply(KeySelectorRef(StringRef(a, s_b), true, 0), false)));
 
 	// test shard boundary key returned by incomplete query is the same as the key found by the other (only possible in
 	// positive direction)
-	ASSERT(TSS_doCompare(gkReq,
-	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
-	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 1), false),
-	                     SevInfo,
-	                     tssId));
+	ASSERT(TSS_doCompare(GetKeyReply(KeySelectorRef(StringRef(a, s_a), true, 0), false),
+	                     GetKeyReply(KeySelectorRef(StringRef(a, s_a), false, 1), false)));
 
 	// explictly test checksum function
 	std::string s12 = "ABCDEFGHIJKL";
diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index 5c61f324c99..4c82e3e12f2 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -364,6 +364,8 @@ UID decodeTssQuarantineKey(KeyRef const& key) {
 	return serverID;
 }
 
+const KeyRangeRef tssMismatchKeys(LiteralStringRef("\xff/tssMismatch/"), LiteralStringRef("\xff/tssMismatch0"));
+
 const KeyRangeRef serverTagKeys(LiteralStringRef("\xff/serverTag/"), LiteralStringRef("\xff/serverTag0"));
 
 const KeyRef serverTagPrefix = serverTagKeys.begin;
diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h
index cd0bced69c0..815abf0fdd9 100644
--- a/fdbclient/SystemData.h
+++ b/fdbclient/SystemData.h
@@ -125,6 +125,10 @@ extern const KeyRangeRef tssQuarantineKeys;
 const Key tssQuarantineKeyFor(UID serverID);
 UID decodeTssQuarantineKey(KeyRef const&);
 
+// \xff/tssMismatch/[[Tuple<TSSStorageUID, timestamp, mismatchUID>]] := [[TraceEventString]]
+// For recording tss mismatch details in the system keyspace
+extern const KeyRangeRef tssMismatchKeys;
+
 // "\xff/serverTag/[[serverID]]" = "[[Tag]]"
 //	Provides the Tag for the given serverID. Used to access a
 //	storage server's corresponding TLog in order to apply mutations.
diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index dbbe933bd58..cf40173a078 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -79,16 +79,22 @@ struct LoadBalancedReply {
 Optional<LoadBalancedReply> getLoadBalancedReply(const LoadBalancedReply* reply);
 Optional<LoadBalancedReply> getLoadBalancedReply(const void*);
 
-ACTOR template <class Req, class Resp>
+ACTOR template <class Req, class Resp, class Interface, class Multi>
 Future<Void> tssComparison(Req req,
                            Future<ErrorOr<Resp>> fSource,
                            Future<ErrorOr<Resp>> fTss,
-                           TSSEndpointData tssData) {
+                           TSSEndpointData tssData,
+                           uint64_t srcEndpointId,
+                           Reference<MultiInterface<Multi>> ssTeam,
+                           RequestStream<Req> Interface::*channel) {
 	state double startTime = now();
 	state Future<Optional<ErrorOr<Resp>>> fTssWithTimeout = timeout(fTss, FLOW_KNOBS->LOAD_BALANCE_TSS_TIMEOUT);
 	state int finished = 0;
 	state double srcEndTime;
 	state double tssEndTime;
+	// we want to record ss/tss errors to metrics
+	state int srcErrorCode = error_code_success;
+	state int tssErrorCode = error_code_success;
 
 	loop {
 		choose {
@@ -110,11 +116,6 @@ Future<Void> tssComparison(Req req,
 			}
 		}
 	}
-
-	// we want to record ss/tss errors to metrics
-	int srcErrorCode = error_code_success;
-	int tssErrorCode = error_code_success;
-
 	++tssData.metrics->requests;
 
 	if (src.isError()) {
@@ -139,15 +140,82 @@ Future<Void> tssComparison(Req req,
 			// apples
 			tssData.metrics->recordLatency(req, srcEndTime - startTime, tssEndTime - startTime);
 
-			// expect mismatches in drop mutations mode.
-			Severity traceSeverity =
-			    (g_network->isSimulated() && g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations)
-			        ? SevWarnAlways
-			        : SevError;
-
-			if (!TSS_doCompare(req, src.get(), tss.get().get(), traceSeverity, tssData.tssId)) {
+			if (!TSS_doCompare(src.get(), tss.get().get())) {
 				TEST(true); // TSS Mismatch
-				++tssData.metrics->mismatches;
+				state TraceEvent mismatchEvent(
+				    (g_network->isSimulated() && g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations)
+				        ? SevWarnAlways
+				        : SevError,
+				    TSS_mismatchTraceName(req));
+				mismatchEvent.detail("TSSID", tssData.tssId);
+
+				if (FLOW_KNOBS->LOAD_BALANCE_TSS_MISMATCH_VERIFY_SS && ssTeam->size() > 1) {
+					TEST(true); // checking TSS mismatch against rest of storage team
+
+					// if there is more than 1 SS in the team, attempt to verify that the other SS servers have the same
+					// data
+					state std::vector<Future<ErrorOr<Resp>>> restOfTeamFutures;
+					restOfTeamFutures.reserve(ssTeam->size() - 1);
+					for (int i = 0; i < ssTeam->size(); i++) {
+						RequestStream<Req> const* si = &ssTeam->get(i, channel);
+						if (si->getEndpoint().token.first() !=
+						    srcEndpointId) { // don't re-request to SS we already have a response from
+							resetReply(req);
+							restOfTeamFutures.push_back(si->tryGetReply(req));
+						}
+					}
+
+					wait(waitForAllReady(restOfTeamFutures));
+
+					int numError = 0;
+					int numMatchSS = 0;
+					int numMatchTSS = 0;
+					int numMatchNeither = 0;
+					for (Future<ErrorOr<Resp>> f : restOfTeamFutures) {
+						if (!f.canGet() || f.get().isError()) {
+							numError++;
+						} else {
+							Optional<LoadBalancedReply> fLB = getLoadBalancedReply(&f.get().get());
+							if (fLB.present() && fLB.get().error.present()) {
+								numError++;
+							} else if (TSS_doCompare(src.get(), f.get().get())) {
+								numMatchSS++;
+							} else if (TSS_doCompare(tss.get().get(), f.get().get())) {
+								numMatchTSS++;
+							} else {
+								numMatchNeither++;
+							}
+						}
+					}
+					mismatchEvent.detail("TeamCheckErrors", numError)
+					    .detail("TeamCheckMatchSS", numMatchSS)
+					    .detail("TeamCheckMatchTSS", numMatchTSS)
+					    .detail("TeamCheckMatchNeither", numMatchNeither);
+				}
+				if (tssData.metrics->shouldRecordDetailedMismatch()) {
+					TSS_traceMismatch(mismatchEvent, req, src.get(), tss.get().get());
+
+					TEST(FLOW_KNOBS->LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL); // Tracing Full TSS Mismatch
+					TEST(!FLOW_KNOBS->LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL); // Tracing Partial TSS Mismatch and storing
+					                                                         // the rest in FDB
+
+					if (!FLOW_KNOBS->LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL) {
+						mismatchEvent.disable();
+						UID mismatchUID = deterministicRandom()->randomUniqueID();
+						tssData.metrics->recordDetailedMismatchData(mismatchUID, mismatchEvent.getFields().toString());
+
+						// record a summarized trace event instead
+						TraceEvent summaryEvent((g_network->isSimulated() &&
+						                         g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations)
+						                            ? SevWarnAlways
+						                            : SevError,
+						                        TSS_mismatchTraceName(req));
+						summaryEvent.detail("TSSID", tssData.tssId).detail("MismatchId", mismatchUID);
+					}
+				} else {
+					// don't record trace event
+					mismatchEvent.disable();
+				}
 			}
 		} else if (tssLB.present() && tssLB.get().error.present()) {
 			tssErrorCode = tssLB.get().error.get().code();
@@ -171,7 +239,7 @@ Future<Void> tssComparison(Req req,
 }
 
 // Stores state for a request made by the load balancer
-template <class Request>
+template <class Request, class Interface, class Multi>
 struct RequestData : NonCopyable {
 	typedef ErrorOr<REPLY_TYPE(Request)> Reply;
 
@@ -189,7 +257,9 @@ struct RequestData : NonCopyable {
 	static void maybeDuplicateTSSRequest(RequestStream<Request> const* stream,
 	                                     Request& request,
 	                                     QueueModel* model,
-	                                     Future<Reply> ssResponse) {
+	                                     Future<Reply> ssResponse,
+	                                     Reference<MultiInterface<Multi>> alternatives,
+	                                     RequestStream<Request> Interface::*channel) {
 		if (model) {
 			// Send parallel request to TSS pair, if it exists
 			Optional<TSSEndpointData> tssData = model->getTssData(stream->getEndpoint().token.first());
@@ -200,34 +270,43 @@ struct RequestData : NonCopyable {
 				// FIXME: optimize to avoid creating new netNotifiedQueue for each message
 				RequestStream<Request> tssRequestStream(tssData.get().endpoint);
 				Future<ErrorOr<REPLY_TYPE(Request)>> fTssResult = tssRequestStream.tryGetReply(request);
-				model->addActor.send(tssComparison(request, ssResponse, fTssResult, tssData.get()));
+				model->addActor.send(tssComparison(request,
+				                                   ssResponse,
+				                                   fTssResult,
+				                                   tssData.get(),
+				                                   stream->getEndpoint().token.first(),
+				                                   alternatives,
+				                                   channel));
 			}
 		}
 	}
 
 	// Initializes the request state and starts it, possibly after a backoff delay
-	void startRequest(double backoff,
-	                  bool triedAllOptions,
-	                  RequestStream<Request> const* stream,
-	                  Request& request,
-	                  QueueModel* model) {
+	void startRequest(
+	    double backoff,
+	    bool triedAllOptions,
+	    RequestStream<Request> const* stream,
+	    Request& request,
+	    QueueModel* model,
+	    Reference<MultiInterface<Multi>> alternatives, // alternatives and channel passed through for TSS check
+	    RequestStream<Request> Interface::*channel) {
 		modelHolder = Reference<ModelHolder>();
 		requestStarted = false;
 
 		if (backoff > 0) {
 			response = mapAsync<Void, std::function<Future<Reply>(Void)>, Reply>(
-			    delay(backoff), [this, stream, &request, model](Void _) {
+			    delay(backoff), [this, stream, &request, model, alternatives, channel](Void _) {
 				    requestStarted = true;
 				    modelHolder = Reference<ModelHolder>(new ModelHolder(model, stream->getEndpoint().token.first()));
 				    Future<Reply> resp = stream->tryGetReply(request);
-				    maybeDuplicateTSSRequest(stream, request, model, resp);
+				    maybeDuplicateTSSRequest(stream, request, model, resp, alternatives, channel);
 				    return resp;
 			    });
 		} else {
 			requestStarted = true;
 			modelHolder = Reference<ModelHolder>(new ModelHolder(model, stream->getEndpoint().token.first()));
 			response = stream->tryGetReply(request);
-			maybeDuplicateTSSRequest(stream, request, model, response);
+			maybeDuplicateTSSRequest(stream, request, model, response, alternatives, channel);
 		}
 
 		requestProcessed = false;
@@ -365,8 +444,8 @@ Future<REPLY_TYPE(Request)> loadBalance(
     bool atMostOnce = false, // if true, throws request_maybe_delivered() instead of retrying automatically
     QueueModel* model = nullptr) {
 
-	state RequestData<Request> firstRequestData;
-	state RequestData<Request> secondRequestData;
+	state RequestData<Request, Interface, Multi> firstRequestData;
+	state RequestData<Request, Interface, Multi> secondRequestData;
 
 	state Optional<uint64_t> firstRequestEndpoint;
 	state Future<Void> secondDelay = Never();
@@ -553,7 +632,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 			firstRequestEndpoint = Optional<uint64_t>();
 		} else if (firstRequestData.isValid()) {
 			// Issue a second request, the first one is taking a long time.
-			secondRequestData.startRequest(backoff, triedAllOptions, stream, request, model);
+			secondRequestData.startRequest(backoff, triedAllOptions, stream, request, model, alternatives, channel);
 			state bool firstFinished = false;
 
 			loop choose {
@@ -582,7 +661,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 			}
 		} else {
 			// Issue a request, if it takes too long to get a reply, go around the loop
-			firstRequestData.startRequest(backoff, triedAllOptions, stream, request, model);
+			firstRequestData.startRequest(backoff, triedAllOptions, stream, request, model, alternatives, channel);
 			firstRequestEndpoint = stream->getEndpoint().token.first();
 
 			loop {
diff --git a/fdbrpc/TSSComparison.h b/fdbrpc/TSSComparison.h
index 335e8ae68e7..650355e696a 100644
--- a/fdbrpc/TSSComparison.h
+++ b/fdbrpc/TSSComparison.h
@@ -29,6 +29,15 @@
 #include "fdbrpc/Stats.h"
 
 // refcounted + noncopyable because both DatabaseContext and individual endpoints share ownership
+struct DetailedTSSMismatch {
+	UID mismatchId;
+	double timestamp;
+	std::string traceString;
+
+	DetailedTSSMismatch(UID mismatchId, double timestamp, std::string traceString)
+	  : mismatchId(mismatchId), timestamp(timestamp), traceString(traceString) {}
+};
+
 struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	CounterCollection cc;
 	Counter requests;
@@ -49,6 +58,8 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	std::unordered_map<int, uint64_t> ssErrorsByCode;
 	std::unordered_map<int, uint64_t> tssErrorsByCode;
 
+	std::vector<DetailedTSSMismatch> detailedMismatches;
+
 	void ssError(int code) {
 		++ssErrors;
 		ssErrorsByCode[code]++;
@@ -62,6 +73,16 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	template <class Req>
 	void recordLatency(const Req& req, double ssLatency, double tssLatency);
 
+	// only record a small number of the detailed mismatches per client per metrics window
+	bool shouldRecordDetailedMismatch() {
+		++mismatches;
+		return (mismatches.getIntervalDelta() < 5);
+	}
+
+	void recordDetailedMismatchData(UID mismatchUID, std::string traceString) {
+		detailedMismatches.push_back(DetailedTSSMismatch(mismatchUID, now(), traceString));
+	}
+
 	void clear() {
 		SSgetValueLatency.clear();
 		SSgetKeyLatency.clear();
@@ -73,6 +94,8 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 
 		tssErrorsByCode.clear();
 		ssErrorsByCode.clear();
+
+		detailedMismatches.clear();
 	}
 
 	TSSMetrics()
@@ -81,9 +104,13 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	    SSgetKeyValuesLatency(1000), TSSgetValueLatency(1000), TSSgetKeyLatency(1000), TSSgetKeyValuesLatency(1000) {}
 };
 
-// part of the contract of this function is that if there is a mismatch, the implementation needs to record a trace
-// event with the specified severity and tssId in the event.
+template <class Rep>
+bool TSS_doCompare(const Rep& src, const Rep& tss);
+
+template <class Req>
+const char* TSS_mismatchTraceName(const Req& req);
+
 template <class Req, class Rep>
-bool TSS_doCompare(const Req& req, const Rep& src, const Rep& tss, Severity traceSeverity, UID tssId);
+void TSS_traceMismatch(TraceEvent& event, const Req& req, const Rep& src, const Rep& tss);
 
 #endif
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index 1d287feed35..2f06498084e 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -235,6 +235,8 @@ void FlowKnobs::initialize(bool randomize, bool isSimulated) {
 	init( BASIC_LOAD_BALANCE_BUCKETS,                           40 ); //proxies bin recent GRV requests into 40 time bins
 	init( BASIC_LOAD_BALANCE_COMPUTE_PRECISION,              10000 ); //determines how much of the LB usage is holding the CPU usage of the proxy
 	init( LOAD_BALANCE_TSS_TIMEOUT,                            5.0 );
+	init( LOAD_BALANCE_TSS_MISMATCH_VERIFY_SS,                true ); if( randomize && BUGGIFY ) LOAD_BALANCE_TSS_MISMATCH_VERIFY_SS = false; // Whether the client should validate the SS teams all agree on TSS mismatch
+	init( LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL,              false ); if( randomize && BUGGIFY ) LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL = true; // If true, saves the full details of the mismatch in a trace event. If false, saves them in the DB and the trace event references the DB row.
 
 	// Health Monitor
 	init( FAILURE_DETECTION_DELAY,                             4.0 ); if( randomize && BUGGIFY ) FAILURE_DETECTION_DELAY = 1.0;
diff --git a/flow/Knobs.h b/flow/Knobs.h
index 9b700613f32..bf465683d0d 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -251,6 +251,8 @@ class FlowKnobs : public Knobs {
 	double BASIC_LOAD_BALANCE_MIN_REQUESTS;
 	double BASIC_LOAD_BALANCE_MIN_CPU;
 	double LOAD_BALANCE_TSS_TIMEOUT;
+	bool LOAD_BALANCE_TSS_MISMATCH_VERIFY_SS;
+	bool LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL;
 
 	// Health Monitor
 	int FAILURE_DETECTION_DELAY;
diff --git a/flow/Trace.h b/flow/Trace.h
index 4c2eadb215b..9a793837812 100644
--- a/flow/Trace.h
+++ b/flow/Trace.h
@@ -463,12 +463,14 @@ struct TraceEvent {
 
 	bool isEnabled() const { return enabled; }
 
-	TraceEvent &setErrorKind(ErrorKind errorKind);
+	TraceEvent& setErrorKind(ErrorKind errorKind);
 
 	explicit operator bool() const { return enabled; }
 
 	void log();
 
+	void disable() { enabled = false; } // Disables the trace event so it doesn't get
+
 	~TraceEvent(); // Actually logs the event
 
 	// Return the number of invocations of TraceEvent() at the specified logging level.
@@ -476,6 +478,8 @@ struct TraceEvent {
 
 	std::unique_ptr<DynamicEventMetric> tmpEventMetric; // This just just a place to store fields
 
+	const TraceEventFields& getFields() const { return fields; }
+
 private:
 	bool initialized;
 	bool enabled;
@@ -491,7 +495,7 @@ struct TraceEvent {
 	int maxFieldLength;
 	int maxEventLength;
 	int timeIndex;
-	int errorKindIndex { -1 };
+	int errorKindIndex{ -1 };
 
 	void setSizeLimits();
 

From c9666833d6b6fb1cd7621cc670152dfdfd69ebf2 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Wed, 30 Jun 2021 18:07:25 +0000
Subject: [PATCH 308/740] Hold a local copy of the ready promise to avoid the
 destruction of acknowledgementReceiver

---
 fdbrpc/fdbrpc.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index ece284c75df..bfc0d93c788 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -296,7 +296,9 @@ struct AcknowledgementReceiver final : FlowReceiver, FastAllocated<Acknowledgeme
 			if (!ready.isValid()) {
 				ready = Promise<Void>();
 			}
-			ready.sendError(message.getError());
+			// Sending the error can lead to the destruction of the acknowledgementReceiver so we keep a local copy
+			Promise<Void> hold = ready;
+			hold.sendError(message.getError());
 		} else {
 			ASSERT(message.get().bytes > bytesAcknowledged);
 			bytesAcknowledged = message.get().bytes;

From 73bb4c984075da1075c3090f3cba6b7d1e928339 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Thu, 24 Jun 2021 11:48:20 -0500
Subject: [PATCH 309/740] Added Streaming Read comparison for TSS

---
 fdbclient/NativeAPI.actor.cpp        | 235 +++++++++++++++++++++++++--
 fdbclient/StorageServerInterface.cpp |  44 +++++
 fdbrpc/LoadBalance.actor.h           |   1 +
 fdbrpc/TSSComparison.h               |   8 +-
 fdbrpc/fdbrpc.h                      |   2 +
 fdbserver/SimulatedCluster.actor.cpp |  22 +--
 flow/Knobs.cpp                       |   1 +
 flow/Knobs.h                         |   1 +
 8 files changed, 286 insertions(+), 28 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index bfe7062ca8b..6c735b919c1 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -154,6 +154,8 @@ void DatabaseContext::addTssMapping(StorageServerInterface const& ssi, StorageSe
 		                             TSSEndpointData(tssi.id(), tssi.getKeyValues.getEndpoint(), metrics));
 		queueModel.updateTssEndpoint(ssi.watchValue.getEndpoint().token.first(),
 		                             TSSEndpointData(tssi.id(), tssi.watchValue.getEndpoint(), metrics));
+		queueModel.updateTssEndpoint(ssi.getKeyValuesStream.getEndpoint().token.first(),
+		                             TSSEndpointData(tssi.id(), tssi.getKeyValuesStream.getEndpoint(), metrics));
 	}
 }
 
@@ -166,6 +168,7 @@ void DatabaseContext::removeTssMapping(StorageServerInterface const& ssi) {
 		queueModel.removeTssEndpoint(ssi.getKey.getEndpoint().token.first());
 		queueModel.removeTssEndpoint(ssi.getKeyValues.getEndpoint().token.first());
 		queueModel.removeTssEndpoint(ssi.watchValue.getEndpoint().token.first());
+		queueModel.removeTssEndpoint(ssi.getKeyValuesStream.getEndpoint().token.first());
 	}
 }
 
@@ -3488,6 +3491,174 @@ ACTOR Future<RangeResult> getRange(Database cx,
 	}
 }
 
+template <class StreamReply>
+struct TSSDuplicateStreamData {
+	PromiseStream<StreamReply> stream;
+	Promise<Void> tssComparisonDone;
+
+	// empty constructor for optional?
+	TSSDuplicateStreamData() {}
+
+	TSSDuplicateStreamData(PromiseStream<StreamReply> stream) : stream(stream) {}
+
+	bool done() { return tssComparisonDone.getFuture().isReady(); }
+
+	void setDone() {
+		if (tssComparisonDone.canBeSet()) {
+			tssComparisonDone.send(Void());
+		}
+	}
+
+	~TSSDuplicateStreamData() {}
+};
+
+// Error tracking here is weird, and latency doesn't really mean the same thing here as it does with normal tss
+// comparisons, so this is pretty much just counting mismatches
+ACTOR template <class Request>
+static Future<Void> tssStreamComparison(Request request,
+                                        TSSDuplicateStreamData<REPLYSTREAM_TYPE(Request)> streamData,
+                                        ReplyPromiseStream<REPLYSTREAM_TYPE(Request)> tssReplyStream,
+                                        TSSEndpointData tssData) {
+	state bool ssEndOfStream = false;
+	state bool tssEndOfStream = false;
+	state Optional<REPLYSTREAM_TYPE(Request)> ssReply = Optional<REPLYSTREAM_TYPE(Request)>();
+	state Optional<REPLYSTREAM_TYPE(Request)> tssReply = Optional<REPLYSTREAM_TYPE(Request)>();
+
+	loop {
+		// reset replies
+		ssReply = Optional<REPLYSTREAM_TYPE(Request)>();
+		tssReply = Optional<REPLYSTREAM_TYPE(Request)>();
+
+		state double startTime = now();
+		// wait for ss response
+		try {
+			REPLYSTREAM_TYPE(Request) _ssReply = waitNext(streamData.stream.getFuture());
+			ssReply = _ssReply;
+		} catch (Error& e) {
+			if (e.code() == error_code_actor_cancelled) {
+				streamData.setDone();
+				throw;
+			}
+			if (e.code() == error_code_end_of_stream) {
+				// ss response will be set to empty, to compare to the SS response if it wasn't empty and cause a
+				// mismatch
+				ssEndOfStream = true;
+			} else {
+				tssData.metrics->ssError(e.code());
+			}
+			TEST(e.code() != error_code_end_of_stream); // SS got error in TSS stream comparison
+		}
+
+		state double sleepTime = std::max(startTime + FLOW_KNOBS->LOAD_BALANCE_TSS_TIMEOUT - now(), 0.0);
+		// wait for tss response
+		try {
+			choose {
+				when(REPLYSTREAM_TYPE(Request) _tssReply = waitNext(tssReplyStream.getFuture())) {
+					tssReply = _tssReply;
+				}
+				when(wait(delay(sleepTime))) {
+					++tssData.metrics->tssTimeouts;
+					TEST(true); // Got TSS timeout in stream comparison
+				}
+			}
+		} catch (Error& e) {
+			if (e.code() == error_code_actor_cancelled) {
+				streamData.setDone();
+				throw;
+			}
+			if (e.code() == error_code_end_of_stream) {
+				// tss response will be set to empty, to compare to the SS response if it wasn't empty and cause a
+				// mismatch
+				tssEndOfStream = true;
+			} else {
+				tssData.metrics->tssError(e.code());
+			}
+			TEST(e.code() != error_code_end_of_stream); // TSS got error in TSS stream comparison
+		}
+
+		if (!ssEndOfStream || !tssEndOfStream) {
+			++tssData.metrics->streamComparisons;
+		}
+
+		// if both are successful, compare
+		if (ssReply.present() && tssReply.present()) {
+			// compare results
+			// FIXME: this code is pretty much identical to LoadBalance.h
+			// TODO could add team check logic in if we added synchronous way to turn this into a fixed getRange request
+			// and send it to the whole team and compare? I think it's fine to skip that for streaming though
+			TEST(ssEndOfStream != tssEndOfStream); // SS or TSS stream finished early!
+
+			// skip tss comparison if both are end of stream
+			if ((!ssEndOfStream || !tssEndOfStream) && !TSS_doCompare(ssReply.get(), tssReply.get())) {
+				TEST(true); // TSS mismatch in stream comparison
+				TraceEvent mismatchEvent(
+				    (g_network->isSimulated() && g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations)
+				        ? SevWarnAlways
+				        : SevError,
+				    TSS_mismatchTraceName(request));
+				mismatchEvent.setMaxEventLength(FLOW_KNOBS->TSS_LARGE_TRACE_SIZE);
+				mismatchEvent.detail("TSSID", tssData.tssId);
+
+				if (tssData.metrics->shouldRecordDetailedMismatch()) {
+					TSS_traceMismatch(mismatchEvent, request, ssReply.get(), tssReply.get());
+
+					TEST(FLOW_KNOBS
+					         ->LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL); // Tracing Full TSS Mismatch in stream comparison
+					TEST(!FLOW_KNOBS->LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL); // Tracing Partial TSS Mismatch in stream
+					                                                         // comparison and storing the rest in FDB
+
+					if (!FLOW_KNOBS->LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL) {
+						mismatchEvent.disable();
+						UID mismatchUID = deterministicRandom()->randomUniqueID();
+						tssData.metrics->recordDetailedMismatchData(mismatchUID, mismatchEvent.getFields().toString());
+
+						// record a summarized trace event instead
+						TraceEvent summaryEvent((g_network->isSimulated() &&
+						                         g_simulator.tssMode == ISimulator::TSSMode::EnabledDropMutations)
+						                            ? SevWarnAlways
+						                            : SevError,
+						                        TSS_mismatchTraceName(request));
+						summaryEvent.detail("TSSID", tssData.tssId).detail("MismatchId", mismatchUID);
+					}
+				} else {
+					// don't record trace event
+					mismatchEvent.disable();
+				}
+				streamData.setDone();
+				return Void();
+			}
+		}
+		if (!ssReply.present() || !tssReply.present() || ssEndOfStream || tssEndOfStream) {
+			// if both streams don't still have more data, stop comparison
+			streamData.setDone();
+			return Void();
+		}
+	}
+}
+
+// Currently only used for GetKeyValuesStream but could easily be plugged for other stream types
+// User of the stream has to forward the SS's responses to the returned promise stream, if it is set
+template <class Request>
+Optional<TSSDuplicateStreamData<REPLYSTREAM_TYPE(Request)>>
+maybeDuplicateTSSStreamFragment(Request& req, QueueModel* model, RequestStream<Request> const* ssStream) {
+	if (model) {
+		Optional<TSSEndpointData> tssData = model->getTssData(ssStream->getEndpoint().token.first());
+
+		if (tssData.present()) {
+			TEST(true); // duplicating stream to TSS
+			resetReply(req);
+			// FIXME: optimize to avoid creating new netNotifiedQueueWithAcknowledgements for each stream duplication
+			RequestStream<Request> tssRequestStream(tssData.get().endpoint);
+			ReplyPromiseStream<REPLYSTREAM_TYPE(Request)> tssReplyStream = tssRequestStream.getReplyStream(req);
+			PromiseStream<REPLYSTREAM_TYPE(Request)> ssDuplicateReplyStream;
+			TSSDuplicateStreamData<REPLYSTREAM_TYPE(Request)> streamData(ssDuplicateReplyStream);
+			model->addActor.send(tssStreamComparison(req, streamData, tssReplyStream, tssData.get()));
+			return Optional<TSSDuplicateStreamData<REPLYSTREAM_TYPE(Request)>>(streamData);
+		}
+	}
+	return Optional<TSSDuplicateStreamData<REPLYSTREAM_TYPE(Request)>>();
+}
+
 // Streams all of the KV pairs in a target key range into a ParallelStream fragment
 ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment* results,
                                           Database cx,
@@ -3508,6 +3679,7 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 		loop {
 			const KeyRange& range = locations[shard].first;
 
+			state Optional<TSSDuplicateStreamData<GetKeyValuesStreamReply>> tssDuplicateStream;
 			state GetKeyValuesStreamRequest req;
 			req.version = version;
 			req.begin = firstGreaterOrEqual(range.begin);
@@ -3516,6 +3688,9 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 			req.limit = reverse ? -CLIENT_KNOBS->REPLY_BYTE_LIMIT : CLIENT_KNOBS->REPLY_BYTE_LIMIT;
 			req.limitBytes = std::numeric_limits<int>::max();
 
+			// keep shard's arena around in case of async tss comparison
+			req.arena.dependsOn(range.arena());
+
 			ASSERT(req.limitBytes > 0 && req.limit != 0 && req.limit < 0 == reverse);
 
 			// FIXME: buggify byte limits on internal functions that use them, instead of globally
@@ -3579,6 +3754,12 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 				    locations[shard]
 				        .second->get(useIdx, &StorageServerInterface::getKeyValuesStream)
 				        .getReplyStream(req);
+
+				tssDuplicateStream = maybeDuplicateTSSStreamFragment(
+				    req,
+				    cx->enableLocalityLoadBalance ? &cx->queueModel : nullptr,
+				    &locations[shard].second->get(useIdx, &StorageServerInterface::getKeyValuesStream));
+
 				state bool breakAgain = false;
 				loop {
 					wait(results->onEmpty());
@@ -3586,6 +3767,9 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 						choose {
 							when(wait(cx->connectionFileChanged())) {
 								results->sendError(transaction_too_old());
+								if (tssDuplicateStream.present() && !tssDuplicateStream.get().done()) {
+									tssDuplicateStream.get().stream.sendError(transaction_too_old());
+								}
 								return Void();
 							}
 
@@ -3595,9 +3779,15 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					} catch (Error& e) {
 						++cx->transactionPhysicalReadsCompleted;
 						if (e.code() == error_code_broken_promise) {
+							if (tssDuplicateStream.present() && !tssDuplicateStream.get().done()) {
+								tssDuplicateStream.get().stream.sendError(connection_failed());
+							}
 							throw connection_failed();
 						}
 						if (e.code() != error_code_end_of_stream) {
+							if (tssDuplicateStream.present() && !tssDuplicateStream.get().done()) {
+								tssDuplicateStream.get().stream.sendError(e);
+							}
 							throw;
 						}
 						rep = GetKeyValuesStreamReply();
@@ -3607,6 +3797,17 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 						    "TransactionDebug", info.debugID.get().first(), "NativeAPI.getExactRange.After");
 					RangeResult output(RangeResultRef(rep.data, rep.more), rep.arena);
 
+					if (tssDuplicateStream.present() && !tssDuplicateStream.get().done()) {
+						// shallow copy the reply with an arena depends, and send it to the duplicate stream for TSS
+						GetKeyValuesStreamReply replyCopy;
+						replyCopy.version = rep.version;
+						replyCopy.more = rep.more;
+						replyCopy.cached = rep.cached;
+						replyCopy.arena.dependsOn(rep.arena);
+						replyCopy.data.append(replyCopy.arena, rep.data.begin(), rep.data.size());
+						tssDuplicateStream.get().stream.send(replyCopy);
+					}
+
 					int64_t bytes = 0;
 					for (const KeyValueRef& kv : output) {
 						bytes += kv.key.size() + kv.value.size();
@@ -3664,6 +3865,9 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 								output.readThrough = reverse ? keys.begin : keys.end;
 								results->send(std::move(output));
 								results->finish();
+								if (tssDuplicateStream.present() && !tssDuplicateStream.get().done()) {
+									tssDuplicateStream.get().stream.sendError(end_of_stream());
+								}
 								return Void();
 							}
 							keys = KeyRangeRef(begin, end);
@@ -3690,6 +3894,10 @@ ACTOR Future<Void> getRangeStreamFragment(ParallelStream<RangeResult>::Fragment*
 					break;
 				}
 			} catch (Error& e) {
+				// send errors to tss duplicate stream, including actor_cancelled
+				if (tssDuplicateStream.present() && !tssDuplicateStream.get().done()) {
+					tssDuplicateStream.get().stream.sendError(e);
+				}
 				if (e.code() == error_code_actor_cancelled) {
 					throw;
 				}
@@ -6274,21 +6482,20 @@ Future<Void> DatabaseContext::createSnapshot(StringRef uid, StringRef snapshot_c
 }
 
 ACTOR Future<Void> setPerpetualStorageWiggle(Database cx, bool enable, bool lock_aware) {
-    state ReadYourWritesTransaction tr(cx);
-    loop {
-        try {
-            tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-			if(lock_aware) {
+	state ReadYourWritesTransaction tr(cx);
+	loop {
+		try {
+			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+			if (lock_aware) {
 				tr.setOption(FDBTransactionOptions::LOCK_AWARE);
 			}
 
-            tr.set(perpetualStorageWiggleKey, enable ? LiteralStringRef("1") : LiteralStringRef("0"));
-            wait(tr.commit());
-            break;
-        }
-        catch (Error& e) {
-            wait(tr.onError(e));
-        }
-    }
-    return Void();
+			tr.set(perpetualStorageWiggleKey, enable ? LiteralStringRef("1") : LiteralStringRef("0"));
+			wait(tr.commit());
+			break;
+		} catch (Error& e) {
+			wait(tr.onError(e));
+		}
+	}
+	return Void();
 }
\ No newline at end of file
diff --git a/fdbclient/StorageServerInterface.cpp b/fdbclient/StorageServerInterface.cpp
index 404322e7aa7..d379a0fa69c 100644
--- a/fdbclient/StorageServerInterface.cpp
+++ b/fdbclient/StorageServerInterface.cpp
@@ -145,6 +145,47 @@ void TSS_traceMismatch(TraceEvent& event,
 	    .detail("Version", req.version)
 	    .detail("Limit", req.limit)
 	    .detail("LimitBytes", req.limitBytes)
+	    .setMaxFieldLength(FLOW_KNOBS->TSS_LARGE_TRACE_SIZE * 4 / 10)
+	    .detail("SSReply", ssResultsString)
+	    .detail("TSSReply", tssResultsString);
+}
+
+// streaming range reads
+template <>
+bool TSS_doCompare(const GetKeyValuesStreamReply& src, const GetKeyValuesStreamReply& tss) {
+	return src.more == tss.more && src.data == tss.data;
+}
+
+template <>
+const char* TSS_mismatchTraceName(const GetKeyValuesStreamRequest& req) {
+	return "TSSMismatchGetKeyValuesStream";
+}
+
+// TODO this is all duplicated from above, simplify?
+template <>
+void TSS_traceMismatch(TraceEvent& event,
+                       const GetKeyValuesStreamRequest& req,
+                       const GetKeyValuesStreamReply& src,
+                       const GetKeyValuesStreamReply& tss) {
+	std::string ssResultsString = format("(%d)%s:\n", src.data.size(), src.more ? "+" : "");
+	for (auto& it : src.data) {
+		ssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
+	}
+
+	std::string tssResultsString = format("(%d)%s:\n", tss.data.size(), tss.more ? "+" : "");
+	for (auto& it : tss.data) {
+		tssResultsString += "\n" + it.key.printable() + "=" + traceChecksumValue(it.value);
+	}
+	event
+	    .detail(
+	        "Begin",
+	        format("%s%s:%d", req.begin.orEqual ? "=" : "", req.begin.getKey().printable().c_str(), req.begin.offset))
+	    .detail("End",
+	            format("%s%s:%d", req.end.orEqual ? "=" : "", req.end.getKey().printable().c_str(), req.end.offset))
+	    .detail("Version", req.version)
+	    .detail("Limit", req.limit)
+	    .detail("LimitBytes", req.limitBytes)
+	    .setMaxFieldLength(FLOW_KNOBS->TSS_LARGE_TRACE_SIZE * 4 / 10)
 	    .detail("SSReply", ssResultsString)
 	    .detail("TSSReply", tssResultsString);
 }
@@ -290,6 +331,9 @@ void TSSMetrics::recordLatency(const ReadHotSubRangeRequest& req, double ssLaten
 template <>
 void TSSMetrics::recordLatency(const SplitRangeRequest& req, double ssLatency, double tssLatency) {}
 
+template <>
+void TSSMetrics::recordLatency(const GetKeyValuesStreamRequest& req, double ssLatency, double tssLatency) {}
+
 // -------------------
 
 TEST_CASE("/StorageServerInterface/TSSCompare/TestComparison") {
diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index cf40173a078..fd0a2c0d920 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -147,6 +147,7 @@ Future<Void> tssComparison(Req req,
 				        ? SevWarnAlways
 				        : SevError,
 				    TSS_mismatchTraceName(req));
+				mismatchEvent.setMaxEventLength(FLOW_KNOBS->TSS_LARGE_TRACE_SIZE);
 				mismatchEvent.detail("TSSID", tssData.tssId);
 
 				if (FLOW_KNOBS->LOAD_BALANCE_TSS_MISMATCH_VERIFY_SS && ssTeam->size() > 1) {
diff --git a/fdbrpc/TSSComparison.h b/fdbrpc/TSSComparison.h
index 650355e696a..af5080af6ff 100644
--- a/fdbrpc/TSSComparison.h
+++ b/fdbrpc/TSSComparison.h
@@ -41,6 +41,7 @@ struct DetailedTSSMismatch {
 struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	CounterCollection cc;
 	Counter requests;
+	Counter streamComparisons;
 	Counter ssErrors;
 	Counter tssErrors;
 	Counter tssTimeouts;
@@ -99,9 +100,10 @@ struct TSSMetrics : ReferenceCounted<TSSMetrics>, NonCopyable {
 	}
 
 	TSSMetrics()
-	  : cc("TSSClientMetrics"), requests("Requests", cc), ssErrors("SSErrors", cc), tssErrors("TSSErrors", cc),
-	    tssTimeouts("TSSTimeouts", cc), mismatches("Mismatches", cc), SSgetValueLatency(1000), SSgetKeyLatency(1000),
-	    SSgetKeyValuesLatency(1000), TSSgetValueLatency(1000), TSSgetKeyLatency(1000), TSSgetKeyValuesLatency(1000) {}
+	  : cc("TSSClientMetrics"), requests("Requests", cc), streamComparisons("StreamComparisons", cc),
+	    ssErrors("SSErrors", cc), tssErrors("TSSErrors", cc), tssTimeouts("TSSTimeouts", cc),
+	    mismatches("Mismatches", cc), SSgetValueLatency(1000), SSgetKeyLatency(1000), SSgetKeyValuesLatency(1000),
+	    TSSgetValueLatency(1000), TSSgetKeyLatency(1000), TSSgetKeyValuesLatency(1000) {}
 };
 
 template <class Rep>
diff --git a/fdbrpc/fdbrpc.h b/fdbrpc/fdbrpc.h
index bfc0d93c788..df13a7fa0c7 100644
--- a/fdbrpc/fdbrpc.h
+++ b/fdbrpc/fdbrpc.h
@@ -533,6 +533,8 @@ class ReplyPromiseStream {
 		}
 	}
 
+	void reset() { *this = ReplyPromiseStream<T>(); }
+
 private:
 	NetNotifiedQueueWithAcknowledgements<T>* queue;
 	SAV<Void>* errors;
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index 8f4db1b48ab..92876c296a1 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -942,20 +942,20 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
 		tssCount = deterministicRandom()->randomInt(1, 3);
 	}
 
-//	if (deterministicRandom()->random01() < 0.5) {
-//		set_config("ssd");
-//	} else {
-//		set_config("memory");
-//	}
-//	set_config("memory");
-//	set_config("memory-radixtree-beta");
-	
+	//	if (deterministicRandom()->random01() < 0.5) {
+	//		set_config("ssd");
+	//	} else {
+	//		set_config("memory");
+	//	}
+	//	set_config("memory");
+	//	set_config("memory-radixtree-beta");
+
 	if (deterministicRandom()->random01() < 0.5) {
-        	set_config("perpetual_storage_wiggle=0");
+		set_config("perpetual_storage_wiggle=0");
 	} else {
-        	set_config("perpetual_storage_wiggle=1");
+		set_config("perpetual_storage_wiggle=1");
 	}
-// 	set_config("perpetual_storage_wiggle=1");
+	// 	set_config("perpetual_storage_wiggle=1");
 
 	if (simple) {
 		db.desiredTLogCount = 1;
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index 2f06498084e..648f46d5756 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -237,6 +237,7 @@ void FlowKnobs::initialize(bool randomize, bool isSimulated) {
 	init( LOAD_BALANCE_TSS_TIMEOUT,                            5.0 );
 	init( LOAD_BALANCE_TSS_MISMATCH_VERIFY_SS,                true ); if( randomize && BUGGIFY ) LOAD_BALANCE_TSS_MISMATCH_VERIFY_SS = false; // Whether the client should validate the SS teams all agree on TSS mismatch
 	init( LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL,              false ); if( randomize && BUGGIFY ) LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL = true; // If true, saves the full details of the mismatch in a trace event. If false, saves them in the DB and the trace event references the DB row.
+	init( TSS_LARGE_TRACE_SIZE,                              50000 );
 
 	// Health Monitor
 	init( FAILURE_DETECTION_DELAY,                             4.0 ); if( randomize && BUGGIFY ) FAILURE_DETECTION_DELAY = 1.0;
diff --git a/flow/Knobs.h b/flow/Knobs.h
index bf465683d0d..6ea757b29dd 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -253,6 +253,7 @@ class FlowKnobs : public Knobs {
 	double LOAD_BALANCE_TSS_TIMEOUT;
 	bool LOAD_BALANCE_TSS_MISMATCH_VERIFY_SS;
 	bool LOAD_BALANCE_TSS_MISMATCH_TRACE_FULL;
+	int TSS_LARGE_TRACE_SIZE;
 
 	// Health Monitor
 	int FAILURE_DETECTION_DELAY;

From 0ebb01c5b077879987060ecc508b42055f08b3c8 Mon Sep 17 00:00:00 2001
From: Russell Sears <russell_sears@apple.com>
Date: Wed, 30 Jun 2021 12:45:50 -0700
Subject: [PATCH 310/740] Add a ThreadID field to each TraceEvent.  This is
 needed for multithreaded client debugging, and should also be helpful for
 multithreaded storage engines, SSL handshake threadpools, and so on

---
 flow/Trace.cpp | 13 +++++++++++++
 flow/Trace.h   |  1 +
 2 files changed, 14 insertions(+)

diff --git a/flow/Trace.cpp b/flow/Trace.cpp
index 06c7f33ec1c..dac55187d3c 100644
--- a/flow/Trace.cpp
+++ b/flow/Trace.cpp
@@ -1121,6 +1121,17 @@ TraceEvent& TraceEvent::setMaxFieldLength(int maxFieldLength) {
 	return *this;
 }
 
+// A unique, per-thread ID.  This is particularly important for multithreaded
+// or multiversion client setups and for multithreaded storage engines.
+thread_local uint64_t threadId = 0;
+
+void TraceEvent::setThreadId() {
+	while (threadId == 0) {
+		threadId = deterministicRandom()->randomUInt64();
+	}
+	this->detail("ThreadID", threadId);
+}
+
 int TraceEvent::getMaxFieldLength() const {
 	return maxFieldLength;
 }
@@ -1174,6 +1185,8 @@ void TraceEvent::log() {
 					fields.mutate(timeIndex + 1).second = TraceEvent::printRealTime(time);
 				}
 
+				setThreadId();
+
 				if (this->severity == SevError) {
 					severity = SevInfo;
 					backtrace();
diff --git a/flow/Trace.h b/flow/Trace.h
index 9a793837812..5bb3f1c7c4b 100644
--- a/flow/Trace.h
+++ b/flow/Trace.h
@@ -431,6 +431,7 @@ struct TraceEvent {
 	void setField(const char* key, int64_t value);
 	void setField(const char* key, double value);
 	void setField(const char* key, const std::string& value);
+	void setThreadId();
 
 	TraceEvent& errorImpl(const class Error& e, bool includeCancelled = false);
 	// Private version of detailf that does NOT write to the eventMetric.  This is to be used by other detail methods

From 7cc706c813372e80cb3548de6be8215c3d85062e Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Tue, 18 May 2021 23:48:04 -0700
Subject: [PATCH 311/740] exclude servers based on locality match

---
 fdbcli/fdbcli.actor.cpp                       |  79 +++++-
 fdbclient/DatabaseConfiguration.cpp           |  38 +++
 fdbclient/DatabaseConfiguration.h             |   3 +
 fdbclient/FDBTypes.h                          |   6 +
 fdbclient/ManagementAPI.actor.cpp             | 221 +++++++++++++++
 fdbclient/ManagementAPI.actor.h               |  14 +
 fdbclient/NativeAPI.actor.cpp                 |   8 +
 fdbclient/SpecialKeySpace.actor.cpp           | 161 ++++++++++-
 fdbclient/SpecialKeySpace.actor.h             |  20 ++
 fdbclient/SystemData.cpp                      |  24 ++
 fdbclient/SystemData.h                        |  14 +
 fdbrpc/Locality.h                             |   5 +
 fdbserver/ApplyMetadataMutation.cpp           |   7 +-
 fdbserver/DataDistribution.actor.cpp          |  42 ++-
 fdbserver/Status.actor.cpp                    |  19 +-
 .../workloads/RemoveServersSafely.actor.cpp   | 258 +++++++++++++++++-
 16 files changed, 888 insertions(+), 31 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index e9cf0b75648..82abd4ccb08 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -2420,17 +2420,23 @@ ACTOR Future<bool> coordinators(Database db, std::vector<StringRef> tokens, bool
 
 ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 	std::vector<AddressExclusion> addresses;
-	bool failed = false;
-	bool all = false;
+	state std::vector<std::string> localities;
+	state bool failed = false;
+	state bool all = false;
 	for (auto t = tokens.begin() + 1; t != tokens.end(); ++t) {
 		if (*t == LiteralStringRef("all")) {
 			all = true;
 		} else if (*t == LiteralStringRef("failed")) {
 			failed = true;
+		} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix)
+			|| t->startsWith(ExcludeLocalityKeyMachineIdPrefix)
+			|| t->startsWith(ExcludeLocalityKeyProcessIdPrefix)
+			|| t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+			localities.push_back(t->toString());
 		} else {
 			auto a = AddressExclusion::parse(*t);
 			if (!a.isValid()) {
-				fprintf(stderr, "ERROR: '%s' is not a valid network endpoint address\n", t->toString().c_str());
+				fprintf(stderr, "ERROR: '%s' is neither a valid network endpoint address nor a locality\n", t->toString().c_str());
 				if (t->toString().find(":tls") != std::string::npos)
 					printf("        Do not include the `:tls' suffix when naming a process\n");
 				return true;
@@ -2442,8 +2448,14 @@ ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 		std::vector<AddressExclusion> includeAll;
 		includeAll.push_back(AddressExclusion());
 		wait(makeInterruptable(includeServers(db, includeAll, failed)));
+		wait(makeInterruptable(includeLocalities(db, localities, failed, all)));
 	} else {
-		wait(makeInterruptable(includeServers(db, addresses, failed)));
+		if (!addresses.empty()) {
+			wait(makeInterruptable(includeServers(db, addresses, failed)));
+		}
+		if (!localities.empty()) {
+			wait(makeInterruptable(includeLocalities(db, localities, failed, all)));
+		}
 	}
 	return false;
 };
@@ -2453,16 +2465,24 @@ ACTOR Future<bool> exclude(Database db,
                            Reference<ClusterConnectionFile> ccf,
                            Future<Void> warn) {
 	if (tokens.size() <= 1) {
-		vector<AddressExclusion> excl = wait(makeInterruptable(getExcludedServers(db)));
-		if (!excl.size()) {
-			printf("There are currently no servers excluded from the database.\n"
+		state Future<vector<AddressExclusion>> fexclAddresses = makeInterruptable(getExcludedServers(db));
+		state Future<vector<std::string>> fexclLocalities = makeInterruptable(getExcludedLocalities(db));
+
+		wait(success(fexclAddresses) && success(fexclLocalities));
+		vector<AddressExclusion> exclAddresses = fexclAddresses.get();
+		vector<std::string> exclLocalities = fexclLocalities.get();
+
+		if (!exclAddresses.size() && !exclLocalities.size()) {
+			printf("There are currently no servers or localities excluded from the database.\n"
 			       "To learn how to exclude a server, type `help exclude'.\n");
 			return false;
 		}
 
-		printf("There are currently %zu servers or processes being excluded from the database:\n", excl.size());
-		for (const auto& e : excl)
+		printf("There are currently %zu servers or localities being excluded from the database:\n", exclAddresses.size() + exclLocalities.size());
+		for (const auto& e : exclAddresses)
 			printf("  %s\n", e.toString().c_str());
+		for (const auto& e : exclLocalities)
+			printf("  %s\n", e.c_str());
 
 		printf("To find out whether it is safe to remove one or more of these\n"
 		       "servers from the cluster, type `exclude <addresses>'.\n"
@@ -2472,9 +2492,13 @@ ACTOR Future<bool> exclude(Database db,
 	} else {
 		state std::vector<AddressExclusion> exclusionVector;
 		state std::set<AddressExclusion> exclusionSet;
-		bool force = false;
+		state std::vector<AddressExclusion> exclusionAddresses;
+		state std::unordered_set<std::string> exclusionLocalities;
+		state std::vector<std::string> noMatchLocalities;
+		state bool force = false;
 		state bool waitForAllExcluded = true;
 		state bool markFailed = false;
+		state std::vector<ProcessData> workers = wait(makeInterruptable(getWorkers(db)));
 		for (auto t = tokens.begin() + 1; t != tokens.end(); ++t) {
 			if (*t == LiteralStringRef("FORCE")) {
 				force = true;
@@ -2482,19 +2506,37 @@ ACTOR Future<bool> exclude(Database db,
 				waitForAllExcluded = false;
 			} else if (*t == LiteralStringRef("failed")) {
 				markFailed = true;
+			} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix)
+					   || t->startsWith(ExcludeLocalityKeyMachineIdPrefix)
+					   || t->startsWith(ExcludeLocalityKeyProcessIdPrefix)
+					   || t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+				std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, t->toString());
+				if(localityAddresses.empty()) {
+					noMatchLocalities.push_back(t->toString());
+				} else {
+					std::copy(localityAddresses.begin(), localityAddresses.end(), back_inserter(exclusionVector));
+					exclusionSet.insert(localityAddresses.begin(), localityAddresses.end());
+				}
+				exclusionLocalities.insert(t->toString());
 			} else {
 				auto a = AddressExclusion::parse(*t);
 				if (!a.isValid()) {
-					fprintf(stderr, "ERROR: '%s' is not a valid network endpoint address\n", t->toString().c_str());
+					fprintf(stderr, "ERROR: '%s' is neither a valid network endpoint address nor a locality\n", t->toString().c_str());
 					if (t->toString().find(":tls") != std::string::npos)
 						printf("        Do not include the `:tls' suffix when naming a process\n");
 					return true;
 				}
 				exclusionVector.push_back(a);
 				exclusionSet.insert(a);
+				exclusionAddresses.push_back(a);
 			}
 		}
 
+		if (exclusionAddresses.empty() && exclusionLocalities.empty()) {
+			fprintf(stderr, "ERROR: Atleast one valid network endpoint address or a locality is not provided\n");
+			return true;
+		}
+
 		if (!force) {
 			if (markFailed) {
 				state bool safe;
@@ -2606,7 +2648,12 @@ ACTOR Future<bool> exclude(Database db,
 			}
 		}
 
-		wait(makeInterruptable(excludeServers(db, exclusionVector, markFailed)));
+		if (!exclusionAddresses.empty()) {
+			wait(makeInterruptable(excludeServers(db, exclusionAddresses, markFailed)));
+		}
+		if (!exclusionLocalities.empty()) {
+			wait(makeInterruptable(excludeLocalities(db, exclusionLocalities, markFailed)));
+		}
 
 		if (waitForAllExcluded) {
 			printf("Waiting for state to be removed from all excluded servers. This may take a while.\n");
@@ -2618,7 +2665,6 @@ ACTOR Future<bool> exclude(Database db,
 
 		state std::set<NetworkAddress> notExcludedServers =
 		    wait(makeInterruptable(checkForExcludingServers(db, exclusionVector, waitForAllExcluded)));
-		std::vector<ProcessData> workers = wait(makeInterruptable(getWorkers(db)));
 		std::map<IPAddress, std::set<uint16_t>> workerPorts;
 		for (auto addr : workers)
 			workerPorts[addr.address.ip].insert(addr.address.port);
@@ -2673,6 +2719,13 @@ ACTOR Future<bool> exclude(Database db,
 			}
 		}
 
+		for(const auto& locality : noMatchLocalities) {
+			fprintf(stderr,
+					"  %s  ---- WARNING: Currently no servers found with this locality match! Be sure that you excluded "
+					"the correct locality.\n",
+					locality.c_str());
+		}
+
 		bool foundCoordinator = false;
 		auto ccs = ClusterConnectionFile(ccf->getFilename()).getConnectionString();
 		for (const auto& c : ccs.coordinators()) {
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index 26f2fa64970..64f33618f24 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -632,6 +632,44 @@ std::set<AddressExclusion> DatabaseConfiguration::getExcludedServers() const {
 	return addrs;
 }
 
+bool DatabaseConfiguration::isExcludedLocality(const LocalityData& locality) const {
+	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() + locality.dcId().get().toString())).present() : false) ||
+		   (locality.dcId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() + locality.dcId().get().toString())).present() : false) ||
+		   (locality.machineId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() + locality.machineId().get().toString())).present() : false) ||
+		   (locality.machineId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() + locality.machineId().get().toString())).present() : false) ||
+		   (locality.processId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() + locality.processId().get().toString())).present() : false) ||
+		   (locality.processId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() + locality.processId().get().toString())).present() : false) ||
+		   (locality.zoneId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() + locality.zoneId().get().toString())).present() : false) ||
+		   (locality.zoneId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() + locality.zoneId().get().toString())).present() : false);
+}
+
+bool DatabaseConfiguration::isMachineExcluded(const LocalityData& locality) const {
+	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() + locality.dcId().get().toString())).present() : false) ||
+		   (locality.dcId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() + locality.dcId().get().toString())).present() : false) ||
+		   (locality.machineId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() + locality.machineId().get().toString())).present() : false) ||
+		   (locality.machineId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() + locality.machineId().get().toString())).present() : false) ||
+		   (locality.zoneId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() + locality.zoneId().get().toString())).present() : false) ||
+		   (locality.zoneId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() + locality.zoneId().get().toString())).present() : false);
+}
+
+std::set<std::string> DatabaseConfiguration::getExcludedLocalities() const {
+	const_cast<DatabaseConfiguration*>(this)->makeConfigurationImmutable();
+	std::set<std::string> localities;
+	for (auto i = lower_bound(rawConfiguration, excludedLocalityKeys.begin);
+	     i != rawConfiguration.end() && i->key < excludedLocalityKeys.end;
+	     ++i) {
+		std::string l = decodeExcludedLocalityKey(i->key);
+		localities.insert(l);
+	}
+	for (auto i = lower_bound(rawConfiguration, failedLocalityKeys.begin);
+	     i != rawConfiguration.end() && i->key < failedLocalityKeys.end;
+	     ++i) {
+		std::string l = decodeFailedLocalityKey(i->key);
+		localities.insert(l);
+	}
+	return localities;
+}
+
 void DatabaseConfiguration::makeConfigurationMutable() {
 	if (mutableConfiguration.present())
 		return;
diff --git a/fdbclient/DatabaseConfiguration.h b/fdbclient/DatabaseConfiguration.h
index 0df45ce2284..1d0ceab5c36 100644
--- a/fdbclient/DatabaseConfiguration.h
+++ b/fdbclient/DatabaseConfiguration.h
@@ -248,7 +248,10 @@ struct DatabaseConfiguration {
 
 	// Excluded servers (no state should be here)
 	bool isExcludedServer(NetworkAddressList) const;
+	bool isExcludedLocality(const LocalityData& locality) const;
+	bool isMachineExcluded(const LocalityData& locality) const;
 	std::set<AddressExclusion> getExcludedServers() const;
+	std::set<std::string> getExcludedLocalities() const;
 
 	int32_t getDesiredCommitProxies() const {
 		if (commitProxyCount == -1)
diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index 0e942525d37..2dc9d789fa0 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -25,6 +25,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <unordered_set>
 
 #include "flow/Arena.h"
 #include "flow/flow.h"
@@ -245,6 +246,11 @@ std::string describe(std::vector<T> const& items, int max_items = -1) {
 	return describeList(items, max_items);
 }
 
+template <class T>
+std::string describe(std::unordered_set<T> const& items, int max_items = -1) {
+	return describeList(items, max_items);
+}
+
 template <typename T>
 struct Traceable<std::vector<T>> : std::true_type {
 	static std::string toString(const std::vector<T>& value) { return describe(value); }
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index 876236f855c..7778c149e70 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -40,6 +40,7 @@
 #include "fdbrpc/ReplicationPolicy.h"
 #include "fdbrpc/Replication.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
+#include "fdbclient/Schemas.h"
 
 bool isInteger(const std::string& s) {
 	if (s.empty())
@@ -1569,6 +1570,7 @@ ACTOR Future<Void> excludeServers(Database cx, vector<AddressExclusion> servers,
 				wait(ryw.commit());
 				return Void();
 			} catch (Error& e) {
+				TraceEvent("ExcludeServersError").error(e, true);
 				wait(ryw.onError(e));
 			}
 		}
@@ -1580,6 +1582,69 @@ ACTOR Future<Void> excludeServers(Database cx, vector<AddressExclusion> servers,
 				wait(tr.commit());
 				return Void();
 			} catch (Error& e) {
+				TraceEvent("ExcludeServersError").error(e, true);
+				wait(tr.onError(e));
+			}
+		}
+	}
+}
+
+void excludeLocalities(Transaction& tr, std::unordered_set<std::string>& localities, bool failed) {
+	tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+	tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+	tr.setOption(FDBTransactionOptions::LOCK_AWARE);
+	tr.setOption(FDBTransactionOptions::USE_PROVISIONAL_PROXIES);
+	std::string excludeVersionKey = deterministicRandom()->randomUniqueID().toString();
+	auto localityVersionKey = failed ? failedLocalityVersionKey : excludedLocalityVersionKey;
+	tr.addReadConflictRange(singleKeyRange(localityVersionKey)); // To conflict with parallel includeLocalities
+	tr.set(localityVersionKey, excludeVersionKey);
+	for (auto& l : localities) {
+		if (failed) {
+			tr.set(encodeFailedLocalityKey(l), StringRef());
+		} else {
+			tr.set(encodeExcludedLocalityKey(l), StringRef());
+		}
+	}
+	TraceEvent("ExcludeLocalitiesCommit")
+		.detail("Localities", describe(localities))
+		.detail("ExcludeFailed", failed);
+}
+
+ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string> localities, bool failed) {
+	if (cx->apiVersionAtLeast(700)) {
+		state ReadYourWritesTransaction ryw(cx);
+		loop {
+			try {
+				ryw.setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
+				ryw.set(
+				    SpecialKeySpace::getManagementApiCommandOptionSpecialKey(failed ? "failedlocality" : "excludedlocality", "force"),
+				    ValueRef());
+				for (auto& l : localities) {
+					Key addr = failed
+					               ? SpecialKeySpace::getManagementApiCommandPrefix("failedlocality").withSuffix(l)
+					               : SpecialKeySpace::getManagementApiCommandPrefix("excludedlocality").withSuffix(l);
+					ryw.set(addr, ValueRef());
+				}
+				TraceEvent("ExcludeLocalitiesSpecialKeySpaceCommit")
+				    .detail("Localities", describe(localities))
+					.detail("ExcludeFailed", failed);
+
+				wait(ryw.commit());
+				return Void();
+			} catch (Error& e) {
+				TraceEvent("ExcludeLocalitiesError").error(e, true);
+				wait(ryw.onError(e));
+			}
+		}
+	} else {
+		state Transaction tr(cx);
+		loop {
+			try {
+				excludeLocalities(tr, localities, failed);
+				wait(tr.commit());
+				return Void();
+			} catch (Error& e) {
+				TraceEvent("ExcludeLocalitiesError").error(e, true);
 				wait(tr.onError(e));
 			}
 		}
@@ -1687,6 +1752,90 @@ ACTOR Future<Void> includeServers(Database cx, vector<AddressExclusion> servers,
 	}
 }
 
+ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities, bool failed, bool includeAll) {
+	state std::string versionKey = deterministicRandom()->randomUniqueID().toString();
+	if (cx->apiVersionAtLeast(700)) {
+		state ReadYourWritesTransaction ryw(cx);
+		loop {
+			try {
+				ryw.setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
+				if (includeAll) {
+					if (failed) {
+						ryw.clear(SpecialKeySpace::getManamentApiCommandRange("failedlocality"));
+					} else {
+						ryw.clear(SpecialKeySpace::getManamentApiCommandRange("excludedlocality"));
+					}
+				} else {
+					for (auto& l : localities) {
+						Key locality =
+						    failed ? SpecialKeySpace::getManagementApiCommandPrefix("failedlocality").withSuffix(l)
+						           : SpecialKeySpace::getManagementApiCommandPrefix("excludedlocality").withSuffix(l);
+						ryw.clear(locality);
+					}
+				}
+				TraceEvent("IncludeLocalitiesCommit")
+					.detail("Localities", describe(localities))
+					.detail("Failed", failed)
+					.detail("IncludeAll", includeAll);
+
+				wait(ryw.commit());
+				return Void();
+			} catch (Error& e) {
+				TraceEvent("IncludeLocalitiesError").error(e, true);
+				wait(ryw.onError(e));
+			}
+		}
+	} else {
+		state Transaction tr(cx);
+		loop {
+			try {
+				tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+				tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+				tr.setOption(FDBTransactionOptions::LOCK_AWARE);
+				tr.setOption(FDBTransactionOptions::USE_PROVISIONAL_PROXIES);
+
+				// includeLocalities might be used in an emergency transaction, so make sure it is retry-self-conflicting
+				// and CAUSAL_WRITE_RISKY
+				tr.setOption(FDBTransactionOptions::CAUSAL_WRITE_RISKY);
+				if (failed) {
+					tr.addReadConflictRange(singleKeyRange(failedLocalityVersionKey));
+					tr.set(failedLocalityVersionKey, versionKey);
+				} else {
+					tr.addReadConflictRange(singleKeyRange(excludedLocalityVersionKey));
+					tr.set(excludedLocalityVersionKey, versionKey);
+				}
+
+				if (includeAll) {
+					if (failed) {
+						tr.clear(failedLocalityKeys);
+					} else {
+						tr.clear(excludedLocalityKeys);
+					}
+				} else {
+					for (auto& l : localities) {
+						if (failed) {
+							tr.clear(encodeFailedLocalityKey(l));
+						} else {
+							tr.clear(encodeExcludedLocalityKey(l));
+						}
+					}
+				}
+
+				TraceEvent("IncludeLocalitiesCommit")
+					.detail("Localities", describe(localities))
+					.detail("Failed", failed)
+					.detail("IncludeAll", includeAll);
+
+				wait(tr.commit());
+				return Void();
+			} catch (Error& e) {
+				TraceEvent("IncludeLocalitiesError").error(e, true);
+				wait(tr.onError(e));
+			}
+		}
+	}
+}
+
 ACTOR Future<Void> setClass(Database cx, AddressExclusion server, ProcessClass processClass) {
 	state Transaction tr(cx);
 
@@ -1758,6 +1907,78 @@ ACTOR Future<vector<AddressExclusion>> getExcludedServers(Database cx) {
 	}
 }
 
+ACTOR Future<vector<std::string>> getExcludedLocalities(Transaction* tr) {
+	state RangeResult r = wait(tr->getRange(excludedLocalityKeys, CLIENT_KNOBS->TOO_MANY));
+	ASSERT(!r.more && r.size() < CLIENT_KNOBS->TOO_MANY);
+	state RangeResult r2 = wait(tr->getRange(failedLocalityKeys, CLIENT_KNOBS->TOO_MANY));
+	ASSERT(!r2.more && r2.size() < CLIENT_KNOBS->TOO_MANY);
+
+	vector<std::string> excludedLocalities;
+	for (auto i = r.begin(); i != r.end(); ++i) {
+		auto a = decodeExcludedLocalityKey(i->key);
+		excludedLocalities.push_back(a);
+	}
+	for (auto i = r2.begin(); i != r2.end(); ++i) {
+		auto a = decodeFailedLocalityKey(i->key);
+		excludedLocalities.push_back(a);
+	}
+	uniquify(excludedLocalities);
+	return excludedLocalities;
+}
+
+ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx) {
+	state Transaction tr(cx);
+	loop {
+		try {
+			tr.setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
+			tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE); // necessary?
+			tr.setOption(FDBTransactionOptions::LOCK_AWARE);
+			vector<std::string> exclusions = wait(getExcludedLocalities(&tr));
+			return exclusions;
+		} catch (Error& e) {
+			wait(tr.onError(e));
+		}
+	}
+}
+
+std::pair<std::string, std::string> decodeLocality(std::string locality) {
+	StringRef localityRef(locality.c_str());
+	if (localityRef.startsWith(ExcludeLocalityKeyDcIdPrefix)) {
+		return std::make_pair(LocalityData::keyDcId.toString(), localityRef.removePrefix(ExcludeLocalityKeyDcIdPrefix).toString());
+	} else if (localityRef.startsWith(ExcludeLocalityKeyMachineIdPrefix)) {
+		return std::make_pair(LocalityData::keyMachineId.toString(), localityRef.removePrefix(ExcludeLocalityKeyMachineIdPrefix).toString());
+	} else if (localityRef.startsWith(ExcludeLocalityKeyProcessIdPrefix)) {
+		return std::make_pair(LocalityData::keyProcessId.toString(), localityRef.removePrefix(ExcludeLocalityKeyProcessIdPrefix).toString());
+	} else if (localityRef.startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+		return std::make_pair(LocalityData::keyZoneId.toString(), localityRef.removePrefix(ExcludeLocalityKeyZoneIdPrefix).toString());
+	}
+
+	return std::make_pair("", "");
+}
+
+std::set<AddressExclusion> getAddressesByLocality(std::vector<ProcessData>& workers, std::string locality) {
+	std::pair<std::string, std::string> localityKeyValue = decodeLocality(locality);
+
+	std::set<AddressExclusion> localityAddresses;
+	for (int i = 0; i < workers.size(); i++) {
+		if (localityKeyValue.first == LocalityData::keyDcId && workers[i].locality.dcId().present()
+		    && localityKeyValue.second == workers[i].locality.dcId().get()) {
+			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
+		} else if (localityKeyValue.first == LocalityData::keyMachineId && workers[i].locality.machineId().present()
+		           && localityKeyValue.second == workers[i].locality.machineId().get()) {
+			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
+		} else if (localityKeyValue.first == LocalityData::keyProcessId && workers[i].locality.processId().present()
+		           && localityKeyValue.second == workers[i].locality.processId().get()) {
+			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
+		} else if (localityKeyValue.first == LocalityData::keyZoneId && workers[i].locality.zoneId().present()
+		           && localityKeyValue.second == workers[i].locality.zoneId().get()) {
+			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
+		}
+	}
+
+	return localityAddresses;
+}
+
 ACTOR Future<Void> printHealthyZone(Database cx) {
 	state Transaction tr(cx);
 	loop {
diff --git a/fdbclient/ManagementAPI.actor.h b/fdbclient/ManagementAPI.actor.h
index b66419c7add..f93b528ac90 100644
--- a/fdbclient/ManagementAPI.actor.h
+++ b/fdbclient/ManagementAPI.actor.h
@@ -163,10 +163,18 @@ Reference<IQuorumChange> nameQuorumChange(std::string const& name, Reference<IQu
 ACTOR Future<Void> excludeServers(Database cx, vector<AddressExclusion> servers, bool failed = false);
 void excludeServers(Transaction& tr, vector<AddressExclusion>& servers, bool failed = false);
 
+// Exclude the servers matching the given set of localities from use as state servers.  Returns as soon as the change
+// is durable, without necessarily waiting for the servers to be evacuated.
+ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string> localities, bool failed = false);
+void excludeLocalities(Transaction& tr, std::unordered_set<std::string>& localities, bool failed = false);
+
 // Remove the given servers from the exclusion list.  A NetworkAddress with a port of 0 means all servers on the given
 // IP.  A NetworkAddress() means all servers (don't exclude anything)
 ACTOR Future<Void> includeServers(Database cx, vector<AddressExclusion> servers, bool failed = false);
 
+// Remove the given localities from the exclusion list.
+ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities, bool failed = false, bool includeAll = false);
+
 // Set the process class of processes with the given address.  A NetworkAddress with a port of 0 means all servers on
 // the given IP.
 ACTOR Future<Void> setClass(Database cx, AddressExclusion server, ProcessClass processClass);
@@ -175,6 +183,12 @@ ACTOR Future<Void> setClass(Database cx, AddressExclusion server, ProcessClass p
 ACTOR Future<vector<AddressExclusion>> getExcludedServers(Database cx);
 ACTOR Future<vector<AddressExclusion>> getExcludedServers(Transaction* tr);
 
+// Get the current list of excluded localities
+ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx);
+ACTOR Future<vector<std::string>> getExcludedLocalities(Transaction* tr);
+
+std::set<AddressExclusion> getAddressesByLocality(std::vector<ProcessData>& workers, std::string locality);
+
 // Check for the given, previously excluded servers to be evacuated (no longer used for state).  If waitForExclusion is
 // true, this actor returns once it is safe to shut down all such machines without impacting fault tolerance, until and
 // unless any of them are explicitly included with includeServers()
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 6c735b919c1..cd4f1e18581 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1172,6 +1172,14 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 		    SpecialKeySpace::MODULE::MANAGEMENT,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
 		    std::make_unique<FailedServersRangeImpl>(SpecialKeySpace::getManamentApiCommandRange("failed")));
+		registerSpecialKeySpaceModule(
+		    SpecialKeySpace::MODULE::MANAGEMENT,
+		    SpecialKeySpace::IMPLTYPE::READWRITE,
+		    std::make_unique<ExcludedLocalitiesRangeImpl>(SpecialKeySpace::getManamentApiCommandRange("excludedlocality")));
+		registerSpecialKeySpaceModule(
+		    SpecialKeySpace::MODULE::MANAGEMENT,
+		    SpecialKeySpace::IMPLTYPE::READWRITE,
+		    std::make_unique<FailedLocalitiesRangeImpl>(SpecialKeySpace::getManamentApiCommandRange("failedlocality")));
 		registerSpecialKeySpaceModule(
 		    SpecialKeySpace::MODULE::MANAGEMENT,
 		    SpecialKeySpace::IMPLTYPE::READONLY,
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index d51d27a23ce..4cac25ff462 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -77,6 +77,12 @@ std::unordered_map<std::string, KeyRange> SpecialKeySpace::managementApiCommandT
 	{ "failed",
 	  KeyRangeRef(LiteralStringRef("failed/"), LiteralStringRef("failed0"))
 	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) },
+	{ "excludedlocality",
+	  KeyRangeRef(LiteralStringRef("excludedlocality/"), LiteralStringRef("excludedlocality0"))
+	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) },
+	{ "failedlocality",
+	  KeyRangeRef(LiteralStringRef("failedlocality/"), LiteralStringRef("failedlocality0"))
+	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) },
 	{ "lock", singleKeyRange(LiteralStringRef("db_locked")).withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) },
 	{ "consistencycheck",
 	  singleKeyRange(LiteralStringRef("consistency_check_suspended"))
@@ -98,7 +104,7 @@ std::unordered_map<std::string, KeyRange> SpecialKeySpace::managementApiCommandT
 	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) }
 };
 
-std::set<std::string> SpecialKeySpace::options = { "excluded/force", "failed/force" };
+std::set<std::string> SpecialKeySpace::options = { "excluded/force", "failed/force", "excludedlocality/force", "failedlocality/force" };
 
 std::set<std::string> SpecialKeySpace::tracingOptions = { kTracingTransactionIdKey, kTracingTokenKey };
 
@@ -2110,3 +2116,156 @@ Future<Optional<std::string>> DataDistributionImpl::commit(ReadYourWritesTransac
 	}
 	return msg;
 }
+
+void includeLocalities(ReadYourWritesTransaction* ryw) {
+	ryw->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+	ryw->setOption(FDBTransactionOptions::LOCK_AWARE);
+	ryw->setOption(FDBTransactionOptions::USE_PROVISIONAL_PROXIES);
+	// includeLocalities might be used in an emergency transaction, so make sure it is retry-self-conflicting and
+	// CAUSAL_WRITE_RISKY
+	ryw->setOption(FDBTransactionOptions::CAUSAL_WRITE_RISKY);
+	std::string versionKey = deterministicRandom()->randomUniqueID().toString();
+	// for excluded localities
+	auto ranges =
+	    ryw->getSpecialKeySpaceWriteMap().containedRanges(SpecialKeySpace::getManamentApiCommandRange("excludedlocality"));
+	auto iter = ranges.begin();
+	Transaction& tr = ryw->getTransaction();
+	while (iter != ranges.end()) {
+		auto entry = iter->value();
+		if (entry.first && !entry.second.present()) {
+			tr.addReadConflictRange(singleKeyRange(excludedLocalityVersionKey));
+			tr.set(excludedLocalityVersionKey, versionKey);
+			tr.clear(ryw->getDatabase()->specialKeySpace->decode(iter->range()));
+		}
+		++iter;
+	}
+	// for failed localities
+	ranges = ryw->getSpecialKeySpaceWriteMap().containedRanges(SpecialKeySpace::getManamentApiCommandRange("failedlocality"));
+	iter = ranges.begin();
+	while (iter != ranges.end()) {
+		auto entry = iter->value();
+		if (entry.first && !entry.second.present()) {
+			tr.addReadConflictRange(singleKeyRange(failedLocalityVersionKey));
+			tr.set(failedLocalityVersionKey, versionKey);
+			tr.clear(ryw->getDatabase()->specialKeySpace->decode(iter->range()));
+		}
+		++iter;
+	}
+}
+
+bool parseLocalitiesFromKeys(ReadYourWritesTransaction* ryw,
+                             bool failed,
+                             std::unordered_set<std::string>& localities,
+							 std::vector<AddressExclusion>& addresses,
+                             std::set<AddressExclusion>& exclusions,
+							 std::vector<ProcessData>& workers,
+                             Optional<std::string>& msg) {
+	KeyRangeRef range = failed ? SpecialKeySpace::getManamentApiCommandRange("failedlocality")
+	                           : SpecialKeySpace::getManamentApiCommandRange("excludedlocality");
+	auto ranges = ryw->getSpecialKeySpaceWriteMap().containedRanges(range);
+	auto iter = ranges.begin();
+	while (iter != ranges.end()) {
+		auto entry = iter->value();
+		// only check for exclude(set) operation, include(clear) are not checked
+		TraceEvent(SevDebug, "ParseLocalities")
+		    .detail("Valid", entry.first)
+		    .detail("Set", entry.second.present())
+		    .detail("Key", iter->begin().toString());
+		if (entry.first && entry.second.present()) {
+			Key locality = iter->begin().removePrefix(range.begin);
+			if (locality.startsWith(ExcludeLocalityKeyDcIdPrefix)
+				|| locality.startsWith(ExcludeLocalityKeyMachineIdPrefix)
+				|| locality.startsWith(ExcludeLocalityKeyProcessIdPrefix)
+				|| locality.startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+				std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, locality.toString());
+				if(!localityAddresses.empty()) {
+					std::copy(localityAddresses.begin(), localityAddresses.end(), back_inserter(addresses));
+					exclusions.insert(localityAddresses.begin(), localityAddresses.end());
+				}
+
+				localities.insert(locality.toString());
+			} else {
+				std::string error = "ERROR: \'" + locality.toString() + "\' is not a valid locality\n";
+				msg = ManagementAPIError::toJsonString(
+				    false, entry.second.present() ? (failed ? "exclude failed" : "exclude") : "include", error);
+				return false;
+			}
+		}
+		++iter;
+	}
+	return true;
+}
+
+ACTOR Future<Optional<std::string>> excludeLocalityCommitActor(ReadYourWritesTransaction* ryw, bool failed) {
+	state Optional<std::string> result;
+	state std::unordered_set<std::string> localities;
+	state std::vector<AddressExclusion> addresses;
+	state std::set<AddressExclusion> exclusions;
+	state std::vector<ProcessData> workers = wait(getWorkers(&ryw->getTransaction()));
+	if (!parseLocalitiesFromKeys(ryw, failed, localities, addresses, exclusions, workers, result))
+		return result;
+	// If force option is not set, we need to do safety check
+	auto force = ryw->getSpecialKeySpaceWriteMap()[SpecialKeySpace::getManagementApiCommandOptionSpecialKey(
+	    failed ? "failedlocality" : "excludedlocality", "force")];
+	// only do safety check when we have localities to be excluded and the force option key is not set
+	if (localities.size() && !(force.first && force.second.present())) {
+		bool safe = wait(checkExclusion(ryw->getDatabase(), &addresses, &exclusions, failed, &result));
+		if (!safe)
+			return result;
+	}
+
+	excludeLocalities(ryw->getTransaction(), localities, failed);
+	includeLocalities(ryw);
+
+	return result;
+}
+
+ExcludedLocalitiesRangeImpl::ExcludedLocalitiesRangeImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
+
+Future<RangeResult> ExcludedLocalitiesRangeImpl::getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const {
+	return rwModuleWithMappingGetRangeActor(ryw, this, kr);
+}
+
+void ExcludedLocalitiesRangeImpl::set(ReadYourWritesTransaction* ryw, const KeyRef& key, const ValueRef& value) {
+	// ignore value
+	ryw->getSpecialKeySpaceWriteMap().insert(key, std::make_pair(true, Optional<Value>(ValueRef())));
+}
+
+Key ExcludedLocalitiesRangeImpl::decode(const KeyRef& key) const {
+	return key.removePrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)
+	    .withPrefix(LiteralStringRef("\xff/conf/"));
+}
+
+Key ExcludedLocalitiesRangeImpl::encode(const KeyRef& key) const {
+	return key.removePrefix(LiteralStringRef("\xff/conf/"))
+	    .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin);
+}
+
+Future<Optional<std::string>> ExcludedLocalitiesRangeImpl::commit(ReadYourWritesTransaction* ryw) {
+	return excludeLocalityCommitActor(ryw, false);
+}
+
+FailedLocalitiesRangeImpl::FailedLocalitiesRangeImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
+
+Future<RangeResult> FailedLocalitiesRangeImpl::getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const {
+	return rwModuleWithMappingGetRangeActor(ryw, this, kr);
+}
+
+void FailedLocalitiesRangeImpl::set(ReadYourWritesTransaction* ryw, const KeyRef& key, const ValueRef& value) {
+	// ignore value
+	ryw->getSpecialKeySpaceWriteMap().insert(key, std::make_pair(true, Optional<Value>(ValueRef())));
+}
+
+Key FailedLocalitiesRangeImpl::decode(const KeyRef& key) const {
+	return key.removePrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)
+	    .withPrefix(LiteralStringRef("\xff/conf/"));
+}
+
+Key FailedLocalitiesRangeImpl::encode(const KeyRef& key) const {
+	return key.removePrefix(LiteralStringRef("\xff/conf/"))
+	    .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin);
+}
+
+Future<Optional<std::string>> FailedLocalitiesRangeImpl::commit(ReadYourWritesTransaction* ryw) {
+	return excludeLocalityCommitActor(ryw, true);
+}
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index 084135bfb65..674e9d2f0ad 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -280,6 +280,26 @@ class ManagementCommandsOptionsImpl : public SpecialKeyRangeRWImpl {
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
 
+class ExcludedLocalitiesRangeImpl : public SpecialKeyRangeRWImpl {
+public:
+	explicit ExcludedLocalitiesRangeImpl(KeyRangeRef kr);
+	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const override;
+	void set(ReadYourWritesTransaction* ryw, const KeyRef& key, const ValueRef& value) override;
+	Key decode(const KeyRef& key) const override;
+	Key encode(const KeyRef& key) const override;
+	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
+};
+
+class FailedLocalitiesRangeImpl : public SpecialKeyRangeRWImpl {
+public:
+	explicit FailedLocalitiesRangeImpl(KeyRangeRef kr);
+	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw, KeyRangeRef kr) const override;
+	void set(ReadYourWritesTransaction* ryw, const KeyRef& key, const ValueRef& value) override;
+	Key decode(const KeyRef& key) const override;
+	Key encode(const KeyRef& key) const override;
+	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
+};
+
 class ExcludeServersRangeImpl : public SpecialKeyRangeRWImpl {
 public:
 	explicit ExcludeServersRangeImpl(KeyRangeRef kr);
diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index 4c82e3e12f2..b9dd2d6fd45 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -650,6 +650,18 @@ std::string encodeExcludedServersKey(AddressExclusion const& addr) {
 	return excludedServersPrefix.toString() + addr.toString();
 }
 
+const KeyRangeRef excludedLocalityKeys(LiteralStringRef("\xff/conf/excludedlocality/"), LiteralStringRef("\xff/conf/excludedlocality0"));
+const KeyRef excludedLocalityPrefix = excludedLocalityKeys.begin;
+const KeyRef excludedLocalityVersionKey = LiteralStringRef("\xff/conf/excludedlocality");
+const std::string decodeExcludedLocalityKey(KeyRef const& key) {
+	ASSERT(key.startsWith(excludedLocalityPrefix));
+	return key.removePrefix(excludedLocalityPrefix).toString();
+}
+std::string encodeExcludedLocalityKey(std::string const& locality) {
+	// FIXME: make sure what's persisted here is not affected by innocent changes elsewhere
+	return excludedLocalityPrefix.toString() + locality;
+}
+
 const KeyRangeRef failedServersKeys(LiteralStringRef("\xff/conf/failed/"), LiteralStringRef("\xff/conf/failed0"));
 const KeyRef failedServersPrefix = failedServersKeys.begin;
 const KeyRef failedServersVersionKey = LiteralStringRef("\xff/conf/failed");
@@ -667,6 +679,18 @@ std::string encodeFailedServersKey(AddressExclusion const& addr) {
 	return failedServersPrefix.toString() + addr.toString();
 }
 
+const KeyRangeRef failedLocalityKeys(LiteralStringRef("\xff/conf/failedlocality/"), LiteralStringRef("\xff/conf/failedlocality0"));
+const KeyRef failedLocalityPrefix = failedLocalityKeys.begin;
+const KeyRef failedLocalityVersionKey = LiteralStringRef("\xff/conf/failedlocality");
+const std::string decodeFailedLocalityKey(KeyRef const& key) {
+	ASSERT(key.startsWith(failedLocalityPrefix));
+	return key.removePrefix(failedLocalityPrefix).toString();
+}
+std::string encodeFailedLocalityKey(std::string const& locality) {
+	// FIXME: make sure what's persisted here is not affected by innocent changes elsewhere
+	return failedLocalityPrefix.toString() + locality;
+}
+
 // const KeyRangeRef globalConfigKeys( LiteralStringRef("\xff/globalConfig/"), LiteralStringRef("\xff/globalConfig0") );
 // const KeyRef globalConfigPrefix = globalConfigKeys.begin;
 
diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h
index 815abf0fdd9..537de78a4bc 100644
--- a/fdbclient/SystemData.h
+++ b/fdbclient/SystemData.h
@@ -232,6 +232,13 @@ extern const KeyRef excludedServersVersionKey; // The value of this key shall be
 const AddressExclusion decodeExcludedServersKey(KeyRef const& key); // where key.startsWith(excludedServersPrefix)
 std::string encodeExcludedServersKey(AddressExclusion const&);
 
+extern const KeyRef excludedLocalityPrefix;
+extern const KeyRangeRef excludedLocalityKeys;
+extern const KeyRef excludedLocalityVersionKey; // The value of this key shall be changed by any transaction that
+                                               // modifies the excluded localities list
+const std::string decodeExcludedLocalityKey(KeyRef const& key); // where key.startsWith(excludedLocalityPrefix)
+std::string encodeExcludedLocalityKey(std::string const&);
+
 //   "\xff/conf/failed/1.2.3.4" := ""
 //   "\xff/conf/failed/1.2.3.4:4000" := ""
 //   These are inside configKeysPrefix since they represent a form of configuration and they are convenient
@@ -246,6 +253,13 @@ extern const KeyRef failedServersVersionKey; // The value of this key shall be c
 const AddressExclusion decodeFailedServersKey(KeyRef const& key); // where key.startsWith(failedServersPrefix)
 std::string encodeFailedServersKey(AddressExclusion const&);
 
+extern const KeyRef failedLocalityPrefix;
+extern const KeyRangeRef failedLocalityKeys;
+extern const KeyRef failedLocalityVersionKey; // The value of this key shall be changed by any transaction that modifies
+                                             // the failed localities list
+const std::string decodeFailedLocalityKey(KeyRef const& key); // where key.startsWith(failedLocalityPrefix)
+std::string encodeFailedLocalityKey(std::string const&);
+
 //   "\xff/globalConfig/[[option]]" := "value"
 //	 An umbrella prefix for global configuration data synchronized to all nodes.
 // extern const KeyRangeRef globalConfigData;
diff --git a/fdbrpc/Locality.h b/fdbrpc/Locality.h
index 0a7467e0bf5..ae666dcdf59 100644
--- a/fdbrpc/Locality.h
+++ b/fdbrpc/Locality.h
@@ -24,6 +24,11 @@
 
 #include "flow/flow.h"
 
+const StringRef ExcludeLocalityKeyDcIdPrefix = LiteralStringRef("dcid:");
+const StringRef ExcludeLocalityKeyMachineIdPrefix = LiteralStringRef("machineid:");
+const StringRef ExcludeLocalityKeyProcessIdPrefix = LiteralStringRef("processid:");
+const StringRef ExcludeLocalityKeyZoneIdPrefix = LiteralStringRef("zoneid:");
+
 struct ProcessClass {
 	constexpr static FileIdentifier file_identifier = 6697257;
 	// This enum is stored in restartInfo.ini for upgrade tests, so be very careful about changing the existing items!
diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index f7dc855d125..8756b3a2a76 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -213,7 +213,9 @@ void applyMetadataMutations(SpanID const& spanContext,
 				        .castTo<StringRef>()) { // FIXME: Make this check more specific, here or by reading
 					                            // configuration whenever there is a change
 					if ((!m.param1.startsWith(excludedServersPrefix) && m.param1 != excludedServersVersionKey) &&
-					    (!m.param1.startsWith(failedServersPrefix) && m.param1 != failedServersVersionKey)) {
+					    (!m.param1.startsWith(failedServersPrefix) && m.param1 != failedServersVersionKey) &&
+						(!m.param1.startsWith(excludedLocalityPrefix) && m.param1 != excludedLocalityVersionKey) &&
+					    (!m.param1.startsWith(failedLocalityPrefix) && m.param1 != failedLocalityVersionKey)) {
 						auto t = txnStateStore->readValue(m.param1).get();
 						TraceEvent("MutationRequiresRestart", dbgid)
 						    .detail("M", m.toString())
@@ -427,7 +429,8 @@ void applyMetadataMutations(SpanID const& spanContext,
 			if (configKeys.intersects(range)) {
 				if (!initialCommit)
 					txnStateStore->clear(range & configKeys);
-				if (!excludedServersKeys.contains(range) && !failedServersKeys.contains(range)) {
+				if (!excludedServersKeys.contains(range) && !failedServersKeys.contains(range)
+				    && !excludedLocalityKeys.contains(range) && !failedLocalityKeys.contains(range)) {
 					TraceEvent("MutationRequiresRestart", dbgid).detail("M", m.toString());
 					confChange = true;
 				}
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 2b4c8ec4cad..5f27fa0bb88 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -3815,16 +3815,26 @@ ACTOR Future<Void> trackExcludedServers(DDTeamCollection* self) {
 			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 			state Future<RangeResult> fresultsExclude = tr.getRange(excludedServersKeys, CLIENT_KNOBS->TOO_MANY);
 			state Future<RangeResult> fresultsFailed = tr.getRange(failedServersKeys, CLIENT_KNOBS->TOO_MANY);
-			wait(success(fresultsExclude) && success(fresultsFailed));
+			state Future<RangeResult> flocalitiesExclude = tr.getRange(excludedLocalityKeys, CLIENT_KNOBS->TOO_MANY);
+			state Future<RangeResult> flocalitiesFailed = tr.getRange(failedLocalityKeys, CLIENT_KNOBS->TOO_MANY);
+			state Future<std::vector<ProcessData>> fworkers = getWorkers(self->cx);
+			wait(success(fresultsExclude) && success(fresultsFailed) &&
+				success(flocalitiesExclude) && success(flocalitiesFailed));
 
-			RangeResult excludedResults = fresultsExclude.get();
+			state RangeResult excludedResults = fresultsExclude.get();
 			ASSERT(!excludedResults.more && excludedResults.size() < CLIENT_KNOBS->TOO_MANY);
 
-			RangeResult failedResults = fresultsFailed.get();
+			state RangeResult failedResults = fresultsFailed.get();
 			ASSERT(!failedResults.more && failedResults.size() < CLIENT_KNOBS->TOO_MANY);
 
-			std::set<AddressExclusion> excluded;
-			std::set<AddressExclusion> failed;
+			state RangeResult excludedLocalityResults = flocalitiesExclude.get();
+			ASSERT(!excludedLocalityResults.more && excludedLocalityResults.size() < CLIENT_KNOBS->TOO_MANY);
+
+			state RangeResult failedLocalityResults = flocalitiesFailed.get();
+			ASSERT(!failedLocalityResults.more && failedLocalityResults.size() < CLIENT_KNOBS->TOO_MANY);
+
+			state std::set<AddressExclusion> excluded;
+			state std::set<AddressExclusion> failed;
 			for (const auto& r : excludedResults) {
 				AddressExclusion addr = decodeExcludedServersKey(r.key);
 				if (addr.isValid()) {
@@ -3838,6 +3848,19 @@ ACTOR Future<Void> trackExcludedServers(DDTeamCollection* self) {
 				}
 			}
 
+			wait(success(fworkers));
+			std::vector<ProcessData> workers = fworkers.get();
+			for (const auto& r : excludedLocalityResults) {
+				std::string locality = decodeExcludedLocalityKey(r.key);
+				std::set<AddressExclusion> localityExcludedAddresses = getAddressesByLocality(workers, locality);
+				excluded.insert(localityExcludedAddresses.begin(), localityExcludedAddresses.end());
+			}
+			for (const auto& r : failedLocalityResults) {
+				std::string locality = decodeFailedLocalityKey(r.key);
+				std::set<AddressExclusion> localityFailedAddresses = getAddressesByLocality(workers, locality);
+				failed.insert(localityFailedAddresses.begin(), localityFailedAddresses.end());
+			}
+
 			// Reset and reassign self->excludedServers based on excluded, but we only
 			// want to trigger entries that are different
 			// Do not retrigger and double-overwrite failed or wiggling servers
@@ -3860,11 +3883,14 @@ ACTOR Future<Void> trackExcludedServers(DDTeamCollection* self) {
 			}
 
 			TraceEvent("DDExcludedServersChanged", self->distributorId)
-			    .detail("RowsExcluded", excludedResults.size())
-			    .detail("RowsFailed", failedResults.size());
+			    .detail("AddressesExcluded", excludedResults.size())
+			    .detail("AddressesFailed", failedResults.size())
+				.detail("LocalitiesExcluded", excludedLocalityResults.size())
+				.detail("LocalitiesFailed", failedLocalityResults.size());
 
 			self->restartRecruiting.trigger();
-			state Future<Void> watchFuture = tr.watch(excludedServersVersionKey) || tr.watch(failedServersVersionKey);
+			state Future<Void> watchFuture = tr.watch(excludedServersVersionKey) || tr.watch(failedServersVersionKey) ||
+			                                 tr.watch(excludedLocalityVersionKey) || tr.watch(failedLocalityVersionKey);
 			wait(tr.commit());
 			wait(watchFuture);
 			tr.reset();
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index ca4ed58ccee..bb24cdd4990 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -357,8 +357,14 @@ static JsonBuilderObject machineStatusFetcher(WorkerEvents mMetrics,
 			// FIXME: this will not catch if the secondary address of the process was excluded
 			NetworkAddressList tempList;
 			tempList.address = it->first;
-			if (configuration.present() && !configuration.get().isExcludedServer(tempList))
-				notExcludedMap[machineId] = false;
+			bool excludedServer = false;
+			bool excludedLocality = false;
+			if (configuration.present() && configuration.get().isExcludedServer(tempList))
+			    excludedServer = true;
+			if (locality.count(it->first) && configuration.present() && configuration.get().isMachineExcluded(locality[it->first]))
+				excludedLocality = true;
+
+			notExcludedMap[machineId] = excludedServer || excludedLocality;
 			workerContribMap[machineId]++;
 		} catch (Error&) {
 			++failed;
@@ -1016,7 +1022,8 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 			statusObj["roles"] = roles.getStatusForAddress(address);
 
 			if (configuration.present()) {
-				statusObj["excluded"] = configuration.get().isExcludedServer(workerItr->interf.addresses());
+				statusObj["excluded"] = configuration.get().isExcludedServer(workerItr->interf.addresses())
+				                        || configuration.get().isExcludedLocality(workerItr->interf.locality);
 			}
 
 			statusObj["class_type"] = workerItr->processClass.toString();
@@ -1609,6 +1616,12 @@ static JsonBuilderObject configurationFetcher(Optional<DatabaseConfiguration> co
 				statusObj["address"] = it->toString();
 				excludedServersArr.push_back(statusObj);
 			}
+			std::set<std::string> excludedLocalities = configuration.getExcludedLocalities();
+			for (std::set<std::string>::iterator it = excludedLocalities.begin(); it != excludedLocalities.end(); it++) {
+				JsonBuilderObject statusObj;
+				statusObj["locality"] = *it;
+				excludedServersArr.push_back(statusObj);
+			}
 			statusObj["excluded_servers"] = excludedServersArr;
 		}
 		vector<ClientLeaderRegInterface> coordinatorLeaderServers = coordinators.clientLeaderServers;
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index c5fe4369da6..34842f8e6cc 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -35,7 +35,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 	bool enabled, killProcesses;
 	int minMachinesToKill, maxMachinesToKill, maxSafetyCheckRetries;
 	double minDelay, maxDelay;
-	double kill1Timeout, kill2Timeout;
+	double kill1Timeout, kill2Timeout, kill3Timeout;
 
 	std::set<AddressExclusion> toKill1, toKill2;
 	std::map<AddressExclusion, Optional<Standalone<StringRef>>> machine_ids; // ip -> Locality Zone id
@@ -52,6 +52,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		maxDelay = getOption(options, LiteralStringRef("maxDelay"), 60.0);
 		kill1Timeout = getOption(options, LiteralStringRef("kill1Timeout"), 60.0);
 		kill2Timeout = getOption(options, LiteralStringRef("kill2Timeout"), 6000.0);
+		kill3Timeout = getOption(options, LiteralStringRef("kill3Timeout"), 6000.0);
 		killProcesses = deterministicRandom()->random01() < 0.5;
 		if (g_network->isSimulated()) {
 			g_simulator.allowLogSetKills = false;
@@ -75,7 +76,10 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 			TraceEvent("RemoveAndKill")
 			    .detail("Step", "listAddresses")
 			    .detail("Address", pAddr.toString())
-			    .detail("Process", describe(*it));
+			    .detail("Process", describe(*it))
+			    .detail("Dcid", it->locality.dcId().get().toString())
+			    .detail("Zoneid", it->locality.zoneId().get().toString())
+			    .detail("MachineId", it->locality.machineId().get().toString());
 
 			if (g_simulator.protectedAddresses.count(it->address) == 0)
 				processAddrs.push_back(pAddr);
@@ -140,7 +144,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		if (!enabled)
 			return Void();
 		double delay = deterministicRandom()->random01() * (maxDelay - minDelay) + minDelay;
-		return workloadMain(this, cx, delay, toKill1, toKill2);
+		return workloadMain(this, cx, delay, toKill1, toKill2, minMachinesToKill, maxMachinesToKill);
 	}
 
 	Future<bool> check(Database const& cx) override { return true; }
@@ -334,7 +338,10 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 	                                       Database cx,
 	                                       double waitSeconds,
 	                                       std::set<AddressExclusion> toKill1,
-	                                       std::set<AddressExclusion> toKill2) {
+	                                       std::set<AddressExclusion> toKill2,
+	                                       int minMachinesToKill,
+	                                       int maxMachinesToKill) {
+		wait(updateProcessIds(cx));
 		wait(delay(waitSeconds));
 
 		// Removing the first set of machines might legitimately bring the database down, so a timeout is not an error
@@ -430,6 +437,71 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 			self->includeAddresses(toKill2);
 		}
 
+		std::unordered_set<std::string> localities;
+		auto processes = getServers();
+		// collecting all localities
+		for (auto& it : processes) {
+			if (it->locality.dcId().present())
+				localities.insert(ExcludeLocalityKeyDcIdPrefix.toString() + it->locality.dcId().get().toString());
+			if (it->locality.zoneId().present())
+				localities.insert(ExcludeLocalityKeyZoneIdPrefix.toString() + it->locality.zoneId().get().toString());
+			if (it->locality.machineId().present())
+				localities.insert(ExcludeLocalityKeyMachineIdPrefix.toString() +
+				                  it->locality.machineId().get().toString());
+			if (it->locality.processId().present())
+				localities.insert(ExcludeLocalityKeyProcessIdPrefix.toString() +
+				                  it->locality.processId().get().toString());
+		}
+		int localitiesCount = localities.size();
+		int nToKill3 = deterministicRandom()->randomInt(std::min(localitiesCount, minMachinesToKill),
+		                                                std::min(localitiesCount, maxMachinesToKill) + 1);
+		state std::set<std::string> toKill3 = random_subset(localities, nToKill3);
+
+		TraceEvent("RemoveAndKillLocalities")
+		    .detail("LocalitiesSize", localities.size())
+		    .detail("Kill3Size", toKill3.size())
+		    .detail("ToKill3", describe(toKill3));
+
+		// toKill3 may kill too many servers to make cluster unavailable.
+		// Get the processes in toKill3 that are safe to kill
+		state std::set<AddressExclusion> toKill3Addresses = wait(self->getLocalitiesAddresses(cx, toKill3));
+		killProcArray = self->protectServers(toKill3Addresses);
+
+		// Update the kill networks to the killable localities
+		toKill3 = self->getSafeLocalitiesToKill(killProcArray);
+		state bool failed =
+		    deterministicRandom()->randomInt(0, 2) ? true : false; // excluding with random failed option
+
+		TraceEvent("RemoveAndKillLocalities")
+		    .detail("Step", "exclude third list")
+		    .detail("ToKill3AddressesSize", toKill3Addresses.size())
+		    .detail("KillProcArraySize", killProcArray.size())
+		    .detail("Kill3Size", toKill3.size())
+		    .detail("ToKill3", describe(toKill3))
+		    .detail("ClusterAvailable", g_simulator.isAvailable());
+		wait(reportErrors(
+		    timeoutError(removeAndKillLocalities(self, cx, toKill3, bClearedFirst ? &toKill2 : nullptr, failed),
+		                 self->kill3Timeout),
+		    "RemoveServersSafelyError",
+		    UID()));
+
+		TraceEvent("RemoveAndKillLocalities")
+		    .detail("Step", "excluded thrid list")
+		    .detail("Kill3Size", toKill3.size())
+		    .detail("ToKill3", describe(toKill3))
+		    .detail("ClusterAvailable", g_simulator.isAvailable());
+
+		// Reinclude all of the machine, if buggified
+		if (BUGGIFY) {
+			// Get the updated list of processes which may have changed due to reboots, deletes, etc
+			TraceEvent("RemoveAndKillLocalities")
+			    .detail("Step", "include all third")
+			    .detail("Kill3Size", toKill3.size())
+			    .detail("ToKill3", describe(toKill3))
+			    .detail("ClusterAvailable", g_simulator.isAvailable());
+			wait(includeLocalities(cx, vector<std::string>(1), failed, true));
+		}
+
 		return Void();
 	}
 
@@ -693,10 +765,188 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		return subset;
 	}
 
+	template <class T>
+	static std::set<T> random_subset(std::unordered_set<T> s, int n) {
+		std::vector<T> v;
+		std::copy(s.begin(), s.end(), back_inserter(v));
+		return random_subset(v, n);
+	}
+
+	template <class T>
+	static std::set<T> random_subset(std::set<T> s, int n) {
+		std::vector<T> v;
+		std::copy(s.begin(), s.end(), back_inserter(v));
+		return random_subset(v, n);
+	}
+
 	bool killContainsProcess(AddressExclusion kill, NetworkAddress process) {
 		return kill.excludes(process) || (machineProcesses.find(kill) != machineProcesses.end() &&
 		                                  machineProcesses[kill].count(AddressExclusion(process.ip, process.port)) > 0);
 	}
+
+	ACTOR Future<std::set<AddressExclusion>> getLocalitiesAddresses(Database cx, std::set<std::string> localities) {
+		state Transaction tr(cx);
+		state std::vector<ProcessData> workers = wait(getWorkers(&tr));
+		state std::set<AddressExclusion> addressesSet;
+		for (auto& l : localities) {
+			std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, l);
+			addressesSet.insert(localityAddresses.begin(), localityAddresses.end());
+		}
+
+		return addressesSet;
+	}
+
+	std::set<std::string> getSafeLocalitiesToKill(std::vector<ISimulator::ProcessInfo*> const& safeProcesses) {
+		std::unordered_map<std::string, int> safeLocalitiesCount;
+		for (auto& processInfo : safeProcesses) {
+			if (processInfo->locality.dcId().present())
+				safeLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
+				                    processInfo->locality.dcId().get().toString()]++;
+			if (processInfo->locality.machineId().present())
+				safeLocalitiesCount[ExcludeLocalityKeyMachineIdPrefix.toString() +
+				                    processInfo->locality.machineId().get().toString()]++;
+			if (processInfo->locality.processId().present())
+				safeLocalitiesCount[ExcludeLocalityKeyProcessIdPrefix.toString() +
+				                    processInfo->locality.processId().get().toString()]++;
+			if (processInfo->locality.zoneId().present())
+				safeLocalitiesCount[ExcludeLocalityKeyZoneIdPrefix.toString() +
+				                    processInfo->locality.zoneId().get().toString()]++;
+		}
+
+		auto processes = getServers();
+		std::unordered_map<std::string, int> allLocalitiesCount;
+		for (auto& processInfo : processes) {
+			if (processInfo->locality.dcId().present())
+				allLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
+				                   processInfo->locality.dcId().get().toString()]++;
+			if (processInfo->locality.machineId().present())
+				allLocalitiesCount[ExcludeLocalityKeyMachineIdPrefix.toString() +
+				                   processInfo->locality.machineId().get().toString()]++;
+			if (processInfo->locality.processId().present())
+				allLocalitiesCount[ExcludeLocalityKeyProcessIdPrefix.toString() +
+				                   processInfo->locality.processId().get().toString()]++;
+			if (processInfo->locality.zoneId().present())
+				allLocalitiesCount[ExcludeLocalityKeyZoneIdPrefix.toString() +
+				                   processInfo->locality.zoneId().get().toString()]++;
+		}
+
+		std::set<std::string> safeLocalities;
+		for (auto& l : safeLocalitiesCount) {
+			if (l.second == allLocalitiesCount[l.first]) {
+				safeLocalities.insert(l.first);
+			}
+		}
+
+		return safeLocalities;
+	}
+
+	// Attempts to exclude a set of processes, and once the exclusion is successful it kills them.
+	// If markExcludeAsFailed is true, then it is an error if we cannot complete the exclusion.
+	ACTOR static Future<Void> removeAndKillLocalities(RemoveServersSafelyWorkload* self,
+	                                                  Database cx,
+	                                                  std::set<std::string> toKill,
+	                                                  std::set<AddressExclusion>* pIncAddrs,
+	                                                  bool markExcludeAsFailed) {
+		state UID functionId = nondeterministicRandom()->randomUniqueID();
+
+		// First clear the exclusion list and exclude the given list
+		TraceEvent("RemoveAndKillLocalities", functionId)
+		    .detail("Step", "Including all")
+		    .detail("ClusterAvailable", g_simulator.isAvailable())
+		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
+		wait(includeServers(cx, vector<AddressExclusion>(1)));
+		TraceEvent("RemoveAndKillLocalities", functionId)
+		    .detail("Step", "Included all")
+		    .detail("ClusterAvailable", g_simulator.isAvailable())
+		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
+		// Reinclude the addresses that were excluded, if present
+		if (pIncAddrs) {
+			self->includeAddresses(*pIncAddrs);
+		}
+
+		state std::set<std::string> toKillMarkFailedSet;
+		if (markExcludeAsFailed) {
+			state int retries = 0;
+			loop {
+				state bool safe = false;
+				toKillMarkFailedSet = random_subset(toKill, deterministicRandom()->randomInt(0, toKill.size() + 1));
+				state std::set<AddressExclusion> toKillMarkFailedAddressesSet =
+				    wait(self->getLocalitiesAddresses(cx, toKillMarkFailedSet));
+				state std::vector<AddressExclusion> toKillMarkFailedAddressesVector;
+				std::copy(toKillMarkFailedAddressesSet.begin(),
+				          toKillMarkFailedAddressesSet.end(),
+				          back_inserter(toKillMarkFailedAddressesVector));
+				TraceEvent("RemoveAndKillLocalities", functionId)
+				    .detail("Step", "SafetyCheck")
+				    .detail("Exclusion Localities", describe(toKillMarkFailedSet))
+				    .detail("Exclusion Addresses", describe(toKillMarkFailedAddressesSet));
+				choose {
+					when(bool _safe = wait(checkSafeExclusions(cx, toKillMarkFailedAddressesVector))) {
+						safe = _safe && self->protectServers(toKillMarkFailedAddressesSet).size() ==
+						                    toKillMarkFailedAddressesSet.size();
+					}
+					when(wait(delay(5.0))) {
+						TraceEvent("RemoveAndKillLocalities", functionId)
+						    .detail("Step", "SafetyCheckTimedOut")
+						    .detail("Exclusion Localities", describe(toKillMarkFailedSet))
+						    .detail("Exclusion Addresses", describe(toKillMarkFailedAddressesSet));
+					}
+				}
+				if (retries == self->maxSafetyCheckRetries) {
+					// Do not mark as failed if limit is reached
+					TraceEvent("RemoveAndKillLocalities", functionId)
+					    .detail("Step", "SafetyCheckLimitReached")
+					    .detail("Retries", retries);
+					markExcludeAsFailed = false;
+					safe = true;
+				}
+				if (safe)
+					break;
+				retries++;
+			}
+		}
+
+		state std::unordered_set<std::string> toKillUnorderedSet;
+		state std::unordered_set<std::string> toKillMarkFailedUnorderedSet;
+		toKillUnorderedSet.insert(toKill.begin(), toKill.end());
+		toKillMarkFailedUnorderedSet.insert(toKillMarkFailedSet.begin(), toKillMarkFailedSet.end());
+
+		TraceEvent("RemoveAndKillLocalities", functionId)
+		    .detail("Step", "Activate Localities Exclusion")
+		    .detail("KillLocalitiesSize", toKill.size())
+		    .detail("ToKill", describe(toKill))
+		    .detail("Localities", describe(toKillUnorderedSet))
+		    .detail("FailedLocalities", describe(toKillMarkFailedUnorderedSet))
+		    .detail("ClusterAvailable", g_simulator.isAvailable())
+		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
+		if (markExcludeAsFailed) {
+			wait(excludeLocalities(cx, toKillMarkFailedUnorderedSet, true));
+		}
+		wait(excludeLocalities(cx, toKillUnorderedSet));
+
+		TraceEvent("RemoveAndKillLocalities", functionId)
+		    .detail("Step", "done")
+		    .detail("ClusterAvailable", g_simulator.isAvailable());
+
+		return Void();
+	}
+
+	ACTOR static Future<Void> updateProcessIds(Database cx) {
+		Transaction tr(cx);
+		std::vector<ProcessData> workers = wait(getWorkers(&tr));
+		std::unordered_map<NetworkAddress, int> addressToIndexMap;
+		for (int i = 0; i < workers.size(); i++) {
+			addressToIndexMap[workers[i].address] = i;
+		}
+
+		vector<ISimulator::ProcessInfo*> processes = g_simulator.getAllProcesses();
+		for (int i = 0; i < processes.size(); i++) {
+			processes[i]->locality.set(LocalityData::keyProcessId,
+			                           workers[addressToIndexMap[processes[i]->address]].locality.processId());
+		}
+
+		return Void();
+	}
 };
 
 WorkloadFactory<RemoveServersSafelyWorkload> RemoveServersSafelyWorkloadFactory("RemoveServersSafely");

From 59cd8481aaf3af55d37b7164b6b3d795f8f9a743 Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Fri, 4 Jun 2021 15:23:04 -0700
Subject: [PATCH 312/740] exclude locality:clang-format, ranged loops,
 documentation, tracking addStoragesever for exclusion.

---
 .../sphinx/source/administration.rst          |   2 +-
 .../sphinx/source/command-line-interface.rst  |  12 +-
 .../sphinx/source/developer-guide.rst         | 240 ++++++++++++++++++
 fdbcli/fdbcli.actor.cpp                       |  70 ++---
 fdbclient/DatabaseConfiguration.cpp           |  74 +++++-
 fdbclient/ManagementAPI.actor.cpp             |  82 +++---
 fdbclient/ManagementAPI.actor.h               |   9 +-
 fdbclient/NativeAPI.actor.cpp                 |   8 +-
 fdbclient/SpecialKeySpace.actor.cpp           |  44 ++--
 fdbclient/SystemData.cpp                      |  14 +-
 fdbclient/SystemData.h                        |  12 +-
 fdbrpc/Locality.h                             |   8 +-
 fdbserver/ApplyMetadataMutation.cpp           |   6 +-
 fdbserver/DataDistribution.actor.cpp          |   8 +-
 fdbserver/MoveKeys.actor.cpp                  |  51 +++-
 fdbserver/Ratekeeper.actor.cpp                |   7 +-
 fdbserver/Status.actor.cpp                    |  13 +-
 fdbserver/masterserver.actor.cpp              |   7 +-
 .../workloads/RemoveServersSafely.actor.cpp   |  41 ++-
 19 files changed, 527 insertions(+), 181 deletions(-)

diff --git a/documentation/sphinx/source/administration.rst b/documentation/sphinx/source/administration.rst
index 553375c979d..431f637bd79 100644
--- a/documentation/sphinx/source/administration.rst
+++ b/documentation/sphinx/source/administration.rst
@@ -207,7 +207,7 @@ To temporarily or permanently remove one or more machines from a FoundationDB cl
     The database is available.
 
     Welcome to the fdbcli. For help, type `help'.
-    fdb> exclude 1.2.3.4 1.2.3.5 1.2.3.6
+    fdb> exclude 1.2.3.4 1.2.3.5 1.2.3.6 dcid:primary-satellite zoneid:primary-satellite-log-2 machineid:primary-stateless-1 processid:223be2da244ca0182375364e4d122c30
     Waiting for state to be removed from all excluded servers.  This may take a while.
     It is now safe to remove these machines or processes from the cluster.
 
diff --git a/documentation/sphinx/source/command-line-interface.rst b/documentation/sphinx/source/command-line-interface.rst
index 78fd074db0f..9e6193ea508 100644
--- a/documentation/sphinx/source/command-line-interface.rst
+++ b/documentation/sphinx/source/command-line-interface.rst
@@ -139,9 +139,9 @@ For more information on setting the cluster description, see :ref:`configuration
 exclude
 -------
 
-The ``exclude`` command excludes servers from the database or marks them as failed. Its syntax is ``exclude [failed] <ADDRESS...>``. If no addresses are specified, the command provides the set of excluded and failed servers.
+The ``exclude`` command excludes servers from the database or marks them as failed. Its syntax is ``exclude [failed] [<ADDRESS...>] [dcid:<excludedcid>] [zoneid:<excludezoneid>] [machineid:<excludemachineid>] [processid:<excludeprocessid>]``. If no addresses are specified, the command provides the set of excluded and failed servers and localities.
 
-For each IP address or IP:port pair in ``<ADDRESS...>``, the command adds the address to the set of excluded servers. It then waits until all database state has been safely moved off the specified servers.
+For each IP address or IP:port pair in ``<ADDRESS...>`` or locality (which include dcid, zoneid, machineid, processid), the command adds the address/locality to the set of excluded servers and localities. It then waits until all database state has been safely moved off the specified servers.
 
 If the ``failed`` keyword is specified, the address is marked as failed and added to the set of failed servers. It will not wait for the database state to move off the specified servers.
 
@@ -246,15 +246,15 @@ The following options are available for use with the ``option`` command:
 include
 -------
 
-The ``include`` command permits previously excluded or failed servers to rejoin the database. Its syntax is ``include [failed] all|<ADDRESS...>``.
+The ``include`` command permits previously excluded or failed servers/localities to rejoin the database. Its syntax is ``include [failed] all|[<ADDRESS...>] [dcid:<excludedcid>] [zoneid:<excludezoneid>] [machineid:<excludemachineid>] [processid:<excludeprocessid>]``.
 
 The ``failed`` keyword is required if the servers were previously marked as failed rather than excluded.
 
-If ``all`` is specified, the excluded servers list is cleared. This will not clear the failed servers list.
+If ``all`` is specified, the excluded servers and localities list is cleared. This will not clear the failed servers and localities list.
 
-If ``failed all`` or ``all failed`` is specified, the failed servers list is cleared. This will not clear the excluded servers list.
+If ``failed all`` or ``all failed`` is specified, the failed servers and localities list is cleared. This will not clear the excluded servers and localities list.
 
-For each IP address or IP:port pair in ``<ADDRESS...>``, the command removes any matching exclusions from the excluded servers list. (A specified IP will match all ``IP:*`` exclusion entries).
+For each IP address or IP:port pair in ``<ADDRESS...>`` or locality, the command removes any matching exclusions from the excluded servers/localities list. (A specified IP will match all ``IP:*`` exclusion entries).
 
 For information on adding machines to a cluster, see :ref:`adding-machines-to-a-cluster`.
 
diff --git a/documentation/sphinx/source/developer-guide.rst b/documentation/sphinx/source/developer-guide.rst
index af2ff736f8d..d1b21737b16 100644
--- a/documentation/sphinx/source/developer-guide.rst
+++ b/documentation/sphinx/source/developer-guide.rst
@@ -757,6 +757,246 @@ If you only need to detect the *fact* of a change, and your response doesn't dep
 .. _developer-guide-peformance-considerations:
 
 
+Special keys
+============
+
+Keys starting with the bytes ``\xff\xff`` are called "special" keys, and they are materialized when read. :doc:`\\xff\\xff/status/json <mr-status>` is an example of a special key.
+As of api version 630, additional features have been exposed as special keys and are available to read as ranges instead of just individual keys. Additionally, the special keys are now organized into "modules".
+
+Read-only modules
+-----------------
+
+A module is loosely defined as a key range in the special key space where a user can expect similar behavior from reading any key in that range.
+By default, users will see a ``special_keys_no_module_found`` error if they read from a range not contained in a module.
+The error indicates the read would always return an empty set of keys if it proceeded. This could be caused by typo in the keys to read.
+Users will also (by default) see a ``special_keys_cross_module_read`` error if their read spans a module boundary.
+The error is to save the user from the surprise of seeing the behavior of multiple modules in the same read.
+Users may opt out of these restrictions by setting the ``special_key_space_relaxed`` transaction option.
+
+Each special key that existed before api version 630 is its own module. These are
+
+#. ``\xff\xff/cluster_file_path`` See :ref:`cluster file client access <cluster-file-client-access>`
+#. ``\xff\xff/cluster_file_path`` See :ref:`cluster file client access <cluster-file-client-access>`
+#. ``\xff\xff/status/json`` See :doc:`Machine-readable status <mr-status>`
+
+Prior to api version 630, it was also possible to read a range starting at
+``\xff\xff/worker_interfaces``. This is mostly an implementation detail of fdbcli,
+but it's available in api version 630 as a module with prefix ``\xff\xff/worker_interfaces/``.
+
+Api version 630 includes two new modules with prefixes
+``\xff\xff/transaction/`` (information about the current transaction), and
+``\xff\xff/metrics/`` (various metrics, not transactional).
+
+Transaction module
+------------------
+
+Reads from the transaction module generally do not require an rpc and only inspect in-memory state for the current transaction.
+
+There are three sets of keys exposed by the transaction module, and each set uses the same encoding, so let's first describe that encoding.
+
+Let's say we have a set of keys represented as intervals of the form ``begin1 <= k < end1 && begin2 <= k < end2 && ...``.
+It could be the case that some of the intervals overlap, e.g. if ``begin1 <= begin2 < end1``, or are adjacent, e.g. if ``end1 == begin2``.
+If we merge all overlapping/adjacent intervals then sort, we end up with a canonical representation of this set of keys.
+
+We encode this canonical set as ordered key value pairs like this::
+
+  <namespace><begin1> -> "1"
+  <namespace><end1> -> "0"
+  <namespace><begin2> -> "1"
+  <namespace><end2> -> "0"
+  ...
+
+Python example::
+
+  >>> tr = db.create_transaction()
+  >>> tr.add_read_conflict_key('foo')
+  >>> tr.add_read_conflict_range('bar/', 'bar0')
+  >>> for k, v in tr.get_range_startswith('\xff\xff/transaction/read_conflict_range/'):
+  ...     print(k, v)
+  ...
+  ('\xff\xff/transaction/read_conflict_range/bar/', '1')
+  ('\xff\xff/transaction/read_conflict_range/bar0', '0')
+  ('\xff\xff/transaction/read_conflict_range/foo', '1')
+  ('\xff\xff/transaction/read_conflict_range/foo\x00', '0')
+
+For read-your-writes transactions, this canonical encoding of conflict ranges
+is already available in memory, and so requesting small ranges is
+correspondingly cheaper than large ranges.
+
+For transactions with read-your-writes disabled, this canonical encoding is computed on
+every read, so you're paying the full cost in CPU time whether or not you
+request a small range.
+
+The namespaces for sets of keys are
+
+#. ``\xff\xff/transaction/read_conflict_range/`` This is the set of keys that will be used for read conflict detection. If another transaction writes to any of these keys after this transaction's read version, then this transaction won't commit.
+#. ``\xff\xff/transaction/write_conflict_range/`` This is the set of keys that will be used for write conflict detection. Keys in this range may cause other transactions which read these keys to abort if this transaction commits.
+#. ``\xff\xff/transaction/conflicting_keys/`` If this transaction failed due to a conflict, it must be the case that some transaction attempted [#conflicting_keys]_ to commit with a write conflict range that intersects this transaction's read conflict range. This is the subset of your read conflict range that actually intersected a write conflict from another transaction.
+
+Caveats
+~~~~~~~
+
+#. ``\xff\xff/transaction/read_conflict_range/`` The conflict range for a read is sometimes not known until that read completes (e.g. range reads with limits, key selectors). When you read from these special keys, the returned future first blocks until all pending reads are complete so it can give an accurate response.
+#. ``\xff\xff/transaction/write_conflict_range/`` The conflict range range for a ``set_versionstamped_key`` atomic op is not known until commit time. You'll get an approximate range (the actual range will be a subset of the approximate range) until the precise range is known.
+#. ``\xff\xff/transaction/conflicting_keys/`` Since using this feature costs server (i.e., commit proxy and resolver) resources, it's disabled by default. You must opt in by setting the ``report_conflicting_keys`` transaction option.
+
+Metrics module
+--------------
+
+Reads in the metrics module are not transactional and may require rpcs to complete.
+
+``\xff\xff/metrics/data_distribution_stats/<begin>`` represent stats about the shard that begins at ``<begin>``
+
+  >>> for k, v in db.get_range_startswith('\xff\xff/metrics/data_distribution_stats/', limit=3):
+  ...     print(k, v)
+  ...
+  ('\xff\xff/metrics/data_distribution_stats/', '{"shard_bytes":3828000}')
+  ('\xff\xff/metrics/data_distribution_stats/mako00079', '{"shard_bytes":2013000}')
+  ('\xff\xff/metrics/data_distribution_stats/mako00126', '{"shard_bytes":3201000}')
+
+========================= ======== ===============
+**Field**                 **Type** **Description**
+------------------------- -------- ---------------
+shard_bytes               number   An estimate of the sum of kv sizes for this shard.
+========================= ======== ===============
+
+Keys starting with ``\xff\xff/metrics/health/`` represent stats about the health of the cluster, suitable for application-level throttling.
+Some of this information is also available in ``\xff\xff/status/json``, but these keys are significantly cheaper (in terms of server resources) to read.
+
+  >>> for k, v in db.get_range_startswith('\xff\xff/metrics/health/'):
+  ...     print(k, v)
+  ...
+  ('\xff\xff/metrics/health/aggregate', '{"batch_limited":false,"limiting_storage_durability_lag":5000000,"limiting_storage_queue":1000,"tps_limit":483988.66315011407,"worst_storage_durability_lag":5000001,"worst_storage_queue":2036,"worst_log_queue":300}')
+  ('\xff\xff/metrics/health/log/e639a9ad0373367784cc550c615c469b', '{"log_queue":300}')
+  ('\xff\xff/metrics/health/storage/ab2ce4caf743c9c1ae57063629c6678a', '{"cpu_usage":2.398696781487125,"disk_usage":0.059995917598039405,"storage_durability_lag":5000001,"storage_queue":2036}')
+
+``\xff\xff/metrics/health/aggregate``
+
+Aggregate stats about cluster health. Reading this key alone is slightly cheaper than reading any of the per-process keys.
+
+=================================== ======== ===============
+**Field**                           **Type** **Description**
+----------------------------------- -------- ---------------
+batch_limited                       boolean  Whether or not the cluster is limiting batch priority transactions
+limiting_storage_durability_lag     number   storage_durability_lag that ratekeeper is using to determing throttling (see the description for storage_durability_lag)
+limiting_storage_queue              number   storage_queue that ratekeeper is using to determing throttling (see the description for storage_queue)
+tps_limit                           number   The rate at which normal priority transactions are allowed to start
+worst_storage_durability_lag        number   See the description for storage_durability_lag
+worst_storage_queue                 number   See the description for storage_queue
+worst_log_queue                     number   See the description for log_queue
+=================================== ======== ===============
+
+``\xff\xff/metrics/health/log/<id>``
+
+Stats about the health of a particular transaction log process
+
+========================= ======== ===============
+**Field**                 **Type** **Description**
+------------------------- -------- ---------------
+log_queue                 number   The number of bytes of mutations that need to be stored in memory on this transaction log process
+========================= ======== ===============
+
+``\xff\xff/metrics/health/storage/<id>``
+
+Stats about the health of a particular storage process
+
+========================== ======== ===============
+**Field**                  **Type** **Description**
+-------------------------- -------- ---------------
+cpu_usage                  number   The cpu percentage used by this storage process
+disk_usage                 number   The disk IO percentage used by this storage process
+storage_durability_lag     number   The difference between the newest version and the durable version on this storage process. On a lightly loaded cluster this will stay just above 5000000 [#max_read_transaction_life_versions]_.
+storage_queue              number   The number of bytes of mutations that need to be stored in memory on this storage process
+========================== ======== ===============
+
+Caveats
+~~~~~~~
+
+#. ``\xff\xff/metrics/health/`` These keys may return data that's several seconds old, and the data may not be available for a brief period during recovery. This will be indicated by the keys being absent.
+
+
+Read/write modules
+------------------
+
+As of api version 700, some modules in the special key space allow writes as
+well as reads. In these modules, a user can expect that mutations (i.e. sets,
+clears, etc) do not have side-effects outside of the current transaction
+until commit is called (the same is true for writes to the normal key space).
+A user can also expect the effects on commit to be atomic. Reads to
+special keys may require reading system keys (whose format is an implementation
+detail), and for those reads appropriate read conflict ranges are added on
+the underlying system keys.
+
+Writes to read/write modules in the special key space are disabled by
+default. Use the ``special_key_space_enable_writes`` transaction option to
+enable them [#special_key_space_enable_writes]_.
+
+
+.. _special-key-space-management-module:
+
+Management module
+~~~~~~~~~~~~~~~~~
+
+The management module is for temporary cluster configuration changes. For
+example, in order to safely remove a process from the cluster, one can add an
+exclusion to the ``\xff\xff/management/excluded/`` key prefix that matches
+that process, and wait for necessary data to be moved away.
+
+#. ``\xff\xff/management/excluded/<exclusion>`` Read/write. Indicates that the cluster should move data away from processes matching ``<exclusion>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/failed/<exclusion>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/in_progress_exclusion/<address>`` Read-only. Indicates that the process matching ``<address>`` matches an exclusion, but still has necessary data and can't yet be safely removed.
+#. ``\xff\xff/management/options/excluded/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excluded/<exclusion>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+#. ``\xff\xff/management/options/failed/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failed/<exclusion>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+#. ``\xff\xff/management/min_required_commit_version`` Read/write. Changing this key will change the corresponding system key ``\xff/minRequiredCommitVersion = [[Version]]``. The value of this special key is the literal text of the underlying ``Version``, which is ``int64_t``. If you set the key with a value failed to be parsed as ``int64_t``, ``special_keys_api_failure`` will be thrown. In addition, the given ``Version`` should be larger than the current read version and smaller than the upper bound(``2**63-1-version_per_second*3600*24*365*1000``). Otherwise, ``special_keys_api_failure`` is thrown. For more details, see help text of ``fdbcli`` command ``advanceversion``.
+#. ``\xff\xff/management/profiling/<client_txn_sample_rate|client_txn_size_limit>`` Read/write. Changing these two keys will change the corresponding system keys ``\xff\x02/fdbClientInfo/<client_txn_sample_rate|client_txn_size_limit>``, respectively. The value of ``\xff\xff/management/client_txn_sample_rate`` is a literal text of ``double``, and the value of ``\xff\xff/management/client_txn_size_limit`` is a literal text of ``int64_t``. A special value ``default`` can be set to or read from these two keys, representing the client profiling is disabled. In addition, ``clear`` in this range is not allowed. For more details, see help text of ``fdbcli`` command ``profile client``.
+#. ``\xff\xff/management/maintenance/<zone_id> := <seconds>`` Read/write. Set/clear a key in this range will change the corresponding system key ``\xff\x02/healthyZone``. The value is a literal text of a non-negative ``double`` which represents the remaining time for the zone to be in maintenance. Commiting with an invalid value will throw ``special_keys_api_failure``. Only one zone is allowed to be in maintenance at the same time. Setting a new key in the range will override the old one and the transaction will throw ``special_keys_api_failure`` error if more than one zone is given. For more details, see help text of ``fdbcli`` command ``maintenance``.
+   In addition, a special key ``\xff\xff/management/maintenance/IgnoreSSFailures`` in the range, if set, will disable datadistribution for storage server failures.
+   It is doing the same thing as the fdbcli command ``datadistribution disable ssfailure``.
+   Maintenance mode will be unable to use until the key is cleared, which is the same as the fdbcli command ``datadistribution enable ssfailure``.
+   While the key is set, any commit that tries to set a key in the range will fail with the ``special_keys_api_failure`` error.
+#. ``\xff\xff/management/data_distribution/<mode|rebalance_ignored>`` Read/write. Changing these two keys will change the two corresponding system keys ``\xff/dataDistributionMode`` and ``\xff\x02/rebalanceDDIgnored``. The value of ``\xff\xff/management/data_distribution/mode`` is a literal text of ``0`` (disable) or ``1`` (enable). Transactions committed with invalid values will throw ``special_keys_api_failure`` . The value of ``\xff\xff/management/data_distribution/rebalance_ignored`` is empty. If present, it means data distribution is disabled for rebalance. Any transaction committed with non-empty value for this key will throw ``special_keys_api_failure``. For more details, see help text of ``fdbcli`` command ``datadistribution``.
+#. ``\xff\xff/management/consistency_check_suspended`` Read/write. Set or read this key will set or read the underlying system key ``\xff\x02/ConsistencyCheck/Suspend``. The value of this special key is unused thus if present, will be empty. In particular, if the key exists, then consistency is suspended. For more details, see help text of ``fdbcli`` command ``consistencycheck``.
+#. ``\xff\xff/management/db_locked`` Read/write. A single key that can be read and modified. Set the key will lock the database and clear the key will unlock. If the database is already locked, then the commit will fail with the ``special_keys_api_failure`` error. For more details, see help text of ``fdbcli`` command ``lock`` and ``unlock``.
+#. ``\xff\xff/management/auto_coordinators`` Read-only. A single key, if read, will return a set of processes which is able to satisfy the current redundency level and serve as new coordinators. The return value is formatted as a comma delimited string of network addresses of coordinators, i.e. ``<ip:port>,<ip:port>,...,<ip:port>``.
+#. ``\xff\xff/management/excludedlocality/<locality>`` Read/write. Indicates that the cluster should move data away from processes matching ``<locality>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/failedlocality/<locality>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/options/excludedlocality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excludedlocality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+#. ``\xff\xff/management/options/failedlocality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failedlocality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+
+An exclusion is syntactically either an ip address (e.g. ``127.0.0.1``), or
+an ip address and port (e.g. ``127.0.0.1:4500``) or locality (e.g ``dcid:primary-satellite`` or
+``zoneid:primary-satellite-log-2`` or ``machineid:primary-stateless-1`` or ``processid:223be2da244ca0182375364e4d122c30``). 
+If no port is specified, then all processes on that host match the exclusion.
+For locality, all processes that match the given locality are excluded.
+
+Configuration module
+~~~~~~~~~~~~~~~~~~~~
+
+The configuration module is for changing the cluster configuration.
+For example, you can change a process type or update coordinators by manipulating related special keys through transactions.
+
+#. ``\xff\xff/configuration/process/class_type/<address> := <class_type>`` Read/write. Reading keys in the range will retrieve processes' class types. Setting keys in the range will update processes' class types. The process matching ``<address>`` will be assigned to the given class type if the commit is successful. The valid class types are ``storage``, ``transaction``, ``resolution``, etc. A full list of class type can be found via ``fdbcli`` command ``help setclass``. Clearing keys is forbidden in the range. Instead, you can set the type as ``default``, which will clear the assigned class type if existing. For more details, see help text of ``fdbcli`` command ``setclass``.
+#. ``\xff\xff/configuration/process/class_source/<address> := <class_source>`` Read-only. Reading keys in the range will retrieve processes' class source. The class source is one of ``command_line``, ``configure_auto``, ``set_class`` and ``invalid``, indicating the source that the process's class type comes from.
+#. ``\xff\xff/configuration/coordinators/processes := <ip:port>,<ip:port>,...,<ip:port>`` Read/write. A single key, if read, will return a comma delimited string of coordinators' network addresses. Thus to provide a new set of cooridinators, set the key with a correct formatted string of new coordinators' network addresses. As there's always the need to have coordinators, clear on the key is forbidden and a transaction will fail with the ``special_keys_api_failure`` error if the clear is committed. For more details, see help text of ``fdbcli`` command ``coordinators``.
+#. ``\xff\xff/configuration/coordinators/cluster_description := <new_description>`` Read/write. A single key, if read, will return the cluster description. Thus modifying the key will update the cluster decription. The new description needs to match ``[A-Za-z0-9_]+``, otherwise, the ``special_keys_api_failure`` error will be thrown. In addition, clear on the key is meaningless thus forbidden. For more details, see help text of ``fdbcli`` command ``coordinators``.
+
+The ``<address>`` here is the network address of the corresponding process. Thus the general form is ``ip:port``.
+
+Error message module
+~~~~~~~~~~~~~~~~~~~~
+
+Each module written to validates the transaction before committing, and this
+validation failing is indicated by a ``special_keys_api_failure`` error.
+More detailed information about why this validation failed can be accessed through the ``\xff\xff/error_message`` key, whose value is a json document with the following schema.
+
+========================== ======== ===============
+**Field**                  **Type** **Description**
+-------------------------- -------- ---------------
+retriable                  boolean  Whether or not this operation might succeed if retried
+command                    string   The fdbcli command corresponding to this operation
+message                    string   Help text explaining the reason this operation failed
+========================== ======== ===============
+
 Performance considerations
 ==========================
 
diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 82abd4ccb08..ed7ce1cdea8 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -541,21 +541,25 @@ void initHelp() {
 	    "10.0.0.1:4000 10.0.0.2:4000 10.0.0.3:4000\n\nIf 'description=desc' is specified then the description field in "
 	    "the cluster\nfile is changed to desc, which must match [A-Za-z0-9_]+.");
 	helpMap["exclude"] = CommandHelp(
-	    "exclude [FORCE] [failed] [no_wait] <ADDRESS...>",
-	    "exclude servers from the database",
-	    "If no addresses are specified, lists the set of excluded servers.\n\nFor each IP address or "
-	    "IP:port pair in <ADDRESS...>, adds the address to the set of excluded servers then waits until all "
-	    "database state has been safely moved away from the specified servers. If 'no_wait' is set, the "
+	    "exclude [FORCE] [failed] [no_wait] [<ADDRESS...>] [dcid:<excludedcid>] [zoneid:<excludezoneid>] "
+	    "[machineid:<excludemachineid>] [processid:<excludeprocessid>]",
+	    "exclude servers from the database either with IP address match or locality match",
+	    "If no addresses or locaities are specified, lists the set of excluded addresses and localities."
+	    "\n\nFor each IP address or IP:port pair in <ADDRESS...> or locality (which include dcid, zoneid, "
+	    "machineid, processid), adds the address/locality to the set of excluded servers and localities then waits "
+	    "until all database state has been safely moved away from the specified servers. If 'no_wait' is set, the "
 	    "command returns \nimmediately without checking if the exclusions have completed successfully.\n"
 	    "If 'FORCE' is set, the command does not perform safety checks before excluding.\n"
 	    "If 'failed' is set, the transaction log queue is dropped pre-emptively before waiting\n"
 	    "for data movement to finish and the server cannot be included again.");
-	helpMap["include"] =
-	    CommandHelp("include all|<ADDRESS...>",
-	                "permit previously-excluded servers to rejoin the database",
-	                "If `all' is specified, the excluded servers list is cleared.\n\nFor each IP address or IP:port "
-	                "pair in <ADDRESS...>, removes any matching exclusions from the excluded servers list. (A "
-	                "specified IP will match all IP:* exclusion entries)");
+	helpMap["include"] = CommandHelp(
+	    "include all|[<ADDRESS...>] [dcid:<excludedcid>] [zoneid:<excludezoneid>] "
+	    "[machineid:<excludemachineid>] [processid:<excludeprocessid>]",
+	    "permit previously-excluded servers and localities to rejoin the database",
+	    "If `all' is specified, the excluded servers and localities list is cleared.\n\nFor each IP address or IP:port "
+	    "pair in <ADDRESS...> or locality (which include dcid, zoneid, machineid, processid), removes any "
+	    "matching exclusions from the excluded servers and localities list. "
+	    "(A specified IP will match all IP:* exclusion entries)");
 	helpMap["setclass"] =
 	    CommandHelp("setclass [<ADDRESS> <CLASS>]",
 	                "change the class of a process",
@@ -2428,15 +2432,15 @@ ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 			all = true;
 		} else if (*t == LiteralStringRef("failed")) {
 			failed = true;
-		} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix)
-			|| t->startsWith(ExcludeLocalityKeyMachineIdPrefix)
-			|| t->startsWith(ExcludeLocalityKeyProcessIdPrefix)
-			|| t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+		} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix) || t->startsWith(ExcludeLocalityKeyMachineIdPrefix) ||
+		           t->startsWith(ExcludeLocalityKeyProcessIdPrefix) || t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
 			localities.push_back(t->toString());
 		} else {
 			auto a = AddressExclusion::parse(*t);
 			if (!a.isValid()) {
-				fprintf(stderr, "ERROR: '%s' is neither a valid network endpoint address nor a locality\n", t->toString().c_str());
+				fprintf(stderr,
+				        "ERROR: '%s' is neither a valid network endpoint address nor a locality\n",
+				        t->toString().c_str());
 				if (t->toString().find(":tls") != std::string::npos)
 					printf("        Do not include the `:tls' suffix when naming a process\n");
 				return true;
@@ -2448,13 +2452,13 @@ ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 		std::vector<AddressExclusion> includeAll;
 		includeAll.push_back(AddressExclusion());
 		wait(makeInterruptable(includeServers(db, includeAll, failed)));
-		wait(makeInterruptable(includeLocalities(db, localities, failed, all)));
+		wait(makeInterruptable(includeLocalities(db, &localities, failed, all)));
 	} else {
 		if (!addresses.empty()) {
 			wait(makeInterruptable(includeServers(db, addresses, failed)));
 		}
 		if (!localities.empty()) {
-			wait(makeInterruptable(includeLocalities(db, localities, failed, all)));
+			wait(makeInterruptable(includeLocalities(db, &localities, failed, all)));
 		}
 	}
 	return false;
@@ -2478,7 +2482,8 @@ ACTOR Future<bool> exclude(Database db,
 			return false;
 		}
 
-		printf("There are currently %zu servers or localities being excluded from the database:\n", exclAddresses.size() + exclLocalities.size());
+		printf("There are currently %zu servers or localities being excluded from the database:\n",
+		       exclAddresses.size() + exclLocalities.size());
 		for (const auto& e : exclAddresses)
 			printf("  %s\n", e.toString().c_str());
 		for (const auto& e : exclLocalities)
@@ -2506,12 +2511,12 @@ ACTOR Future<bool> exclude(Database db,
 				waitForAllExcluded = false;
 			} else if (*t == LiteralStringRef("failed")) {
 				markFailed = true;
-			} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix)
-					   || t->startsWith(ExcludeLocalityKeyMachineIdPrefix)
-					   || t->startsWith(ExcludeLocalityKeyProcessIdPrefix)
-					   || t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+			} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix) ||
+			           t->startsWith(ExcludeLocalityKeyMachineIdPrefix) ||
+			           t->startsWith(ExcludeLocalityKeyProcessIdPrefix) ||
+			           t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
 				std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, t->toString());
-				if(localityAddresses.empty()) {
+				if (localityAddresses.empty()) {
 					noMatchLocalities.push_back(t->toString());
 				} else {
 					std::copy(localityAddresses.begin(), localityAddresses.end(), back_inserter(exclusionVector));
@@ -2521,7 +2526,9 @@ ACTOR Future<bool> exclude(Database db,
 			} else {
 				auto a = AddressExclusion::parse(*t);
 				if (!a.isValid()) {
-					fprintf(stderr, "ERROR: '%s' is neither a valid network endpoint address nor a locality\n", t->toString().c_str());
+					fprintf(stderr,
+					        "ERROR: '%s' is neither a valid network endpoint address nor a locality\n",
+					        t->toString().c_str());
 					if (t->toString().find(":tls") != std::string::npos)
 						printf("        Do not include the `:tls' suffix when naming a process\n");
 					return true;
@@ -2652,7 +2659,7 @@ ACTOR Future<bool> exclude(Database db,
 			wait(makeInterruptable(excludeServers(db, exclusionAddresses, markFailed)));
 		}
 		if (!exclusionLocalities.empty()) {
-			wait(makeInterruptable(excludeLocalities(db, exclusionLocalities, markFailed)));
+			wait(makeInterruptable(excludeLocalities(db, &exclusionLocalities, markFailed)));
 		}
 
 		if (waitForAllExcluded) {
@@ -2719,11 +2726,12 @@ ACTOR Future<bool> exclude(Database db,
 			}
 		}
 
-		for(const auto& locality : noMatchLocalities) {
-			fprintf(stderr,
-					"  %s  ---- WARNING: Currently no servers found with this locality match! Be sure that you excluded "
-					"the correct locality.\n",
-					locality.c_str());
+		for (const auto& locality : noMatchLocalities) {
+			fprintf(
+			    stderr,
+			    "  %s  ---- WARNING: Currently no servers found with this locality match! Be sure that you excluded "
+			    "the correct locality.\n",
+			    locality.c_str());
 		}
 
 		bool foundCoordinator = false;
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index 64f33618f24..b0f61de333f 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -633,26 +633,72 @@ std::set<AddressExclusion> DatabaseConfiguration::getExcludedServers() const {
 }
 
 bool DatabaseConfiguration::isExcludedLocality(const LocalityData& locality) const {
-	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() + locality.dcId().get().toString())).present() : false) ||
-		   (locality.dcId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() + locality.dcId().get().toString())).present() : false) ||
-		   (locality.machineId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() + locality.machineId().get().toString())).present() : false) ||
-		   (locality.machineId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() + locality.machineId().get().toString())).present() : false) ||
-		   (locality.processId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() + locality.processId().get().toString())).present() : false) ||
-		   (locality.processId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() + locality.processId().get().toString())).present() : false) ||
-		   (locality.zoneId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() + locality.zoneId().get().toString())).present() : false) ||
-		   (locality.zoneId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() + locality.zoneId().get().toString())).present() : false);
+	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
+	                                                                  locality.dcId().get().toString()))
+	                                        .present()
+	                                  : false) ||
+	       (locality.dcId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
+	                                                                locality.dcId().get().toString()))
+	                                        .present()
+	                                  : false) ||
+	       (locality.machineId().present()
+	            ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
+	                                            locality.machineId().get().toString()))
+	                  .present()
+	            : false) ||
+	       (locality.machineId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
+	                                                                     locality.machineId().get().toString()))
+	                                             .present()
+	                                       : false) ||
+	       (locality.processId().present()
+	            ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() +
+	                                            locality.processId().get().toString()))
+	                  .present()
+	            : false) ||
+	       (locality.processId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() +
+	                                                                     locality.processId().get().toString()))
+	                                             .present()
+	                                       : false) ||
+	       (locality.zoneId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
+	                                                                    locality.zoneId().get().toString()))
+	                                          .present()
+	                                    : false) ||
+	       (locality.zoneId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
+	                                                                  locality.zoneId().get().toString()))
+	                                          .present()
+	                                    : false);
 }
 
 bool DatabaseConfiguration::isMachineExcluded(const LocalityData& locality) const {
-	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() + locality.dcId().get().toString())).present() : false) ||
-		   (locality.dcId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() + locality.dcId().get().toString())).present() : false) ||
-		   (locality.machineId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() + locality.machineId().get().toString())).present() : false) ||
-		   (locality.machineId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() + locality.machineId().get().toString())).present() : false) ||
-		   (locality.zoneId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() + locality.zoneId().get().toString())).present() : false) ||
-		   (locality.zoneId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() + locality.zoneId().get().toString())).present() : false);
+	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
+	                                                                  locality.dcId().get().toString()))
+	                                        .present()
+	                                  : false) ||
+	       (locality.dcId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
+	                                                                locality.dcId().get().toString()))
+	                                        .present()
+	                                  : false) ||
+	       (locality.machineId().present()
+	            ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
+	                                            locality.machineId().get().toString()))
+	                  .present()
+	            : false) ||
+	       (locality.machineId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
+	                                                                     locality.machineId().get().toString()))
+	                                             .present()
+	                                       : false) ||
+	       (locality.zoneId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
+	                                                                    locality.zoneId().get().toString()))
+	                                          .present()
+	                                    : false) ||
+	       (locality.zoneId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
+	                                                                  locality.zoneId().get().toString()))
+	                                          .present()
+	                                    : false);
 }
 
 std::set<std::string> DatabaseConfiguration::getExcludedLocalities() const {
+	// TODO: revisit all const_cast usages
 	const_cast<DatabaseConfiguration*>(this)->makeConfigurationImmutable();
 	std::set<std::string> localities;
 	for (auto i = lower_bound(rawConfiguration, excludedLocalityKeys.begin);
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index 7778c149e70..35cc030b00b 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -1589,7 +1589,7 @@ ACTOR Future<Void> excludeServers(Database cx, vector<AddressExclusion> servers,
 	}
 }
 
-void excludeLocalities(Transaction& tr, std::unordered_set<std::string>& localities, bool failed) {
+void excludeLocalities(Transaction& tr, std::unordered_set<std::string>* localities, bool failed) {
 	tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 	tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 	tr.setOption(FDBTransactionOptions::LOCK_AWARE);
@@ -1598,36 +1598,34 @@ void excludeLocalities(Transaction& tr, std::unordered_set<std::string>& localit
 	auto localityVersionKey = failed ? failedLocalityVersionKey : excludedLocalityVersionKey;
 	tr.addReadConflictRange(singleKeyRange(localityVersionKey)); // To conflict with parallel includeLocalities
 	tr.set(localityVersionKey, excludeVersionKey);
-	for (auto& l : localities) {
+	for (const auto& l : *localities) {
 		if (failed) {
 			tr.set(encodeFailedLocalityKey(l), StringRef());
 		} else {
 			tr.set(encodeExcludedLocalityKey(l), StringRef());
 		}
 	}
-	TraceEvent("ExcludeLocalitiesCommit")
-		.detail("Localities", describe(localities))
-		.detail("ExcludeFailed", failed);
+	TraceEvent("ExcludeLocalitiesCommit").detail("Localities", describe(*localities)).detail("ExcludeFailed", failed);
 }
 
-ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string> localities, bool failed) {
+ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string>* localities, bool failed) {
 	if (cx->apiVersionAtLeast(700)) {
 		state ReadYourWritesTransaction ryw(cx);
 		loop {
 			try {
 				ryw.setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
-				ryw.set(
-				    SpecialKeySpace::getManagementApiCommandOptionSpecialKey(failed ? "failedlocality" : "excludedlocality", "force"),
-				    ValueRef());
-				for (auto& l : localities) {
+				ryw.set(SpecialKeySpace::getManagementApiCommandOptionSpecialKey(
+				            failed ? "failedlocality" : "excludedlocality", "force"),
+				        ValueRef());
+				for (const auto& l : *localities) {
 					Key addr = failed
 					               ? SpecialKeySpace::getManagementApiCommandPrefix("failedlocality").withSuffix(l)
 					               : SpecialKeySpace::getManagementApiCommandPrefix("excludedlocality").withSuffix(l);
 					ryw.set(addr, ValueRef());
 				}
 				TraceEvent("ExcludeLocalitiesSpecialKeySpaceCommit")
-				    .detail("Localities", describe(localities))
-					.detail("ExcludeFailed", failed);
+				    .detail("Localities", describe(*localities))
+				    .detail("ExcludeFailed", failed);
 
 				wait(ryw.commit());
 				return Void();
@@ -1752,7 +1750,7 @@ ACTOR Future<Void> includeServers(Database cx, vector<AddressExclusion> servers,
 	}
 }
 
-ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities, bool failed, bool includeAll) {
+ACTOR Future<Void> includeLocalities(Database cx, vector<std::string>* localities, bool failed, bool includeAll) {
 	state std::string versionKey = deterministicRandom()->randomUniqueID().toString();
 	if (cx->apiVersionAtLeast(700)) {
 		state ReadYourWritesTransaction ryw(cx);
@@ -1766,7 +1764,7 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities
 						ryw.clear(SpecialKeySpace::getManamentApiCommandRange("excludedlocality"));
 					}
 				} else {
-					for (auto& l : localities) {
+					for (const auto& l : *localities) {
 						Key locality =
 						    failed ? SpecialKeySpace::getManagementApiCommandPrefix("failedlocality").withSuffix(l)
 						           : SpecialKeySpace::getManagementApiCommandPrefix("excludedlocality").withSuffix(l);
@@ -1774,9 +1772,9 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities
 					}
 				}
 				TraceEvent("IncludeLocalitiesCommit")
-					.detail("Localities", describe(localities))
-					.detail("Failed", failed)
-					.detail("IncludeAll", includeAll);
+				    .detail("Localities", describe(*localities))
+				    .detail("Failed", failed)
+				    .detail("IncludeAll", includeAll);
 
 				wait(ryw.commit());
 				return Void();
@@ -1794,8 +1792,8 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities
 				tr.setOption(FDBTransactionOptions::LOCK_AWARE);
 				tr.setOption(FDBTransactionOptions::USE_PROVISIONAL_PROXIES);
 
-				// includeLocalities might be used in an emergency transaction, so make sure it is retry-self-conflicting
-				// and CAUSAL_WRITE_RISKY
+				// includeLocalities might be used in an emergency transaction, so make sure it is
+				// retry-self-conflicting and CAUSAL_WRITE_RISKY
 				tr.setOption(FDBTransactionOptions::CAUSAL_WRITE_RISKY);
 				if (failed) {
 					tr.addReadConflictRange(singleKeyRange(failedLocalityVersionKey));
@@ -1812,7 +1810,7 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities
 						tr.clear(excludedLocalityKeys);
 					}
 				} else {
-					for (auto& l : localities) {
+					for (const auto& l : *localities) {
 						if (failed) {
 							tr.clear(encodeFailedLocalityKey(l));
 						} else {
@@ -1822,9 +1820,9 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities
 				}
 
 				TraceEvent("IncludeLocalitiesCommit")
-					.detail("Localities", describe(localities))
-					.detail("Failed", failed)
-					.detail("IncludeAll", includeAll);
+				    .detail("Localities", describe(*localities))
+				    .detail("Failed", failed)
+				    .detail("IncludeAll", includeAll);
 
 				wait(tr.commit());
 				return Void();
@@ -1914,12 +1912,12 @@ ACTOR Future<vector<std::string>> getExcludedLocalities(Transaction* tr) {
 	ASSERT(!r2.more && r2.size() < CLIENT_KNOBS->TOO_MANY);
 
 	vector<std::string> excludedLocalities;
-	for (auto i = r.begin(); i != r.end(); ++i) {
-		auto a = decodeExcludedLocalityKey(i->key);
+	for (const auto& i : r) {
+		auto a = decodeExcludedLocalityKey(i.key);
 		excludedLocalities.push_back(a);
 	}
-	for (auto i = r2.begin(); i != r2.end(); ++i) {
-		auto a = decodeFailedLocalityKey(i->key);
+	for (const auto& i : r2) {
+		auto a = decodeFailedLocalityKey(i.key);
 		excludedLocalities.push_back(a);
 	}
 	uniquify(excludedLocalities);
@@ -1941,16 +1939,20 @@ ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx) {
 	}
 }
 
-std::pair<std::string, std::string> decodeLocality(std::string locality) {
+std::pair<std::string, std::string> decodeLocality(std::string& locality) {
 	StringRef localityRef(locality.c_str());
 	if (localityRef.startsWith(ExcludeLocalityKeyDcIdPrefix)) {
-		return std::make_pair(LocalityData::keyDcId.toString(), localityRef.removePrefix(ExcludeLocalityKeyDcIdPrefix).toString());
+		return std::make_pair(LocalityData::keyDcId.toString(),
+		                      localityRef.removePrefix(ExcludeLocalityKeyDcIdPrefix).toString());
 	} else if (localityRef.startsWith(ExcludeLocalityKeyMachineIdPrefix)) {
-		return std::make_pair(LocalityData::keyMachineId.toString(), localityRef.removePrefix(ExcludeLocalityKeyMachineIdPrefix).toString());
+		return std::make_pair(LocalityData::keyMachineId.toString(),
+		                      localityRef.removePrefix(ExcludeLocalityKeyMachineIdPrefix).toString());
 	} else if (localityRef.startsWith(ExcludeLocalityKeyProcessIdPrefix)) {
-		return std::make_pair(LocalityData::keyProcessId.toString(), localityRef.removePrefix(ExcludeLocalityKeyProcessIdPrefix).toString());
+		return std::make_pair(LocalityData::keyProcessId.toString(),
+		                      localityRef.removePrefix(ExcludeLocalityKeyProcessIdPrefix).toString());
 	} else if (localityRef.startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
-		return std::make_pair(LocalityData::keyZoneId.toString(), localityRef.removePrefix(ExcludeLocalityKeyZoneIdPrefix).toString());
+		return std::make_pair(LocalityData::keyZoneId.toString(),
+		                      localityRef.removePrefix(ExcludeLocalityKeyZoneIdPrefix).toString());
 	}
 
 	return std::make_pair("", "");
@@ -1961,17 +1963,17 @@ std::set<AddressExclusion> getAddressesByLocality(std::vector<ProcessData>& work
 
 	std::set<AddressExclusion> localityAddresses;
 	for (int i = 0; i < workers.size(); i++) {
-		if (localityKeyValue.first == LocalityData::keyDcId && workers[i].locality.dcId().present()
-		    && localityKeyValue.second == workers[i].locality.dcId().get()) {
+		if (localityKeyValue.first == LocalityData::keyDcId && workers[i].locality.dcId().present() &&
+		    localityKeyValue.second == workers[i].locality.dcId().get()) {
 			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
-		} else if (localityKeyValue.first == LocalityData::keyMachineId && workers[i].locality.machineId().present()
-		           && localityKeyValue.second == workers[i].locality.machineId().get()) {
+		} else if (localityKeyValue.first == LocalityData::keyMachineId && workers[i].locality.machineId().present() &&
+		           localityKeyValue.second == workers[i].locality.machineId().get()) {
 			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
-		} else if (localityKeyValue.first == LocalityData::keyProcessId && workers[i].locality.processId().present()
-		           && localityKeyValue.second == workers[i].locality.processId().get()) {
+		} else if (localityKeyValue.first == LocalityData::keyProcessId && workers[i].locality.processId().present() &&
+		           localityKeyValue.second == workers[i].locality.processId().get()) {
 			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
-		} else if (localityKeyValue.first == LocalityData::keyZoneId && workers[i].locality.zoneId().present()
-		           && localityKeyValue.second == workers[i].locality.zoneId().get()) {
+		} else if (localityKeyValue.first == LocalityData::keyZoneId && workers[i].locality.zoneId().present() &&
+		           localityKeyValue.second == workers[i].locality.zoneId().get()) {
 			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
 		}
 	}
diff --git a/fdbclient/ManagementAPI.actor.h b/fdbclient/ManagementAPI.actor.h
index f93b528ac90..7660f62f062 100644
--- a/fdbclient/ManagementAPI.actor.h
+++ b/fdbclient/ManagementAPI.actor.h
@@ -165,15 +165,18 @@ void excludeServers(Transaction& tr, vector<AddressExclusion>& servers, bool fai
 
 // Exclude the servers matching the given set of localities from use as state servers.  Returns as soon as the change
 // is durable, without necessarily waiting for the servers to be evacuated.
-ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string> localities, bool failed = false);
-void excludeLocalities(Transaction& tr, std::unordered_set<std::string>& localities, bool failed = false);
+ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string>* localities, bool failed = false);
+void excludeLocalities(Transaction& tr, std::unordered_set<std::string>* localities, bool failed = false);
 
 // Remove the given servers from the exclusion list.  A NetworkAddress with a port of 0 means all servers on the given
 // IP.  A NetworkAddress() means all servers (don't exclude anything)
 ACTOR Future<Void> includeServers(Database cx, vector<AddressExclusion> servers, bool failed = false);
 
 // Remove the given localities from the exclusion list.
-ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities, bool failed = false, bool includeAll = false);
+ACTOR Future<Void> includeLocalities(Database cx,
+                                     vector<std::string>* localities,
+                                     bool failed = false,
+                                     bool includeAll = false);
 
 // Set the process class of processes with the given address.  A NetworkAddress with a port of 0 means all servers on
 // the given IP.
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index cd4f1e18581..e6e9f1fa953 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1172,10 +1172,10 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
 		    SpecialKeySpace::MODULE::MANAGEMENT,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
 		    std::make_unique<FailedServersRangeImpl>(SpecialKeySpace::getManamentApiCommandRange("failed")));
-		registerSpecialKeySpaceModule(
-		    SpecialKeySpace::MODULE::MANAGEMENT,
-		    SpecialKeySpace::IMPLTYPE::READWRITE,
-		    std::make_unique<ExcludedLocalitiesRangeImpl>(SpecialKeySpace::getManamentApiCommandRange("excludedlocality")));
+		registerSpecialKeySpaceModule(SpecialKeySpace::MODULE::MANAGEMENT,
+		                              SpecialKeySpace::IMPLTYPE::READWRITE,
+		                              std::make_unique<ExcludedLocalitiesRangeImpl>(
+		                                  SpecialKeySpace::getManamentApiCommandRange("excludedlocality")));
 		registerSpecialKeySpaceModule(
 		    SpecialKeySpace::MODULE::MANAGEMENT,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 4cac25ff462..f2949aa1cc0 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -104,7 +104,10 @@ std::unordered_map<std::string, KeyRange> SpecialKeySpace::managementApiCommandT
 	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) }
 };
 
-std::set<std::string> SpecialKeySpace::options = { "excluded/force", "failed/force", "excludedlocality/force", "failedlocality/force" };
+std::set<std::string> SpecialKeySpace::options = { "excluded/force",
+	                                               "failed/force",
+	                                               "excludedlocality/force",
+	                                               "failedlocality/force" };
 
 std::set<std::string> SpecialKeySpace::tracingOptions = { kTracingTransactionIdKey, kTracingTokenKey };
 
@@ -2126,39 +2129,36 @@ void includeLocalities(ReadYourWritesTransaction* ryw) {
 	ryw->setOption(FDBTransactionOptions::CAUSAL_WRITE_RISKY);
 	std::string versionKey = deterministicRandom()->randomUniqueID().toString();
 	// for excluded localities
-	auto ranges =
-	    ryw->getSpecialKeySpaceWriteMap().containedRanges(SpecialKeySpace::getManamentApiCommandRange("excludedlocality"));
-	auto iter = ranges.begin();
+	auto ranges = ryw->getSpecialKeySpaceWriteMap().containedRanges(
+	    SpecialKeySpace::getManamentApiCommandRange("excludedlocality"));
 	Transaction& tr = ryw->getTransaction();
-	while (iter != ranges.end()) {
-		auto entry = iter->value();
+	for (auto& iter : ranges) {
+		auto entry = iter.value();
 		if (entry.first && !entry.second.present()) {
 			tr.addReadConflictRange(singleKeyRange(excludedLocalityVersionKey));
 			tr.set(excludedLocalityVersionKey, versionKey);
-			tr.clear(ryw->getDatabase()->specialKeySpace->decode(iter->range()));
+			tr.clear(ryw->getDatabase()->specialKeySpace->decode(iter.range()));
 		}
-		++iter;
 	}
 	// for failed localities
-	ranges = ryw->getSpecialKeySpaceWriteMap().containedRanges(SpecialKeySpace::getManamentApiCommandRange("failedlocality"));
-	iter = ranges.begin();
-	while (iter != ranges.end()) {
-		auto entry = iter->value();
+	ranges = ryw->getSpecialKeySpaceWriteMap().containedRanges(
+	    SpecialKeySpace::getManamentApiCommandRange("failedlocality"));
+	for (auto& iter : ranges) {
+		auto entry = iter.value();
 		if (entry.first && !entry.second.present()) {
 			tr.addReadConflictRange(singleKeyRange(failedLocalityVersionKey));
 			tr.set(failedLocalityVersionKey, versionKey);
-			tr.clear(ryw->getDatabase()->specialKeySpace->decode(iter->range()));
+			tr.clear(ryw->getDatabase()->specialKeySpace->decode(iter.range()));
 		}
-		++iter;
 	}
 }
 
 bool parseLocalitiesFromKeys(ReadYourWritesTransaction* ryw,
                              bool failed,
                              std::unordered_set<std::string>& localities,
-							 std::vector<AddressExclusion>& addresses,
+                             std::vector<AddressExclusion>& addresses,
                              std::set<AddressExclusion>& exclusions,
-							 std::vector<ProcessData>& workers,
+                             std::vector<ProcessData>& workers,
                              Optional<std::string>& msg) {
 	KeyRangeRef range = failed ? SpecialKeySpace::getManamentApiCommandRange("failedlocality")
 	                           : SpecialKeySpace::getManamentApiCommandRange("excludedlocality");
@@ -2173,12 +2173,12 @@ bool parseLocalitiesFromKeys(ReadYourWritesTransaction* ryw,
 		    .detail("Key", iter->begin().toString());
 		if (entry.first && entry.second.present()) {
 			Key locality = iter->begin().removePrefix(range.begin);
-			if (locality.startsWith(ExcludeLocalityKeyDcIdPrefix)
-				|| locality.startsWith(ExcludeLocalityKeyMachineIdPrefix)
-				|| locality.startsWith(ExcludeLocalityKeyProcessIdPrefix)
-				|| locality.startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+			if (locality.startsWith(ExcludeLocalityKeyDcIdPrefix) ||
+			    locality.startsWith(ExcludeLocalityKeyMachineIdPrefix) ||
+			    locality.startsWith(ExcludeLocalityKeyProcessIdPrefix) ||
+			    locality.startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
 				std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, locality.toString());
-				if(!localityAddresses.empty()) {
+				if (!localityAddresses.empty()) {
 					std::copy(localityAddresses.begin(), localityAddresses.end(), back_inserter(addresses));
 					exclusions.insert(localityAddresses.begin(), localityAddresses.end());
 				}
@@ -2214,7 +2214,7 @@ ACTOR Future<Optional<std::string>> excludeLocalityCommitActor(ReadYourWritesTra
 			return result;
 	}
 
-	excludeLocalities(ryw->getTransaction(), localities, failed);
+	excludeLocalities(ryw->getTransaction(), &localities, failed);
 	includeLocalities(ryw);
 
 	return result;
diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index b9dd2d6fd45..aa0b4ac2eb4 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -636,7 +636,7 @@ const KeyRef triggerDDTeamInfoPrintKey(LiteralStringRef("\xff/triggerDDTeamInfoP
 const KeyRangeRef excludedServersKeys(LiteralStringRef("\xff/conf/excluded/"), LiteralStringRef("\xff/conf/excluded0"));
 const KeyRef excludedServersPrefix = excludedServersKeys.begin;
 const KeyRef excludedServersVersionKey = LiteralStringRef("\xff/conf/excluded");
-const AddressExclusion decodeExcludedServersKey(KeyRef const& key) {
+AddressExclusion decodeExcludedServersKey(KeyRef const& key) {
 	ASSERT(key.startsWith(excludedServersPrefix));
 	// Returns an invalid NetworkAddress if given an invalid key (within the prefix)
 	// Excluded servers have IP in x.x.x.x format, port optional, and no SSL suffix
@@ -650,10 +650,11 @@ std::string encodeExcludedServersKey(AddressExclusion const& addr) {
 	return excludedServersPrefix.toString() + addr.toString();
 }
 
-const KeyRangeRef excludedLocalityKeys(LiteralStringRef("\xff/conf/excludedlocality/"), LiteralStringRef("\xff/conf/excludedlocality0"));
+const KeyRangeRef excludedLocalityKeys(LiteralStringRef("\xff/conf/excludedlocality/"),
+                                       LiteralStringRef("\xff/conf/excludedlocality0"));
 const KeyRef excludedLocalityPrefix = excludedLocalityKeys.begin;
 const KeyRef excludedLocalityVersionKey = LiteralStringRef("\xff/conf/excludedlocality");
-const std::string decodeExcludedLocalityKey(KeyRef const& key) {
+std::string decodeExcludedLocalityKey(KeyRef const& key) {
 	ASSERT(key.startsWith(excludedLocalityPrefix));
 	return key.removePrefix(excludedLocalityPrefix).toString();
 }
@@ -665,7 +666,7 @@ std::string encodeExcludedLocalityKey(std::string const& locality) {
 const KeyRangeRef failedServersKeys(LiteralStringRef("\xff/conf/failed/"), LiteralStringRef("\xff/conf/failed0"));
 const KeyRef failedServersPrefix = failedServersKeys.begin;
 const KeyRef failedServersVersionKey = LiteralStringRef("\xff/conf/failed");
-const AddressExclusion decodeFailedServersKey(KeyRef const& key) {
+AddressExclusion decodeFailedServersKey(KeyRef const& key) {
 	ASSERT(key.startsWith(failedServersPrefix));
 	// Returns an invalid NetworkAddress if given an invalid key (within the prefix)
 	// Excluded servers have IP in x.x.x.x format, port optional, and no SSL suffix
@@ -679,10 +680,11 @@ std::string encodeFailedServersKey(AddressExclusion const& addr) {
 	return failedServersPrefix.toString() + addr.toString();
 }
 
-const KeyRangeRef failedLocalityKeys(LiteralStringRef("\xff/conf/failedlocality/"), LiteralStringRef("\xff/conf/failedlocality0"));
+const KeyRangeRef failedLocalityKeys(LiteralStringRef("\xff/conf/failedlocality/"),
+                                     LiteralStringRef("\xff/conf/failedlocality0"));
 const KeyRef failedLocalityPrefix = failedLocalityKeys.begin;
 const KeyRef failedLocalityVersionKey = LiteralStringRef("\xff/conf/failedlocality");
-const std::string decodeFailedLocalityKey(KeyRef const& key) {
+std::string decodeFailedLocalityKey(KeyRef const& key) {
 	ASSERT(key.startsWith(failedLocalityPrefix));
 	return key.removePrefix(failedLocalityPrefix).toString();
 }
diff --git a/fdbclient/SystemData.h b/fdbclient/SystemData.h
index 537de78a4bc..d57cebdf5a9 100644
--- a/fdbclient/SystemData.h
+++ b/fdbclient/SystemData.h
@@ -229,14 +229,14 @@ extern const KeyRef excludedServersPrefix;
 extern const KeyRangeRef excludedServersKeys;
 extern const KeyRef excludedServersVersionKey; // The value of this key shall be changed by any transaction that
                                                // modifies the excluded servers list
-const AddressExclusion decodeExcludedServersKey(KeyRef const& key); // where key.startsWith(excludedServersPrefix)
+AddressExclusion decodeExcludedServersKey(KeyRef const& key); // where key.startsWith(excludedServersPrefix)
 std::string encodeExcludedServersKey(AddressExclusion const&);
 
 extern const KeyRef excludedLocalityPrefix;
 extern const KeyRangeRef excludedLocalityKeys;
 extern const KeyRef excludedLocalityVersionKey; // The value of this key shall be changed by any transaction that
-                                               // modifies the excluded localities list
-const std::string decodeExcludedLocalityKey(KeyRef const& key); // where key.startsWith(excludedLocalityPrefix)
+                                                // modifies the excluded localities list
+std::string decodeExcludedLocalityKey(KeyRef const& key); // where key.startsWith(excludedLocalityPrefix)
 std::string encodeExcludedLocalityKey(std::string const&);
 
 //   "\xff/conf/failed/1.2.3.4" := ""
@@ -250,14 +250,14 @@ extern const KeyRef failedServersPrefix;
 extern const KeyRangeRef failedServersKeys;
 extern const KeyRef failedServersVersionKey; // The value of this key shall be changed by any transaction that modifies
                                              // the failed servers list
-const AddressExclusion decodeFailedServersKey(KeyRef const& key); // where key.startsWith(failedServersPrefix)
+AddressExclusion decodeFailedServersKey(KeyRef const& key); // where key.startsWith(failedServersPrefix)
 std::string encodeFailedServersKey(AddressExclusion const&);
 
 extern const KeyRef failedLocalityPrefix;
 extern const KeyRangeRef failedLocalityKeys;
 extern const KeyRef failedLocalityVersionKey; // The value of this key shall be changed by any transaction that modifies
-                                             // the failed localities list
-const std::string decodeFailedLocalityKey(KeyRef const& key); // where key.startsWith(failedLocalityPrefix)
+                                              // the failed localities list
+std::string decodeFailedLocalityKey(KeyRef const& key); // where key.startsWith(failedLocalityPrefix)
 std::string encodeFailedLocalityKey(std::string const&);
 
 //   "\xff/globalConfig/[[option]]" := "value"
diff --git a/fdbrpc/Locality.h b/fdbrpc/Locality.h
index ae666dcdf59..13bf55e773c 100644
--- a/fdbrpc/Locality.h
+++ b/fdbrpc/Locality.h
@@ -24,10 +24,10 @@
 
 #include "flow/flow.h"
 
-const StringRef ExcludeLocalityKeyDcIdPrefix = LiteralStringRef("dcid:");
-const StringRef ExcludeLocalityKeyMachineIdPrefix = LiteralStringRef("machineid:");
-const StringRef ExcludeLocalityKeyProcessIdPrefix = LiteralStringRef("processid:");
-const StringRef ExcludeLocalityKeyZoneIdPrefix = LiteralStringRef("zoneid:");
+inline const StringRef ExcludeLocalityKeyDcIdPrefix = LiteralStringRef("dcid:");
+inline const StringRef ExcludeLocalityKeyMachineIdPrefix = LiteralStringRef("machineid:");
+inline const StringRef ExcludeLocalityKeyProcessIdPrefix = LiteralStringRef("processid:");
+inline const StringRef ExcludeLocalityKeyZoneIdPrefix = LiteralStringRef("zoneid:");
 
 struct ProcessClass {
 	constexpr static FileIdentifier file_identifier = 6697257;
diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index 8756b3a2a76..cea35794a98 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -214,7 +214,7 @@ void applyMetadataMutations(SpanID const& spanContext,
 					                            // configuration whenever there is a change
 					if ((!m.param1.startsWith(excludedServersPrefix) && m.param1 != excludedServersVersionKey) &&
 					    (!m.param1.startsWith(failedServersPrefix) && m.param1 != failedServersVersionKey) &&
-						(!m.param1.startsWith(excludedLocalityPrefix) && m.param1 != excludedLocalityVersionKey) &&
+					    (!m.param1.startsWith(excludedLocalityPrefix) && m.param1 != excludedLocalityVersionKey) &&
 					    (!m.param1.startsWith(failedLocalityPrefix) && m.param1 != failedLocalityVersionKey)) {
 						auto t = txnStateStore->readValue(m.param1).get();
 						TraceEvent("MutationRequiresRestart", dbgid)
@@ -429,8 +429,8 @@ void applyMetadataMutations(SpanID const& spanContext,
 			if (configKeys.intersects(range)) {
 				if (!initialCommit)
 					txnStateStore->clear(range & configKeys);
-				if (!excludedServersKeys.contains(range) && !failedServersKeys.contains(range)
-				    && !excludedLocalityKeys.contains(range) && !failedLocalityKeys.contains(range)) {
+				if (!excludedServersKeys.contains(range) && !failedServersKeys.contains(range) &&
+				    !excludedLocalityKeys.contains(range) && !failedLocalityKeys.contains(range)) {
 					TraceEvent("MutationRequiresRestart", dbgid).detail("M", m.toString());
 					confChange = true;
 				}
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 5f27fa0bb88..3f73d4bb8fe 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -3818,8 +3818,8 @@ ACTOR Future<Void> trackExcludedServers(DDTeamCollection* self) {
 			state Future<RangeResult> flocalitiesExclude = tr.getRange(excludedLocalityKeys, CLIENT_KNOBS->TOO_MANY);
 			state Future<RangeResult> flocalitiesFailed = tr.getRange(failedLocalityKeys, CLIENT_KNOBS->TOO_MANY);
 			state Future<std::vector<ProcessData>> fworkers = getWorkers(self->cx);
-			wait(success(fresultsExclude) && success(fresultsFailed) &&
-				success(flocalitiesExclude) && success(flocalitiesFailed));
+			wait(success(fresultsExclude) && success(fresultsFailed) && success(flocalitiesExclude) &&
+			     success(flocalitiesFailed));
 
 			state RangeResult excludedResults = fresultsExclude.get();
 			ASSERT(!excludedResults.more && excludedResults.size() < CLIENT_KNOBS->TOO_MANY);
@@ -3885,8 +3885,8 @@ ACTOR Future<Void> trackExcludedServers(DDTeamCollection* self) {
 			TraceEvent("DDExcludedServersChanged", self->distributorId)
 			    .detail("AddressesExcluded", excludedResults.size())
 			    .detail("AddressesFailed", failedResults.size())
-				.detail("LocalitiesExcluded", excludedLocalityResults.size())
-				.detail("LocalitiesFailed", failedLocalityResults.size());
+			    .detail("LocalitiesExcluded", excludedLocalityResults.size())
+			    .detail("LocalitiesFailed", failedLocalityResults.size());
 
 			self->restartRecruiting.trigger();
 			state Future<Void> watchFuture = tr.watch(excludedServersVersionKey) || tr.watch(failedServersVersionKey) ||
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index aadc7ff998c..1c931a30378 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -1032,17 +1032,64 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 			        ? tr->get(StringRef(encodeFailedServersKey(AddressExclusion(server.secondaryAddress().get().ip))))
 			        : Future<Optional<Value>>(Optional<Value>());
 
+			state Future<Optional<Value>> fExclLocDCID =
+			    server.locality.dcId().present()
+			        ? tr->get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
+			                                                      server.locality.dcId().get().toString())))
+			        : Future<Optional<Value>>(Optional<Value>());
+			state Future<Optional<Value>> fFailedLocDCID =
+			    server.locality.dcId().present()
+			        ? tr->get(StringRef(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
+			                                                    server.locality.dcId().get().toString())))
+			        : Future<Optional<Value>>(Optional<Value>());
+			state Future<Optional<Value>> fExclLocZoneID =
+			    server.locality.zoneId().present()
+			        ? tr->get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
+			                                                      server.locality.zoneId().get().toString())))
+			        : Future<Optional<Value>>(Optional<Value>());
+			state Future<Optional<Value>> fFailedLocZoneID =
+			    server.locality.zoneId().present()
+			        ? tr->get(StringRef(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
+			                                                    server.locality.zoneId().get().toString())))
+			        : Future<Optional<Value>>(Optional<Value>());
+			state Future<Optional<Value>> fExclLocMachineID =
+			    server.locality.machineId().present()
+			        ? tr->get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
+			                                                      server.locality.machineId().get().toString())))
+			        : Future<Optional<Value>>(Optional<Value>());
+			state Future<Optional<Value>> fFailedLocMachineID =
+			    server.locality.machineId().present()
+			        ? tr->get(StringRef(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
+			                                                    server.locality.machineId().get().toString())))
+			        : Future<Optional<Value>>(Optional<Value>());
+			state Future<Optional<Value>> fExclLocProcessID =
+			    server.locality.processId().present()
+			        ? tr->get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() +
+			                                                      server.locality.processId().get().toString())))
+			        : Future<Optional<Value>>(Optional<Value>());
+			state Future<Optional<Value>> fFailedLocProcessID =
+			    server.locality.processId().present()
+			        ? tr->get(StringRef(encodeFailedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() +
+			                                                    server.locality.processId().get().toString())))
+			        : Future<Optional<Value>>(Optional<Value>());
+
 			state Future<RangeResult> fTags = tr->getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY, true);
 			state Future<RangeResult> fHistoryTags = tr->getRange(serverTagHistoryKeys, CLIENT_KNOBS->TOO_MANY, true);
 
 			wait(success(fTagLocalities) && success(fv) && success(fTags) && success(fHistoryTags) &&
 			     success(fExclProc) && success(fExclIP) && success(fFailProc) && success(fFailIP) &&
-			     success(fExclProc2) && success(fExclIP2) && success(fFailProc2) && success(fFailIP2));
+			     success(fExclProc2) && success(fExclIP2) && success(fFailProc2) && success(fFailIP2) &&
+			     success(fExclLocDCID) && success(fFailedLocDCID) && success(fExclLocZoneID) &&
+			     success(fFailedLocZoneID) && success(fExclLocMachineID) && success(fFailedLocMachineID) &&
+			     success(fExclLocProcessID) && success(fFailedLocProcessID));
 
 			// If we have been added to the excluded/failed state servers list, we have to fail
 			if (fExclProc.get().present() || fExclIP.get().present() || fFailProc.get().present() ||
 			    fFailIP.get().present() || fExclProc2.get().present() || fExclIP2.get().present() ||
-			    fFailProc2.get().present() || fFailIP2.get().present()) {
+			    fFailProc2.get().present() || fFailIP2.get().present() || fExclLocDCID.get().present() ||
+			    fFailedLocDCID.get().present() || fExclLocZoneID.get().present() || fFailedLocZoneID.get().present() ||
+			    fExclLocMachineID.get().present() || fFailedLocMachineID.get().present() ||
+			    fExclLocProcessID.get().present() || fFailedLocProcessID.get().present()) {
 				throw recruitment_failed();
 			}
 
diff --git a/fdbserver/Ratekeeper.actor.cpp b/fdbserver/Ratekeeper.actor.cpp
index 4881b00914f..804e4a537ed 100644
--- a/fdbserver/Ratekeeper.actor.cpp
+++ b/fdbserver/Ratekeeper.actor.cpp
@@ -1394,9 +1394,10 @@ ACTOR Future<Void> configurationMonitor(RatekeeperData* self) {
 
 				self->configuration.fromKeyValues((VectorRef<KeyValueRef>)results);
 
-				state Future<Void> watchFuture = tr.watch(moveKeysLockOwnerKey) ||
-				                                 tr.watch(excludedServersVersionKey) ||
-				                                 tr.watch(failedServersVersionKey);
+				state Future<Void> watchFuture =
+				    tr.watch(moveKeysLockOwnerKey) || tr.watch(excludedServersVersionKey) ||
+				    tr.watch(failedServersVersionKey) || tr.watch(excludedLocalityVersionKey) ||
+				    tr.watch(failedLocalityVersionKey);
 				wait(tr.commit());
 				wait(watchFuture);
 				break;
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index bb24cdd4990..67b0baef32f 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -360,8 +360,9 @@ static JsonBuilderObject machineStatusFetcher(WorkerEvents mMetrics,
 			bool excludedServer = false;
 			bool excludedLocality = false;
 			if (configuration.present() && configuration.get().isExcludedServer(tempList))
-			    excludedServer = true;
-			if (locality.count(it->first) && configuration.present() && configuration.get().isMachineExcluded(locality[it->first]))
+				excludedServer = true;
+			if (locality.count(it->first) && configuration.present() &&
+			    configuration.get().isMachineExcluded(locality[it->first]))
 				excludedLocality = true;
 
 			notExcludedMap[machineId] = excludedServer || excludedLocality;
@@ -1022,8 +1023,8 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 			statusObj["roles"] = roles.getStatusForAddress(address);
 
 			if (configuration.present()) {
-				statusObj["excluded"] = configuration.get().isExcludedServer(workerItr->interf.addresses())
-				                        || configuration.get().isExcludedLocality(workerItr->interf.locality);
+				statusObj["excluded"] = configuration.get().isExcludedServer(workerItr->interf.addresses()) ||
+				                        configuration.get().isExcludedLocality(workerItr->interf.locality);
 			}
 
 			statusObj["class_type"] = workerItr->processClass.toString();
@@ -1617,9 +1618,9 @@ static JsonBuilderObject configurationFetcher(Optional<DatabaseConfiguration> co
 				excludedServersArr.push_back(statusObj);
 			}
 			std::set<std::string> excludedLocalities = configuration.getExcludedLocalities();
-			for (std::set<std::string>::iterator it = excludedLocalities.begin(); it != excludedLocalities.end(); it++) {
+			for (const auto& it : excludedLocalities) {
 				JsonBuilderObject statusObj;
-				statusObj["locality"] = *it;
+				statusObj["locality"] = it;
 				excludedServersArr.push_back(statusObj);
 			}
 			statusObj["excluded_servers"] = excludedServersArr;
diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index c0d1d31d2ff..7aaf556504b 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -1529,9 +1529,10 @@ ACTOR Future<Void> configurationMonitor(Reference<MasterData> self, Database cx)
 					self->registrationTrigger.trigger();
 				}
 
-				state Future<Void> watchFuture = tr.watch(moveKeysLockOwnerKey) ||
-				                                 tr.watch(excludedServersVersionKey) ||
-				                                 tr.watch(failedServersVersionKey);
+				state Future<Void> watchFuture =
+				    tr.watch(moveKeysLockOwnerKey) || tr.watch(excludedServersVersionKey) ||
+				    tr.watch(failedServersVersionKey) || tr.watch(excludedLocalityVersionKey) ||
+				    tr.watch(failedLocalityVersionKey);
 				wait(tr.commit());
 				wait(watchFuture);
 				break;
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index 34842f8e6cc..e2a31ef429f 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -440,7 +440,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		std::unordered_set<std::string> localities;
 		auto processes = getServers();
 		// collecting all localities
-		for (auto& it : processes) {
+		for (const auto& it : processes) {
 			if (it->locality.dcId().present())
 				localities.insert(ExcludeLocalityKeyDcIdPrefix.toString() + it->locality.dcId().get().toString());
 			if (it->locality.zoneId().present())
@@ -499,7 +499,8 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 			    .detail("Kill3Size", toKill3.size())
 			    .detail("ToKill3", describe(toKill3))
 			    .detail("ClusterAvailable", g_simulator.isAvailable());
-			wait(includeLocalities(cx, vector<std::string>(1), failed, true));
+			vector<std::string> emptyLocalities;
+			wait(includeLocalities(cx, &emptyLocalities, failed, true));
 		}
 
 		return Void();
@@ -766,17 +767,13 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 	}
 
 	template <class T>
-	static std::set<T> random_subset(std::unordered_set<T> s, int n) {
-		std::vector<T> v;
-		std::copy(s.begin(), s.end(), back_inserter(v));
-		return random_subset(v, n);
+	static std::set<T> random_subset(std::unordered_set<T>& s, int n) {
+		return random_subset(std::vector<T>(s.begin(), s.end()), n);
 	}
 
 	template <class T>
-	static std::set<T> random_subset(std::set<T> s, int n) {
-		std::vector<T> v;
-		std::copy(s.begin(), s.end(), back_inserter(v));
-		return random_subset(v, n);
+	static std::set<T> random_subset(std::set<T>& s, int n) {
+		return random_subset(std::vector<T>(s.begin(), s.end()), n);
 	}
 
 	bool killContainsProcess(AddressExclusion kill, NetworkAddress process) {
@@ -788,7 +785,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		state Transaction tr(cx);
 		state std::vector<ProcessData> workers = wait(getWorkers(&tr));
 		state std::set<AddressExclusion> addressesSet;
-		for (auto& l : localities) {
+		for (const auto& l : localities) {
 			std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, l);
 			addressesSet.insert(localityAddresses.begin(), localityAddresses.end());
 		}
@@ -798,7 +795,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 
 	std::set<std::string> getSafeLocalitiesToKill(std::vector<ISimulator::ProcessInfo*> const& safeProcesses) {
 		std::unordered_map<std::string, int> safeLocalitiesCount;
-		for (auto& processInfo : safeProcesses) {
+		for (const auto& processInfo : safeProcesses) {
 			if (processInfo->locality.dcId().present())
 				safeLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
 				                    processInfo->locality.dcId().get().toString()]++;
@@ -815,7 +812,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 
 		auto processes = getServers();
 		std::unordered_map<std::string, int> allLocalitiesCount;
-		for (auto& processInfo : processes) {
+		for (const auto& processInfo : processes) {
 			if (processInfo->locality.dcId().present())
 				allLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
 				                   processInfo->locality.dcId().get().toString()]++;
@@ -831,7 +828,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		}
 
 		std::set<std::string> safeLocalities;
-		for (auto& l : safeLocalitiesCount) {
+		for (const auto& l : safeLocalitiesCount) {
 			if (l.second == allLocalitiesCount[l.first]) {
 				safeLocalities.insert(l.first);
 			}
@@ -872,10 +869,8 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 				toKillMarkFailedSet = random_subset(toKill, deterministicRandom()->randomInt(0, toKill.size() + 1));
 				state std::set<AddressExclusion> toKillMarkFailedAddressesSet =
 				    wait(self->getLocalitiesAddresses(cx, toKillMarkFailedSet));
-				state std::vector<AddressExclusion> toKillMarkFailedAddressesVector;
-				std::copy(toKillMarkFailedAddressesSet.begin(),
-				          toKillMarkFailedAddressesSet.end(),
-				          back_inserter(toKillMarkFailedAddressesVector));
+				state std::vector<AddressExclusion> toKillMarkFailedAddressesVector(
+				    toKillMarkFailedAddressesSet.begin(), toKillMarkFailedAddressesSet.end());
 				TraceEvent("RemoveAndKillLocalities", functionId)
 				    .detail("Step", "SafetyCheck")
 				    .detail("Exclusion Localities", describe(toKillMarkFailedSet))
@@ -920,9 +915,9 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		    .detail("ClusterAvailable", g_simulator.isAvailable())
 		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
 		if (markExcludeAsFailed) {
-			wait(excludeLocalities(cx, toKillMarkFailedUnorderedSet, true));
+			wait(excludeLocalities(cx, &toKillMarkFailedUnorderedSet, true));
 		}
-		wait(excludeLocalities(cx, toKillUnorderedSet));
+		wait(excludeLocalities(cx, &toKillUnorderedSet));
 
 		TraceEvent("RemoveAndKillLocalities", functionId)
 		    .detail("Step", "done")
@@ -940,9 +935,9 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		}
 
 		vector<ISimulator::ProcessInfo*> processes = g_simulator.getAllProcesses();
-		for (int i = 0; i < processes.size(); i++) {
-			processes[i]->locality.set(LocalityData::keyProcessId,
-			                           workers[addressToIndexMap[processes[i]->address]].locality.processId());
+		for (auto process : processes) {
+			process->locality.set(LocalityData::keyProcessId,
+			                      workers[addressToIndexMap[process->address]].locality.processId());
 		}
 
 		return Void();

From e4d274c3046003afd81eb096b6b1e75930d7e32c Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Wed, 9 Jun 2021 17:04:05 -0700
Subject: [PATCH 313/740] Snake naming of keys and added comments to all new
 functions.

---
 documentation/sphinx/source/developer-guide.rst  |  8 ++++----
 documentation/sphinx/source/moving-a-cluster.rst |  2 +-
 fdbcli/fdbcli.actor.cpp                          |  6 +++++-
 fdbclient/DatabaseConfiguration.cpp              |  5 +++++
 fdbclient/ManagementAPI.actor.cpp                | 13 ++++++++++++-
 fdbclient/SpecialKeySpace.actor.cpp              | 11 +++++++++--
 fdbclient/SpecialKeySpace.actor.h                |  2 ++
 fdbclient/SystemData.cpp                         | 14 ++++++--------
 fdbserver/MoveKeys.actor.cpp                     |  2 +-
 .../workloads/RemoveServersSafely.actor.cpp      | 16 +++++++++++++++-
 10 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/documentation/sphinx/source/developer-guide.rst b/documentation/sphinx/source/developer-guide.rst
index d1b21737b16..d22625e2510 100644
--- a/documentation/sphinx/source/developer-guide.rst
+++ b/documentation/sphinx/source/developer-guide.rst
@@ -958,10 +958,10 @@ that process, and wait for necessary data to be moved away.
 #. ``\xff\xff/management/consistency_check_suspended`` Read/write. Set or read this key will set or read the underlying system key ``\xff\x02/ConsistencyCheck/Suspend``. The value of this special key is unused thus if present, will be empty. In particular, if the key exists, then consistency is suspended. For more details, see help text of ``fdbcli`` command ``consistencycheck``.
 #. ``\xff\xff/management/db_locked`` Read/write. A single key that can be read and modified. Set the key will lock the database and clear the key will unlock. If the database is already locked, then the commit will fail with the ``special_keys_api_failure`` error. For more details, see help text of ``fdbcli`` command ``lock`` and ``unlock``.
 #. ``\xff\xff/management/auto_coordinators`` Read-only. A single key, if read, will return a set of processes which is able to satisfy the current redundency level and serve as new coordinators. The return value is formatted as a comma delimited string of network addresses of coordinators, i.e. ``<ip:port>,<ip:port>,...,<ip:port>``.
-#. ``\xff\xff/management/excludedlocality/<locality>`` Read/write. Indicates that the cluster should move data away from processes matching ``<locality>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
-#. ``\xff\xff/management/failedlocality/<locality>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
-#. ``\xff\xff/management/options/excludedlocality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excludedlocality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
-#. ``\xff\xff/management/options/failedlocality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failedlocality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+#. ``\xff\xff/management/excluded_locality/<locality>`` Read/write. Indicates that the cluster should move data away from processes matching ``<locality>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/failed_locality/<locality>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/options/excluded_locality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excluded_locality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+#. ``\xff\xff/management/options/failed_locality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failed_locality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
 
 An exclusion is syntactically either an ip address (e.g. ``127.0.0.1``), or
 an ip address and port (e.g. ``127.0.0.1:4500``) or locality (e.g ``dcid:primary-satellite`` or
diff --git a/documentation/sphinx/source/moving-a-cluster.rst b/documentation/sphinx/source/moving-a-cluster.rst
index 56cbcc27e0e..18ec698502f 100644
--- a/documentation/sphinx/source/moving-a-cluster.rst
+++ b/documentation/sphinx/source/moving-a-cluster.rst
@@ -38,7 +38,7 @@ $ sudo service foundationdb stop
 
 7. Exclude the original machines from the cluster using ``exclude`` in ``fdbcli``. This command will not return until all database state has been moved off of the original machines and fully replicated to the new machines. For example::
 
-    fdb> exclude 192.168.1.1:4500 192.168.1.2:4500 192.168.1.3:4500
+    fdb> exclude 192.168.1.1:4500 192.168.1.2:4500 192.168.1.3:4500 dcid:primary-satellite zoneid:primary-satellite-log-2 machineid:primary-stateless-1 processid:223be2da244ca0182375364e4d122c30
 
 8. Run ``coordinators auto`` in ``fdbcli`` to move coordination state to the new machines. Please note that this will cause the fdb.cluster file to be updated with the addresses of the new machines. Any currently connected clients will be notified and (assuming they have appropriate file system :ref:`permissions <cluster_file_permissions>`) will update their own copy of the cluster file. As long as the original machines are still running, any clients that connect to them will be automatically forwarded to the new cluster coordinators. However, if you have a client that has not yet connected or only connects intermittently, you will need to copy the new cluster file from one of the new machines to the client machine.
 
diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index ed7ce1cdea8..17d12911471 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -2422,6 +2422,7 @@ ACTOR Future<bool> coordinators(Database db, std::vector<StringRef> tokens, bool
 	return err;
 }
 
+// Includes the servers that could be ipaddresses or localities back to the cluster.
 ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 	std::vector<AddressExclusion> addresses;
 	state std::vector<std::string> localities;
@@ -2434,6 +2435,7 @@ ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 			failed = true;
 		} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix) || t->startsWith(ExcludeLocalityKeyMachineIdPrefix) ||
 		           t->startsWith(ExcludeLocalityKeyProcessIdPrefix) || t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+			// if the token starts with any locality prefix.
 			localities.push_back(t->toString());
 		} else {
 			auto a = AddressExclusion::parse(*t);
@@ -2458,6 +2460,7 @@ ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 			wait(makeInterruptable(includeServers(db, addresses, failed)));
 		}
 		if (!localities.empty()) {
+			// includes the servers that belong to given localities.
 			wait(makeInterruptable(includeLocalities(db, &localities, failed, all)));
 		}
 	}
@@ -2519,6 +2522,7 @@ ACTOR Future<bool> exclude(Database db,
 				if (localityAddresses.empty()) {
 					noMatchLocalities.push_back(t->toString());
 				} else {
+					// add all the server ipaddresses that belong to the given localities to the exclusionSet.
 					std::copy(localityAddresses.begin(), localityAddresses.end(), back_inserter(exclusionVector));
 					exclusionSet.insert(localityAddresses.begin(), localityAddresses.end());
 				}
@@ -2540,7 +2544,7 @@ ACTOR Future<bool> exclude(Database db,
 		}
 
 		if (exclusionAddresses.empty() && exclusionLocalities.empty()) {
-			fprintf(stderr, "ERROR: Atleast one valid network endpoint address or a locality is not provided\n");
+			fprintf(stderr, "ERROR: At least one valid network endpoint address or a locality is not provided\n");
 			return true;
 		}
 
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index b0f61de333f..088a10fafdc 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -632,6 +632,7 @@ std::set<AddressExclusion> DatabaseConfiguration::getExcludedServers() const {
 	return addrs;
 }
 
+// checks if the locality is excluded or not by checking if the key is present.
 bool DatabaseConfiguration::isExcludedLocality(const LocalityData& locality) const {
 	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
 	                                                                  locality.dcId().get().toString()))
@@ -669,6 +670,9 @@ bool DatabaseConfiguration::isExcludedLocality(const LocalityData& locality) con
 	                                    : false);
 }
 
+// checks if this machineid of given locality is excluded.
+// A machine can be excluded either as part of dcid exclustion or zoneid exclusion
+// or this explicit machineid exclusion.
 bool DatabaseConfiguration::isMachineExcluded(const LocalityData& locality) const {
 	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
 	                                                                  locality.dcId().get().toString()))
@@ -697,6 +701,7 @@ bool DatabaseConfiguration::isMachineExcluded(const LocalityData& locality) cons
 	                                    : false);
 }
 
+// Gets the list of already excluded localities (with failed option)
 std::set<std::string> DatabaseConfiguration::getExcludedLocalities() const {
 	// TODO: revisit all const_cast usages
 	const_cast<DatabaseConfiguration*>(this)->makeConfigurationImmutable();
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index 35cc030b00b..a4f80064c73 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -1589,6 +1589,7 @@ ACTOR Future<Void> excludeServers(Database cx, vector<AddressExclusion> servers,
 	}
 }
 
+// excludes localities by setting the keys in api version below 7.0
 void excludeLocalities(Transaction& tr, std::unordered_set<std::string>* localities, bool failed) {
 	tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 	tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
@@ -1608,6 +1609,8 @@ void excludeLocalities(Transaction& tr, std::unordered_set<std::string>* localit
 	TraceEvent("ExcludeLocalitiesCommit").detail("Localities", describe(*localities)).detail("ExcludeFailed", failed);
 }
 
+// Exclude the servers matching the given set of localities from use as state servers.
+// excludes localities by setting the keys.
 ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string>* localities, bool failed) {
 	if (cx->apiVersionAtLeast(700)) {
 		state ReadYourWritesTransaction ryw(cx);
@@ -1750,6 +1753,8 @@ ACTOR Future<Void> includeServers(Database cx, vector<AddressExclusion> servers,
 	}
 }
 
+// Remove the given localities from the exclusion list.
+// include localities by clearing the keys.
 ACTOR Future<Void> includeLocalities(Database cx, vector<std::string>* localities, bool failed, bool includeAll) {
 	state std::string versionKey = deterministicRandom()->randomUniqueID().toString();
 	if (cx->apiVersionAtLeast(700)) {
@@ -1905,6 +1910,7 @@ ACTOR Future<vector<AddressExclusion>> getExcludedServers(Database cx) {
 	}
 }
 
+// Get the current list of excluded localities by reading the keys.
 ACTOR Future<vector<std::string>> getExcludedLocalities(Transaction* tr) {
 	state RangeResult r = wait(tr->getRange(excludedLocalityKeys, CLIENT_KNOBS->TOO_MANY));
 	ASSERT(!r.more && r.size() < CLIENT_KNOBS->TOO_MANY);
@@ -1924,12 +1930,13 @@ ACTOR Future<vector<std::string>> getExcludedLocalities(Transaction* tr) {
 	return excludedLocalities;
 }
 
+// Get the list of excluded localities by reading the keys.
 ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx) {
 	state Transaction tr(cx);
 	loop {
 		try {
 			tr.setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
-			tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE); // necessary?
+			tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 			tr.setOption(FDBTransactionOptions::LOCK_AWARE);
 			vector<std::string> exclusions = wait(getExcludedLocalities(&tr));
 			return exclusions;
@@ -1939,6 +1946,8 @@ ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx) {
 	}
 }
 
+// Decodes the locality string to a pair of locality prefix and its value.
+// The prefix could be dcid, processid, machineid, processid.
 std::pair<std::string, std::string> decodeLocality(std::string& locality) {
 	StringRef localityRef(locality.c_str());
 	if (localityRef.startsWith(ExcludeLocalityKeyDcIdPrefix)) {
@@ -1958,6 +1967,8 @@ std::pair<std::string, std::string> decodeLocality(std::string& locality) {
 	return std::make_pair("", "");
 }
 
+// Returns the list of IPAddresses of the workers that match the given locality.
+// Example: locality="dcid:primary" returns all the ip addresses of the workers in the primary dc.
 std::set<AddressExclusion> getAddressesByLocality(std::vector<ProcessData>& workers, std::string locality) {
 	std::pair<std::string, std::string> localityKeyValue = decodeLocality(locality);
 
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index f2949aa1cc0..2db85f4c776 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -78,10 +78,10 @@ std::unordered_map<std::string, KeyRange> SpecialKeySpace::managementApiCommandT
 	  KeyRangeRef(LiteralStringRef("failed/"), LiteralStringRef("failed0"))
 	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) },
 	{ "excludedlocality",
-	  KeyRangeRef(LiteralStringRef("excludedlocality/"), LiteralStringRef("excludedlocality0"))
+	  KeyRangeRef(LiteralStringRef("excluded_locality/"), LiteralStringRef("excluded_locality0"))
 	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) },
 	{ "failedlocality",
-	  KeyRangeRef(LiteralStringRef("failedlocality/"), LiteralStringRef("failedlocality0"))
+	  KeyRangeRef(LiteralStringRef("failed_locality/"), LiteralStringRef("failed_locality0"))
 	      .withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) },
 	{ "lock", singleKeyRange(LiteralStringRef("db_locked")).withPrefix(moduleToBoundary[MODULE::MANAGEMENT].begin) },
 	{ "consistencycheck",
@@ -2120,6 +2120,7 @@ Future<Optional<std::string>> DataDistributionImpl::commit(ReadYourWritesTransac
 	return msg;
 }
 
+// Clears the special management api keys excludeLocality and failedLocality.
 void includeLocalities(ReadYourWritesTransaction* ryw) {
 	ryw->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 	ryw->setOption(FDBTransactionOptions::LOCK_AWARE);
@@ -2153,6 +2154,8 @@ void includeLocalities(ReadYourWritesTransaction* ryw) {
 	}
 }
 
+// Reads the excludedlocality and failed locality keys using managment api,
+// parses them and returns the list.
 bool parseLocalitiesFromKeys(ReadYourWritesTransaction* ryw,
                              bool failed,
                              std::unordered_set<std::string>& localities,
@@ -2196,6 +2199,8 @@ bool parseLocalitiesFromKeys(ReadYourWritesTransaction* ryw,
 	return true;
 }
 
+// On commit, parses the special exclusion keys and get the localities to be excluded, check for exclusions
+// and add them to the exclusion list. Also, clears the special management api keys with includeLocalities.
 ACTOR Future<Optional<std::string>> excludeLocalityCommitActor(ReadYourWritesTransaction* ryw, bool failed) {
 	state Optional<std::string> result;
 	state std::unordered_set<std::string> localities;
@@ -2242,6 +2247,7 @@ Key ExcludedLocalitiesRangeImpl::encode(const KeyRef& key) const {
 }
 
 Future<Optional<std::string>> ExcludedLocalitiesRangeImpl::commit(ReadYourWritesTransaction* ryw) {
+	// exclude locality with failed option as false.
 	return excludeLocalityCommitActor(ryw, false);
 }
 
@@ -2267,5 +2273,6 @@ Key FailedLocalitiesRangeImpl::encode(const KeyRef& key) const {
 }
 
 Future<Optional<std::string>> FailedLocalitiesRangeImpl::commit(ReadYourWritesTransaction* ryw) {
+	// exclude locality with failed option as true.
 	return excludeLocalityCommitActor(ryw, true);
 }
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index 674e9d2f0ad..8076c320b95 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -280,6 +280,7 @@ class ManagementCommandsOptionsImpl : public SpecialKeyRangeRWImpl {
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
 
+// Special key management api for excluding localities (exclude_locality)
 class ExcludedLocalitiesRangeImpl : public SpecialKeyRangeRWImpl {
 public:
 	explicit ExcludedLocalitiesRangeImpl(KeyRangeRef kr);
@@ -290,6 +291,7 @@ class ExcludedLocalitiesRangeImpl : public SpecialKeyRangeRWImpl {
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
 
+// Special key management api for excluding localities with failed option (failed_locality)
 class FailedLocalitiesRangeImpl : public SpecialKeyRangeRWImpl {
 public:
 	explicit FailedLocalitiesRangeImpl(KeyRangeRef kr);
diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index aa0b4ac2eb4..f035c641800 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -650,16 +650,15 @@ std::string encodeExcludedServersKey(AddressExclusion const& addr) {
 	return excludedServersPrefix.toString() + addr.toString();
 }
 
-const KeyRangeRef excludedLocalityKeys(LiteralStringRef("\xff/conf/excludedlocality/"),
-                                       LiteralStringRef("\xff/conf/excludedlocality0"));
+const KeyRangeRef excludedLocalityKeys(LiteralStringRef("\xff/conf/excluded_locality/"),
+                                       LiteralStringRef("\xff/conf/excluded_locality0"));
 const KeyRef excludedLocalityPrefix = excludedLocalityKeys.begin;
-const KeyRef excludedLocalityVersionKey = LiteralStringRef("\xff/conf/excludedlocality");
+const KeyRef excludedLocalityVersionKey = LiteralStringRef("\xff/conf/excluded_locality");
 std::string decodeExcludedLocalityKey(KeyRef const& key) {
 	ASSERT(key.startsWith(excludedLocalityPrefix));
 	return key.removePrefix(excludedLocalityPrefix).toString();
 }
 std::string encodeExcludedLocalityKey(std::string const& locality) {
-	// FIXME: make sure what's persisted here is not affected by innocent changes elsewhere
 	return excludedLocalityPrefix.toString() + locality;
 }
 
@@ -680,16 +679,15 @@ std::string encodeFailedServersKey(AddressExclusion const& addr) {
 	return failedServersPrefix.toString() + addr.toString();
 }
 
-const KeyRangeRef failedLocalityKeys(LiteralStringRef("\xff/conf/failedlocality/"),
-                                     LiteralStringRef("\xff/conf/failedlocality0"));
+const KeyRangeRef failedLocalityKeys(LiteralStringRef("\xff/conf/failed_locality/"),
+                                     LiteralStringRef("\xff/conf/failed_locality0"));
 const KeyRef failedLocalityPrefix = failedLocalityKeys.begin;
-const KeyRef failedLocalityVersionKey = LiteralStringRef("\xff/conf/failedlocality");
+const KeyRef failedLocalityVersionKey = LiteralStringRef("\xff/conf/failed_locality");
 std::string decodeFailedLocalityKey(KeyRef const& key) {
 	ASSERT(key.startsWith(failedLocalityPrefix));
 	return key.removePrefix(failedLocalityPrefix).toString();
 }
 std::string encodeFailedLocalityKey(std::string const& locality) {
-	// FIXME: make sure what's persisted here is not affected by innocent changes elsewhere
 	return failedLocalityPrefix.toString() + locality;
 }
 
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index 1c931a30378..5327f27ce4d 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -1083,7 +1083,7 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 			     success(fFailedLocZoneID) && success(fExclLocMachineID) && success(fFailedLocMachineID) &&
 			     success(fExclLocProcessID) && success(fFailedLocProcessID));
 
-			// If we have been added to the excluded/failed state servers list, we have to fail
+			// If we have been added to the excluded/failed state servers or localities list, we have to fail
 			if (fExclProc.get().present() || fExclIP.get().present() || fFailProc.get().present() ||
 			    fFailIP.get().present() || fExclProc2.get().present() || fExclIP2.get().present() ||
 			    fFailProc2.get().present() || fFailIP2.get().present() || fExclLocDCID.get().present() ||
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index e2a31ef429f..7fdb9c72ffc 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -455,6 +455,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		int localitiesCount = localities.size();
 		int nToKill3 = deterministicRandom()->randomInt(std::min(localitiesCount, minMachinesToKill),
 		                                                std::min(localitiesCount, maxMachinesToKill) + 1);
+		// get random subset of localities.
 		state std::set<std::string> toKill3 = random_subset(localities, nToKill3);
 
 		TraceEvent("RemoveAndKillLocalities")
@@ -479,6 +480,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		    .detail("Kill3Size", toKill3.size())
 		    .detail("ToKill3", describe(toKill3))
 		    .detail("ClusterAvailable", g_simulator.isAvailable());
+		// exclude localities
 		wait(reportErrors(
 		    timeoutError(removeAndKillLocalities(self, cx, toKill3, bClearedFirst ? &toKill2 : nullptr, failed),
 		                 self->kill3Timeout),
@@ -766,11 +768,13 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		return subset;
 	}
 
+	// creates a random set of size n from given unordered_set.
 	template <class T>
 	static std::set<T> random_subset(std::unordered_set<T>& s, int n) {
 		return random_subset(std::vector<T>(s.begin(), s.end()), n);
 	}
 
+	// creates a random set of size n from given set.
 	template <class T>
 	static std::set<T> random_subset(std::set<T>& s, int n) {
 		return random_subset(std::vector<T>(s.begin(), s.end()), n);
@@ -781,6 +785,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		                                  machineProcesses[kill].count(AddressExclusion(process.ip, process.port)) > 0);
 	}
 
+	// Returns the list of IPAddresses of the workers that match the given list of localities.
 	ACTOR Future<std::set<AddressExclusion>> getLocalitiesAddresses(Database cx, std::set<std::string> localities) {
 		state Transaction tr(cx);
 		state std::vector<ProcessData> workers = wait(getWorkers(&tr));
@@ -793,6 +798,9 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		return addressesSet;
 	}
 
+	// Finds the safe localities list that can be excluded from the killable safeProcesses list.
+	// If excluding based on a particular locality of the safe process, kills any other process, that
+	// particular locality is not included in the killable safeLocalities list.
 	std::set<std::string> getSafeLocalitiesToKill(std::vector<ISimulator::ProcessInfo*> const& safeProcesses) {
 		std::unordered_map<std::string, int> safeLocalitiesCount;
 		for (const auto& processInfo : safeProcesses) {
@@ -837,7 +845,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		return safeLocalities;
 	}
 
-	// Attempts to exclude a set of processes, and once the exclusion is successful it kills them.
+	// Attempts to exclude a set of localities, and once the exclusion is successful it kills them.
 	// If markExcludeAsFailed is true, then it is an error if we cannot complete the exclusion.
 	ACTOR static Future<Void> removeAndKillLocalities(RemoveServersSafelyWorkload* self,
 	                                                  Database cx,
@@ -862,6 +870,8 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		}
 
 		state std::set<std::string> toKillMarkFailedSet;
+		// if markExcludedasFailed is true, get random subset of tokill, check for
+		// safe exclusions and exclude them with failed option.
 		if (markExcludeAsFailed) {
 			state int retries = 0;
 			loop {
@@ -914,9 +924,11 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		    .detail("FailedLocalities", describe(toKillMarkFailedUnorderedSet))
 		    .detail("ClusterAvailable", g_simulator.isAvailable())
 		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
+		// exclude localities with failed option as true
 		if (markExcludeAsFailed) {
 			wait(excludeLocalities(cx, &toKillMarkFailedUnorderedSet, true));
 		}
+		// exclude localities with failed option as false.
 		wait(excludeLocalities(cx, &toKillUnorderedSet));
 
 		TraceEvent("RemoveAndKillLocalities", functionId)
@@ -926,6 +938,8 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		return Void();
 	}
 
+	// Update the g_simulator processes list with the process ids
+	// of the workers, that are generated as part of worker creation.
 	ACTOR static Future<Void> updateProcessIds(Database cx) {
 		Transaction tr(cx);
 		std::vector<ProcessData> workers = wait(getWorkers(&tr));

From 2136e65d8a7c9e1540d090d33fcdc6e6b4257a2d Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Thu, 17 Jun 2021 00:27:26 -0700
Subject: [PATCH 314/740] Status json schema update, includelocalities back for
 consistency check, review comments.

---
 fdbcli/fdbcli.actor.cpp                       |  10 +-
 fdbclient/ManagementAPI.actor.cpp             |  29 +-
 fdbclient/ManagementAPI.actor.h               |   8 +-
 fdbclient/Schemas.cpp                         |   3 +-
 fdbclient/SpecialKeySpace.actor.cpp           |   8 +-
 .../workloads/RemoveServersSafely.actor.cpp   | 332 +++++-------------
 6 files changed, 124 insertions(+), 266 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 17d12911471..e4069297311 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -2422,7 +2422,7 @@ ACTOR Future<bool> coordinators(Database db, std::vector<StringRef> tokens, bool
 	return err;
 }
 
-// Includes the servers that could be ipaddresses or localities back to the cluster.
+// Includes the servers that could be IP addresses or localities back to the cluster.
 ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 	std::vector<AddressExclusion> addresses;
 	state std::vector<std::string> localities;
@@ -2454,14 +2454,14 @@ ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 		std::vector<AddressExclusion> includeAll;
 		includeAll.push_back(AddressExclusion());
 		wait(makeInterruptable(includeServers(db, includeAll, failed)));
-		wait(makeInterruptable(includeLocalities(db, &localities, failed, all)));
+		wait(makeInterruptable(includeLocalities(db, localities, failed, all)));
 	} else {
 		if (!addresses.empty()) {
 			wait(makeInterruptable(includeServers(db, addresses, failed)));
 		}
 		if (!localities.empty()) {
 			// includes the servers that belong to given localities.
-			wait(makeInterruptable(includeLocalities(db, &localities, failed, all)));
+			wait(makeInterruptable(includeLocalities(db, localities, failed, all)));
 		}
 	}
 	return false;
@@ -2523,7 +2523,7 @@ ACTOR Future<bool> exclude(Database db,
 					noMatchLocalities.push_back(t->toString());
 				} else {
 					// add all the server ipaddresses that belong to the given localities to the exclusionSet.
-					std::copy(localityAddresses.begin(), localityAddresses.end(), back_inserter(exclusionVector));
+					exclusionVector.insert(exclusionVector.end(), localityAddresses.begin(), localityAddresses.end());
 					exclusionSet.insert(localityAddresses.begin(), localityAddresses.end());
 				}
 				exclusionLocalities.insert(t->toString());
@@ -2663,7 +2663,7 @@ ACTOR Future<bool> exclude(Database db,
 			wait(makeInterruptable(excludeServers(db, exclusionAddresses, markFailed)));
 		}
 		if (!exclusionLocalities.empty()) {
-			wait(makeInterruptable(excludeLocalities(db, &exclusionLocalities, markFailed)));
+			wait(makeInterruptable(excludeLocalities(db, exclusionLocalities, markFailed)));
 		}
 
 		if (waitForAllExcluded) {
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index a4f80064c73..ee9ded0516c 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -1590,7 +1590,7 @@ ACTOR Future<Void> excludeServers(Database cx, vector<AddressExclusion> servers,
 }
 
 // excludes localities by setting the keys in api version below 7.0
-void excludeLocalities(Transaction& tr, std::unordered_set<std::string>* localities, bool failed) {
+void excludeLocalities(Transaction& tr, std::unordered_set<std::string> localities, bool failed) {
 	tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 	tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
 	tr.setOption(FDBTransactionOptions::LOCK_AWARE);
@@ -1599,35 +1599,35 @@ void excludeLocalities(Transaction& tr, std::unordered_set<std::string>* localit
 	auto localityVersionKey = failed ? failedLocalityVersionKey : excludedLocalityVersionKey;
 	tr.addReadConflictRange(singleKeyRange(localityVersionKey)); // To conflict with parallel includeLocalities
 	tr.set(localityVersionKey, excludeVersionKey);
-	for (const auto& l : *localities) {
+	for (const auto& l : localities) {
 		if (failed) {
 			tr.set(encodeFailedLocalityKey(l), StringRef());
 		} else {
 			tr.set(encodeExcludedLocalityKey(l), StringRef());
 		}
 	}
-	TraceEvent("ExcludeLocalitiesCommit").detail("Localities", describe(*localities)).detail("ExcludeFailed", failed);
+	TraceEvent("ExcludeLocalitiesCommit").detail("Localities", describe(localities)).detail("ExcludeFailed", failed);
 }
 
 // Exclude the servers matching the given set of localities from use as state servers.
 // excludes localities by setting the keys.
-ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string>* localities, bool failed) {
+ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string> localities, bool failed) {
 	if (cx->apiVersionAtLeast(700)) {
 		state ReadYourWritesTransaction ryw(cx);
 		loop {
 			try {
 				ryw.setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
 				ryw.set(SpecialKeySpace::getManagementApiCommandOptionSpecialKey(
-				            failed ? "failedlocality" : "excludedlocality", "force"),
+				            failed ? "failed_locality" : "excluded_locality", "force"),
 				        ValueRef());
-				for (const auto& l : *localities) {
+				for (const auto& l : localities) {
 					Key addr = failed
 					               ? SpecialKeySpace::getManagementApiCommandPrefix("failedlocality").withSuffix(l)
 					               : SpecialKeySpace::getManagementApiCommandPrefix("excludedlocality").withSuffix(l);
 					ryw.set(addr, ValueRef());
 				}
 				TraceEvent("ExcludeLocalitiesSpecialKeySpaceCommit")
-				    .detail("Localities", describe(*localities))
+				    .detail("Localities", describe(localities))
 				    .detail("ExcludeFailed", failed);
 
 				wait(ryw.commit());
@@ -1755,7 +1755,7 @@ ACTOR Future<Void> includeServers(Database cx, vector<AddressExclusion> servers,
 
 // Remove the given localities from the exclusion list.
 // include localities by clearing the keys.
-ACTOR Future<Void> includeLocalities(Database cx, vector<std::string>* localities, bool failed, bool includeAll) {
+ACTOR Future<Void> includeLocalities(Database cx, vector<std::string> localities, bool failed, bool includeAll) {
 	state std::string versionKey = deterministicRandom()->randomUniqueID().toString();
 	if (cx->apiVersionAtLeast(700)) {
 		state ReadYourWritesTransaction ryw(cx);
@@ -1769,7 +1769,7 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string>* localitie
 						ryw.clear(SpecialKeySpace::getManamentApiCommandRange("excludedlocality"));
 					}
 				} else {
-					for (const auto& l : *localities) {
+					for (const auto& l : localities) {
 						Key locality =
 						    failed ? SpecialKeySpace::getManagementApiCommandPrefix("failedlocality").withSuffix(l)
 						           : SpecialKeySpace::getManagementApiCommandPrefix("excludedlocality").withSuffix(l);
@@ -1777,7 +1777,7 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string>* localitie
 					}
 				}
 				TraceEvent("IncludeLocalitiesCommit")
-				    .detail("Localities", describe(*localities))
+				    .detail("Localities", describe(localities))
 				    .detail("Failed", failed)
 				    .detail("IncludeAll", includeAll);
 
@@ -1815,7 +1815,7 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string>* localitie
 						tr.clear(excludedLocalityKeys);
 					}
 				} else {
-					for (const auto& l : *localities) {
+					for (const auto& l : localities) {
 						if (failed) {
 							tr.clear(encodeFailedLocalityKey(l));
 						} else {
@@ -1825,7 +1825,7 @@ ACTOR Future<Void> includeLocalities(Database cx, vector<std::string>* localitie
 				}
 
 				TraceEvent("IncludeLocalitiesCommit")
-				    .detail("Localities", describe(*localities))
+				    .detail("Localities", describe(localities))
 				    .detail("Failed", failed)
 				    .detail("IncludeAll", includeAll);
 
@@ -1948,7 +1948,7 @@ ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx) {
 
 // Decodes the locality string to a pair of locality prefix and its value.
 // The prefix could be dcid, processid, machineid, processid.
-std::pair<std::string, std::string> decodeLocality(std::string& locality) {
+std::pair<std::string, std::string> decodeLocality(const std::string& locality) {
 	StringRef localityRef(locality.c_str());
 	if (localityRef.startsWith(ExcludeLocalityKeyDcIdPrefix)) {
 		return std::make_pair(LocalityData::keyDcId.toString(),
@@ -1969,7 +1969,8 @@ std::pair<std::string, std::string> decodeLocality(std::string& locality) {
 
 // Returns the list of IPAddresses of the workers that match the given locality.
 // Example: locality="dcid:primary" returns all the ip addresses of the workers in the primary dc.
-std::set<AddressExclusion> getAddressesByLocality(std::vector<ProcessData>& workers, std::string locality) {
+std::set<AddressExclusion> getAddressesByLocality(const std::vector<ProcessData>& workers,
+                                                  const std::string& locality) {
 	std::pair<std::string, std::string> localityKeyValue = decodeLocality(locality);
 
 	std::set<AddressExclusion> localityAddresses;
diff --git a/fdbclient/ManagementAPI.actor.h b/fdbclient/ManagementAPI.actor.h
index 7660f62f062..4cf46a3cf8a 100644
--- a/fdbclient/ManagementAPI.actor.h
+++ b/fdbclient/ManagementAPI.actor.h
@@ -165,8 +165,8 @@ void excludeServers(Transaction& tr, vector<AddressExclusion>& servers, bool fai
 
 // Exclude the servers matching the given set of localities from use as state servers.  Returns as soon as the change
 // is durable, without necessarily waiting for the servers to be evacuated.
-ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string>* localities, bool failed = false);
-void excludeLocalities(Transaction& tr, std::unordered_set<std::string>* localities, bool failed = false);
+ACTOR Future<Void> excludeLocalities(Database cx, std::unordered_set<std::string> localities, bool failed = false);
+void excludeLocalities(Transaction& tr, std::unordered_set<std::string> localities, bool failed = false);
 
 // Remove the given servers from the exclusion list.  A NetworkAddress with a port of 0 means all servers on the given
 // IP.  A NetworkAddress() means all servers (don't exclude anything)
@@ -174,7 +174,7 @@ ACTOR Future<Void> includeServers(Database cx, vector<AddressExclusion> servers,
 
 // Remove the given localities from the exclusion list.
 ACTOR Future<Void> includeLocalities(Database cx,
-                                     vector<std::string>* localities,
+                                     vector<std::string> localities,
                                      bool failed = false,
                                      bool includeAll = false);
 
@@ -190,7 +190,7 @@ ACTOR Future<vector<AddressExclusion>> getExcludedServers(Transaction* tr);
 ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx);
 ACTOR Future<vector<std::string>> getExcludedLocalities(Transaction* tr);
 
-std::set<AddressExclusion> getAddressesByLocality(std::vector<ProcessData>& workers, std::string locality);
+std::set<AddressExclusion> getAddressesByLocality(const std::vector<ProcessData>& workers, const std::string& locality);
 
 // Check for the given, previously excluded servers to be evacuated (no longer used for state).  If waitForExclusion is
 // true, this actor returns once it is safe to shut down all such machines without impacting fault tolerance, until and
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index b23e95f11ef..910364ebde1 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -747,7 +747,8 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
          "coordinators_count":1,
          "excluded_servers":[
             {
-               "address":"10.0.4.1"
+               "address":"10.0.4.1",
+               "locality":"processid:e9816ca4a89ff64ddb7ba2a5ec10b75b"
             }
          ],
          "auto_commit_proxies":3,
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 2db85f4c776..5b5b20d1748 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -106,8 +106,8 @@ std::unordered_map<std::string, KeyRange> SpecialKeySpace::managementApiCommandT
 
 std::set<std::string> SpecialKeySpace::options = { "excluded/force",
 	                                               "failed/force",
-	                                               "excludedlocality/force",
-	                                               "failedlocality/force" };
+	                                               "excluded_locality/force",
+	                                               "failed_locality/force" };
 
 std::set<std::string> SpecialKeySpace::tracingOptions = { kTracingTransactionIdKey, kTracingTokenKey };
 
@@ -2211,7 +2211,7 @@ ACTOR Future<Optional<std::string>> excludeLocalityCommitActor(ReadYourWritesTra
 		return result;
 	// If force option is not set, we need to do safety check
 	auto force = ryw->getSpecialKeySpaceWriteMap()[SpecialKeySpace::getManagementApiCommandOptionSpecialKey(
-	    failed ? "failedlocality" : "excludedlocality", "force")];
+	    failed ? "failed_locality" : "excluded_locality", "force")];
 	// only do safety check when we have localities to be excluded and the force option key is not set
 	if (localities.size() && !(force.first && force.second.present())) {
 		bool safe = wait(checkExclusion(ryw->getDatabase(), &addresses, &exclusions, failed, &result));
@@ -2219,7 +2219,7 @@ ACTOR Future<Optional<std::string>> excludeLocalityCommitActor(ReadYourWritesTra
 			return result;
 	}
 
-	excludeLocalities(ryw->getTransaction(), &localities, failed);
+	excludeLocalities(ryw->getTransaction(), localities, failed);
 	includeLocalities(ryw);
 
 	return result;
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index 7fdb9c72ffc..3c9b6b041f9 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -35,7 +35,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 	bool enabled, killProcesses;
 	int minMachinesToKill, maxMachinesToKill, maxSafetyCheckRetries;
 	double minDelay, maxDelay;
-	double kill1Timeout, kill2Timeout, kill3Timeout;
+	double kill1Timeout, kill2Timeout;
 
 	std::set<AddressExclusion> toKill1, toKill2;
 	std::map<AddressExclusion, Optional<Standalone<StringRef>>> machine_ids; // ip -> Locality Zone id
@@ -52,7 +52,6 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		maxDelay = getOption(options, LiteralStringRef("maxDelay"), 60.0);
 		kill1Timeout = getOption(options, LiteralStringRef("kill1Timeout"), 60.0);
 		kill2Timeout = getOption(options, LiteralStringRef("kill2Timeout"), 6000.0);
-		kill3Timeout = getOption(options, LiteralStringRef("kill3Timeout"), 6000.0);
 		killProcesses = deterministicRandom()->random01() < 0.5;
 		if (g_network->isSimulated()) {
 			g_simulator.allowLogSetKills = false;
@@ -144,7 +143,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		if (!enabled)
 			return Void();
 		double delay = deterministicRandom()->random01() * (maxDelay - minDelay) + minDelay;
-		return workloadMain(this, cx, delay, toKill1, toKill2, minMachinesToKill, maxMachinesToKill);
+		return workloadMain(this, cx, delay, toKill1, toKill2);
 	}
 
 	Future<bool> check(Database const& cx) override { return true; }
@@ -338,9 +337,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 	                                       Database cx,
 	                                       double waitSeconds,
 	                                       std::set<AddressExclusion> toKill1,
-	                                       std::set<AddressExclusion> toKill2,
-	                                       int minMachinesToKill,
-	                                       int maxMachinesToKill) {
+	                                       std::set<AddressExclusion> toKill2) {
 		wait(updateProcessIds(cx));
 		wait(delay(waitSeconds));
 
@@ -381,6 +378,7 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 
 		// Include the servers, if unable to exclude
 		// Reinclude when buggify is on to increase the surface area of the next set of excludes
+		state bool failed = true;
 		if (!bClearedFirst || BUGGIFY) {
 			// Get the updated list of processes which may have changed due to reboots, deletes, etc
 			TraceEvent("RemoveAndKill")
@@ -389,6 +387,8 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 			    .detail("ToKill", describe(toKill1))
 			    .detail("ClusterAvailable", g_simulator.isAvailable());
 			wait(includeServers(cx, vector<AddressExclusion>(1)));
+			wait(includeLocalities(cx, vector<std::string>(), failed, true));
+			wait(includeLocalities(cx, vector<std::string>(), !failed, true));
 			self->includeAddresses(toKill1);
 		}
 
@@ -425,85 +425,16 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		    .detail("ToKill", describe(toKill2))
 		    .detail("ClusterAvailable", g_simulator.isAvailable());
 
-		// Reinclude all of the machine, if buggified
-		if (BUGGIFY) {
-			// Get the updated list of processes which may have changed due to reboots, deletes, etc
-			TraceEvent("RemoveAndKill")
-			    .detail("Step", "include all second")
-			    .detail("KillTotal", toKill2.size())
-			    .detail("ToKill", describe(toKill2))
-			    .detail("ClusterAvailable", g_simulator.isAvailable());
-			wait(includeServers(cx, vector<AddressExclusion>(1)));
-			self->includeAddresses(toKill2);
-		}
-
-		std::unordered_set<std::string> localities;
-		auto processes = getServers();
-		// collecting all localities
-		for (const auto& it : processes) {
-			if (it->locality.dcId().present())
-				localities.insert(ExcludeLocalityKeyDcIdPrefix.toString() + it->locality.dcId().get().toString());
-			if (it->locality.zoneId().present())
-				localities.insert(ExcludeLocalityKeyZoneIdPrefix.toString() + it->locality.zoneId().get().toString());
-			if (it->locality.machineId().present())
-				localities.insert(ExcludeLocalityKeyMachineIdPrefix.toString() +
-				                  it->locality.machineId().get().toString());
-			if (it->locality.processId().present())
-				localities.insert(ExcludeLocalityKeyProcessIdPrefix.toString() +
-				                  it->locality.processId().get().toString());
-		}
-		int localitiesCount = localities.size();
-		int nToKill3 = deterministicRandom()->randomInt(std::min(localitiesCount, minMachinesToKill),
-		                                                std::min(localitiesCount, maxMachinesToKill) + 1);
-		// get random subset of localities.
-		state std::set<std::string> toKill3 = random_subset(localities, nToKill3);
-
-		TraceEvent("RemoveAndKillLocalities")
-		    .detail("LocalitiesSize", localities.size())
-		    .detail("Kill3Size", toKill3.size())
-		    .detail("ToKill3", describe(toKill3));
-
-		// toKill3 may kill too many servers to make cluster unavailable.
-		// Get the processes in toKill3 that are safe to kill
-		state std::set<AddressExclusion> toKill3Addresses = wait(self->getLocalitiesAddresses(cx, toKill3));
-		killProcArray = self->protectServers(toKill3Addresses);
-
-		// Update the kill networks to the killable localities
-		toKill3 = self->getSafeLocalitiesToKill(killProcArray);
-		state bool failed =
-		    deterministicRandom()->randomInt(0, 2) ? true : false; // excluding with random failed option
-
-		TraceEvent("RemoveAndKillLocalities")
-		    .detail("Step", "exclude third list")
-		    .detail("ToKill3AddressesSize", toKill3Addresses.size())
-		    .detail("KillProcArraySize", killProcArray.size())
-		    .detail("Kill3Size", toKill3.size())
-		    .detail("ToKill3", describe(toKill3))
-		    .detail("ClusterAvailable", g_simulator.isAvailable());
-		// exclude localities
-		wait(reportErrors(
-		    timeoutError(removeAndKillLocalities(self, cx, toKill3, bClearedFirst ? &toKill2 : nullptr, failed),
-		                 self->kill3Timeout),
-		    "RemoveServersSafelyError",
-		    UID()));
-
-		TraceEvent("RemoveAndKillLocalities")
-		    .detail("Step", "excluded thrid list")
-		    .detail("Kill3Size", toKill3.size())
-		    .detail("ToKill3", describe(toKill3))
+		// Get the updated list of processes which may have changed due to reboots, deletes, etc
+		TraceEvent("RemoveAndKill")
+		    .detail("Step", "include all second")
+		    .detail("KillTotal", toKill2.size())
+		    .detail("ToKill", describe(toKill2))
 		    .detail("ClusterAvailable", g_simulator.isAvailable());
-
-		// Reinclude all of the machine, if buggified
-		if (BUGGIFY) {
-			// Get the updated list of processes which may have changed due to reboots, deletes, etc
-			TraceEvent("RemoveAndKillLocalities")
-			    .detail("Step", "include all third")
-			    .detail("Kill3Size", toKill3.size())
-			    .detail("ToKill3", describe(toKill3))
-			    .detail("ClusterAvailable", g_simulator.isAvailable());
-			vector<std::string> emptyLocalities;
-			wait(includeLocalities(cx, &emptyLocalities, failed, true));
-		}
+		wait(includeServers(cx, vector<AddressExclusion>(1)));
+		wait(includeLocalities(cx, vector<std::string>(), failed, true));
+		wait(includeLocalities(cx, vector<std::string>(), !failed, true));
+		self->includeAddresses(toKill2);
 
 		return Void();
 	}
@@ -591,7 +522,10 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		    .detail("Step", "Including all")
 		    .detail("ClusterAvailable", g_simulator.isAvailable())
 		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
+		state bool failed = true;
 		wait(includeServers(cx, vector<AddressExclusion>(1)));
+		wait(includeLocalities(cx, vector<std::string>(), failed, true));
+		wait(includeLocalities(cx, vector<std::string>(), !failed, true));
 		TraceEvent("RemoveAndKill", functionId)
 		    .detail("Step", "Included all")
 		    .detail("ClusterAvailable", g_simulator.isAvailable())
@@ -692,20 +626,60 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		    .detail("FailedAddresses", describe(toKillMarkFailedArray))
 		    .detail("ClusterAvailable", g_simulator.isAvailable())
 		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
+
+		state bool excludeLocalitiesInsteadOfServers = deterministicRandom()->coinflip();
 		if (markExcludeAsFailed) {
-			wait(excludeServers(cx, toKillMarkFailedArray, true));
+			if (excludeLocalitiesInsteadOfServers) {
+				state std::unordered_set<std::string> toKillLocalitiesFailed =
+				    self->getLocalitiesFromAddresses(toKillMarkFailedArray);
+				TraceEvent("RemoveAndKill", functionId)
+				    .detail("Step", "Excluding localities with failed option")
+				    .detail("FailedAddressesSize", toKillMarkFailedArray.size())
+				    .detail("FailedAddresses", describe(toKillMarkFailedArray))
+				    .detail("FailedLocaitiesSize", toKillLocalitiesFailed.size())
+				    .detail("FailedLocaities", describe(toKillLocalitiesFailed));
+
+				wait(excludeLocalities(cx, toKillLocalitiesFailed, true));
+			} else {
+				TraceEvent("RemoveAndKill", functionId)
+				    .detail("Step", "Excluding servers with failed option")
+				    .detail("FailedAddressesSize", toKillMarkFailedArray.size())
+				    .detail("FailedAddresses", describe(toKillMarkFailedArray));
+
+				wait(excludeServers(cx, toKillMarkFailedArray, true));
+			}
+		}
+
+		if (excludeLocalitiesInsteadOfServers) {
+			state std::unordered_set<std::string> toKillLocalities = self->getLocalitiesFromAddresses(toKillArray);
+			TraceEvent("RemoveAndKill", functionId)
+			    .detail("Step", "Excluding localities without failed option")
+			    .detail("AddressesSize", toKillArray.size())
+			    .detail("Addresses", describe(toKillArray))
+			    .detail("LocaitiesSize", toKillLocalities.size())
+			    .detail("Locaities", describe(toKillLocalities));
+
+			wait(excludeLocalities(cx, toKillLocalities, false));
+		} else {
+			TraceEvent("RemoveAndKill", functionId)
+			    .detail("Step", "Excluding servers without failed option")
+			    .detail("AddressesSize", toKillArray.size())
+			    .detail("Addresses", describe(toKillArray));
+
+			wait(excludeServers(cx, toKillArray));
 		}
-		wait(excludeServers(cx, toKillArray));
 
 		// We need to skip at least the quorum change if there's nothing to kill, because there might not be enough
 		// servers left alive to do a coordinators auto (?)
 		if (toKill.size()) {
-			// Wait for removal to be safe
-			TraceEvent("RemoveAndKill", functionId)
-			    .detail("Step", "Wait For Server Exclusion")
-			    .detail("Addresses", describe(toKill))
-			    .detail("ClusterAvailable", g_simulator.isAvailable());
-			wait(success(checkForExcludingServers(cx, toKillArray, true /* wait for exclusion */)));
+			if (!excludeLocalitiesInsteadOfServers) {
+				// Wait for removal to be safe
+				TraceEvent("RemoveAndKill", functionId)
+				    .detail("Step", "Wait For Server Exclusion")
+				    .detail("Addresses", describe(toKill))
+				    .detail("ClusterAvailable", g_simulator.isAvailable());
+				wait(success(checkForExcludingServers(cx, toKillArray, true /* wait for exclusion */)));
+			}
 
 			TraceEvent("RemoveAndKill", functionId)
 			    .detail("Step", "coordinators auto")
@@ -768,181 +742,63 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		return subset;
 	}
 
-	// creates a random set of size n from given unordered_set.
-	template <class T>
-	static std::set<T> random_subset(std::unordered_set<T>& s, int n) {
-		return random_subset(std::vector<T>(s.begin(), s.end()), n);
-	}
-
-	// creates a random set of size n from given set.
-	template <class T>
-	static std::set<T> random_subset(std::set<T>& s, int n) {
-		return random_subset(std::vector<T>(s.begin(), s.end()), n);
-	}
-
 	bool killContainsProcess(AddressExclusion kill, NetworkAddress process) {
 		return kill.excludes(process) || (machineProcesses.find(kill) != machineProcesses.end() &&
 		                                  machineProcesses[kill].count(AddressExclusion(process.ip, process.port)) > 0);
 	}
 
-	// Returns the list of IPAddresses of the workers that match the given list of localities.
-	ACTOR Future<std::set<AddressExclusion>> getLocalitiesAddresses(Database cx, std::set<std::string> localities) {
-		state Transaction tr(cx);
-		state std::vector<ProcessData> workers = wait(getWorkers(&tr));
-		state std::set<AddressExclusion> addressesSet;
-		for (const auto& l : localities) {
-			std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, l);
-			addressesSet.insert(localityAddresses.begin(), localityAddresses.end());
-		}
-
-		return addressesSet;
-	}
-
-	// Finds the safe localities list that can be excluded from the killable safeProcesses list.
+	// Finds the localities list that can be excluded from the safe killable addresses list.
 	// If excluding based on a particular locality of the safe process, kills any other process, that
-	// particular locality is not included in the killable safeLocalities list.
-	std::set<std::string> getSafeLocalitiesToKill(std::vector<ISimulator::ProcessInfo*> const& safeProcesses) {
-		std::unordered_map<std::string, int> safeLocalitiesCount;
-		for (const auto& processInfo : safeProcesses) {
-			if (processInfo->locality.dcId().present())
-				safeLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
-				                    processInfo->locality.dcId().get().toString()]++;
-			if (processInfo->locality.machineId().present())
-				safeLocalitiesCount[ExcludeLocalityKeyMachineIdPrefix.toString() +
-				                    processInfo->locality.machineId().get().toString()]++;
-			if (processInfo->locality.processId().present())
-				safeLocalitiesCount[ExcludeLocalityKeyProcessIdPrefix.toString() +
-				                    processInfo->locality.processId().get().toString()]++;
-			if (processInfo->locality.zoneId().present())
-				safeLocalitiesCount[ExcludeLocalityKeyZoneIdPrefix.toString() +
-				                    processInfo->locality.zoneId().get().toString()]++;
-		}
-
-		auto processes = getServers();
+	// particular locality is not included in the killable localities list.
+	std::unordered_set<std::string> getLocalitiesFromAddresses(const std::vector<AddressExclusion>& addresses) {
 		std::unordered_map<std::string, int> allLocalitiesCount;
+		std::unordered_map<std::string, int> killableLocalitiesCount;
+		auto processes = getServers();
 		for (const auto& processInfo : processes) {
 			if (processInfo->locality.dcId().present())
 				allLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
 				                   processInfo->locality.dcId().get().toString()]++;
+			if (processInfo->locality.zoneId().present())
+				allLocalitiesCount[ExcludeLocalityKeyZoneIdPrefix.toString() +
+				                   processInfo->locality.zoneId().get().toString()]++;
 			if (processInfo->locality.machineId().present())
 				allLocalitiesCount[ExcludeLocalityKeyMachineIdPrefix.toString() +
 				                   processInfo->locality.machineId().get().toString()]++;
 			if (processInfo->locality.processId().present())
 				allLocalitiesCount[ExcludeLocalityKeyProcessIdPrefix.toString() +
 				                   processInfo->locality.processId().get().toString()]++;
-			if (processInfo->locality.zoneId().present())
-				allLocalitiesCount[ExcludeLocalityKeyZoneIdPrefix.toString() +
-				                   processInfo->locality.zoneId().get().toString()]++;
-		}
 
-		std::set<std::string> safeLocalities;
-		for (const auto& l : safeLocalitiesCount) {
-			if (l.second == allLocalitiesCount[l.first]) {
-				safeLocalities.insert(l.first);
+			AddressExclusion pAddr(processInfo->address.ip, processInfo->address.port);
+			if (std::find(addresses.begin(), addresses.end(), pAddr) != addresses.end()) {
+				if (processInfo->locality.dcId().present())
+					killableLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
+					                        processInfo->locality.dcId().get().toString()]++;
+				if (processInfo->locality.zoneId().present())
+					killableLocalitiesCount[ExcludeLocalityKeyZoneIdPrefix.toString() +
+					                        processInfo->locality.zoneId().get().toString()]++;
+				if (processInfo->locality.machineId().present())
+					killableLocalitiesCount[ExcludeLocalityKeyMachineIdPrefix.toString() +
+					                        processInfo->locality.machineId().get().toString()]++;
+				if (processInfo->locality.processId().present())
+					killableLocalitiesCount[ExcludeLocalityKeyProcessIdPrefix.toString() +
+					                        processInfo->locality.processId().get().toString()]++;
 			}
 		}
 
-		return safeLocalities;
-	}
-
-	// Attempts to exclude a set of localities, and once the exclusion is successful it kills them.
-	// If markExcludeAsFailed is true, then it is an error if we cannot complete the exclusion.
-	ACTOR static Future<Void> removeAndKillLocalities(RemoveServersSafelyWorkload* self,
-	                                                  Database cx,
-	                                                  std::set<std::string> toKill,
-	                                                  std::set<AddressExclusion>* pIncAddrs,
-	                                                  bool markExcludeAsFailed) {
-		state UID functionId = nondeterministicRandom()->randomUniqueID();
-
-		// First clear the exclusion list and exclude the given list
-		TraceEvent("RemoveAndKillLocalities", functionId)
-		    .detail("Step", "Including all")
-		    .detail("ClusterAvailable", g_simulator.isAvailable())
-		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
-		wait(includeServers(cx, vector<AddressExclusion>(1)));
-		TraceEvent("RemoveAndKillLocalities", functionId)
-		    .detail("Step", "Included all")
-		    .detail("ClusterAvailable", g_simulator.isAvailable())
-		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
-		// Reinclude the addresses that were excluded, if present
-		if (pIncAddrs) {
-			self->includeAddresses(*pIncAddrs);
-		}
-
-		state std::set<std::string> toKillMarkFailedSet;
-		// if markExcludedasFailed is true, get random subset of tokill, check for
-		// safe exclusions and exclude them with failed option.
-		if (markExcludeAsFailed) {
-			state int retries = 0;
-			loop {
-				state bool safe = false;
-				toKillMarkFailedSet = random_subset(toKill, deterministicRandom()->randomInt(0, toKill.size() + 1));
-				state std::set<AddressExclusion> toKillMarkFailedAddressesSet =
-				    wait(self->getLocalitiesAddresses(cx, toKillMarkFailedSet));
-				state std::vector<AddressExclusion> toKillMarkFailedAddressesVector(
-				    toKillMarkFailedAddressesSet.begin(), toKillMarkFailedAddressesSet.end());
-				TraceEvent("RemoveAndKillLocalities", functionId)
-				    .detail("Step", "SafetyCheck")
-				    .detail("Exclusion Localities", describe(toKillMarkFailedSet))
-				    .detail("Exclusion Addresses", describe(toKillMarkFailedAddressesSet));
-				choose {
-					when(bool _safe = wait(checkSafeExclusions(cx, toKillMarkFailedAddressesVector))) {
-						safe = _safe && self->protectServers(toKillMarkFailedAddressesSet).size() ==
-						                    toKillMarkFailedAddressesSet.size();
-					}
-					when(wait(delay(5.0))) {
-						TraceEvent("RemoveAndKillLocalities", functionId)
-						    .detail("Step", "SafetyCheckTimedOut")
-						    .detail("Exclusion Localities", describe(toKillMarkFailedSet))
-						    .detail("Exclusion Addresses", describe(toKillMarkFailedAddressesSet));
-					}
-				}
-				if (retries == self->maxSafetyCheckRetries) {
-					// Do not mark as failed if limit is reached
-					TraceEvent("RemoveAndKillLocalities", functionId)
-					    .detail("Step", "SafetyCheckLimitReached")
-					    .detail("Retries", retries);
-					markExcludeAsFailed = false;
-					safe = true;
-				}
-				if (safe)
-					break;
-				retries++;
+		std::unordered_set<std::string> toKillLocalities;
+		for (const auto& l : killableLocalitiesCount) {
+			if (l.second == allLocalitiesCount[l.first]) {
+				toKillLocalities.insert(l.first);
 			}
 		}
 
-		state std::unordered_set<std::string> toKillUnorderedSet;
-		state std::unordered_set<std::string> toKillMarkFailedUnorderedSet;
-		toKillUnorderedSet.insert(toKill.begin(), toKill.end());
-		toKillMarkFailedUnorderedSet.insert(toKillMarkFailedSet.begin(), toKillMarkFailedSet.end());
-
-		TraceEvent("RemoveAndKillLocalities", functionId)
-		    .detail("Step", "Activate Localities Exclusion")
-		    .detail("KillLocalitiesSize", toKill.size())
-		    .detail("ToKill", describe(toKill))
-		    .detail("Localities", describe(toKillUnorderedSet))
-		    .detail("FailedLocalities", describe(toKillMarkFailedUnorderedSet))
-		    .detail("ClusterAvailable", g_simulator.isAvailable())
-		    .detail("MarkExcludeAsFailed", markExcludeAsFailed);
-		// exclude localities with failed option as true
-		if (markExcludeAsFailed) {
-			wait(excludeLocalities(cx, &toKillMarkFailedUnorderedSet, true));
-		}
-		// exclude localities with failed option as false.
-		wait(excludeLocalities(cx, &toKillUnorderedSet));
-
-		TraceEvent("RemoveAndKillLocalities", functionId)
-		    .detail("Step", "done")
-		    .detail("ClusterAvailable", g_simulator.isAvailable());
-
-		return Void();
+		return toKillLocalities;
 	}
 
 	// Update the g_simulator processes list with the process ids
 	// of the workers, that are generated as part of worker creation.
 	ACTOR static Future<Void> updateProcessIds(Database cx) {
-		Transaction tr(cx);
-		std::vector<ProcessData> workers = wait(getWorkers(&tr));
+		std::vector<ProcessData> workers = wait(getWorkers(cx));
 		std::unordered_map<NetworkAddress, int> addressToIndexMap;
 		for (int i = 0; i < workers.size(); i++) {
 			addressToIndexMap[workers[i].address] = i;

From bc6b65d25c73a9d1c3c4b0c93fc5d4928661afc5 Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Wed, 23 Jun 2021 13:55:17 -0700
Subject: [PATCH 315/740] exclude to work with any locality data match.

---
 .../sphinx/source/administration.rst          |  6 +-
 .../sphinx/source/command-line-interface.rst  |  6 +-
 .../sphinx/source/developer-guide.rst         |  4 +-
 .../sphinx/source/moving-a-cluster.rst        |  2 +-
 .../source/mr-status-json-schemas.rst.inc     |  3 +-
 fdbcli/fdbcli.actor.cpp                       | 23 +++---
 fdbclient/DatabaseConfiguration.cpp           | 80 +++++--------------
 fdbclient/ManagementAPI.actor.cpp             | 29 ++-----
 fdbclient/Schemas.cpp                         |  2 +-
 fdbclient/SpecialKeySpace.actor.cpp           |  5 +-
 fdbrpc/Locality.h                             | 16 +++-
 fdbserver/MoveKeys.actor.cpp                  | 66 +++++----------
 .../workloads/RemoveServersSafely.actor.cpp   | 39 +++------
 13 files changed, 93 insertions(+), 188 deletions(-)

diff --git a/documentation/sphinx/source/administration.rst b/documentation/sphinx/source/administration.rst
index 431f637bd79..6df97325ecb 100644
--- a/documentation/sphinx/source/administration.rst
+++ b/documentation/sphinx/source/administration.rst
@@ -182,7 +182,7 @@ You can add new machines to a cluster at any time:
 
     user@host2$ sudo service foundationdb restart
 
-5) If you have previously :ref:`excluded <removing-machines-from-a-cluster>` a machine from the cluster, you will need to take it off the exclusion list using the ``include <ip>`` command of fdbcli before it can be a full participant in the cluster.
+5) If you have previously :ref:`excluded <removing-machines-from-a-cluster>` a machine from the cluster, you will need to take it off the exclusion list using the ``include <ip>`` or ``include <locality>`` command of fdbcli before it can be a full participant in the cluster.
 
 .. note:: Addresses have the form ``IP``:``PORT``. This form is used even if TLS is enabled.
 
@@ -207,12 +207,12 @@ To temporarily or permanently remove one or more machines from a FoundationDB cl
     The database is available.
 
     Welcome to the fdbcli. For help, type `help'.
-    fdb> exclude 1.2.3.4 1.2.3.5 1.2.3.6 dcid:primary-satellite zoneid:primary-satellite-log-2 machineid:primary-stateless-1 processid:223be2da244ca0182375364e4d122c30
+    fdb> exclude 1.2.3.4 1.2.3.5 1.2.3.6 locality_dcid:primary-satellite locality_zoneid:primary-satellite-log-2 locality_machineid:primary-stateless-1 locality_processid:223be2da244ca0182375364e4d122c30 or any locality
     Waiting for state to be removed from all excluded servers.  This may take a while.
     It is now safe to remove these machines or processes from the cluster.
 
 
-``exclude`` can be used to exclude either machines (by specifying an IP address) or individual processes (by specifying an ``IP``:``PORT`` pair).
+``exclude`` can be used to exclude either machines (by specifying an IP address) or individual processes (by specifying an ``IP``:``PORT`` pair or by specifying a locality match).
 
 .. note:: Addresses have the form ``IP``:``PORT``. This form is used even if TLS is enabled.
 
diff --git a/documentation/sphinx/source/command-line-interface.rst b/documentation/sphinx/source/command-line-interface.rst
index 9e6193ea508..c7d717d7994 100644
--- a/documentation/sphinx/source/command-line-interface.rst
+++ b/documentation/sphinx/source/command-line-interface.rst
@@ -139,9 +139,9 @@ For more information on setting the cluster description, see :ref:`configuration
 exclude
 -------
 
-The ``exclude`` command excludes servers from the database or marks them as failed. Its syntax is ``exclude [failed] [<ADDRESS...>] [dcid:<excludedcid>] [zoneid:<excludezoneid>] [machineid:<excludemachineid>] [processid:<excludeprocessid>]``. If no addresses are specified, the command provides the set of excluded and failed servers and localities.
+The ``exclude`` command excludes servers from the database or marks them as failed. Its syntax is ``exclude [failed] [<ADDRESS...>] [locality_dcid:<excludedcid>] [locality_zoneid:<excludezoneid>] [locality_machineid:<excludemachineid>] [locality_processid:<excludeprocessid>] or any locality``. If no addresses are specified, the command provides the set of excluded and failed servers and localities.
 
-For each IP address or IP:port pair in ``<ADDRESS...>`` or locality (which include dcid, zoneid, machineid, processid), the command adds the address/locality to the set of excluded servers and localities. It then waits until all database state has been safely moved off the specified servers.
+For each IP address or IP:port pair in ``<ADDRESS...>`` or locality (which include anything set on LocalityData like dcid, zoneid, machineid, processid), the command adds the address/locality to the set of excluded servers and localities. It then waits until all database state has been safely moved off the specified servers.
 
 If the ``failed`` keyword is specified, the address is marked as failed and added to the set of failed servers. It will not wait for the database state to move off the specified servers.
 
@@ -246,7 +246,7 @@ The following options are available for use with the ``option`` command:
 include
 -------
 
-The ``include`` command permits previously excluded or failed servers/localities to rejoin the database. Its syntax is ``include [failed] all|[<ADDRESS...>] [dcid:<excludedcid>] [zoneid:<excludezoneid>] [machineid:<excludemachineid>] [processid:<excludeprocessid>]``.
+The ``include`` command permits previously excluded or failed servers/localities to rejoin the database. Its syntax is ``include [failed] all|[<ADDRESS...>] [locality_dcid:<excludedcid>] [locality_zoneid:<excludezoneid>] [locality_machineid:<excludemachineid>] [locality_processid:<excludeprocessid>] or any locality``.
 
 The ``failed`` keyword is required if the servers were previously marked as failed rather than excluded.
 
diff --git a/documentation/sphinx/source/developer-guide.rst b/documentation/sphinx/source/developer-guide.rst
index d22625e2510..691ad01ad9e 100644
--- a/documentation/sphinx/source/developer-guide.rst
+++ b/documentation/sphinx/source/developer-guide.rst
@@ -964,8 +964,8 @@ that process, and wait for necessary data to be moved away.
 #. ``\xff\xff/management/options/failed_locality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failed_locality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
 
 An exclusion is syntactically either an ip address (e.g. ``127.0.0.1``), or
-an ip address and port (e.g. ``127.0.0.1:4500``) or locality (e.g ``dcid:primary-satellite`` or
-``zoneid:primary-satellite-log-2`` or ``machineid:primary-stateless-1`` or ``processid:223be2da244ca0182375364e4d122c30``). 
+an ip address and port (e.g. ``127.0.0.1:4500``) or locality (e.g ``locality_dcid:primary-satellite`` or
+``locality_zoneid:primary-satellite-log-2`` or ``locality_machineid:primary-stateless-1`` or ``locality_processid:223be2da244ca0182375364e4d122c30``).
 If no port is specified, then all processes on that host match the exclusion.
 For locality, all processes that match the given locality are excluded.
 
diff --git a/documentation/sphinx/source/moving-a-cluster.rst b/documentation/sphinx/source/moving-a-cluster.rst
index 18ec698502f..0e6f49ef70b 100644
--- a/documentation/sphinx/source/moving-a-cluster.rst
+++ b/documentation/sphinx/source/moving-a-cluster.rst
@@ -38,7 +38,7 @@ $ sudo service foundationdb stop
 
 7. Exclude the original machines from the cluster using ``exclude`` in ``fdbcli``. This command will not return until all database state has been moved off of the original machines and fully replicated to the new machines. For example::
 
-    fdb> exclude 192.168.1.1:4500 192.168.1.2:4500 192.168.1.3:4500 dcid:primary-satellite zoneid:primary-satellite-log-2 machineid:primary-stateless-1 processid:223be2da244ca0182375364e4d122c30
+    fdb> exclude 192.168.1.1:4500 192.168.1.2:4500 192.168.1.3:4500 locality_dcid:primary-satellite locality_zoneid:primary-satellite-log-2 locality_machineid:primary-stateless-1 locality_processid:223be2da244ca0182375364e4d122c30 or any locality
 
 8. Run ``coordinators auto`` in ``fdbcli`` to move coordination state to the new machines. Please note that this will cause the fdb.cluster file to be updated with the addresses of the new machines. Any currently connected clients will be notified and (assuming they have appropriate file system :ref:`permissions <cluster_file_permissions>`) will update their own copy of the cluster file. As long as the original machines are still running, any clients that connect to them will be automatically forwarded to the new cluster coordinators. However, if you have a client that has not yet connected or only connects intermittently, you will need to copy the new cluster file from one of the new machines to the client machine.
 
diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index 34ffcfc4c53..1eb6b3db82e 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -695,7 +695,8 @@
          "coordinators_count":1,
          "excluded_servers":[
             {
-               "address":"10.0.4.1"
+               "address":"10.0.4.1",
+               "locality":"locality_processid:e9816ca4a89ff64ddb7ba2a5ec10b75b"
             }
          ],
          "auto_commit_proxies":3,
diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index e4069297311..590f4dfd2ef 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -541,11 +541,12 @@ void initHelp() {
 	    "10.0.0.1:4000 10.0.0.2:4000 10.0.0.3:4000\n\nIf 'description=desc' is specified then the description field in "
 	    "the cluster\nfile is changed to desc, which must match [A-Za-z0-9_]+.");
 	helpMap["exclude"] = CommandHelp(
-	    "exclude [FORCE] [failed] [no_wait] [<ADDRESS...>] [dcid:<excludedcid>] [zoneid:<excludezoneid>] "
-	    "[machineid:<excludemachineid>] [processid:<excludeprocessid>]",
+	    "exclude [FORCE] [failed] [no_wait] [<ADDRESS...>] [locality_dcid:<excludedcid>] "
+	    "[locality_zoneid:<excludezoneid>] [locality_machineid:<excludemachineid>] "
+	    "[locality_processid:<excludeprocessid>] or any locality data",
 	    "exclude servers from the database either with IP address match or locality match",
 	    "If no addresses or locaities are specified, lists the set of excluded addresses and localities."
-	    "\n\nFor each IP address or IP:port pair in <ADDRESS...> or locality (which include dcid, zoneid, "
+	    "\n\nFor each IP address or IP:port pair in <ADDRESS...> or any LocalityData attributes (like dcid, zoneid, "
 	    "machineid, processid), adds the address/locality to the set of excluded servers and localities then waits "
 	    "until all database state has been safely moved away from the specified servers. If 'no_wait' is set, the "
 	    "command returns \nimmediately without checking if the exclusions have completed successfully.\n"
@@ -553,11 +554,11 @@ void initHelp() {
 	    "If 'failed' is set, the transaction log queue is dropped pre-emptively before waiting\n"
 	    "for data movement to finish and the server cannot be included again.");
 	helpMap["include"] = CommandHelp(
-	    "include all|[<ADDRESS...>] [dcid:<excludedcid>] [zoneid:<excludezoneid>] "
-	    "[machineid:<excludemachineid>] [processid:<excludeprocessid>]",
+	    "include all|[<ADDRESS...>] [locality_dcid:<excludedcid>] [locality_zoneid:<excludezoneid>] "
+	    "[locality_machineid:<excludemachineid>] [locality_processid:<excludeprocessid>] or any locality data",
 	    "permit previously-excluded servers and localities to rejoin the database",
 	    "If `all' is specified, the excluded servers and localities list is cleared.\n\nFor each IP address or IP:port "
-	    "pair in <ADDRESS...> or locality (which include dcid, zoneid, machineid, processid), removes any "
+	    "pair in <ADDRESS...> or any LocalityData (like dcid, zoneid, machineid, processid), removes any "
 	    "matching exclusions from the excluded servers and localities list. "
 	    "(A specified IP will match all IP:* exclusion entries)");
 	helpMap["setclass"] =
@@ -2433,9 +2434,8 @@ ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 			all = true;
 		} else if (*t == LiteralStringRef("failed")) {
 			failed = true;
-		} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix) || t->startsWith(ExcludeLocalityKeyMachineIdPrefix) ||
-		           t->startsWith(ExcludeLocalityKeyProcessIdPrefix) || t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
-			// if the token starts with any locality prefix.
+		} else if (t->startsWith(ExcludeLocalityPrefix) && t->toString().find(':') != std::string::npos) {
+			// if the token starts with 'locality_' prefix.
 			localities.push_back(t->toString());
 		} else {
 			auto a = AddressExclusion::parse(*t);
@@ -2514,10 +2514,7 @@ ACTOR Future<bool> exclude(Database db,
 				waitForAllExcluded = false;
 			} else if (*t == LiteralStringRef("failed")) {
 				markFailed = true;
-			} else if (t->startsWith(ExcludeLocalityKeyDcIdPrefix) ||
-			           t->startsWith(ExcludeLocalityKeyMachineIdPrefix) ||
-			           t->startsWith(ExcludeLocalityKeyProcessIdPrefix) ||
-			           t->startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+			} else if (t->startsWith(ExcludeLocalityPrefix) && t->toString().find(':') != std::string::npos) {
 				std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, t->toString());
 				if (localityAddresses.empty()) {
 					noMatchLocalities.push_back(t->toString());
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index 088a10fafdc..630c88c1dc6 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -634,71 +634,33 @@ std::set<AddressExclusion> DatabaseConfiguration::getExcludedServers() const {
 
 // checks if the locality is excluded or not by checking if the key is present.
 bool DatabaseConfiguration::isExcludedLocality(const LocalityData& locality) const {
-	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
-	                                                                  locality.dcId().get().toString()))
-	                                        .present()
-	                                  : false) ||
-	       (locality.dcId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
-	                                                                locality.dcId().get().toString()))
-	                                        .present()
-	                                  : false) ||
-	       (locality.machineId().present()
-	            ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
-	                                            locality.machineId().get().toString()))
-	                  .present()
-	            : false) ||
-	       (locality.machineId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
-	                                                                     locality.machineId().get().toString()))
-	                                             .present()
-	                                       : false) ||
-	       (locality.processId().present()
-	            ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() +
-	                                            locality.processId().get().toString()))
-	                  .present()
-	            : false) ||
-	       (locality.processId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() +
-	                                                                     locality.processId().get().toString()))
-	                                             .present()
-	                                       : false) ||
-	       (locality.zoneId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
-	                                                                    locality.zoneId().get().toString()))
-	                                          .present()
-	                                    : false) ||
-	       (locality.zoneId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
-	                                                                  locality.zoneId().get().toString()))
-	                                          .present()
-	                                    : false);
+	std::map<std::string, std::string> localityData = locality.getAllData();
+	for (const auto& l : localityData) {
+		if (get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityPrefix.toString() + l.first + ":" + l.second)))
+		        .present() ||
+		    get(StringRef(encodeFailedLocalityKey(ExcludeLocalityPrefix.toString() + l.first + ":" + l.second)))
+		        .present()) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
 // checks if this machineid of given locality is excluded.
 // A machine can be excluded either as part of dcid exclustion or zoneid exclusion
 // or this explicit machineid exclusion.
 bool DatabaseConfiguration::isMachineExcluded(const LocalityData& locality) const {
-	return (locality.dcId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
-	                                                                  locality.dcId().get().toString()))
-	                                        .present()
-	                                  : false) ||
-	       (locality.dcId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
-	                                                                locality.dcId().get().toString()))
-	                                        .present()
-	                                  : false) ||
-	       (locality.machineId().present()
-	            ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
-	                                            locality.machineId().get().toString()))
-	                  .present()
-	            : false) ||
-	       (locality.machineId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
-	                                                                     locality.machineId().get().toString()))
-	                                             .present()
-	                                       : false) ||
-	       (locality.zoneId().present() ? get(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
-	                                                                    locality.zoneId().get().toString()))
-	                                          .present()
-	                                    : false) ||
-	       (locality.zoneId().present() ? get(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
-	                                                                  locality.zoneId().get().toString()))
-	                                          .present()
-	                                    : false);
+	if (locality.machineId().present()) {
+		return get(encodeExcludedLocalityKey("ExcludeLocalityKeyMachineIdPrefix.toString()" +
+		                                     locality.machineId().get().toString()))
+		           .present() ||
+		       get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
+		                                   locality.machineId().get().toString()))
+		           .present();
+	}
+
+	return false;
 }
 
 // Gets the list of already excluded localities (with failed option)
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index ee9ded0516c..6bc3067077c 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -1950,18 +1950,10 @@ ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx) {
 // The prefix could be dcid, processid, machineid, processid.
 std::pair<std::string, std::string> decodeLocality(const std::string& locality) {
 	StringRef localityRef(locality.c_str());
-	if (localityRef.startsWith(ExcludeLocalityKeyDcIdPrefix)) {
-		return std::make_pair(LocalityData::keyDcId.toString(),
-		                      localityRef.removePrefix(ExcludeLocalityKeyDcIdPrefix).toString());
-	} else if (localityRef.startsWith(ExcludeLocalityKeyMachineIdPrefix)) {
-		return std::make_pair(LocalityData::keyMachineId.toString(),
-		                      localityRef.removePrefix(ExcludeLocalityKeyMachineIdPrefix).toString());
-	} else if (localityRef.startsWith(ExcludeLocalityKeyProcessIdPrefix)) {
-		return std::make_pair(LocalityData::keyProcessId.toString(),
-		                      localityRef.removePrefix(ExcludeLocalityKeyProcessIdPrefix).toString());
-	} else if (localityRef.startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
-		return std::make_pair(LocalityData::keyZoneId.toString(),
-		                      localityRef.removePrefix(ExcludeLocalityKeyZoneIdPrefix).toString());
+	std::string localityKeyValue = localityRef.removePrefix(ExcludeLocalityPrefix).toString();
+	int split = localityKeyValue.find(':');
+	if (split != std::string::npos) {
+		return std::make_pair(localityKeyValue.substr(0, split), localityKeyValue.substr(split + 1));
 	}
 
 	return std::make_pair("", "");
@@ -1975,17 +1967,8 @@ std::set<AddressExclusion> getAddressesByLocality(const std::vector<ProcessData>
 
 	std::set<AddressExclusion> localityAddresses;
 	for (int i = 0; i < workers.size(); i++) {
-		if (localityKeyValue.first == LocalityData::keyDcId && workers[i].locality.dcId().present() &&
-		    localityKeyValue.second == workers[i].locality.dcId().get()) {
-			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
-		} else if (localityKeyValue.first == LocalityData::keyMachineId && workers[i].locality.machineId().present() &&
-		           localityKeyValue.second == workers[i].locality.machineId().get()) {
-			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
-		} else if (localityKeyValue.first == LocalityData::keyProcessId && workers[i].locality.processId().present() &&
-		           localityKeyValue.second == workers[i].locality.processId().get()) {
-			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
-		} else if (localityKeyValue.first == LocalityData::keyZoneId && workers[i].locality.zoneId().present() &&
-		           localityKeyValue.second == workers[i].locality.zoneId().get()) {
+		if (workers[i].locality.isPresent(localityKeyValue.first) &&
+		    workers[i].locality.get(localityKeyValue.first) == localityKeyValue.second) {
 			localityAddresses.insert(AddressExclusion(workers[i].address.ip, workers[i].address.port));
 		}
 	}
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 910364ebde1..19c1cb65d32 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -748,7 +748,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
          "excluded_servers":[
             {
                "address":"10.0.4.1",
-               "locality":"processid:e9816ca4a89ff64ddb7ba2a5ec10b75b"
+               "locality":"locality_processid:e9816ca4a89ff64ddb7ba2a5ec10b75b"
             }
          ],
          "auto_commit_proxies":3,
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 5b5b20d1748..d169b418e21 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -2176,10 +2176,7 @@ bool parseLocalitiesFromKeys(ReadYourWritesTransaction* ryw,
 		    .detail("Key", iter->begin().toString());
 		if (entry.first && entry.second.present()) {
 			Key locality = iter->begin().removePrefix(range.begin);
-			if (locality.startsWith(ExcludeLocalityKeyDcIdPrefix) ||
-			    locality.startsWith(ExcludeLocalityKeyMachineIdPrefix) ||
-			    locality.startsWith(ExcludeLocalityKeyProcessIdPrefix) ||
-			    locality.startsWith(ExcludeLocalityKeyZoneIdPrefix)) {
+			if (locality.startsWith(ExcludeLocalityPrefix) && locality.toString().find(':') != std::string::npos) {
 				std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, locality.toString());
 				if (!localityAddresses.empty()) {
 					std::copy(localityAddresses.begin(), localityAddresses.end(), back_inserter(addresses));
diff --git a/fdbrpc/Locality.h b/fdbrpc/Locality.h
index 13bf55e773c..00a2032c8a1 100644
--- a/fdbrpc/Locality.h
+++ b/fdbrpc/Locality.h
@@ -24,10 +24,8 @@
 
 #include "flow/flow.h"
 
-inline const StringRef ExcludeLocalityKeyDcIdPrefix = LiteralStringRef("dcid:");
-inline const StringRef ExcludeLocalityKeyMachineIdPrefix = LiteralStringRef("machineid:");
-inline const StringRef ExcludeLocalityKeyProcessIdPrefix = LiteralStringRef("processid:");
-inline const StringRef ExcludeLocalityKeyZoneIdPrefix = LiteralStringRef("zoneid:");
+inline const StringRef ExcludeLocalityKeyMachineIdPrefix = LiteralStringRef("locality_machineid:");
+inline const StringRef ExcludeLocalityPrefix = LiteralStringRef("locality_");
 
 struct ProcessClass {
 	constexpr static FileIdentifier file_identifier = 6697257;
@@ -313,6 +311,16 @@ struct LocalityData {
 		}
 	}
 
+	std::map<std::string, std::string> getAllData() const {
+		std::map<std::string, std::string> data;
+		for (const auto& d : _data) {
+			if (d.second.present()) {
+				data[d.first.toString()] = d.second.get().toString();
+			}
+		}
+		return data;
+	}
+
 	static const UID UNSET_ID;
 };
 
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index 5327f27ce4d..deb7b2ebde1 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -1032,67 +1032,37 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 			        ? tr->get(StringRef(encodeFailedServersKey(AddressExclusion(server.secondaryAddress().get().ip))))
 			        : Future<Optional<Value>>(Optional<Value>());
 
-			state Future<Optional<Value>> fExclLocDCID =
-			    server.locality.dcId().present()
-			        ? tr->get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
-			                                                      server.locality.dcId().get().toString())))
-			        : Future<Optional<Value>>(Optional<Value>());
-			state Future<Optional<Value>> fFailedLocDCID =
-			    server.locality.dcId().present()
-			        ? tr->get(StringRef(encodeFailedLocalityKey(ExcludeLocalityKeyDcIdPrefix.toString() +
-			                                                    server.locality.dcId().get().toString())))
-			        : Future<Optional<Value>>(Optional<Value>());
-			state Future<Optional<Value>> fExclLocZoneID =
-			    server.locality.zoneId().present()
-			        ? tr->get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
-			                                                      server.locality.zoneId().get().toString())))
-			        : Future<Optional<Value>>(Optional<Value>());
-			state Future<Optional<Value>> fFailedLocZoneID =
-			    server.locality.zoneId().present()
-			        ? tr->get(StringRef(encodeFailedLocalityKey(ExcludeLocalityKeyZoneIdPrefix.toString() +
-			                                                    server.locality.zoneId().get().toString())))
-			        : Future<Optional<Value>>(Optional<Value>());
-			state Future<Optional<Value>> fExclLocMachineID =
-			    server.locality.machineId().present()
-			        ? tr->get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
-			                                                      server.locality.machineId().get().toString())))
-			        : Future<Optional<Value>>(Optional<Value>());
-			state Future<Optional<Value>> fFailedLocMachineID =
-			    server.locality.machineId().present()
-			        ? tr->get(StringRef(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
-			                                                    server.locality.machineId().get().toString())))
-			        : Future<Optional<Value>>(Optional<Value>());
-			state Future<Optional<Value>> fExclLocProcessID =
-			    server.locality.processId().present()
-			        ? tr->get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() +
-			                                                      server.locality.processId().get().toString())))
-			        : Future<Optional<Value>>(Optional<Value>());
-			state Future<Optional<Value>> fFailedLocProcessID =
-			    server.locality.processId().present()
-			        ? tr->get(StringRef(encodeFailedLocalityKey(ExcludeLocalityKeyProcessIdPrefix.toString() +
-			                                                    server.locality.processId().get().toString())))
-			        : Future<Optional<Value>>(Optional<Value>());
+			state vector<Future<Optional<Value>>> localityExclusions;
+			std::map<std::string, std::string> localityData = server.locality.getAllData();
+			for (const auto& l : localityData) {
+				localityExclusions.push_back(tr->get(
+				    StringRef(encodeExcludedLocalityKey(ExcludeLocalityPrefix.toString() + l.first + ":" + l.second))));
+			}
 
 			state Future<RangeResult> fTags = tr->getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY, true);
 			state Future<RangeResult> fHistoryTags = tr->getRange(serverTagHistoryKeys, CLIENT_KNOBS->TOO_MANY, true);
 
 			wait(success(fTagLocalities) && success(fv) && success(fTags) && success(fHistoryTags) &&
 			     success(fExclProc) && success(fExclIP) && success(fFailProc) && success(fFailIP) &&
-			     success(fExclProc2) && success(fExclIP2) && success(fFailProc2) && success(fFailIP2) &&
-			     success(fExclLocDCID) && success(fFailedLocDCID) && success(fExclLocZoneID) &&
-			     success(fFailedLocZoneID) && success(fExclLocMachineID) && success(fFailedLocMachineID) &&
-			     success(fExclLocProcessID) && success(fFailedLocProcessID));
+			     success(fExclProc2) && success(fExclIP2) && success(fFailProc2) && success(fFailIP2));
+
+			for (const auto& exclusion : localityExclusions) {
+				wait(success(exclusion));
+			}
 
 			// If we have been added to the excluded/failed state servers or localities list, we have to fail
 			if (fExclProc.get().present() || fExclIP.get().present() || fFailProc.get().present() ||
 			    fFailIP.get().present() || fExclProc2.get().present() || fExclIP2.get().present() ||
-			    fFailProc2.get().present() || fFailIP2.get().present() || fExclLocDCID.get().present() ||
-			    fFailedLocDCID.get().present() || fExclLocZoneID.get().present() || fFailedLocZoneID.get().present() ||
-			    fExclLocMachineID.get().present() || fFailedLocMachineID.get().present() ||
-			    fExclLocProcessID.get().present() || fFailedLocProcessID.get().present()) {
+			    fFailProc2.get().present() || fFailIP2.get().present()) {
 				throw recruitment_failed();
 			}
 
+			for (const auto& exclusion : localityExclusions) {
+				if (exclusion.get().present()) {
+					throw recruitment_failed();
+				}
+			}
+
 			if (fTagLocalities.get().more || fTags.get().more || fHistoryTags.get().more)
 				ASSERT(false);
 
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index 3c9b6b041f9..b487355579a 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -755,33 +755,16 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		std::unordered_map<std::string, int> killableLocalitiesCount;
 		auto processes = getServers();
 		for (const auto& processInfo : processes) {
-			if (processInfo->locality.dcId().present())
-				allLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
-				                   processInfo->locality.dcId().get().toString()]++;
-			if (processInfo->locality.zoneId().present())
-				allLocalitiesCount[ExcludeLocalityKeyZoneIdPrefix.toString() +
-				                   processInfo->locality.zoneId().get().toString()]++;
-			if (processInfo->locality.machineId().present())
-				allLocalitiesCount[ExcludeLocalityKeyMachineIdPrefix.toString() +
-				                   processInfo->locality.machineId().get().toString()]++;
-			if (processInfo->locality.processId().present())
-				allLocalitiesCount[ExcludeLocalityKeyProcessIdPrefix.toString() +
-				                   processInfo->locality.processId().get().toString()]++;
+			std::map<std::string, std::string> localityData = processInfo->locality.getAllData();
+			for (const auto& l : localityData) {
+				allLocalitiesCount[ExcludeLocalityPrefix.toString() + l.first + ":" + l.second]++;
+			}
 
 			AddressExclusion pAddr(processInfo->address.ip, processInfo->address.port);
 			if (std::find(addresses.begin(), addresses.end(), pAddr) != addresses.end()) {
-				if (processInfo->locality.dcId().present())
-					killableLocalitiesCount[ExcludeLocalityKeyDcIdPrefix.toString() +
-					                        processInfo->locality.dcId().get().toString()]++;
-				if (processInfo->locality.zoneId().present())
-					killableLocalitiesCount[ExcludeLocalityKeyZoneIdPrefix.toString() +
-					                        processInfo->locality.zoneId().get().toString()]++;
-				if (processInfo->locality.machineId().present())
-					killableLocalitiesCount[ExcludeLocalityKeyMachineIdPrefix.toString() +
-					                        processInfo->locality.machineId().get().toString()]++;
-				if (processInfo->locality.processId().present())
-					killableLocalitiesCount[ExcludeLocalityKeyProcessIdPrefix.toString() +
-					                        processInfo->locality.processId().get().toString()]++;
+				for (const auto& l : localityData) {
+					killableLocalitiesCount[ExcludeLocalityPrefix.toString() + l.first + ":" + l.second]++;
+				}
 			}
 		}
 
@@ -806,8 +789,12 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 
 		vector<ISimulator::ProcessInfo*> processes = g_simulator.getAllProcesses();
 		for (auto process : processes) {
-			process->locality.set(LocalityData::keyProcessId,
-			                      workers[addressToIndexMap[process->address]].locality.processId());
+			if (addressToIndexMap.find(process->address) != addressToIndexMap.end()) {
+				if (workers[addressToIndexMap[process->address]].locality.processId().present()) {
+					process->locality.set(LocalityData::keyProcessId,
+					                      workers[addressToIndexMap[process->address]].locality.processId());
+				}
+			}
 		}
 
 		return Void();

From 3d95cb6f8e56a0b9c87676568e9c0ad78a7a9b4d Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Wed, 23 Jun 2021 20:18:01 -0700
Subject: [PATCH 316/740] Special keys documentation merge issue fixes.

---
 .../sphinx/source/developer-guide.rst         | 240 ------------------
 documentation/sphinx/source/special-keys.rst  |  10 +-
 2 files changed, 8 insertions(+), 242 deletions(-)

diff --git a/documentation/sphinx/source/developer-guide.rst b/documentation/sphinx/source/developer-guide.rst
index 691ad01ad9e..af2ff736f8d 100644
--- a/documentation/sphinx/source/developer-guide.rst
+++ b/documentation/sphinx/source/developer-guide.rst
@@ -757,246 +757,6 @@ If you only need to detect the *fact* of a change, and your response doesn't dep
 .. _developer-guide-peformance-considerations:
 
 
-Special keys
-============
-
-Keys starting with the bytes ``\xff\xff`` are called "special" keys, and they are materialized when read. :doc:`\\xff\\xff/status/json <mr-status>` is an example of a special key.
-As of api version 630, additional features have been exposed as special keys and are available to read as ranges instead of just individual keys. Additionally, the special keys are now organized into "modules".
-
-Read-only modules
------------------
-
-A module is loosely defined as a key range in the special key space where a user can expect similar behavior from reading any key in that range.
-By default, users will see a ``special_keys_no_module_found`` error if they read from a range not contained in a module.
-The error indicates the read would always return an empty set of keys if it proceeded. This could be caused by typo in the keys to read.
-Users will also (by default) see a ``special_keys_cross_module_read`` error if their read spans a module boundary.
-The error is to save the user from the surprise of seeing the behavior of multiple modules in the same read.
-Users may opt out of these restrictions by setting the ``special_key_space_relaxed`` transaction option.
-
-Each special key that existed before api version 630 is its own module. These are
-
-#. ``\xff\xff/cluster_file_path`` See :ref:`cluster file client access <cluster-file-client-access>`
-#. ``\xff\xff/cluster_file_path`` See :ref:`cluster file client access <cluster-file-client-access>`
-#. ``\xff\xff/status/json`` See :doc:`Machine-readable status <mr-status>`
-
-Prior to api version 630, it was also possible to read a range starting at
-``\xff\xff/worker_interfaces``. This is mostly an implementation detail of fdbcli,
-but it's available in api version 630 as a module with prefix ``\xff\xff/worker_interfaces/``.
-
-Api version 630 includes two new modules with prefixes
-``\xff\xff/transaction/`` (information about the current transaction), and
-``\xff\xff/metrics/`` (various metrics, not transactional).
-
-Transaction module
-------------------
-
-Reads from the transaction module generally do not require an rpc and only inspect in-memory state for the current transaction.
-
-There are three sets of keys exposed by the transaction module, and each set uses the same encoding, so let's first describe that encoding.
-
-Let's say we have a set of keys represented as intervals of the form ``begin1 <= k < end1 && begin2 <= k < end2 && ...``.
-It could be the case that some of the intervals overlap, e.g. if ``begin1 <= begin2 < end1``, or are adjacent, e.g. if ``end1 == begin2``.
-If we merge all overlapping/adjacent intervals then sort, we end up with a canonical representation of this set of keys.
-
-We encode this canonical set as ordered key value pairs like this::
-
-  <namespace><begin1> -> "1"
-  <namespace><end1> -> "0"
-  <namespace><begin2> -> "1"
-  <namespace><end2> -> "0"
-  ...
-
-Python example::
-
-  >>> tr = db.create_transaction()
-  >>> tr.add_read_conflict_key('foo')
-  >>> tr.add_read_conflict_range('bar/', 'bar0')
-  >>> for k, v in tr.get_range_startswith('\xff\xff/transaction/read_conflict_range/'):
-  ...     print(k, v)
-  ...
-  ('\xff\xff/transaction/read_conflict_range/bar/', '1')
-  ('\xff\xff/transaction/read_conflict_range/bar0', '0')
-  ('\xff\xff/transaction/read_conflict_range/foo', '1')
-  ('\xff\xff/transaction/read_conflict_range/foo\x00', '0')
-
-For read-your-writes transactions, this canonical encoding of conflict ranges
-is already available in memory, and so requesting small ranges is
-correspondingly cheaper than large ranges.
-
-For transactions with read-your-writes disabled, this canonical encoding is computed on
-every read, so you're paying the full cost in CPU time whether or not you
-request a small range.
-
-The namespaces for sets of keys are
-
-#. ``\xff\xff/transaction/read_conflict_range/`` This is the set of keys that will be used for read conflict detection. If another transaction writes to any of these keys after this transaction's read version, then this transaction won't commit.
-#. ``\xff\xff/transaction/write_conflict_range/`` This is the set of keys that will be used for write conflict detection. Keys in this range may cause other transactions which read these keys to abort if this transaction commits.
-#. ``\xff\xff/transaction/conflicting_keys/`` If this transaction failed due to a conflict, it must be the case that some transaction attempted [#conflicting_keys]_ to commit with a write conflict range that intersects this transaction's read conflict range. This is the subset of your read conflict range that actually intersected a write conflict from another transaction.
-
-Caveats
-~~~~~~~
-
-#. ``\xff\xff/transaction/read_conflict_range/`` The conflict range for a read is sometimes not known until that read completes (e.g. range reads with limits, key selectors). When you read from these special keys, the returned future first blocks until all pending reads are complete so it can give an accurate response.
-#. ``\xff\xff/transaction/write_conflict_range/`` The conflict range range for a ``set_versionstamped_key`` atomic op is not known until commit time. You'll get an approximate range (the actual range will be a subset of the approximate range) until the precise range is known.
-#. ``\xff\xff/transaction/conflicting_keys/`` Since using this feature costs server (i.e., commit proxy and resolver) resources, it's disabled by default. You must opt in by setting the ``report_conflicting_keys`` transaction option.
-
-Metrics module
---------------
-
-Reads in the metrics module are not transactional and may require rpcs to complete.
-
-``\xff\xff/metrics/data_distribution_stats/<begin>`` represent stats about the shard that begins at ``<begin>``
-
-  >>> for k, v in db.get_range_startswith('\xff\xff/metrics/data_distribution_stats/', limit=3):
-  ...     print(k, v)
-  ...
-  ('\xff\xff/metrics/data_distribution_stats/', '{"shard_bytes":3828000}')
-  ('\xff\xff/metrics/data_distribution_stats/mako00079', '{"shard_bytes":2013000}')
-  ('\xff\xff/metrics/data_distribution_stats/mako00126', '{"shard_bytes":3201000}')
-
-========================= ======== ===============
-**Field**                 **Type** **Description**
-------------------------- -------- ---------------
-shard_bytes               number   An estimate of the sum of kv sizes for this shard.
-========================= ======== ===============
-
-Keys starting with ``\xff\xff/metrics/health/`` represent stats about the health of the cluster, suitable for application-level throttling.
-Some of this information is also available in ``\xff\xff/status/json``, but these keys are significantly cheaper (in terms of server resources) to read.
-
-  >>> for k, v in db.get_range_startswith('\xff\xff/metrics/health/'):
-  ...     print(k, v)
-  ...
-  ('\xff\xff/metrics/health/aggregate', '{"batch_limited":false,"limiting_storage_durability_lag":5000000,"limiting_storage_queue":1000,"tps_limit":483988.66315011407,"worst_storage_durability_lag":5000001,"worst_storage_queue":2036,"worst_log_queue":300}')
-  ('\xff\xff/metrics/health/log/e639a9ad0373367784cc550c615c469b', '{"log_queue":300}')
-  ('\xff\xff/metrics/health/storage/ab2ce4caf743c9c1ae57063629c6678a', '{"cpu_usage":2.398696781487125,"disk_usage":0.059995917598039405,"storage_durability_lag":5000001,"storage_queue":2036}')
-
-``\xff\xff/metrics/health/aggregate``
-
-Aggregate stats about cluster health. Reading this key alone is slightly cheaper than reading any of the per-process keys.
-
-=================================== ======== ===============
-**Field**                           **Type** **Description**
------------------------------------ -------- ---------------
-batch_limited                       boolean  Whether or not the cluster is limiting batch priority transactions
-limiting_storage_durability_lag     number   storage_durability_lag that ratekeeper is using to determing throttling (see the description for storage_durability_lag)
-limiting_storage_queue              number   storage_queue that ratekeeper is using to determing throttling (see the description for storage_queue)
-tps_limit                           number   The rate at which normal priority transactions are allowed to start
-worst_storage_durability_lag        number   See the description for storage_durability_lag
-worst_storage_queue                 number   See the description for storage_queue
-worst_log_queue                     number   See the description for log_queue
-=================================== ======== ===============
-
-``\xff\xff/metrics/health/log/<id>``
-
-Stats about the health of a particular transaction log process
-
-========================= ======== ===============
-**Field**                 **Type** **Description**
-------------------------- -------- ---------------
-log_queue                 number   The number of bytes of mutations that need to be stored in memory on this transaction log process
-========================= ======== ===============
-
-``\xff\xff/metrics/health/storage/<id>``
-
-Stats about the health of a particular storage process
-
-========================== ======== ===============
-**Field**                  **Type** **Description**
--------------------------- -------- ---------------
-cpu_usage                  number   The cpu percentage used by this storage process
-disk_usage                 number   The disk IO percentage used by this storage process
-storage_durability_lag     number   The difference between the newest version and the durable version on this storage process. On a lightly loaded cluster this will stay just above 5000000 [#max_read_transaction_life_versions]_.
-storage_queue              number   The number of bytes of mutations that need to be stored in memory on this storage process
-========================== ======== ===============
-
-Caveats
-~~~~~~~
-
-#. ``\xff\xff/metrics/health/`` These keys may return data that's several seconds old, and the data may not be available for a brief period during recovery. This will be indicated by the keys being absent.
-
-
-Read/write modules
-------------------
-
-As of api version 700, some modules in the special key space allow writes as
-well as reads. In these modules, a user can expect that mutations (i.e. sets,
-clears, etc) do not have side-effects outside of the current transaction
-until commit is called (the same is true for writes to the normal key space).
-A user can also expect the effects on commit to be atomic. Reads to
-special keys may require reading system keys (whose format is an implementation
-detail), and for those reads appropriate read conflict ranges are added on
-the underlying system keys.
-
-Writes to read/write modules in the special key space are disabled by
-default. Use the ``special_key_space_enable_writes`` transaction option to
-enable them [#special_key_space_enable_writes]_.
-
-
-.. _special-key-space-management-module:
-
-Management module
-~~~~~~~~~~~~~~~~~
-
-The management module is for temporary cluster configuration changes. For
-example, in order to safely remove a process from the cluster, one can add an
-exclusion to the ``\xff\xff/management/excluded/`` key prefix that matches
-that process, and wait for necessary data to be moved away.
-
-#. ``\xff\xff/management/excluded/<exclusion>`` Read/write. Indicates that the cluster should move data away from processes matching ``<exclusion>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
-#. ``\xff\xff/management/failed/<exclusion>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
-#. ``\xff\xff/management/in_progress_exclusion/<address>`` Read-only. Indicates that the process matching ``<address>`` matches an exclusion, but still has necessary data and can't yet be safely removed.
-#. ``\xff\xff/management/options/excluded/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excluded/<exclusion>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
-#. ``\xff\xff/management/options/failed/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failed/<exclusion>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
-#. ``\xff\xff/management/min_required_commit_version`` Read/write. Changing this key will change the corresponding system key ``\xff/minRequiredCommitVersion = [[Version]]``. The value of this special key is the literal text of the underlying ``Version``, which is ``int64_t``. If you set the key with a value failed to be parsed as ``int64_t``, ``special_keys_api_failure`` will be thrown. In addition, the given ``Version`` should be larger than the current read version and smaller than the upper bound(``2**63-1-version_per_second*3600*24*365*1000``). Otherwise, ``special_keys_api_failure`` is thrown. For more details, see help text of ``fdbcli`` command ``advanceversion``.
-#. ``\xff\xff/management/profiling/<client_txn_sample_rate|client_txn_size_limit>`` Read/write. Changing these two keys will change the corresponding system keys ``\xff\x02/fdbClientInfo/<client_txn_sample_rate|client_txn_size_limit>``, respectively. The value of ``\xff\xff/management/client_txn_sample_rate`` is a literal text of ``double``, and the value of ``\xff\xff/management/client_txn_size_limit`` is a literal text of ``int64_t``. A special value ``default`` can be set to or read from these two keys, representing the client profiling is disabled. In addition, ``clear`` in this range is not allowed. For more details, see help text of ``fdbcli`` command ``profile client``.
-#. ``\xff\xff/management/maintenance/<zone_id> := <seconds>`` Read/write. Set/clear a key in this range will change the corresponding system key ``\xff\x02/healthyZone``. The value is a literal text of a non-negative ``double`` which represents the remaining time for the zone to be in maintenance. Commiting with an invalid value will throw ``special_keys_api_failure``. Only one zone is allowed to be in maintenance at the same time. Setting a new key in the range will override the old one and the transaction will throw ``special_keys_api_failure`` error if more than one zone is given. For more details, see help text of ``fdbcli`` command ``maintenance``.
-   In addition, a special key ``\xff\xff/management/maintenance/IgnoreSSFailures`` in the range, if set, will disable datadistribution for storage server failures.
-   It is doing the same thing as the fdbcli command ``datadistribution disable ssfailure``.
-   Maintenance mode will be unable to use until the key is cleared, which is the same as the fdbcli command ``datadistribution enable ssfailure``.
-   While the key is set, any commit that tries to set a key in the range will fail with the ``special_keys_api_failure`` error.
-#. ``\xff\xff/management/data_distribution/<mode|rebalance_ignored>`` Read/write. Changing these two keys will change the two corresponding system keys ``\xff/dataDistributionMode`` and ``\xff\x02/rebalanceDDIgnored``. The value of ``\xff\xff/management/data_distribution/mode`` is a literal text of ``0`` (disable) or ``1`` (enable). Transactions committed with invalid values will throw ``special_keys_api_failure`` . The value of ``\xff\xff/management/data_distribution/rebalance_ignored`` is empty. If present, it means data distribution is disabled for rebalance. Any transaction committed with non-empty value for this key will throw ``special_keys_api_failure``. For more details, see help text of ``fdbcli`` command ``datadistribution``.
-#. ``\xff\xff/management/consistency_check_suspended`` Read/write. Set or read this key will set or read the underlying system key ``\xff\x02/ConsistencyCheck/Suspend``. The value of this special key is unused thus if present, will be empty. In particular, if the key exists, then consistency is suspended. For more details, see help text of ``fdbcli`` command ``consistencycheck``.
-#. ``\xff\xff/management/db_locked`` Read/write. A single key that can be read and modified. Set the key will lock the database and clear the key will unlock. If the database is already locked, then the commit will fail with the ``special_keys_api_failure`` error. For more details, see help text of ``fdbcli`` command ``lock`` and ``unlock``.
-#. ``\xff\xff/management/auto_coordinators`` Read-only. A single key, if read, will return a set of processes which is able to satisfy the current redundency level and serve as new coordinators. The return value is formatted as a comma delimited string of network addresses of coordinators, i.e. ``<ip:port>,<ip:port>,...,<ip:port>``.
-#. ``\xff\xff/management/excluded_locality/<locality>`` Read/write. Indicates that the cluster should move data away from processes matching ``<locality>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
-#. ``\xff\xff/management/failed_locality/<locality>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
-#. ``\xff\xff/management/options/excluded_locality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excluded_locality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
-#. ``\xff\xff/management/options/failed_locality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failed_locality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
-
-An exclusion is syntactically either an ip address (e.g. ``127.0.0.1``), or
-an ip address and port (e.g. ``127.0.0.1:4500``) or locality (e.g ``locality_dcid:primary-satellite`` or
-``locality_zoneid:primary-satellite-log-2`` or ``locality_machineid:primary-stateless-1`` or ``locality_processid:223be2da244ca0182375364e4d122c30``).
-If no port is specified, then all processes on that host match the exclusion.
-For locality, all processes that match the given locality are excluded.
-
-Configuration module
-~~~~~~~~~~~~~~~~~~~~
-
-The configuration module is for changing the cluster configuration.
-For example, you can change a process type or update coordinators by manipulating related special keys through transactions.
-
-#. ``\xff\xff/configuration/process/class_type/<address> := <class_type>`` Read/write. Reading keys in the range will retrieve processes' class types. Setting keys in the range will update processes' class types. The process matching ``<address>`` will be assigned to the given class type if the commit is successful. The valid class types are ``storage``, ``transaction``, ``resolution``, etc. A full list of class type can be found via ``fdbcli`` command ``help setclass``. Clearing keys is forbidden in the range. Instead, you can set the type as ``default``, which will clear the assigned class type if existing. For more details, see help text of ``fdbcli`` command ``setclass``.
-#. ``\xff\xff/configuration/process/class_source/<address> := <class_source>`` Read-only. Reading keys in the range will retrieve processes' class source. The class source is one of ``command_line``, ``configure_auto``, ``set_class`` and ``invalid``, indicating the source that the process's class type comes from.
-#. ``\xff\xff/configuration/coordinators/processes := <ip:port>,<ip:port>,...,<ip:port>`` Read/write. A single key, if read, will return a comma delimited string of coordinators' network addresses. Thus to provide a new set of cooridinators, set the key with a correct formatted string of new coordinators' network addresses. As there's always the need to have coordinators, clear on the key is forbidden and a transaction will fail with the ``special_keys_api_failure`` error if the clear is committed. For more details, see help text of ``fdbcli`` command ``coordinators``.
-#. ``\xff\xff/configuration/coordinators/cluster_description := <new_description>`` Read/write. A single key, if read, will return the cluster description. Thus modifying the key will update the cluster decription. The new description needs to match ``[A-Za-z0-9_]+``, otherwise, the ``special_keys_api_failure`` error will be thrown. In addition, clear on the key is meaningless thus forbidden. For more details, see help text of ``fdbcli`` command ``coordinators``.
-
-The ``<address>`` here is the network address of the corresponding process. Thus the general form is ``ip:port``.
-
-Error message module
-~~~~~~~~~~~~~~~~~~~~
-
-Each module written to validates the transaction before committing, and this
-validation failing is indicated by a ``special_keys_api_failure`` error.
-More detailed information about why this validation failed can be accessed through the ``\xff\xff/error_message`` key, whose value is a json document with the following schema.
-
-========================== ======== ===============
-**Field**                  **Type** **Description**
--------------------------- -------- ---------------
-retriable                  boolean  Whether or not this operation might succeed if retried
-command                    string   The fdbcli command corresponding to this operation
-message                    string   Help text explaining the reason this operation failed
-========================== ======== ===============
-
 Performance considerations
 ==========================
 
diff --git a/documentation/sphinx/source/special-keys.rst b/documentation/sphinx/source/special-keys.rst
index b16cd3c93af..86cc98aeae5 100644
--- a/documentation/sphinx/source/special-keys.rst
+++ b/documentation/sphinx/source/special-keys.rst
@@ -201,10 +201,16 @@ that process, and wait for necessary data to be moved away.
 #. ``\xff\xff/management/consistency_check_suspended`` Read/write. Set or read this key will set or read the underlying system key ``\xff\x02/ConsistencyCheck/Suspend``. The value of this special key is unused thus if present, will be empty. In particular, if the key exists, then consistency is suspended. For more details, see help text of ``fdbcli`` command ``consistencycheck``.
 #. ``\xff\xff/management/db_locked`` Read/write. A single key that can be read and modified. Set the key will lock the database and clear the key will unlock. If the database is already locked, then the commit will fail with the ``special_keys_api_failure`` error. For more details, see help text of ``fdbcli`` command ``lock`` and ``unlock``.
 #. ``\xff\xff/management/auto_coordinators`` Read-only. A single key, if read, will return a set of processes which is able to satisfy the current redundency level and serve as new coordinators. The return value is formatted as a comma delimited string of network addresses of coordinators, i.e. ``<ip:port>,<ip:port>,...,<ip:port>``.
+#. ``\xff\xff/management/excluded_locality/<locality>`` Read/write. Indicates that the cluster should move data away from processes matching ``<locality>``, so that they can be safely removed. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/failed_locality/<locality>`` Read/write. Indicates that the cluster should consider matching processes as permanently failed. This allows the cluster to avoid maintaining extra state and doing extra work in the hope that these processes come back. See :ref:`removing machines from a cluster <removing-machines-from-a-cluster>` for documentation for the corresponding fdbcli command.
+#. ``\xff\xff/management/options/excluded_locality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/excluded_locality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
+#. ``\xff\xff/management/options/failed_locality/force`` Read/write. Setting this key disables safety checks for writes to ``\xff\xff/management/failed_locality/<locality>``. Setting this key only has an effect in the current transaction and is not persisted on commit.
 
 An exclusion is syntactically either an ip address (e.g. ``127.0.0.1``), or
-an ip address and port (e.g. ``127.0.0.1:4500``). If no port is specified,
-then all processes on that host match the exclusion.
+an ip address and port (e.g. ``127.0.0.1:4500``) or any locality (e.g ``locality_dcid:primary-satellite`` or
+``locality_zoneid:primary-satellite-log-2`` or ``locality_machineid:primary-stateless-1`` or ``locality_processid:223be2da244ca0182375364e4d122c30``).
+If no port is specified, then all processes on that host match the exclusion.
+For locality, all processes that match the given locality are excluded.
 
 Configuration module
 --------------------

From 2ba86631a6a6ecc430da5e3ca724ed92841ae11a Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Fri, 25 Jun 2021 13:05:32 -0700
Subject: [PATCH 317/740] Minor review comments.

---
 fdbcli/fdbcli.actor.cpp                           |  5 +++--
 fdbclient/DatabaseConfiguration.cpp               | 12 ++++++------
 fdbclient/ManagementAPI.actor.cpp                 |  2 +-
 fdbclient/SpecialKeySpace.actor.cpp               |  3 ++-
 fdbrpc/Locality.cpp                               |  2 ++
 fdbrpc/Locality.h                                 |  5 ++---
 fdbserver/MoveKeys.actor.cpp                      |  4 ++--
 fdbserver/workloads/RemoveServersSafely.actor.cpp |  5 +++--
 8 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 590f4dfd2ef..0a429b9ffd9 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -2434,7 +2434,7 @@ ACTOR Future<bool> include(Database db, std::vector<StringRef> tokens) {
 			all = true;
 		} else if (*t == LiteralStringRef("failed")) {
 			failed = true;
-		} else if (t->startsWith(ExcludeLocalityPrefix) && t->toString().find(':') != std::string::npos) {
+		} else if (t->startsWith(LocalityData::ExcludeLocalityPrefix) && t->toString().find(':') != std::string::npos) {
 			// if the token starts with 'locality_' prefix.
 			localities.push_back(t->toString());
 		} else {
@@ -2514,7 +2514,8 @@ ACTOR Future<bool> exclude(Database db,
 				waitForAllExcluded = false;
 			} else if (*t == LiteralStringRef("failed")) {
 				markFailed = true;
-			} else if (t->startsWith(ExcludeLocalityPrefix) && t->toString().find(':') != std::string::npos) {
+			} else if (t->startsWith(LocalityData::ExcludeLocalityPrefix) &&
+			           t->toString().find(':') != std::string::npos) {
 				std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, t->toString());
 				if (localityAddresses.empty()) {
 					noMatchLocalities.push_back(t->toString());
diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp
index 630c88c1dc6..f2e929028ea 100644
--- a/fdbclient/DatabaseConfiguration.cpp
+++ b/fdbclient/DatabaseConfiguration.cpp
@@ -636,9 +636,11 @@ std::set<AddressExclusion> DatabaseConfiguration::getExcludedServers() const {
 bool DatabaseConfiguration::isExcludedLocality(const LocalityData& locality) const {
 	std::map<std::string, std::string> localityData = locality.getAllData();
 	for (const auto& l : localityData) {
-		if (get(StringRef(encodeExcludedLocalityKey(ExcludeLocalityPrefix.toString() + l.first + ":" + l.second)))
+		if (get(StringRef(encodeExcludedLocalityKey(LocalityData::ExcludeLocalityPrefix.toString() + l.first + ":" +
+		                                            l.second)))
 		        .present() ||
-		    get(StringRef(encodeFailedLocalityKey(ExcludeLocalityPrefix.toString() + l.first + ":" + l.second)))
+		    get(StringRef(
+		            encodeFailedLocalityKey(LocalityData::ExcludeLocalityPrefix.toString() + l.first + ":" + l.second)))
 		        .present()) {
 			return true;
 		}
@@ -648,14 +650,12 @@ bool DatabaseConfiguration::isExcludedLocality(const LocalityData& locality) con
 }
 
 // checks if this machineid of given locality is excluded.
-// A machine can be excluded either as part of dcid exclustion or zoneid exclusion
-// or this explicit machineid exclusion.
 bool DatabaseConfiguration::isMachineExcluded(const LocalityData& locality) const {
 	if (locality.machineId().present()) {
-		return get(encodeExcludedLocalityKey("ExcludeLocalityKeyMachineIdPrefix.toString()" +
+		return get(encodeExcludedLocalityKey(LocalityData::ExcludeLocalityKeyMachineIdPrefix.toString() +
 		                                     locality.machineId().get().toString()))
 		           .present() ||
-		       get(encodeFailedLocalityKey(ExcludeLocalityKeyMachineIdPrefix.toString() +
+		       get(encodeFailedLocalityKey(LocalityData::ExcludeLocalityKeyMachineIdPrefix.toString() +
 		                                   locality.machineId().get().toString()))
 		           .present();
 	}
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index 6bc3067077c..fe11381aa1b 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -1950,7 +1950,7 @@ ACTOR Future<vector<std::string>> getExcludedLocalities(Database cx) {
 // The prefix could be dcid, processid, machineid, processid.
 std::pair<std::string, std::string> decodeLocality(const std::string& locality) {
 	StringRef localityRef(locality.c_str());
-	std::string localityKeyValue = localityRef.removePrefix(ExcludeLocalityPrefix).toString();
+	std::string localityKeyValue = localityRef.removePrefix(LocalityData::ExcludeLocalityPrefix).toString();
 	int split = localityKeyValue.find(':');
 	if (split != std::string::npos) {
 		return std::make_pair(localityKeyValue.substr(0, split), localityKeyValue.substr(split + 1));
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index d169b418e21..fe1a2d5409e 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -2176,7 +2176,8 @@ bool parseLocalitiesFromKeys(ReadYourWritesTransaction* ryw,
 		    .detail("Key", iter->begin().toString());
 		if (entry.first && entry.second.present()) {
 			Key locality = iter->begin().removePrefix(range.begin);
-			if (locality.startsWith(ExcludeLocalityPrefix) && locality.toString().find(':') != std::string::npos) {
+			if (locality.startsWith(LocalityData::ExcludeLocalityPrefix) &&
+			    locality.toString().find(':') != std::string::npos) {
 				std::set<AddressExclusion> localityAddresses = getAddressesByLocality(workers, locality.toString());
 				if (!localityAddresses.empty()) {
 					std::copy(localityAddresses.begin(), localityAddresses.end(), back_inserter(addresses));
diff --git a/fdbrpc/Locality.cpp b/fdbrpc/Locality.cpp
index 8cdc0751c46..b897322f7bd 100644
--- a/fdbrpc/Locality.cpp
+++ b/fdbrpc/Locality.cpp
@@ -26,6 +26,8 @@ const StringRef LocalityData::keyZoneId = LiteralStringRef("zoneid");
 const StringRef LocalityData::keyDcId = LiteralStringRef("dcid");
 const StringRef LocalityData::keyMachineId = LiteralStringRef("machineid");
 const StringRef LocalityData::keyDataHallId = LiteralStringRef("data_hall");
+const StringRef LocalityData::ExcludeLocalityKeyMachineIdPrefix = LiteralStringRef("locality_machineid:");
+const StringRef LocalityData::ExcludeLocalityPrefix = LiteralStringRef("locality_");
 
 ProcessClass::Fitness ProcessClass::machineClassFitness(ClusterRole role) const {
 	switch (role) {
diff --git a/fdbrpc/Locality.h b/fdbrpc/Locality.h
index 00a2032c8a1..11e1e27d8d6 100644
--- a/fdbrpc/Locality.h
+++ b/fdbrpc/Locality.h
@@ -24,9 +24,6 @@
 
 #include "flow/flow.h"
 
-inline const StringRef ExcludeLocalityKeyMachineIdPrefix = LiteralStringRef("locality_machineid:");
-inline const StringRef ExcludeLocalityPrefix = LiteralStringRef("locality_");
-
 struct ProcessClass {
 	constexpr static FileIdentifier file_identifier = 6697257;
 	// This enum is stored in restartInfo.ini for upgrade tests, so be very careful about changing the existing items!
@@ -322,6 +319,8 @@ struct LocalityData {
 	}
 
 	static const UID UNSET_ID;
+	static const StringRef ExcludeLocalityKeyMachineIdPrefix;
+	static const StringRef ExcludeLocalityPrefix;
 };
 
 static std::string describe(std::vector<LocalityData> const& items, StringRef const key, int max_items = -1) {
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index deb7b2ebde1..8103314235e 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -1035,8 +1035,8 @@ ACTOR Future<std::pair<Version, Tag>> addStorageServer(Database cx, StorageServe
 			state vector<Future<Optional<Value>>> localityExclusions;
 			std::map<std::string, std::string> localityData = server.locality.getAllData();
 			for (const auto& l : localityData) {
-				localityExclusions.push_back(tr->get(
-				    StringRef(encodeExcludedLocalityKey(ExcludeLocalityPrefix.toString() + l.first + ":" + l.second))));
+				localityExclusions.push_back(tr->get(StringRef(encodeExcludedLocalityKey(
+				    LocalityData::ExcludeLocalityPrefix.toString() + l.first + ":" + l.second))));
 			}
 
 			state Future<RangeResult> fTags = tr->getRange(serverTagKeys, CLIENT_KNOBS->TOO_MANY, true);
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index b487355579a..255b75357c7 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -757,13 +757,14 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		for (const auto& processInfo : processes) {
 			std::map<std::string, std::string> localityData = processInfo->locality.getAllData();
 			for (const auto& l : localityData) {
-				allLocalitiesCount[ExcludeLocalityPrefix.toString() + l.first + ":" + l.second]++;
+				allLocalitiesCount[LocalityData::ExcludeLocalityPrefix.toString() + l.first + ":" + l.second]++;
 			}
 
 			AddressExclusion pAddr(processInfo->address.ip, processInfo->address.port);
 			if (std::find(addresses.begin(), addresses.end(), pAddr) != addresses.end()) {
 				for (const auto& l : localityData) {
-					killableLocalitiesCount[ExcludeLocalityPrefix.toString() + l.first + ":" + l.second]++;
+					killableLocalitiesCount[LocalityData::ExcludeLocalityPrefix.toString() + l.first + ":" +
+					                        l.second]++;
 				}
 			}
 		}

From dd3572192cd44348d840191c0d10c3726cba15a8 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openwaygroup.com>
Date: Mon, 29 Mar 2021 16:08:25 +0300
Subject: [PATCH 318/740] Unified caclulation of prerelease_string

---
 CMakeLists.txt               | 14 +++++++++++++-
 bindings/flow/CMakeLists.txt |  8 +-------
 bindings/java/CMakeLists.txt |  7 +------
 cmake/AddFdbTest.cmake       |  7 +------
 cmake/InstallLayout.cmake    | 20 ++++----------------
 5 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6e85984f16..02d1815ec79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,8 +86,20 @@ set(FDB_VERSION ${PROJECT_VERSION})
 set(FDB_VERSION_PLAIN ${FDB_VERSION})
 configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_SOURCE_DIR}/versions.target)
 
-message(STATUS "FDB version is ${FDB_VERSION}")
+if(NOT FDB_VERSION_SUFFIX)
+  if(NOT FDB_RELEASE)
+    if(CURRENT_GIT_VERSION)
+      set(git_string ".${CURRENT_GIT_VERSION}")
+    endif()
+    set(FDB_VERSION_SUFFIX "-0${git_string}.PRERELEASE")
+  else()
+    set(FDB_VERSION_SUFFIX "-1")
+  endif()
+endif()
+
 message(STATUS "FDB package name is ${FDB_PACKAGE_NAME}")
+message(STATUS "FDB version is ${FDB_VERSION}")
+message(STATUS "FDB version suffix is ${FDB_VERSION_SUFFIX}")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fdbclient/versions.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/fdbclient/versions.h)
 
 
diff --git a/bindings/flow/CMakeLists.txt b/bindings/flow/CMakeLists.txt
index 27f51c6a17b..1e7dea6515c 100644
--- a/bindings/flow/CMakeLists.txt
+++ b/bindings/flow/CMakeLists.txt
@@ -35,16 +35,10 @@ if(NOT OPEN_FOR_IDE)
     endif()
   endforeach()
 
-  if(NOT FDB_RELEASE)
-    set(prerelease_string "-PRERELEASE")
-  else()
-    set(prerelease_string "")
-  endif()
-
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages)
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages)
   set(package_dir ${CMAKE_CURRENT_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION})
-  set(tar_file ${CMAKE_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}${prerelease_string}-x86_64.tar.gz)
+  set(tar_file ${CMAKE_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}${FDB_VERSION_SUFFIX}-x86_64.tar.gz)
   add_custom_command(OUTPUT ${tar_file}
     COMMAND
     ${CMAKE_COMMAND} -E make_directory ${package_dir} &&
diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index eb89a9de256..071ef57ae14 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -237,12 +237,7 @@ if(NOT OPEN_FOR_IDE)
     COMMENT "Copy jni library for fat jar")
   add_custom_target(copy_lib DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lib_copied)
   add_dependencies(copy_lib unpack_jar)
-  if(NOT FDB_RELEASE)
-    set(prerelease_string "-PRERELEASE")
-  else()
-    set(prerelease_string "")
-  endif()
-  set(target_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}.jar)
+  set(target_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${FDB_VERSION_SUFFIX}.jar)
   add_custom_command(OUTPUT ${target_jar}
     COMMAND ${Java_JAR_EXECUTABLE} cfm ${target_jar} ${unpack_dir}/META-INF/MANIFEST.MF .
     WORKING_DIRECTORY ${unpack_dir}
diff --git a/cmake/AddFdbTest.cmake b/cmake/AddFdbTest.cmake
index 7e0502c52e9..6dd62f39600 100644
--- a/cmake/AddFdbTest.cmake
+++ b/cmake/AddFdbTest.cmake
@@ -331,15 +331,10 @@ function(package_bindingtester)
 
   set(generated_binding_files python/fdb/fdboptions.py)
   if(WITH_JAVA)
-    if(NOT FDB_RELEASE)
-      set(prerelease_string "-PRERELEASE")
-    else()
-      set(prerelease_string "")
-    endif()
     add_custom_command(
       TARGET copy_binding_output_files
       COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_BINARY_DIR}/packages/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}.jar
+        ${CMAKE_BINARY_DIR}/packages/fdb-java-${CMAKE_PROJECT_VERSION}${FDB_VERSION_SUFFIX}.jar
         ${bdir}/tests/java/foundationdb-client.jar
       COMMENT "Copy Java bindings for bindingtester")
     add_dependencies(copy_binding_output_files fat-jar)
diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index 91d39d4125a..fbadd15b5cb 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -215,25 +215,13 @@ configure_file(${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_BINARY_DIR}/License.txt COPYO
 # Filename of packages
 ################################################################################
 
-if(NOT FDB_RELEASE)
-  if(CURRENT_GIT_VERSION)
-    set(git_string ".${CURRENT_GIT_VERSION}")
-  endif()
-  set(CPACK_RPM_PACKAGE_RELEASE 0)
-  set(prerelease_string "-0${git_string}.PRERELEASE")
-else()
-  set(CPACK_RPM_PACKAGE_RELEASE 1)
-  set(prerelease_string "-1")
-endif()
-
-
 # RPM filenames
-set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}${prerelease_string}")
-set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}${prerelease_string}")
+set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}${FDB_VERSION_SUFFIX}")
+set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}${FDB_VERSION_SUFFIX}")
 
 # Deb filenames
-set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}${prerelease_string}")
-set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}${prerelease_string}")
+set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}${FDB_VERSION_SUFFIX}")
+set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}${FDB_VERSION_SUFFIX}")
 
 ################################################################################
 # Configuration for RPM

From bf2a9f31d52db68be1102b4b6146f1c718a41292 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openwaygroup.com>
Date: Mon, 24 May 2021 13:39:33 +0300
Subject: [PATCH 319/740] Fixed compilation with a recent compiler

---
 cmake/CompileRocksDB.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/CompileRocksDB.cmake b/cmake/CompileRocksDB.cmake
index 44582609f82..a79db06a937 100644
--- a/cmake/CompileRocksDB.cmake
+++ b/cmake/CompileRocksDB.cmake
@@ -51,6 +51,7 @@ else()
                -DWITH_ZSTD=OFF
                -DROCKSDB_BUILD_SHARED=OFF
                -DCMAKE_POSITION_INDEPENDENT_CODE=True
+               -DFAIL_ON_WARNINGS=${USE_WERROR}
     BUILD_BYPRODUCTS <BINARY_DIR>/librocksdb.a
     INSTALL_COMMAND ""
   )

From 3e3bb74f189e5242dcdf485c9d3f7b57101f1b9e Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openwaygroup.com>
Date: Mon, 24 May 2021 13:44:20 +0300
Subject: [PATCH 320/740] Fixed package build version

---
 CMakeLists.txt            | 8 +++++---
 cmake/InstallLayout.cmake | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02d1815ec79..e3f457becec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,17 +86,19 @@ set(FDB_VERSION ${PROJECT_VERSION})
 set(FDB_VERSION_PLAIN ${FDB_VERSION})
 configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_SOURCE_DIR}/versions.target)
 
-if(NOT FDB_VERSION_SUFFIX)
+if(NOT DEFINED BUILD_VERSION)
   if(NOT FDB_RELEASE)
     if(CURRENT_GIT_VERSION)
       set(git_string ".${CURRENT_GIT_VERSION}")
     endif()
-    set(FDB_VERSION_SUFFIX "-0${git_string}.PRERELEASE")
+    set(BUILD_VERSION "0${git_string}.PRERELEASE")
   else()
-    set(FDB_VERSION_SUFFIX "-1")
+    set(BUILD_VERSION "1")
   endif()
 endif()
 
+set(FDB_VERSION_SUFFIX "-${BUILD_VERSION}")
+
 message(STATUS "FDB package name is ${FDB_PACKAGE_NAME}")
 message(STATUS "FDB version is ${FDB_VERSION}")
 message(STATUS "FDB version suffix is ${FDB_VERSION_SUFFIX}")
diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index fbadd15b5cb..d99deac77bb 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -214,6 +214,10 @@ configure_file(${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_BINARY_DIR}/License.txt COPYO
 ################################################################################
 # Filename of packages
 ################################################################################
+if(DEFINED BUILD_VERSION)
+  set(CPACK_RPM_PACKAGE_RELEASE "${BUILD_VERSION}")
+  set(CPACK_DEBIAN_PACKAGE_RELEASE "${BUILD_VERSION}")
+endif()
 
 # RPM filenames
 set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}${FDB_VERSION_SUFFIX}")

From f8a912bab12a3e1a753d7be658e7af5d1b721cec Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openwaygroup.com>
Date: Wed, 9 Jun 2021 18:14:50 +0300
Subject: [PATCH 321/740] Eliminated boost warnings

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index c14c5011c5f..de2b7fa10ee 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -47,7 +47,7 @@ if(USE_GPERFTOOLS)
 endif()
 
 add_compile_options(-DCMAKE_BUILD)
-add_compile_definitions(BOOST_ERROR_CODE_HEADER_ONLY BOOST_SYSTEM_NO_DEPRECATED)
+add_compile_definitions(BOOST_ERROR_CODE_HEADER_ONLY BOOST_SYSTEM_NO_DEPRECATED BOOST_BIND_GLOBAL_PLACEHOLDERS)
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)

From d45b73141d982e59ddf6bd121010208be642d8a8 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openwaygroup.com>
Date: Thu, 10 Jun 2021 16:27:07 +0300
Subject: [PATCH 322/740] Eliminated modifying the source tree during build

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3f457becec..ced3913b079 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@ message(STATUS "Current git version ${CURRENT_GIT_VERSION}")
 set(FDB_PACKAGE_NAME "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 set(FDB_VERSION ${PROJECT_VERSION})
 set(FDB_VERSION_PLAIN ${FDB_VERSION})
-configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_SOURCE_DIR}/versions.target)
+# configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_SOURCE_DIR}/versions.target)
 
 if(NOT DEFINED BUILD_VERSION)
   if(NOT FDB_RELEASE)

From f6e0899177696312169cf5e6b00316e5bd4217b0 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openwaygroup.com>
Date: Mon, 5 Jul 2021 19:43:36 +0300
Subject: [PATCH 323/740] Github build

---
 .github/workflows/build.yml | 138 ++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000000..8f5e430be6d
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,138 @@
+name: Build
+
+on:
+  push:
+    branches: ["ow-fork-*"]
+    tags: ["*-*ow"]
+
+jobs:
+  calc_ver:
+    # calculate versions from git tags
+    runs-on: ubuntu-latest
+    outputs:
+      project_ver: ${{steps.vers.outputs.project_ver}}
+      build_ver: ${{steps.vers.outputs.build_ver}}
+      full_ver: ${{steps.vers.outputs.full_ver}}
+      release_flag: ${{steps.vers.outputs.release_flag}}
+      release_id: ${{ steps.create_release.outputs.id }}
+      release_upload_url: ${{ steps.create_release.outputs.upload_url }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Calculate versions
+      id: vers
+      shell: bash
+      run: |
+        git fetch --prune --unshallow --tags
+        GIT_VERSION=`git describe --tags`
+        PROJECT_VERSION=`echo $GIT_VERSION | cut -d- -f1`
+        BUILD_VERSION=`echo $GIT_VERSION | cut -d- -f2-3 --output-delimiter=.`
+        GIT_CHANGE_NUM=`echo $GIT_VERSION | cut -d- -f3`
+        if [[ -n "$GIT_CHANGE_NUM" ]] || [[ "$BUILD_VERSION" < "1" ]]; then
+          RELEASE_FLAG=OFF
+        else
+          RELEASE_FLAG=ON
+        fi
+
+        echo "::set-output name=project_ver::$PROJECT_VERSION"
+        echo "::set-output name=build_ver::$BUILD_VERSION"
+        echo "::set-output name=full_ver::$PROJECT_VERSION-$BUILD_VERSION"
+        echo "::set-output name=release_flag::$RELEASE_FLAG"
+
+    - name: Display versions
+      run: |
+        echo "project_ver=${{steps.vers.outputs.project_ver}}"
+        echo "build_ver=${{steps.vers.outputs.build_ver}}"
+        echo "full_ver=${{steps.vers.outputs.full_ver}}"
+        echo "release_flag=${{steps.vers.outputs.release_flag}}"
+
+    - name: Create Draft Release
+      if: ${{ steps.vers.outputs.release_flag == 'ON' }}
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: "${{ steps.vers.outputs.full_ver }}"
+        release_name:  "v${{ steps.vers.outputs.full_ver }}"
+        draft: true
+        prerelease: false
+
+  build_linux:
+    runs-on: ubuntu-18.04
+    needs: [calc_ver]
+
+    steps:
+    - name: Install Dependencies
+      shell: bash
+      run: |
+        sudo apt update
+        sudo apt install -y sudo git cmake libboost-dev g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm
+        sudo pip3 install virtualenv
+        sudo apt install -y dirmngr gnupg apt-transport-https ca-certificates
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+        sudo sh -c 'echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" > /etc/apt/sources.list.d/mono-official-stable.list'
+        sudo apt update
+        sudo apt install -y mono-complete
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/bld
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{github.workspace}}/bld
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake -D FDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DGENERATE_DEBUG_PACKAGES=OFF -G Ninja ${{github.workspace}}
+       
+    - name: Build
+      working-directory: ${{github.workspace}}/bld
+      shell: bash
+      run: ninja -j 1
+
+    - name: Build rpms
+      working-directory: ${{github.workspace}}/bld
+      shell: bash
+      run: cpack -G RPM
+
+    - name: Build deb
+      working-directory: ${{github.workspace}}/bld
+      shell: bash
+      run: cpack -G DEB
+
+    - name: Remove versioned
+      shell: bash
+      run: rm -rf ${{github.workspace}}bld/packages/*${{needs.calc_ver.outputs.full_ver}}.versioned*
+
+    - name: Upload result
+      uses: nanoufo/action-upload-artifacts-and-release-assets@v1.4
+      with:
+        path: |
+          ${{github.workspace}}/bld/packages/*${{needs.calc_ver.outputs.full_ver}}.*
+        upload-release-files: ${{ needs.calc_ver.outputs.release_flag }}
+        release-upload-url: ${{ needs.calc_ver.outputs.release_upload_url }}
+        if-no-files-found: error
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  release:
+    needs: [calc_ver, build_linux]
+    if: ${{ needs.calc_ver.outputs.release_flag == 'ON' }}
+    runs-on: ubuntu-latest
+    steps:
+      
+    - uses: eregon/publish-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        release_id: ${{ needs.calc_ver.outputs.release_id }}

From 46700e0c61c6157f3a296a2dfbb7ae485986e2aa Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openwaygroup.com>
Date: Mon, 5 Jul 2021 19:47:49 +0300
Subject: [PATCH 324/740] Netbeans project

---
 .gitignore                   |    5 +
 nbproject/configurations.xml | 8379 ++++++++++++++++++++++++++++++++++
 nbproject/project.xml        |   26 +
 3 files changed, 8410 insertions(+)
 create mode 100644 nbproject/configurations.xml
 create mode 100644 nbproject/project.xml

diff --git a/.gitignore b/.gitignore
index bb16f145de7..df48259a809 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,6 +90,11 @@ flow/coveragetool/obj
 /.clangd
 /.cache
 
+# Openway fork build
+/bld/
+/nbproject/private/
+/Testing/Temporary/
+
 # Temporary and user configuration files
 *~
 *.orig
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
new file mode 100644
index 00000000000..c38dec53845
--- /dev/null
+++ b/nbproject/configurations.xml
@@ -0,0 +1,8379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="100">
+  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
+    <df root="." name="0">
+      <df name="bindings">
+        <df name="c">
+          <df name="test">
+            <df name="mako">
+              <in>mako.c</in>
+              <in>utils.c</in>
+              <in>zipf.c</in>
+            </df>
+            <df name="workloads">
+              <in>SimpleWorkload.cpp</in>
+              <in>workloads.cpp</in>
+            </df>
+            <in>performance_test.c</in>
+            <in>ryw_benchmark.c</in>
+            <in>txn_size_test.c</in>
+          </df>
+          <in>ThreadCleanup.cpp</in>
+          <in>fdb_c.cpp</in>
+        </df>
+        <df name="flow">
+          <df name="tester">
+            <in>DirectoryTester.actor.cpp</in>
+            <in>Tester.actor.cpp</in>
+          </df>
+          <in>DirectoryLayer.actor.cpp</in>
+          <in>DirectorySubspace.cpp</in>
+          <in>HighContentionAllocator.actor.cpp</in>
+          <in>Node.actor.cpp</in>
+          <in>Subspace.cpp</in>
+          <in>Tuple.cpp</in>
+          <in>fdb_flow.actor.cpp</in>
+        </df>
+        <df name="java">
+          <in>JavaWorkload.cpp</in>
+          <in>fdbJNI.cpp</in>
+        </df>
+      </df>
+      <df name="bld">
+        <df name="bindings">
+          <df name="flow">
+            <df name="tester">
+              <in>DirectoryTester.actor.g.cpp</in>
+              <in>Tester.actor.g.cpp</in>
+            </df>
+            <in>DirectoryLayer.actor.g.cpp</in>
+            <in>HighContentionAllocator.actor.g.cpp</in>
+            <in>Node.actor.g.cpp</in>
+            <in>fdb_flow.actor.g.cpp</in>
+          </df>
+        </df>
+        <df name="CMakeFiles">
+          <df name="3.17.1">
+            <df name="CompilerIdC">
+              <in>CMakeCCompilerId.c</in>
+            </df>
+            <df name="CompilerIdCXX">
+              <in>CMakeCXXCompilerId.cpp</in>
+            </df>
+          </df>
+        </df>
+        <df name="documentation">
+          <df name="tutorial">
+            <in>tutorial.actor.g.cpp</in>
+          </df>
+        </df>
+        <df name="fdbbackup">
+          <in>FileConverter.actor.g.cpp</in>
+          <in>FileDecoder.actor.g.cpp</in>
+          <in>backup.actor.g.cpp</in>
+        </df>
+        <df name="fdbcli">
+          <in>FlowLineNoise.actor.g.cpp</in>
+          <in>fdbcli.actor.g.cpp</in>
+        </df>
+        <df name="fdbclient">
+          <in>AsyncFileBlobStore.actor.g.cpp</in>
+          <in>BackupAgentBase.actor.g.cpp</in>
+          <in>BackupContainer.actor.g.cpp</in>
+          <in>BlobStore.actor.g.cpp</in>
+          <in>DatabaseBackupAgent.actor.g.cpp</in>
+          <in>FDBOptions.g.cpp</in>
+          <in>FailureMonitorClient.actor.g.cpp</in>
+          <in>FileBackupAgent.actor.g.cpp</in>
+          <in>HTTP.actor.g.cpp</in>
+          <in>KeyRangeMap.actor.g.cpp</in>
+          <in>ManagementAPI.actor.g.cpp</in>
+          <in>MetricLogger.actor.g.cpp</in>
+          <in>MonitorLeader.actor.g.cpp</in>
+          <in>MultiVersionTransaction.actor.g.cpp</in>
+          <in>NativeAPI.actor.g.cpp</in>
+          <in>ReadYourWrites.actor.g.cpp</in>
+          <in>SpecialKeySpace.actor.g.cpp</in>
+          <in>StatusClient.actor.g.cpp</in>
+          <in>TagThrottle.actor.g.cpp</in>
+          <in>TaskBucket.actor.g.cpp</in>
+          <in>ThreadSafeTransaction.actor.g.cpp</in>
+        </df>
+        <df name="fdbrpc">
+          <in>ActorFuzz.actor.g.cpp</in>
+          <in>AsyncFileCached.actor.g.cpp</in>
+          <in>AsyncFileNonDurable.actor.g.cpp</in>
+          <in>FailureMonitor.actor.g.cpp</in>
+          <in>FlowTests.actor.g.cpp</in>
+          <in>FlowTransport.actor.g.cpp</in>
+          <in>HealthMonitor.actor.g.cpp</in>
+          <in>IAsyncFile.actor.g.cpp</in>
+          <in>Stats.actor.g.cpp</in>
+          <in>dsltest.actor.g.cpp</in>
+          <in>genericactors.actor.g.cpp</in>
+          <in>sim2.actor.g.cpp</in>
+        </df>
+        <df name="fdbserver">
+          <df name="rocksdb-prefix">
+            <df name="src">
+              <df name="rocksdb">
+                <df name="cache">
+                  <in>cache.cc</in>
+                  <in>clock_cache.cc</in>
+                  <in>lru_cache.cc</in>
+                  <in>sharded_cache.cc</in>
+                </df>
+                <df name="db">
+                  <df name="blob">
+                    <in>blob_file_addition.cc</in>
+                    <in>blob_file_garbage.cc</in>
+                    <in>blob_file_meta.cc</in>
+                  </df>
+                  <df name="compaction">
+                    <in>compaction.cc</in>
+                    <in>compaction_iterator.cc</in>
+                    <in>compaction_job.cc</in>
+                    <in>compaction_picker.cc</in>
+                    <in>compaction_picker_fifo.cc</in>
+                    <in>compaction_picker_level.cc</in>
+                    <in>compaction_picker_universal.cc</in>
+                  </df>
+                  <df name="db_impl">
+                    <in>db_impl.cc</in>
+                    <in>db_impl_compaction_flush.cc</in>
+                    <in>db_impl_debug.cc</in>
+                    <in>db_impl_experimental.cc</in>
+                    <in>db_impl_files.cc</in>
+                    <in>db_impl_open.cc</in>
+                    <in>db_impl_readonly.cc</in>
+                    <in>db_impl_secondary.cc</in>
+                    <in>db_impl_write.cc</in>
+                  </df>
+                  <in>arena_wrapped_db_iter.cc</in>
+                  <in>builder.cc</in>
+                  <in>c.cc</in>
+                  <in>column_family.cc</in>
+                  <in>compacted_db_impl.cc</in>
+                  <in>convenience.cc</in>
+                  <in>db_filesnapshot.cc</in>
+                  <in>db_info_dumper.cc</in>
+                  <in>db_iter.cc</in>
+                  <in>dbformat.cc</in>
+                  <in>error_handler.cc</in>
+                  <in>event_helpers.cc</in>
+                  <in>experimental.cc</in>
+                  <in>external_sst_file_ingestion_job.cc</in>
+                  <in>file_indexer.cc</in>
+                  <in>flush_job.cc</in>
+                  <in>flush_scheduler.cc</in>
+                  <in>forward_iterator.cc</in>
+                  <in>import_column_family_job.cc</in>
+                  <in>internal_stats.cc</in>
+                  <in>log_reader.cc</in>
+                  <in>log_writer.cc</in>
+                  <in>logs_with_prep_tracker.cc</in>
+                  <in>malloc_stats.cc</in>
+                  <in>memtable.cc</in>
+                  <in>memtable_list.cc</in>
+                  <in>merge_helper.cc</in>
+                  <in>merge_operator.cc</in>
+                  <in>range_del_aggregator.cc</in>
+                  <in>range_tombstone_fragmenter.cc</in>
+                  <in>repair.cc</in>
+                  <in>snapshot_impl.cc</in>
+                  <in>table_cache.cc</in>
+                  <in>table_properties_collector.cc</in>
+                  <in>transaction_log_impl.cc</in>
+                  <in>trim_history_scheduler.cc</in>
+                  <in>version_builder.cc</in>
+                  <in>version_edit.cc</in>
+                  <in>version_edit_handler.cc</in>
+                  <in>version_set.cc</in>
+                  <in>wal_manager.cc</in>
+                  <in>write_batch.cc</in>
+                  <in>write_batch_base.cc</in>
+                  <in>write_controller.cc</in>
+                  <in>write_thread.cc</in>
+                </df>
+                <df name="env">
+                  <in>env.cc</in>
+                  <in>env_chroot.cc</in>
+                  <in>env_encryption.cc</in>
+                  <in>env_hdfs.cc</in>
+                  <in>env_posix.cc</in>
+                  <in>file_system.cc</in>
+                  <in>fs_posix.cc</in>
+                  <in>io_posix.cc</in>
+                  <in>mock_env.cc</in>
+                </df>
+                <df name="file">
+                  <in>delete_scheduler.cc</in>
+                  <in>file_prefetch_buffer.cc</in>
+                  <in>file_util.cc</in>
+                  <in>filename.cc</in>
+                  <in>random_access_file_reader.cc</in>
+                  <in>read_write_util.cc</in>
+                  <in>readahead_raf.cc</in>
+                  <in>sequence_file_reader.cc</in>
+                  <in>sst_file_manager_impl.cc</in>
+                  <in>writable_file_writer.cc</in>
+                </df>
+                <df name="logging">
+                  <in>auto_roll_logger.cc</in>
+                  <in>event_logger.cc</in>
+                  <in>log_buffer.cc</in>
+                </df>
+                <df name="memory">
+                  <in>arena.cc</in>
+                  <in>concurrent_arena.cc</in>
+                  <in>jemalloc_nodump_allocator.cc</in>
+                  <in>memkind_kmem_allocator.cc</in>
+                </df>
+                <df name="memtable">
+                  <in>alloc_tracker.cc</in>
+                  <in>hash_linklist_rep.cc</in>
+                  <in>hash_skiplist_rep.cc</in>
+                  <in>skiplistrep.cc</in>
+                  <in>vectorrep.cc</in>
+                  <in>write_buffer_manager.cc</in>
+                </df>
+                <df name="monitoring">
+                  <in>histogram.cc</in>
+                  <in>histogram_windowing.cc</in>
+                  <in>in_memory_stats_history.cc</in>
+                  <in>instrumented_mutex.cc</in>
+                  <in>iostats_context.cc</in>
+                  <in>perf_context.cc</in>
+                  <in>perf_level.cc</in>
+                  <in>persistent_stats_history.cc</in>
+                  <in>statistics.cc</in>
+                  <in>thread_status_impl.cc</in>
+                  <in>thread_status_updater.cc</in>
+                  <in>thread_status_util.cc</in>
+                  <in>thread_status_util_debug.cc</in>
+                </df>
+                <df name="options">
+                  <in>cf_options.cc</in>
+                  <in>db_options.cc</in>
+                  <in>options.cc</in>
+                  <in>options_helper.cc</in>
+                  <in>options_parser.cc</in>
+                </df>
+                <df name="port">
+                  <in>port_posix.cc</in>
+                  <in>stack_trace.cc</in>
+                </df>
+                <df name="table">
+                  <df name="adaptive">
+                    <in>adaptive_table_factory.cc</in>
+                  </df>
+                  <df name="block_based">
+                    <in>binary_search_index_reader.cc</in>
+                    <in>block.cc</in>
+                    <in>block_based_filter_block.cc</in>
+                    <in>block_based_table_builder.cc</in>
+                    <in>block_based_table_factory.cc</in>
+                    <in>block_based_table_iterator.cc</in>
+                    <in>block_based_table_reader.cc</in>
+                    <in>block_builder.cc</in>
+                    <in>block_prefetcher.cc</in>
+                    <in>block_prefix_index.cc</in>
+                    <in>data_block_footer.cc</in>
+                    <in>data_block_hash_index.cc</in>
+                    <in>filter_block_reader_common.cc</in>
+                    <in>filter_policy.cc</in>
+                    <in>flush_block_policy.cc</in>
+                    <in>full_filter_block.cc</in>
+                    <in>hash_index_reader.cc</in>
+                    <in>index_builder.cc</in>
+                    <in>index_reader_common.cc</in>
+                    <in>parsed_full_filter_block.cc</in>
+                    <in>partitioned_filter_block.cc</in>
+                    <in>partitioned_index_iterator.cc</in>
+                    <in>partitioned_index_reader.cc</in>
+                    <in>reader_common.cc</in>
+                    <in>uncompression_dict_reader.cc</in>
+                  </df>
+                  <df name="cuckoo">
+                    <in>cuckoo_table_builder.cc</in>
+                    <in>cuckoo_table_factory.cc</in>
+                    <in>cuckoo_table_reader.cc</in>
+                  </df>
+                  <df name="plain">
+                    <in>plain_table_bloom.cc</in>
+                    <in>plain_table_builder.cc</in>
+                    <in>plain_table_factory.cc</in>
+                    <in>plain_table_index.cc</in>
+                    <in>plain_table_key_coding.cc</in>
+                    <in>plain_table_reader.cc</in>
+                  </df>
+                  <in>block_fetcher.cc</in>
+                  <in>format.cc</in>
+                  <in>get_context.cc</in>
+                  <in>iterator.cc</in>
+                  <in>merging_iterator.cc</in>
+                  <in>meta_blocks.cc</in>
+                  <in>persistent_cache_helper.cc</in>
+                  <in>sst_file_reader.cc</in>
+                  <in>sst_file_writer.cc</in>
+                  <in>table_properties.cc</in>
+                  <in>two_level_iterator.cc</in>
+                </df>
+                <df name="test_util">
+                  <in>sync_point.cc</in>
+                  <in>sync_point_impl.cc</in>
+                  <in>testutil.cc</in>
+                  <in>transaction_test_util.cc</in>
+                </df>
+                <df name="third-party">
+                  <df name="folly">
+                    <df name="folly">
+                      <df name="detail">
+                        <in>Futex.cpp</in>
+                      </df>
+                      <df name="synchronization">
+                        <in>AtomicNotification.cpp</in>
+                        <in>DistributedMutex.cpp</in>
+                        <in>ParkingLot.cpp</in>
+                        <in>WaitOptions.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                </df>
+                <df name="tools">
+                  <df name="block_cache_analyzer">
+                    <in>block_cache_trace_analyzer.cc</in>
+                  </df>
+                  <df name="dump">
+                    <in>db_dump_tool.cc</in>
+                  </df>
+                  <in>ldb_cmd.cc</in>
+                  <in>ldb_tool.cc</in>
+                  <in>sst_dump_tool.cc</in>
+                  <in>trace_analyzer_tool.cc</in>
+                </df>
+                <df name="trace_replay">
+                  <in>block_cache_tracer.cc</in>
+                  <in>trace_replay.cc</in>
+                </df>
+                <df name="util">
+                  <in>coding.cc</in>
+                  <in>compaction_job_stats_impl.cc</in>
+                  <in>comparator.cc</in>
+                  <in>compression_context_cache.cc</in>
+                  <in>concurrent_task_limiter_impl.cc</in>
+                  <in>crc32c.cc</in>
+                  <in>dynamic_bloom.cc</in>
+                  <in>file_checksum_helper.cc</in>
+                  <in>hash.cc</in>
+                  <in>murmurhash.cc</in>
+                  <in>random.cc</in>
+                  <in>rate_limiter.cc</in>
+                  <in>slice.cc</in>
+                  <in>status.cc</in>
+                  <in>string_util.cc</in>
+                  <in>thread_local.cc</in>
+                  <in>threadpool_imp.cc</in>
+                  <in>xxhash.cc</in>
+                </df>
+                <df name="utilities">
+                  <df name="backupable">
+                    <in>backupable_db.cc</in>
+                  </df>
+                  <df name="blob_db">
+                    <in>blob_compaction_filter.cc</in>
+                    <in>blob_db.cc</in>
+                    <in>blob_db_impl.cc</in>
+                    <in>blob_db_impl_filesnapshot.cc</in>
+                    <in>blob_dump_tool.cc</in>
+                    <in>blob_file.cc</in>
+                    <in>blob_log_format.cc</in>
+                    <in>blob_log_reader.cc</in>
+                    <in>blob_log_writer.cc</in>
+                  </df>
+                  <df name="cassandra">
+                    <in>cassandra_compaction_filter.cc</in>
+                    <in>format.cc</in>
+                    <in>merge_operator.cc</in>
+                  </df>
+                  <df name="checkpoint">
+                    <in>checkpoint_impl.cc</in>
+                  </df>
+                  <df name="compaction_filters">
+                    <in>remove_emptyvalue_compactionfilter.cc</in>
+                  </df>
+                  <df name="leveldb_options">
+                    <in>leveldb_options.cc</in>
+                  </df>
+                  <df name="memory">
+                    <in>memory_util.cc</in>
+                  </df>
+                  <df name="merge_operators">
+                    <df name="string_append">
+                      <in>stringappend.cc</in>
+                      <in>stringappend2.cc</in>
+                    </df>
+                    <in>bytesxor.cc</in>
+                    <in>max.cc</in>
+                    <in>put.cc</in>
+                    <in>sortlist.cc</in>
+                    <in>uint64add.cc</in>
+                  </df>
+                  <df name="option_change_migration">
+                    <in>option_change_migration.cc</in>
+                  </df>
+                  <df name="options">
+                    <in>options_util.cc</in>
+                  </df>
+                  <df name="persistent_cache">
+                    <in>block_cache_tier.cc</in>
+                    <in>block_cache_tier_file.cc</in>
+                    <in>block_cache_tier_metadata.cc</in>
+                    <in>persistent_cache_tier.cc</in>
+                    <in>volatile_tier_impl.cc</in>
+                  </df>
+                  <df name="simulator_cache">
+                    <in>cache_simulator.cc</in>
+                    <in>sim_cache.cc</in>
+                  </df>
+                  <df name="table_properties_collectors">
+                    <in>compact_on_deletion_collector.cc</in>
+                  </df>
+                  <df name="trace">
+                    <in>file_trace_reader_writer.cc</in>
+                  </df>
+                  <df name="transactions">
+                    <in>optimistic_transaction.cc</in>
+                    <in>optimistic_transaction_db_impl.cc</in>
+                    <in>pessimistic_transaction.cc</in>
+                    <in>pessimistic_transaction_db.cc</in>
+                    <in>snapshot_checker.cc</in>
+                    <in>transaction_base.cc</in>
+                    <in>transaction_db_mutex_impl.cc</in>
+                    <in>transaction_lock_mgr.cc</in>
+                    <in>transaction_util.cc</in>
+                    <in>write_prepared_txn.cc</in>
+                    <in>write_prepared_txn_db.cc</in>
+                    <in>write_unprepared_txn.cc</in>
+                    <in>write_unprepared_txn_db.cc</in>
+                  </df>
+                  <df name="ttl">
+                    <in>db_ttl_impl.cc</in>
+                  </df>
+                  <df name="write_batch_with_index">
+                    <in>write_batch_with_index.cc</in>
+                    <in>write_batch_with_index_internal.cc</in>
+                  </df>
+                  <in>debug.cc</in>
+                  <in>env_mirror.cc</in>
+                  <in>env_timed.cc</in>
+                  <in>object_registry.cc</in>
+                </df>
+              </df>
+              <df name="rocksdb-build">
+                <df name="CMakeFiles">
+                  <df name="3.19.7">
+                    <df name="CompilerIdC">
+                      <in>CMakeCCompilerId.c</in>
+                    </df>
+                    <df name="CompilerIdCXX">
+                      <in>CMakeCXXCompilerId.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <in>build_version.cc</in>
+              </df>
+            </df>
+          </df>
+          <df name="workloads">
+            <in>ApiCorrectness.actor.g.cpp</in>
+            <in>ApiWorkload.actor.g.cpp</in>
+            <in>AsyncFileCorrectness.actor.g.cpp</in>
+            <in>AsyncFileRead.actor.g.cpp</in>
+            <in>AsyncFileWrite.actor.g.cpp</in>
+            <in>AtomicOps.actor.g.cpp</in>
+            <in>AtomicOpsApiCorrectness.actor.g.cpp</in>
+            <in>AtomicRestore.actor.g.cpp</in>
+            <in>AtomicSwitchover.actor.g.cpp</in>
+            <in>BackgroundSelectors.actor.g.cpp</in>
+            <in>BackupAndParallelRestoreCorrectness.actor.g.cpp</in>
+            <in>BackupCorrectness.actor.g.cpp</in>
+            <in>BackupToDBAbort.actor.g.cpp</in>
+            <in>BackupToDBCorrectness.actor.g.cpp</in>
+            <in>BackupToDBUpgrade.actor.g.cpp</in>
+            <in>BulkLoad.actor.g.cpp</in>
+            <in>ChangeConfig.actor.g.cpp</in>
+            <in>ClientTransactionProfileCorrectness.actor.g.cpp</in>
+            <in>CommitBugCheck.actor.g.cpp</in>
+            <in>ConfigureDatabase.actor.g.cpp</in>
+            <in>ConflictRange.actor.g.cpp</in>
+            <in>ConsistencyCheck.actor.g.cpp</in>
+            <in>CpuProfiler.actor.g.cpp</in>
+            <in>Cycle.actor.g.cpp</in>
+            <in>DDBalance.actor.g.cpp</in>
+            <in>DDMetrics.actor.g.cpp</in>
+            <in>DDMetricsExclude.actor.g.cpp</in>
+            <in>DataDistributionMetrics.actor.g.cpp</in>
+            <in>DifferentClustersSameRV.actor.g.cpp</in>
+            <in>DiskDurability.actor.g.cpp</in>
+            <in>DiskDurabilityTest.actor.g.cpp</in>
+            <in>Downgrade.actor.g.cpp</in>
+            <in>DummyWorkload.actor.g.cpp</in>
+            <in>ExternalWorkload.actor.g.cpp</in>
+            <in>FastTriggeredWatches.actor.g.cpp</in>
+            <in>FileSystem.actor.g.cpp</in>
+            <in>FuzzApiCorrectness.actor.g.cpp</in>
+            <in>Increment.actor.g.cpp</in>
+            <in>IncrementalBackup.actor.g.cpp</in>
+            <in>IndexScan.actor.g.cpp</in>
+            <in>Inventory.actor.g.cpp</in>
+            <in>KVStoreTest.actor.g.cpp</in>
+            <in>KillRegion.actor.g.cpp</in>
+            <in>LocalRatekeeper.actor.g.cpp</in>
+            <in>LockDatabase.actor.g.cpp</in>
+            <in>LockDatabaseFrequently.actor.g.cpp</in>
+            <in>LogMetrics.actor.g.cpp</in>
+            <in>LowLatency.actor.g.cpp</in>
+            <in>MachineAttrition.actor.g.cpp</in>
+            <in>Mako.actor.g.cpp</in>
+            <in>MemoryLifetime.actor.g.cpp</in>
+            <in>MetricLogging.actor.g.cpp</in>
+            <in>ParallelRestore.actor.g.cpp</in>
+            <in>Performance.actor.g.cpp</in>
+            <in>Ping.actor.g.cpp</in>
+            <in>PopulateTPCC.actor.g.cpp</in>
+            <in>PubSubMultiples.actor.g.cpp</in>
+            <in>QueuePush.actor.g.cpp</in>
+            <in>RYWDisable.actor.g.cpp</in>
+            <in>RYWPerformance.actor.g.cpp</in>
+            <in>RandomClogging.actor.g.cpp</in>
+            <in>RandomMoveKeys.actor.g.cpp</in>
+            <in>RandomSelector.actor.g.cpp</in>
+            <in>ReadHotDetection.actor.g.cpp</in>
+            <in>ReadWrite.actor.g.cpp</in>
+            <in>RemoveServersSafely.actor.g.cpp</in>
+            <in>ReportConflictingKeys.actor.g.cpp</in>
+            <in>Rollback.actor.g.cpp</in>
+            <in>RyowCorrectness.actor.g.cpp</in>
+            <in>SaveAndKill.actor.g.cpp</in>
+            <in>SelectorCorrectness.actor.g.cpp</in>
+            <in>Serializability.actor.g.cpp</in>
+            <in>Sideband.actor.g.cpp</in>
+            <in>SlowTaskWorkload.actor.g.cpp</in>
+            <in>SnapTest.actor.g.cpp</in>
+            <in>SpecialKeySpaceCorrectness.actor.g.cpp</in>
+            <in>StatusWorkload.actor.g.cpp</in>
+            <in>Storefront.actor.g.cpp</in>
+            <in>StreamingRead.actor.g.cpp</in>
+            <in>SuspendProcesses.actor.g.cpp</in>
+            <in>TPCC.actor.g.cpp</in>
+            <in>TagThrottleApi.actor.g.cpp</in>
+            <in>TargetedKill.actor.g.cpp</in>
+            <in>TaskBucketCorrectness.actor.g.cpp</in>
+            <in>ThreadSafety.actor.g.cpp</in>
+            <in>Throttling.actor.g.cpp</in>
+            <in>Throughput.actor.g.cpp</in>
+            <in>TimeKeeperCorrectness.actor.g.cpp</in>
+            <in>TriggerRecovery.actor.g.cpp</in>
+            <in>UnitPerf.actor.g.cpp</in>
+            <in>UnitTests.actor.g.cpp</in>
+            <in>Unreadable.actor.g.cpp</in>
+            <in>VersionStamp.actor.g.cpp</in>
+            <in>WatchAndWait.actor.g.cpp</in>
+            <in>Watches.actor.g.cpp</in>
+            <in>WorkerErrors.actor.g.cpp</in>
+            <in>WriteBandwidth.actor.g.cpp</in>
+            <in>WriteDuringRead.actor.g.cpp</in>
+          </df>
+          <in>BackupProgress.actor.g.cpp</in>
+          <in>BackupWorker.actor.g.cpp</in>
+          <in>ClusterController.actor.g.cpp</in>
+          <in>CoordinatedState.actor.g.cpp</in>
+          <in>Coordination.actor.g.cpp</in>
+          <in>CoroFlow.actor.g.cpp</in>
+          <in>DataDistribution.actor.g.cpp</in>
+          <in>DataDistributionQueue.actor.g.cpp</in>
+          <in>DataDistributionTracker.actor.g.cpp</in>
+          <in>DiskQueue.actor.g.cpp</in>
+          <in>FDBExecHelper.actor.g.cpp</in>
+          <in>KeyValueStoreCompressTestData.actor.g.cpp</in>
+          <in>KeyValueStoreMemory.actor.g.cpp</in>
+          <in>KeyValueStoreRocksDB.actor.g.cpp</in>
+          <in>KeyValueStoreSQLite.actor.g.cpp</in>
+          <in>LeaderElection.actor.g.cpp</in>
+          <in>LogRouter.actor.g.cpp</in>
+          <in>LogSystemDiskQueueAdapter.actor.g.cpp</in>
+          <in>LogSystemPeekCursor.actor.g.cpp</in>
+          <in>MasterProxyServer.actor.g.cpp</in>
+          <in>MoveKeys.actor.g.cpp</in>
+          <in>OldTLogServer_4_6.actor.g.cpp</in>
+          <in>OldTLogServer_6_0.actor.g.cpp</in>
+          <in>OldTLogServer_6_2.actor.g.cpp</in>
+          <in>QuietDatabase.actor.g.cpp</in>
+          <in>Ratekeeper.actor.g.cpp</in>
+          <in>Resolver.actor.g.cpp</in>
+          <in>Restore.actor.g.cpp</in>
+          <in>RestoreApplier.actor.g.cpp</in>
+          <in>RestoreCommon.actor.g.cpp</in>
+          <in>RestoreController.actor.g.cpp</in>
+          <in>RestoreLoader.actor.g.cpp</in>
+          <in>RestoreMaster.actor.g.cpp</in>
+          <in>RestoreRoleCommon.actor.g.cpp</in>
+          <in>RestoreUtil.actor.g.cpp</in>
+          <in>RestoreWorker.actor.g.cpp</in>
+          <in>SimulatedCluster.actor.g.cpp</in>
+          <in>Status.actor.g.cpp</in>
+          <in>StorageCache.actor.g.cpp</in>
+          <in>TLogServer.actor.g.cpp</in>
+          <in>TagPartitionedLogSystem.actor.g.cpp</in>
+          <in>VersionedBTree.actor.g.cpp</in>
+          <in>WaitFailure.actor.g.cpp</in>
+          <in>fdbserver.actor.g.cpp</in>
+          <in>masterserver.actor.g.cpp</in>
+          <in>networktest.actor.g.cpp</in>
+          <in>pubsub.actor.g.cpp</in>
+          <in>storageserver.actor.g.cpp</in>
+          <in>tester.actor.g.cpp</in>
+          <in>worker.actor.g.cpp</in>
+        </df>
+        <df name="flow">
+          <in>ActorCollection.actor.g.cpp</in>
+          <in>CompressedInt.actor.g.cpp</in>
+          <in>Net2.actor.g.cpp</in>
+          <in>Profiler.actor.g.cpp</in>
+          <in>Stats.actor.g.cpp</in>
+          <in>TLSConfig.actor.g.cpp</in>
+          <in>genericactors.actor.g.cpp</in>
+        </df>
+      </df>
+      <df name="build">
+        <df name="cmake">
+          <df name="package_tester">
+            <df name="fdb_c_app">
+              <in>app.c</in>
+            </df>
+          </df>
+        </df>
+      </df>
+      <df name="contrib">
+        <df name="monitoring">
+          <in>actor_flamegraph.cpp</in>
+        </df>
+      </df>
+      <df name="documentation">
+        <df name="tutorial">
+          <in>tutorial.actor.cpp</in>
+        </df>
+      </df>
+      <df name="fdbbackup">
+        <in>FileConverter.actor.cpp</in>
+        <in>FileDecoder.actor.cpp</in>
+        <in>backup.actor.cpp</in>
+      </df>
+      <df name="fdbcli">
+        <df name="linenoise">
+          <in>linenoise.c</in>
+        </df>
+        <in>FlowLineNoise.actor.cpp</in>
+        <in>fdbcli.actor.cpp</in>
+      </df>
+      <df name="fdbclient">
+        <df name="libb64">
+          <in>cdecode.c</in>
+          <in>cencode.c</in>
+        </df>
+        <df name="md5">
+          <in>md5.c</in>
+        </df>
+        <df name="sha1">
+          <in>SHA1.cpp</in>
+        </df>
+        <in>AsyncFileBlobStore.actor.cpp</in>
+        <in>AutoPublicAddress.cpp</in>
+        <in>BackupAgentBase.actor.cpp</in>
+        <in>BackupContainer.actor.cpp</in>
+        <in>BlobStore.actor.cpp</in>
+        <in>DatabaseBackupAgent.actor.cpp</in>
+        <in>DatabaseConfiguration.cpp</in>
+        <in>FileBackupAgent.actor.cpp</in>
+        <in>HTTP.actor.cpp</in>
+        <in>JsonBuilder.cpp</in>
+        <in>KeyRangeMap.actor.cpp</in>
+        <in>Knobs.cpp</in>
+        <in>ManagementAPI.actor.cpp</in>
+        <in>MetricLogger.actor.cpp</in>
+        <in>MonitorLeader.actor.cpp</in>
+        <in>MultiVersionTransaction.actor.cpp</in>
+        <in>NativeAPI.actor.cpp</in>
+        <in>RYWIterator.cpp</in>
+        <in>ReadYourWrites.actor.cpp</in>
+        <in>Schemas.cpp</in>
+        <in>StatusClient.actor.cpp</in>
+        <in>Subspace.cpp</in>
+        <in>SystemData.cpp</in>
+        <in>TaskBucket.actor.cpp</in>
+        <in>ThreadSafeTransaction.actor.cpp</in>
+        <in>Tuple.cpp</in>
+        <in>VersionedMap.cpp</in>
+        <in>zipf.c</in>
+      </df>
+      <df name="FDBLibTLS">
+        <in>FDBLibTLSPlugin.cpp</in>
+        <in>FDBLibTLSPolicy.cpp</in>
+        <in>FDBLibTLSSession.cpp</in>
+        <in>FDBLibTLSVerify.cpp</in>
+        <in>plugin-test.cpp</in>
+        <in>verify-test.cpp</in>
+      </df>
+      <df name="fdbmonitor">
+        <in>fdbmonitor.cpp</in>
+      </df>
+      <df name="fdbrpc">
+        <df name="libcoroutine">
+          <in>Common.c</in>
+          <in>Coro.c</in>
+          <in>context.c</in>
+        </df>
+        <df name="libeio">
+          <in>eio.c</in>
+        </df>
+        <df name="zlib">
+          <in>adler32.c</in>
+          <in>crc32.c</in>
+          <in>deflate.c</in>
+          <in>gzclose.c</in>
+          <in>gzlib.c</in>
+          <in>gzread.c</in>
+          <in>gzwrite.c</in>
+          <in>infback.c</in>
+          <in>inffast.c</in>
+          <in>inflate.c</in>
+          <in>inftrees.c</in>
+          <in>trees.c</in>
+          <in>zutil.c</in>
+        </df>
+        <in>ActorFuzz.actor.cpp</in>
+        <in>AsyncFileCached.actor.cpp</in>
+        <in>AsyncFileNonDurable.actor.cpp</in>
+        <in>AsyncFileWriteChecker.cpp</in>
+        <in>FailureMonitor.actor.cpp</in>
+        <in>FlowTests.actor.cpp</in>
+        <in>FlowTransport.actor.cpp</in>
+        <in>IAsyncFile.actor.cpp</in>
+        <in>Locality.cpp</in>
+        <in>Net2FileSystem.cpp</in>
+        <in>Platform.cpp</in>
+        <in>QueueModel.cpp</in>
+        <in>Replication.cpp</in>
+        <in>ReplicationPolicy.cpp</in>
+        <in>ReplicationTypes.cpp</in>
+        <in>ReplicationUtils.cpp</in>
+        <in>TraceFileIO.cpp</in>
+        <in>crc32c.cpp</in>
+        <in>dsltest.actor.cpp</in>
+        <in>genericactors.actor.cpp</in>
+        <in>sim2.actor.cpp</in>
+        <in>sim_validation.cpp</in>
+      </df>
+      <df name="fdbserver">
+        <df name="sqlite">
+          <in>btree.c</in>
+          <in>shell.c</in>
+          <in>sqlite3.amalgamation.c</in>
+        </df>
+        <df name="workloads">
+          <in>ApiCorrectness.actor.cpp</in>
+          <in>ApiWorkload.actor.cpp</in>
+          <in>AsyncFile.cpp</in>
+          <in>AsyncFileCorrectness.actor.cpp</in>
+          <in>AsyncFileRead.actor.cpp</in>
+          <in>AsyncFileWrite.actor.cpp</in>
+          <in>AtomicOps.actor.cpp</in>
+          <in>AtomicOpsApiCorrectness.actor.cpp</in>
+          <in>AtomicRestore.actor.cpp</in>
+          <in>AtomicSwitchover.actor.cpp</in>
+          <in>BackgroundSelectors.actor.cpp</in>
+          <in>BackupAndParallelRestoreCorrectness.actor.cpp</in>
+          <in>BackupCorrectness.actor.cpp</in>
+          <in>BackupToDBAbort.actor.cpp</in>
+          <in>BackupToDBCorrectness.actor.cpp</in>
+          <in>BackupToDBUpgrade.actor.cpp</in>
+          <in>BulkLoad.actor.cpp</in>
+          <in>ChangeConfig.actor.cpp</in>
+          <in>ClientTransactionProfileCorrectness.actor.cpp</in>
+          <in>CommitBugCheck.actor.cpp</in>
+          <in>ConfigureDatabase.actor.cpp</in>
+          <in>ConflictRange.actor.cpp</in>
+          <in>ConsistencyCheck.actor.cpp</in>
+          <in>CpuProfiler.actor.cpp</in>
+          <in>Cycle.actor.cpp</in>
+          <in>DDBalance.actor.cpp</in>
+          <in>DDMetrics.actor.cpp</in>
+          <in>DDMetricsExclude.actor.cpp</in>
+          <in>DifferentClustersSameRV.actor.cpp</in>
+          <in>DiskDurability.actor.cpp</in>
+          <in>DiskDurabilityTest.actor.cpp</in>
+          <in>DummyWorkload.actor.cpp</in>
+          <in>ExternalWorkload.actor.cpp</in>
+          <in>FastTriggeredWatches.actor.cpp</in>
+          <in>FileSystem.actor.cpp</in>
+          <in>Fuzz.cpp</in>
+          <in>FuzzApiCorrectness.actor.cpp</in>
+          <in>Increment.actor.cpp</in>
+          <in>IndexScan.actor.cpp</in>
+          <in>Inventory.actor.cpp</in>
+          <in>KVStoreTest.actor.cpp</in>
+          <in>KillRegion.actor.cpp</in>
+          <in>LocalRatekeeper.actor.cpp</in>
+          <in>LockDatabase.actor.cpp</in>
+          <in>LogMetrics.actor.cpp</in>
+          <in>LowLatency.actor.cpp</in>
+          <in>MachineAttrition.actor.cpp</in>
+          <in>Mako.actor.cpp</in>
+          <in>MemoryKeyValueStore.cpp</in>
+          <in>MemoryLifetime.actor.cpp</in>
+          <in>MetricLogging.actor.cpp</in>
+          <in>ParallelRestore.actor.cpp</in>
+          <in>Performance.actor.cpp</in>
+          <in>Ping.actor.cpp</in>
+          <in>PubSubMultiples.actor.cpp</in>
+          <in>QueuePush.actor.cpp</in>
+          <in>RYWDisable.actor.cpp</in>
+          <in>RYWPerformance.actor.cpp</in>
+          <in>RandomClogging.actor.cpp</in>
+          <in>RandomMoveKeys.actor.cpp</in>
+          <in>RandomSelector.actor.cpp</in>
+          <in>ReadWrite.actor.cpp</in>
+          <in>RemoveServersSafely.actor.cpp</in>
+          <in>Rollback.actor.cpp</in>
+          <in>RyowCorrectness.actor.cpp</in>
+          <in>SaveAndKill.actor.cpp</in>
+          <in>SelectorCorrectness.actor.cpp</in>
+          <in>Serializability.actor.cpp</in>
+          <in>Sideband.actor.cpp</in>
+          <in>SlowTaskWorkload.actor.cpp</in>
+          <in>SnapTest.actor.cpp</in>
+          <in>StatusWorkload.actor.cpp</in>
+          <in>Storefront.actor.cpp</in>
+          <in>StreamingRead.actor.cpp</in>
+          <in>SuspendProcesses.actor.cpp</in>
+          <in>TargetedKill.actor.cpp</in>
+          <in>TaskBucketCorrectness.actor.cpp</in>
+          <in>ThreadSafety.actor.cpp</in>
+          <in>Throttling.actor.cpp</in>
+          <in>Throughput.actor.cpp</in>
+          <in>TimeKeeperCorrectness.actor.cpp</in>
+          <in>TriggerRecovery.actor.cpp</in>
+          <in>UnitPerf.actor.cpp</in>
+          <in>UnitTests.actor.cpp</in>
+          <in>Unreadable.actor.cpp</in>
+          <in>VersionStamp.actor.cpp</in>
+          <in>WatchAndWait.actor.cpp</in>
+          <in>Watches.actor.cpp</in>
+          <in>WorkerErrors.actor.cpp</in>
+          <in>WriteBandwidth.actor.cpp</in>
+          <in>WriteDuringRead.actor.cpp</in>
+        </df>
+        <in>ApplyMetadataMutation.cpp</in>
+        <in>BackupProgress.actor.cpp</in>
+        <in>BackupWorker.actor.cpp</in>
+        <in>ClusterController.actor.cpp</in>
+        <in>CompactMap.cpp</in>
+        <in>CoordinatedState.actor.cpp</in>
+        <in>Coordination.actor.cpp</in>
+        <in>CoroFlow.actor.cpp</in>
+        <in>DataDistribution.actor.cpp</in>
+        <in>DataDistributionQueue.actor.cpp</in>
+        <in>DataDistributionTracker.actor.cpp</in>
+        <in>DiskQueue.actor.cpp</in>
+        <in>FDBExecHelper.actor.cpp</in>
+        <in>KeyValueStoreCompressTestData.actor.cpp</in>
+        <in>KeyValueStoreMemory.actor.cpp</in>
+        <in>KeyValueStoreSQLite.actor.cpp</in>
+        <in>Knobs.cpp</in>
+        <in>LatencyBandConfig.cpp</in>
+        <in>LeaderElection.actor.cpp</in>
+        <in>LogRouter.actor.cpp</in>
+        <in>LogSystemDiskQueueAdapter.actor.cpp</in>
+        <in>LogSystemPeekCursor.actor.cpp</in>
+        <in>MasterProxyServer.actor.cpp</in>
+        <in>MoveKeys.actor.cpp</in>
+        <in>OldTLogServer_4_6.actor.cpp</in>
+        <in>OldTLogServer_6_0.actor.cpp</in>
+        <in>OldTLogServer_6_2.actor.cpp</in>
+        <in>QuietDatabase.actor.cpp</in>
+        <in>Ratekeeper.actor.cpp</in>
+        <in>Resolver.actor.cpp</in>
+        <in>RestoreApplier.actor.cpp</in>
+        <in>RestoreCommon.actor.cpp</in>
+        <in>RestoreLoader.actor.cpp</in>
+        <in>RestoreMaster.actor.cpp</in>
+        <in>RestoreRoleCommon.actor.cpp</in>
+        <in>RestoreUtil.actor.cpp</in>
+        <in>RestoreWorker.actor.cpp</in>
+        <in>SimulatedCluster.actor.cpp</in>
+        <in>SkipList.cpp</in>
+        <in>Status.actor.cpp</in>
+        <in>StorageCache.actor.cpp</in>
+        <in>TLogServer.actor.cpp</in>
+        <in>TagPartitionedLogSystem.actor.cpp</in>
+        <in>VFSAsync.cpp</in>
+        <in>VersionedBTree.actor.cpp</in>
+        <in>WaitFailure.actor.cpp</in>
+        <in>fdbserver.actor.cpp</in>
+        <in>masterserver.actor.cpp</in>
+        <in>networktest.actor.cpp</in>
+        <in>pubsub.actor.cpp</in>
+        <in>storageserver.actor.cpp</in>
+        <in>tester.actor.cpp</in>
+        <in>worker.actor.cpp</in>
+      </df>
+      <df name="fdbservice">
+        <in>FDBService.cpp</in>
+        <in>ServiceBase.cpp</in>
+      </df>
+      <df name="flow">
+        <in>ActorCollection.actor.cpp</in>
+        <in>Arena.cpp</in>
+        <in>CompressedInt.actor.cpp</in>
+        <in>Deque.cpp</in>
+        <in>DeterministicRandom.cpp</in>
+        <in>Error.cpp</in>
+        <in>FastAlloc.cpp</in>
+        <in>FaultInjection.cpp</in>
+        <in>FileTraceLogWriter.cpp</in>
+        <in>Hash3.c</in>
+        <in>Histogram.cpp</in>
+        <in>IThreadPool.cpp</in>
+        <in>IndexedSet.cpp</in>
+        <in>JsonTraceLogFormatter.cpp</in>
+        <in>Knobs.cpp</in>
+        <in>Net2.actor.cpp</in>
+        <in>Net2Packet.cpp</in>
+        <in>Platform.cpp</in>
+        <in>Profiler.actor.cpp</in>
+        <in>SignalSafeUnwind.cpp</in>
+        <in>Stats.actor.cpp</in>
+        <in>SystemMonitor.cpp</in>
+        <in>TDMetric.cpp</in>
+        <in>TLSConfig.actor.cpp</in>
+        <in>ThreadHelper.cpp</in>
+        <in>ThreadPrimitives.cpp</in>
+        <in>Trace.cpp</in>
+        <in>UnitTest.cpp</in>
+        <in>XmlTraceLogFormatter.cpp</in>
+        <in>crc32c-generated-constants.cpp</in>
+        <in>crc32c.cpp</in>
+        <in>flat_buffers.cpp</in>
+        <in>flow.cpp</in>
+        <in>genericactors.actor.cpp</in>
+        <in>network.cpp</in>
+        <in>serialize.cpp</in>
+        <in>stacktrace.amalgamation.cpp</in>
+        <in>version.cpp</in>
+        <in>xxhash.c</in>
+      </df>
+      <df name="monitoring">
+        <in>actor_flamegraph.cpp</in>
+      </df>
+    </df>
+    <logicalFolder name="Modules"
+                   displayName="Modules"
+                   projectFiles="true"
+                   root="/usr/share/cmake/Modules">
+      <itemPath>/usr/share/cmake/Modules/CMakeCCompilerABI.c</itemPath>
+      <itemPath>/usr/share/cmake/Modules/CMakeCXXCompilerABI.cpp</itemPath>
+      <itemPath>/usr/share/cmake/Modules/CMakeCompilerABI.h</itemPath>
+      <itemPath>/usr/share/cmake/Modules/CheckFunctionExists.c</itemPath>
+    </logicalFolder>
+    <logicalFolder name="workflows"
+                   displayName="workflows"
+                   projectFiles="true"
+                   root=".github/workflows">
+      <itemPath>.github/workflows/build.yml</itemPath>
+    </logicalFolder>
+    <logicalFolder name="ExternalFiles"
+                   displayName="Важные файлы"
+                   projectFiles="false"
+                   kind="IMPORTANT_FILES_FOLDER">
+      <itemPath>bld/Makefile</itemPath>
+      <itemPath>nbproject/private/launcher.properties</itemPath>
+    </logicalFolder>
+  </logicalFolder>
+  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
+  <sourceRootList>
+    <Elem>.</Elem>
+  </sourceRootList>
+  <projectmakefile>bld/Makefile</projectmakefile>
+  <confs>
+    <conf name="Default" type="0">
+      <toolsSet>
+        <compilerSet>GNU|GNU</compilerSet>
+        <dependencyChecking>false</dependencyChecking>
+        <rebuildPropChanged>false</rebuildPropChanged>
+      </toolsSet>
+      <flagsDictionary>
+        <element flagsID="0" commonFlags="-O2 -fPIC -fPIC -std=gnu++17"/>
+        <element flagsID="1" commonFlags="-O2 -fPIC -std=gnu++17"/>
+        <element flagsID="2" commonFlags="-O2 -fPIC -std=gnu++17 -msse4.2 -mpclmul"/>
+        <element flagsID="3" commonFlags="-O2 -ggdb -fPIC"/>
+        <element flagsID="4" commonFlags="-O2 -ggdb -fPIC -std=gnu11"/>
+        <element flagsID="5" commonFlags="-fPIE"/>
+        <element flagsID="6"
+                 commonFlags="-mtune=generic -march=x86-64 -O2 -std=gnu++17 -fPIC"/>
+        <element flagsID="7" commonFlags="-std=c++14"/>
+      </flagsDictionary>
+      <codeAssistance>
+        <resolveSymbolicLinks>true</resolveSymbolicLinks>
+      </codeAssistance>
+      <makefileType>
+        <makeTool>
+          <buildCommandWorkingDir>bld</buildCommandWorkingDir>
+          <buildCommand>ninja</buildCommand>
+          <cleanCommand>ninja clean</cleanCommand>
+          <executablePath></executablePath>
+        </makeTool>
+        <preBuild>
+          <preBuildCommandWorkingDir>bld</preBuildCommandWorkingDir>
+          <preBuildCommand>cmake -DCMAKE_CXX_STANDARD_LIBRARIES="-lz" -DBUILD_VERSION=0.os.1 -G Ninja ..</preBuildCommand>
+        </preBuild>
+      </makefileType>
+      <item path="/usr/share/cmake/Modules/CMakeCCompilerABI.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="/usr/share/cmake/Modules/CMakeCXXCompilerABI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="5">
+        </ccTool>
+      </item>
+      <item path="/usr/share/cmake/Modules/CheckFunctionExists.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+        <cTool flags="5">
+          <preprocessorList>
+            <Elem>CHECK_FUNCTION_EXISTS=pthread_create</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="FDBLibTLS/FDBLibTLSPlugin.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="FDBLibTLS/FDBLibTLSPolicy.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="FDBLibTLS/FDBLibTLSSession.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="FDBLibTLS/FDBLibTLSVerify.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="FDBLibTLS/plugin-test.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="FDBLibTLS/verify-test.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bindings/c/ThreadCleanup.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>fdb_c_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bindings/c/fdb_c.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>fdb_c_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bindings/c/test/mako/mako.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="bindings/c/test/mako/utils.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="bindings/c/test/mako/zipf.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="3">
+          <incDir>
+            <pElem>fdbclient</pElem>
+            <pElem>bld/fdbclient</pElem>
+            <pElem>fdbrpc</pElem>
+            <pElem>bld/fdbrpc</pElem>
+            <pElem>flow</pElem>
+            <pElem>bld/flow</pElem>
+            <pElem>flow/-lpthread</pElem>
+            <pElem>bld/boostProject-prefix/src/boostProject</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FDB_CLEAN_BUILD</Elem>
+            <Elem>FDB_RELEASE</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_ATEXIT</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="bindings/c/test/performance_test.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="4">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="bindings/c/test/ryw_benchmark.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="bindings/c/test/txn_size_test.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="bindings/c/test/workloads/SimpleWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="0">
+        </ccTool>
+      </item>
+      <item path="bindings/c/test/workloads/workloads.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="0">
+        </ccTool>
+      </item>
+      <item path="bindings/flow/DirectoryLayer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bindings/flow/DirectorySubspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/flow</pElem>
+            <pElem>bindings/flow</pElem>
+            <pElem>bindings/flow/tester</pElem>
+            <pElem>bld/bindings/flow/tester</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bindings/flow/HighContentionAllocator.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bindings/flow/Node.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bindings/flow/Subspace.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/flow</pElem>
+            <pElem>bindings/flow</pElem>
+            <pElem>bindings/flow/tester</pElem>
+            <pElem>bld/bindings/flow/tester</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bindings/flow/Tuple.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/flow</pElem>
+            <pElem>bindings/flow</pElem>
+            <pElem>bindings/flow/tester</pElem>
+            <pElem>bld/bindings/flow/tester</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bindings/flow/fdb_flow.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bindings/flow/tester/DirectoryTester.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bindings/flow/tester/Tester.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bindings/java/JavaWorkload.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>java_workloads_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bindings/java/fdbJNI.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>fdb_java_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/CMakeFiles/3.17.1/CompilerIdC/CMakeCCompilerId.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="bld/CMakeFiles/3.17.1/CompilerIdCXX/CMakeCXXCompilerId.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bld/bindings/flow/DirectoryLayer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/bindings/flow/HighContentionAllocator.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/bindings/flow/Node.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/bindings/flow/fdb_flow.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/bindings/flow/tester/DirectoryTester.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/bindings/flow/tester/Tester.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/documentation/tutorial/tutorial.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbbackup/FileConverter.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbbackup/FileDecoder.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbbackup/backup.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbcli/FlowLineNoise.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbcli/fdbcli.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/AsyncFileBlobStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/BackupAgentBase.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/BackupContainer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/BlobStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/DatabaseBackupAgent.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/FDBOptions.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/FailureMonitorClient.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>fdbclient</pElem>
+            <pElem>bld/fdbclient</pElem>
+            <pElem>fdbrpc</pElem>
+            <pElem>bld/fdbrpc</pElem>
+            <pElem>flow</pElem>
+            <pElem>bld/flow</pElem>
+            <pElem>flow/-lpthread</pElem>
+            <pElem>bld/boostProject-prefix/src/boostProject</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FDB_CLEAN_BUILD</Elem>
+            <Elem>FDB_RELEASE</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_ATEXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/FileBackupAgent.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/HTTP.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/KeyRangeMap.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/ManagementAPI.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/MetricLogger.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/MonitorLeader.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/MultiVersionTransaction.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/NativeAPI.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/ReadYourWrites.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/SpecialKeySpace.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/StatusClient.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/TagThrottle.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/TaskBucket.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbclient/ThreadSafeTransaction.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/ActorFuzz.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/AsyncFileCached.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/AsyncFileNonDurable.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/FailureMonitor.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/FlowTests.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/FlowTransport.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/HealthMonitor.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/IAsyncFile.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/Stats.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/dsltest.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/genericactors.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbrpc/sim2.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/BackupProgress.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/BackupWorker.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/ClusterController.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/CoordinatedState.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/Coordination.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/CoroFlow.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/DataDistribution.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/DataDistributionQueue.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/DataDistributionTracker.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/DiskQueue.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/FDBExecHelper.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/KeyValueStoreCompressTestData.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/KeyValueStoreMemory.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/KeyValueStoreRocksDB.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/KeyValueStoreSQLite.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/LeaderElection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/LogRouter.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/LogSystemDiskQueueAdapter.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/LogSystemPeekCursor.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/MasterProxyServer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/MoveKeys.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/OldTLogServer_4_6.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/OldTLogServer_6_0.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/OldTLogServer_6_2.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/QuietDatabase.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/Ratekeeper.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/Resolver.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/Restore.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>fdbserver</pElem>
+            <pElem>bld/fdbserver</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>fdbclient</pElem>
+            <pElem>bld/fdbclient</pElem>
+            <pElem>fdbrpc</pElem>
+            <pElem>bld/fdbrpc</pElem>
+            <pElem>flow</pElem>
+            <pElem>bld/flow</pElem>
+            <pElem>flow/-lpthread</pElem>
+            <pElem>bld/boostProject-prefix/src/boostProject</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>FDB_CLEAN_BUILD</Elem>
+            <Elem>FDB_RELEASE</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_ATEXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/RestoreApplier.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/RestoreCommon.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/RestoreController.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/RestoreLoader.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/RestoreMaster.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="6">
+          <incDir>
+            <pElem>/usr/include/boost/variant</pElem>
+            <pElem>/usr/include/boost/system</pElem>
+            <pElem>/usr/include/boost/system/detail</pElem>
+            <pElem>/usr/include/boost/asio/impl</pElem>
+            <pElem>flow</pElem>
+            <pElem>fdbrpc</pElem>
+            <pElem>fdbclient</pElem>
+            <pElem>fdbserver</pElem>
+            <pElem>/usr/include/boost/asio/detail</pElem>
+            <pElem>/usr/include/boost/asio</pElem>
+            <pElem>/usr/include/c++/10/bits</pElem>
+            <pElem>/usr/include/c++/10/ext</pElem>
+            <pElem>bld/fdbserver</pElem>
+            <pElem>bld/flow</pElem>
+            <pElem>bld/fdbclient</pElem>
+            <pElem>bld/fdbrpc</pElem>
+            <pElem>/usr/include/c++/10</pElem>
+            <pElem>/usr/include/boost/variant/detail</pElem>
+            <pElem>/usr/include/boost/exception</pElem>
+            <pElem>/usr/include/boost/asio/detail/impl</pElem>
+            <pElem>/usr/include/boost/type_traits</pElem>
+            <pElem>/usr/include/boost</pElem>
+            <pElem>/usr/include/boost/move</pElem>
+            <pElem>/usr/include/boost/optional</pElem>
+            <pElem>/usr/include/boost/spirit/home/classic/core/primitives</pElem>
+            <pElem>/usr/include/boost/spirit/home/classic/core/composite</pElem>
+            <pElem>/usr/include/boost/spirit/home/classic/meta</pElem>
+            <pElem>/usr/include/c++/10/x86_64-redhat-linux/bits</pElem>
+            <pElem>/usr/include/c++/10/debug</pElem>
+            <pElem>/usr/lib/gcc/x86_64-redhat-linux/10/include</pElem>
+            <pElem>/usr/include/c++/10/pstl</pElem>
+            <pElem>/usr/include/boost/config/detail</pElem>
+            <pElem>/usr/include/boost/core</pElem>
+            <pElem>/usr/include/boost/mpl/aux_</pElem>
+            <pElem>/usr/include/boost/mpl</pElem>
+            <pElem>/usr/include/boost/mpl/aux_/preprocessed/gcc</pElem>
+            <pElem>/usr/include/boost/mpl/list/aux_</pElem>
+            <pElem>/usr/include/boost/type_index</pElem>
+            <pElem>/usr/include/boost/function</pElem>
+            <pElem>/usr/include/boost/detail</pElem>
+            <pElem>/usr/include/boost/type_traits/detail</pElem>
+            <pElem>/usr/include/boost/move/detail</pElem>
+            <pElem>/usr/include/boost/integer</pElem>
+            <pElem>/usr/include/boost/asio/generic/detail</pElem>
+            <pElem>/usr/include/boost/asio/ip</pElem>
+            <pElem>/usr/include/boost/asio/ip/detail</pElem>
+            <pElem>/usr/include/boost/asio/local/detail</pElem>
+            <pElem>/usr/include/boost/asio/posix</pElem>
+            <pElem>/usr/include/boost/date_time</pElem>
+            <pElem>/usr/include/boost/date_time/gregorian</pElem>
+            <pElem>/usr/include/boost/date_time/posix_time</pElem>
+            <pElem>/usr/include/boost/numeric/conversion/detail</pElem>
+            <pElem>/usr/include/boost/numeric/conversion</pElem>
+            <pElem>/usr/include/boost/bind</pElem>
+            <pElem>/usr/include/boost/regex/v4</pElem>
+            <pElem>/usr/include/boost/spirit/home/classic/core</pElem>
+            <pElem>/usr/include/boost/spirit/home/classic/meta/impl</pElem>
+            <pElem>/usr/include/boost/spirit/home/classic/utility/impl</pElem>
+            <pElem>/usr/include/boost/spirit/home/classic/utility</pElem>
+            <pElem>/usr/include/boost/spirit/home/classic/iterator</pElem>
+            <pElem>/usr/include/boost/optional/detail</pElem>
+            <pElem>/usr/include/boost/iterator</pElem>
+            <pElem>/usr/include/boost/concept/detail</pElem>
+            <pElem>/usr/include/boost/range</pElem>
+            <pElem>/usr/include/boost/range/detail</pElem>
+            <pElem>fdbclient/json_spirit</pElem>
+            <pElem>/usr/include/c++/10/x86_64-redhat-linux</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/RestoreRoleCommon.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/RestoreUtil.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/RestoreWorker.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/SimulatedCluster.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/Status.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/StorageCache.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/TLogServer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/TagPartitionedLogSystem.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/VersionedBTree.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/WaitFailure.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/fdbserver.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/masterserver.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/networktest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/pubsub.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb-build/CMakeFiles/3.19.7/CompilerIdC/CMakeCCompilerId.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb-build/CMakeFiles/3.19.7/CompilerIdCXX/CMakeCXXCompilerId.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb-build/build_version.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/util</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/gtest-1.8.1/fused-src</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/clock_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/lru_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/sharded_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/arena_wrapped_db_iter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_addition.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_garbage.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_meta.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/c.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/column_family.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compacted_db_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_job.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker_fifo.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker_level.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker_universal.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/convenience.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_filesnapshot.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_compaction_flush.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_debug.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_experimental.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_files.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_open.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_readonly.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_secondary.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_write.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_info_dumper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_iter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/dbformat.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/error_handler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/event_helpers.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/experimental.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/external_sst_file_ingestion_job.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/file_indexer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/flush_job.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/flush_scheduler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/forward_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/import_column_family_job.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/internal_stats.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/log_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/log_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/logs_with_prep_tracker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/malloc_stats.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/memtable.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/memtable_list.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/merge_helper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/merge_operator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/range_del_aggregator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/range_tombstone_fragmenter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/repair.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/snapshot_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/table_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/table_properties_collector.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/transaction_log_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/trim_history_scheduler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_edit.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_edit_handler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_set.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/wal_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_batch.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_batch_base.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_controller.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_thread.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_chroot.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_encryption.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_hdfs.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_posix.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/file_system.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/fs_posix.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/io_posix.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/env/mock_env.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/delete_scheduler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/file_prefetch_buffer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/file_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/filename.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/random_access_file_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/read_write_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/readahead_raf.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/sequence_file_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/sst_file_manager_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/file/writable_file_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/auto_roll_logger.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/event_logger.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/log_buffer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/arena.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/concurrent_arena.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/jemalloc_nodump_allocator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/memkind_kmem_allocator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/alloc_tracker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/hash_linklist_rep.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/hash_skiplist_rep.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/skiplistrep.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/vectorrep.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/write_buffer_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/histogram.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/histogram_windowing.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/in_memory_stats_history.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/instrumented_mutex.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/iostats_context.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/perf_context.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/perf_level.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/persistent_stats_history.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/statistics.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_updater.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_util_debug.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/options/cf_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/options/db_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/options/options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/options/options_helper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/options/options_parser.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/port/port_posix.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/port/stack_trace.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/adaptive/adaptive_table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/binary_search_index_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_filter_block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_prefetcher.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_prefix_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/data_block_footer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/data_block_hash_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/filter_block_reader_common.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/filter_policy.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/flush_block_policy.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/full_filter_block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/hash_index_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/index_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/index_reader_common.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/parsed_full_filter_block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/partitioned_filter_block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/partitioned_index_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/partitioned_index_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/reader_common.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/uncompression_dict_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_fetcher.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cuckoo/cuckoo_table_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cuckoo/cuckoo_table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cuckoo/cuckoo_table_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/format.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/get_context.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/merging_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/meta_blocks.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/persistent_cache_helper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_bloom.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_key_coding.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/sst_file_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/sst_file_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/table_properties.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/table/two_level_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/sync_point.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/sync_point_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/testutil.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/transaction_test_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/detail/Futex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/AtomicNotification.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/DistributedMutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/ParkingLot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/WaitOptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/block_cache_analyzer/block_cache_trace_analyzer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/dump/db_dump_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/ldb_cmd.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/ldb_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/sst_dump_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/trace_analyzer_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/block_cache_tracer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/trace_replay.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/coding.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/compaction_job_stats_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/comparator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/compression_context_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/concurrent_task_limiter_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/crc32c.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="2">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/dynamic_bloom.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/file_checksum_helper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/hash.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/murmurhash.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/random.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/rate_limiter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/slice.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/status.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/string_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/thread_local.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/threadpool_imp.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/util/xxhash.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/backupable/backupable_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_compaction_filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_db_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_db_impl_filesnapshot.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_dump_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_file.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_log_format.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_log_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_log_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/cassandra_compaction_filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/format.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/merge_operator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/checkpoint/checkpoint_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/debug.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/env_mirror.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/env_timed.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/leveldb_options/leveldb_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/memory/memory_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/bytesxor.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/max.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/put.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/sortlist.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/string_append/stringappend.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/string_append/stringappend2.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/uint64add.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/object_registry.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/option_change_migration/option_change_migration.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/options/options_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/block_cache_tier.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/persistent_cache_tier.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/volatile_tier_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/simulator_cache/cache_simulator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/simulator_cache/sim_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/table_properties_collectors/compact_on_deletion_collector.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/trace/file_trace_reader_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/optimistic_transaction.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/optimistic_transaction_db_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/pessimistic_transaction.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/pessimistic_transaction_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/snapshot_checker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/transaction_base.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/transaction_db_mutex_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/transaction_lock_mgr.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/transaction_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_prepared_txn.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_prepared_txn_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_unprepared_txn.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_unprepared_txn_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/ttl/db_ttl_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/storageserver.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/tester.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/worker.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ApiCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ApiWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/AsyncFileCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/AsyncFileRead.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/AsyncFileWrite.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/AtomicOps.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/AtomicOpsApiCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/AtomicRestore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/AtomicSwitchover.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/BackgroundSelectors.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/BackupCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/BackupToDBAbort.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/BackupToDBCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/BackupToDBUpgrade.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/BulkLoad.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ChangeConfig.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ClientTransactionProfileCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/CommitBugCheck.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ConfigureDatabase.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ConflictRange.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ConsistencyCheck.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/CpuProfiler.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Cycle.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/DDBalance.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/DDMetrics.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/DDMetricsExclude.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/DataDistributionMetrics.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/DifferentClustersSameRV.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/DiskDurability.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/DiskDurabilityTest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Downgrade.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/DummyWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ExternalWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/FastTriggeredWatches.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/FileSystem.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/FuzzApiCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Increment.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/IncrementalBackup.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/IndexScan.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Inventory.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/KVStoreTest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/KillRegion.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/LocalRatekeeper.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/LockDatabase.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/LockDatabaseFrequently.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/LogMetrics.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/LowLatency.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/MachineAttrition.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Mako.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/MemoryLifetime.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/MetricLogging.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ParallelRestore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Performance.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Ping.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/PopulateTPCC.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/PubSubMultiples.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/QueuePush.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/RYWDisable.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/RYWPerformance.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/RandomClogging.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/RandomMoveKeys.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/RandomSelector.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ReadHotDetection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ReadWrite.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/RemoveServersSafely.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ReportConflictingKeys.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Rollback.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/RyowCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/SaveAndKill.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/SelectorCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Serializability.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Sideband.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/SlowTaskWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/SnapTest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/StatusWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Storefront.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/StreamingRead.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/SuspendProcesses.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/TPCC.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/TagThrottleApi.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/TargetedKill.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/TaskBucketCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/ThreadSafety.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Throttling.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Throughput.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/TimeKeeperCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/TriggerRecovery.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/UnitPerf.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/UnitTests.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Unreadable.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/VersionStamp.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/WatchAndWait.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/Watches.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/WorkerErrors.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/WriteBandwidth.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/fdbserver/workloads/WriteDuringRead.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="bld/flow/ActorCollection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/flow/CompressedInt.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/flow/Net2.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/flow/Profiler.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/flow/Stats.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="6">
+          <incDir>
+            <pElem>/usr/include/boost/system</pElem>
+            <pElem>/usr/include/boost/system/detail</pElem>
+            <pElem>/usr/include/boost/asio/impl</pElem>
+            <pElem>flow</pElem>
+            <pElem>/usr/include/boost/asio/detail</pElem>
+            <pElem>/usr/include/boost/asio</pElem>
+            <pElem>bld/flow</pElem>
+            <pElem>/usr/include/c++/10/bits</pElem>
+            <pElem>/usr/include/c++/10/ext</pElem>
+            <pElem>/usr/include/boost/asio/detail/impl</pElem>
+            <pElem>/usr/include/c++/10</pElem>
+            <pElem>/usr/include/c++/10/x86_64-redhat-linux/bits</pElem>
+            <pElem>/usr/include/c++/10/debug</pElem>
+            <pElem>/usr/lib/gcc/x86_64-redhat-linux/10/include</pElem>
+            <pElem>/usr/include/c++/10/pstl</pElem>
+            <pElem>/usr/include/boost/config/detail</pElem>
+            <pElem>/usr/include/boost/exception</pElem>
+            <pElem>/usr/include/boost/core</pElem>
+            <pElem>/usr/include/boost/type_traits</pElem>
+            <pElem>/usr/include/boost/mpl/aux_</pElem>
+            <pElem>/usr/include/boost/mpl</pElem>
+            <pElem>/usr/include/boost/mpl/aux_/preprocessed/gcc</pElem>
+            <pElem>/usr/include/boost/mpl/list/aux_</pElem>
+            <pElem>/usr/include/boost/type_index</pElem>
+            <pElem>/usr/include/boost</pElem>
+            <pElem>/usr/include/boost/variant/detail</pElem>
+            <pElem>/usr/include/boost/variant</pElem>
+            <pElem>/usr/include/boost/type_traits/detail</pElem>
+            <pElem>/usr/include/boost/move</pElem>
+            <pElem>/usr/include/boost/integer</pElem>
+            <pElem>/usr/include/boost/asio/generic/detail</pElem>
+            <pElem>/usr/include/boost/asio/ip</pElem>
+            <pElem>/usr/include/boost/asio/ip/detail</pElem>
+            <pElem>/usr/include/boost/asio/local/detail</pElem>
+            <pElem>/usr/include/boost/asio/posix</pElem>
+            <pElem>/usr/include/boost/date_time</pElem>
+            <pElem>/usr/include/boost/date_time/gregorian</pElem>
+            <pElem>/usr/include/boost/date_time/posix_time</pElem>
+            <pElem>/usr/include/boost/numeric/conversion/detail</pElem>
+            <pElem>/usr/include/boost/numeric/conversion</pElem>
+            <pElem>/usr/include/boost/regex/v4</pElem>
+            <pElem>/usr/include/c++/10/x86_64-redhat-linux</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/flow/TLSConfig.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="bld/flow/genericactors.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="build/cmake/package_tester/fdb_c_app/app.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="contrib/monitoring/actor_flamegraph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="documentation/tutorial/tutorial.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <folder path="0/bindings">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/bindings/c">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bindings/c/test">
+        <ccTool>
+          <preprocessorList>
+            <Elem>c_workloads_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bindings/java">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>/usr/lib/jvm/java/include</pElem>
+            <pElem>/usr/lib/jvm/java/include/linux</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/CMakeFiles">
+        <ccTool>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/bindings">
+        <ccTool>
+          <incDir>
+            <pElem>bld/bindings/flow</pElem>
+            <pElem>bindings/flow</pElem>
+            <pElem>bindings/flow/tester</pElem>
+            <pElem>bld/bindings/flow/tester</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/documentation">
+        <ccTool>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbbackup">
+        <ccTool>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbcli">
+        <ccTool>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbclient">
+        <ccTool>
+          <preprocessorList>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbrpc">
+        <ccTool>
+          <incDir>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/gtest-1.8.1/fused-src</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/workloads">
+        <ccTool>
+          <incDir>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/contrib">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/fdbcli">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/fdbclient">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/fdbclient/sha1">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/fdbmonitor">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/fdbrpc">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/flow">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/monitoring">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/monitoring</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>FDB_CLEAN_BUILD</Elem>
+            <Elem>FDB_RELEASE</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_ATEXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="Modules">
+        <cTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build/CMakeFiles/CMakeTmp</pElem>
+          </incDir>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build/CMakeFiles/CMakeTmp</pElem>
+          </incDir>
+        </ccTool>
+      </folder>
+      <item path="fdbbackup/FileConverter.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbbackup/FileDecoder.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbbackup/backup.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbcli/FlowLineNoise.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbcli/fdbcli.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbcli/linenoise/linenoise.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbclient/AsyncFileBlobStore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/AutoPublicAddress.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/BackupAgentBase.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/BackupContainer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/BlobStore.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/DatabaseBackupAgent.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/DatabaseConfiguration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/FileBackupAgent.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/HTTP.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/JsonBuilder.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/KeyRangeMap.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/Knobs.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/ManagementAPI.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/MetricLogger.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/MonitorLeader.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/MultiVersionTransaction.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/NativeAPI.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/RYWIterator.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/ReadYourWrites.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/Schemas.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/StatusClient.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/Subspace.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/SystemData.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/TaskBucket.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/ThreadSafeTransaction.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbclient/Tuple.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/VersionedMap.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbclient/libb64/cdecode.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbclient/libb64/cencode.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbclient/md5/md5.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbclient/sha1/SHA1.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="fdbclient/zipf.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbmonitor/fdbmonitor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/ActorFuzz.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/AsyncFileCached.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/AsyncFileNonDurable.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/AsyncFileWriteChecker.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/FailureMonitor.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/FlowTests.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/FlowTransport.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/IAsyncFile.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/Locality.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/Net2FileSystem.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/Platform.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc</pElem>
+            <pElem>bld/fdbrpc</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>flow</pElem>
+            <pElem>bld/flow</pElem>
+            <pElem>flow/-lpthread</pElem>
+            <pElem>bld/boostProject-prefix/src/boostProject</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>FDB_CLEAN_BUILD</Elem>
+            <Elem>FDB_RELEASE</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_ATEXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/QueueModel.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/Replication.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/ReplicationPolicy.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/ReplicationTypes.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/ReplicationUtils.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/TraceFileIO.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/crc32c.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc</pElem>
+            <pElem>bld/fdbrpc</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>flow</pElem>
+            <pElem>bld/flow</pElem>
+            <pElem>flow/-lpthread</pElem>
+            <pElem>bld/boostProject-prefix/src/boostProject</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>FDB_CLEAN_BUILD</Elem>
+            <Elem>FDB_RELEASE</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_ATEXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/dsltest.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/genericactors.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/libcoroutine/Common.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/libcoroutine/Coro.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/libcoroutine/context.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/libeio/eio.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/sim2.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbrpc/sim_validation.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbrpc/zlib/adler32.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/crc32.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/deflate.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/gzclose.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/gzlib.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/gzread.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/gzwrite.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/infback.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/inffast.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/inflate.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/inftrees.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/trees.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbrpc/zlib/zutil.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="fdbserver/ApplyMetadataMutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbserver/BackupProgress.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/BackupWorker.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/ClusterController.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/CompactMap.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/CoordinatedState.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/Coordination.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/CoroFlow.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/DataDistribution.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/DataDistributionQueue.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/DataDistributionTracker.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/DiskQueue.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/FDBExecHelper.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/KeyValueStoreCompressTestData.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/KeyValueStoreMemory.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/KeyValueStoreSQLite.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/Knobs.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbserver/LatencyBandConfig.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbserver/LeaderElection.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/LogRouter.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/LogSystemDiskQueueAdapter.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/LogSystemPeekCursor.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/MasterProxyServer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/MoveKeys.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/OldTLogServer_4_6.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/OldTLogServer_6_0.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/OldTLogServer_6_2.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/QuietDatabase.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/Ratekeeper.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/Resolver.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/RestoreApplier.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/RestoreCommon.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/RestoreLoader.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/RestoreMaster.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/RestoreRoleCommon.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/RestoreUtil.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/RestoreWorker.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/SimulatedCluster.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/SkipList.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbserver/Status.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/StorageCache.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/TLogServer.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/TagPartitionedLogSystem.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/VFSAsync.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbserver/VersionedBTree.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/WaitFailure.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/fdbserver.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/masterserver.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/networktest.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/pubsub.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/sqlite/btree.c" ex="false" tool="0" flavor2="2">
+      </item>
+      <item path="fdbserver/sqlite/shell.c" ex="false" tool="0" flavor2="2">
+      </item>
+      <item path="fdbserver/sqlite/sqlite3.amalgamation.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="4">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="fdbserver/storageserver.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/tester.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/worker.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ApiCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ApiWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/AsyncFile.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/AsyncFileCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/AsyncFileRead.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/AsyncFileWrite.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/AtomicOps.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/AtomicOpsApiCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/AtomicRestore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/AtomicSwitchover.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/BackgroundSelectors.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/BackupCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/BackupToDBAbort.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/BackupToDBCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/BackupToDBUpgrade.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/BulkLoad.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ChangeConfig.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ClientTransactionProfileCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/CommitBugCheck.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ConfigureDatabase.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ConflictRange.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ConsistencyCheck.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/CpuProfiler.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Cycle.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/DDBalance.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/DDMetrics.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/DDMetricsExclude.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/DifferentClustersSameRV.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/DiskDurability.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/DiskDurabilityTest.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/DummyWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ExternalWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/FastTriggeredWatches.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/FileSystem.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Fuzz.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/FuzzApiCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Increment.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/IndexScan.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Inventory.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/KVStoreTest.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/KillRegion.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/LocalRatekeeper.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/LockDatabase.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/LogMetrics.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/LowLatency.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/MachineAttrition.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Mako.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/MemoryKeyValueStore.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/MemoryLifetime.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/MetricLogging.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ParallelRestore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Performance.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Ping.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/PubSubMultiples.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/QueuePush.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/RYWDisable.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/RYWPerformance.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/RandomClogging.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/RandomMoveKeys.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/RandomSelector.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ReadWrite.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/RemoveServersSafely.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Rollback.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/RyowCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/SaveAndKill.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/SelectorCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Serializability.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Sideband.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/SlowTaskWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/SnapTest.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/StatusWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Storefront.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/StreamingRead.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/SuspendProcesses.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/TargetedKill.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/TaskBucketCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/ThreadSafety.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Throttling.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Throughput.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/TimeKeeperCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/TriggerRecovery.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/UnitPerf.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/UnitTests.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Unreadable.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/VersionStamp.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/WatchAndWait.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/Watches.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/WorkerErrors.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/WriteBandwidth.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbserver/workloads/WriteDuringRead.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbservice/FDBService.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="fdbservice/ServiceBase.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/ActorCollection.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/Arena.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/CompressedInt.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/Deque.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/DeterministicRandom.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/Error.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/FastAlloc.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/FaultInjection.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/FileTraceLogWriter.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/Hash3.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="flow/Histogram.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/IThreadPool.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/IndexedSet.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/JsonTraceLogFormatter.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/Knobs.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/Net2.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/Net2Packet.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/Platform.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/Profiler.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/SignalSafeUnwind.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/Stats.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/SystemMonitor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/TDMetric.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/TLSConfig.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/ThreadHelper.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/ThreadPrimitives.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/Trace.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/UnitTest.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/XmlTraceLogFormatter.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/crc32c-generated-constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/crc32c.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/flat_buffers.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/flow.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/genericactors.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="flow/network.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/serialize.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/stacktrace.amalgamation.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/version.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>DTRACE_PROBES</Elem>
+            <Elem>HAS_ALIGNED_ALLOC</Elem>
+            <Elem>HAVE_OPENSSL</Elem>
+            <Elem>HAVE_OPENSSL_INIT_NO_AT_EXIT</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="flow/xxhash.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="4">
+        </cTool>
+      </item>
+      <item path="monitoring/actor_flamegraph.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+    </conf>
+  </confs>
+</configurationDescriptor>
diff --git a/nbproject/project.xml b/nbproject/project.xml
new file mode 100644
index 00000000000..e43da935bcd
--- /dev/null
+++ b/nbproject/project.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.cnd.makeproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/make-project/1">
+            <name>FoundationDb</name>
+            <c-extensions>c</c-extensions>
+            <cpp-extensions>cc,cpp</cpp-extensions>
+            <header-extensions>h,hpp,inc,linux</header-extensions>
+            <sourceEncoding>UTF-8</sourceEncoding>
+            <make-dep-projects/>
+            <sourceRootList>
+                <sourceRootElem>.</sourceRootElem>
+            </sourceRootList>
+            <confList>
+                <confElem>
+                    <name>Default</name>
+                    <type>0</type>
+                </confElem>
+            </confList>
+            <formatting>
+                <project-formatting-style>false</project-formatting-style>
+            </formatting>
+        </data>
+    </configuration>
+</project>

From d1e2486d6fe96fecb28ce0907640a54ec53dfb28 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openwaygroup.com>
Date: Mon, 5 Jul 2021 20:25:25 +0300
Subject: [PATCH 325/740] Fixed build with gcc <8

---
 cmake/ConfigureCompiler.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index de2b7fa10ee..aceca6f0ce0 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -330,9 +330,9 @@ else()
     -fvisibility=hidden
     -Wreturn-type
     -fPIC)
-  if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
-    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wclass-memaccess>)
-  endif()
+#  if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
+#    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wclass-memaccess>)
+#  endif()
   if (GPERFTOOLS_FOUND AND GCC)
     add_compile_options(
       -fno-builtin-malloc

From afcff2d5dcbbf4c657efaae3134319bee529549b Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Sat, 9 Apr 2022 08:55:19 +0100
Subject: [PATCH 326/740] Add new c libs to client package

---
 packaging/deb/builddebs.sh     | 2 +-
 packaging/msi/FDBInstaller.wxs | 2 ++
 packaging/osx/buildpkg.sh      | 2 +-
 packaging/rpm/buildrpms.sh     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packaging/deb/builddebs.sh b/packaging/deb/builddebs.sh
index f197d302253..e08f1befd5f 100755
--- a/packaging/deb/builddebs.sh
+++ b/packaging/deb/builddebs.sh
@@ -53,7 +53,7 @@ mkdir -p -m 0755 $CLIENTSDIR/usr/lib/foundationdb/backup_agent
 
 install -m 0755 bin/fdbcli $CLIENTSDIR/usr/bin
 install -m 0644 lib/libfdb_c.so $CLIENTSDIR/usr/lib
-install -m 0644 bindings/c/foundationdb/fdb_c.h bindings/c/foundationdb/fdb_c_options.g.h fdbclient/vexillographer/fdb.options $CLIENTSDIR/usr/include/foundationdb
+install -m 0644 bindings/c/foundationdb/fdb_c.h bindings/c/foundationdb/fdb_c_types.h bindings/c/foundationdb/fdb_c_internal.h bindings/c/foundationdb/fdb_c_options.g.h fdbclient/vexillographer/fdb.options $CLIENTSDIR/usr/include/foundationdb
 dos2unix -q -n README.md $CLIENTSDIR/usr/share/doc/foundationdb-clients/README
 chmod 0644 $CLIENTSDIR/usr/share/doc/foundationdb-clients/README
 install -m 0755 bin/fdbbackup $CLIENTSDIR/usr/lib/foundationdb/backup_agent/backup_agent
diff --git a/packaging/msi/FDBInstaller.wxs b/packaging/msi/FDBInstaller.wxs
index 1f23a982785..4ec20dffa9c 100644
--- a/packaging/msi/FDBInstaller.wxs
+++ b/packaging/msi/FDBInstaller.wxs
@@ -104,6 +104,8 @@
               <Component Id='FDBCLibraryHeader' Guid='{32D846FA-3BA8-4CF6-8777-51DFA1011198}' Win64='yes'>
                 <File Id='FDBCH' Name='fdb_c.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c.h' KeyPath='yes'/>
                 <File Id='FDBCOPTIONSH' Name='fdb_c_options.g.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c_options.g.h'/>
+                <File Id='FDBCTYPES' Name='fdb_c_types.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c_types.h' KeyPath='yes'/>
+                <File Id='FDBCINTERNAL' Name='fdb_c_internal.g.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c_internal.g.h'/>
                 <File Id='FDBOPTIONSFILE' Name='fdb.options' DiskId='1' Source='$(var.SolutionRoot)fdbclient\vexillographer\fdb.options'/>
               </Component>
             </Directory>
diff --git a/packaging/osx/buildpkg.sh b/packaging/osx/buildpkg.sh
index f2c11b901d0..c8405d3da96 100755
--- a/packaging/osx/buildpkg.sh
+++ b/packaging/osx/buildpkg.sh
@@ -38,7 +38,7 @@ mkdir -p -m 0775 $CLIENTSDIR/usr/local/etc/foundationdb
 mkdir -p -m 0755 $CLIENTSDIR/usr/local/foundationdb/backup_agent
 
 install -m 0755 "$BUILDDIR"/bin/fdbcli $CLIENTSDIR/usr/local/bin
-install -m 0644 "$SRCDIR"/bindings/c/foundationdb/fdb_c.h "$BUILDDIR"/bindings/c/foundationdb/fdb_c_options.g.h "$SRCDIR"/fdbclient/vexillographer/fdb.options $CLIENTSDIR/usr/local/include/foundationdb
+install -m 0644 "$SRCDIR"/bindings/c/foundationdb/fdb_c.h "$BUILDDIR"/bindings/c/foundationdb/fdb_c_options.g.h "$SRCDIR"/bindings/c/foundationdb/fdb_c_types.h "$SRCDIR"/bindings/c/foundationdb/fdb_c_internal.h "$SRCDIR"/fdbclient/vexillographer/fdb.options $CLIENTSDIR/usr/local/include/foundationdb
 install -m 0755 "$BUILDDIR"/lib/libfdb_c.dylib $CLIENTSDIR/usr/local/lib
 install -m 0644 "$BUILDDIR"/bindings/python/fdb/*.py $CLIENTSDIR/Library/Python/2.7/site-packages/fdb
 install -m 0755 "$BUILDDIR"/bin/fdbbackup $CLIENTSDIR/usr/local/foundationdb/backup_agent/backup_agent
diff --git a/packaging/rpm/buildrpms.sh b/packaging/rpm/buildrpms.sh
index a6cba2797a8..a59fb5caf23 100755
--- a/packaging/rpm/buildrpms.sh
+++ b/packaging/rpm/buildrpms.sh
@@ -33,7 +33,7 @@ install -m 0755 bin/fdbcli $INSTDIR/usr/bin
 install -m 0755 bin/fdbserver $INSTDIR/usr/sbin
 install -m 0755 bin/fdbmonitor $INSTDIR/usr/lib/foundationdb
 install -m 0755 lib/libfdb_c.so $INSTDIR/usr/lib64
-install -m 0644 bindings/c/foundationdb/fdb_c.h bindings/c/foundationdb/fdb_c_options.g.h fdbclient/vexillographer/fdb.options $INSTDIR/usr/include/foundationdb
+install -m 0644 bindings/c/foundationdb/fdb_c.h bindings/c/foundationdb/fdb_c_options.g.h bindings/c/foundationdb/fdb_c_types.h bindings/c/foundationdb/fdb_c_internal.h fdbclient/vexillographer/fdb.options $INSTDIR/usr/include/foundationdb
 dos2unix -q -n README.md $INSTDIR/usr/share/doc/foundationdb-clients/README
 dos2unix -q -n README.md $INSTDIR/usr/share/doc/foundationdb-server/README
 chmod 0644 $INSTDIR/usr/share/doc/foundationdb-clients/README

From 8f081ce30af66f0c30c64da53b653401d37e6e4d Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Sat, 9 Apr 2022 08:59:34 +0100
Subject: [PATCH 327/740] Fix Windows build path

---
 packaging/msi/FDBInstaller.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/msi/FDBInstaller.wxs b/packaging/msi/FDBInstaller.wxs
index 4ec20dffa9c..a68d4ab75e2 100644
--- a/packaging/msi/FDBInstaller.wxs
+++ b/packaging/msi/FDBInstaller.wxs
@@ -105,7 +105,7 @@
                 <File Id='FDBCH' Name='fdb_c.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c.h' KeyPath='yes'/>
                 <File Id='FDBCOPTIONSH' Name='fdb_c_options.g.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c_options.g.h'/>
                 <File Id='FDBCTYPES' Name='fdb_c_types.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c_types.h' KeyPath='yes'/>
-                <File Id='FDBCINTERNAL' Name='fdb_c_internal.g.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c_internal.g.h'/>
+                <File Id='FDBCINTERNAL' Name='fdb_c_internal.h' DiskId='1' Source='$(var.SolutionRoot)bindings\c\foundationdb\fdb_c_internal.h'/>
                 <File Id='FDBOPTIONSFILE' Name='fdb.options' DiskId='1' Source='$(var.SolutionRoot)fdbclient\vexillographer\fdb.options'/>
               </Component>
             </Directory>

From e71dd3ff0f074ae70c1058a929d9f85eac6c20ed Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 12 Apr 2022 02:08:30 +0000
Subject: [PATCH 328/740] update version after 7.1.0 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5ce5de14a9..d5f0d6773fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.0
+  VERSION 7.1.1
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 791c393611d446d1db86fe154ab2a87be0b81284 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 12 Apr 2022 06:45:41 +0000
Subject: [PATCH 329/740] update version after 7.1.1 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5f0d6773fe..f5163d0e638 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.1
+  VERSION 7.1.2
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 3fa1f81a8b8f1b25afda8e385591649456e5589b Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 12 Apr 2022 10:10:41 -0700
Subject: [PATCH 330/740] Disable remote KVS feature in simulation (#6832)

This is to reduce noise of correctness due to known issues in fault injection.
---
 fdbclient/ServerKnobs.cpp            | 2 +-
 fdbserver/SimulatedCluster.actor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index ea0448e8f15..2a54b461488 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -258,7 +258,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( DEBOUNCE_RECRUITING_DELAY,                             5.0 );
 	init( DD_FAILURE_TIME,                                       1.0 ); if( randomize && BUGGIFY ) DD_FAILURE_TIME = 10.0;
 	init( DD_ZERO_HEALTHY_TEAM_DELAY,                            1.0 );
-	init( REMOTE_KV_STORE,                                     false ); if( randomize && BUGGIFY ) REMOTE_KV_STORE = true;
+	init( REMOTE_KV_STORE,                                     false );
 	init( REMOTE_KV_STORE_INIT_DELAY,                            0.1 );
 	init( REMOTE_KV_STORE_MAX_INIT_DURATION,                    10.0 );
 	init( REBALANCE_MAX_RETRIES,                                 100 );
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index 3883dd50d3f..f209ab51d6b 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -1850,7 +1850,7 @@ void setupSimulatedSystem(std::vector<Future<Void>>* systemActors,
 	if (testConfig.disableRemoteKVS) {
 		IKnobCollection::getMutableGlobalKnobCollection().setKnob("remote_kv_store",
 		                                                          KnobValueRef::create(bool{ false }));
-		TraceEvent(SevDebug, "DisaableRemoteKVS").log();
+		TraceEvent(SevDebug, "DisableRemoteKVS").log();
 	}
 	auto configDBType = testConfig.getConfigDBType();
 	for (auto kv : startingConfigJSON) {

From c3c8511e1724a30c2ebd093e51a7fbb763c3835d Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 12 Apr 2022 21:36:18 -0700
Subject: [PATCH 331/740] Fix provisional GRV Proxy ID in GetReadVersionReply

This was not set and can cause infinite loop in simulation where the client
calls getConsistentReadVersion(), in which we do "continue" for stale GRV reply
and retry. Then this repeats forever.
---
 fdbserver/ClusterRecovery.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
index af564b377df..0c1da6f60f1 100644
--- a/fdbserver/ClusterRecovery.actor.cpp
+++ b/fdbserver/ClusterRecovery.actor.cpp
@@ -851,6 +851,7 @@ ACTOR Future<Standalone<CommitTransactionRef>> provisionalMaster(Reference<Clust
 				rep.version = parent->lastEpochEnd;
 				rep.locked = locked;
 				rep.metadataVersion = metadataVersion;
+				rep.proxyId = parent->provisionalGrvProxies[0].id();
 				req.reply.send(rep);
 			} else
 				req.reply.send(Never()); // We can't perform causally consistent reads without recovering

From b7c05eb117bddc109eb8aa879a59573894315a94 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Wed, 13 Apr 2022 13:47:18 -0700
Subject: [PATCH 332/740] Fix ClientTransactionProfilingCorrectness upgrade
 test (release-7.1) (#6841)

* Check for viable version before deserializing

* Add protocol feature

Co-authored-by: Jingyu Zhou <jingyuzhou@gmail.com>
---
 fdbclient/CommitTransaction.h | 2 +-
 flow/ProtocolVersion.h        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdbclient/CommitTransaction.h b/fdbclient/CommitTransaction.h
index c4f2182d68b..53c87c43bd0 100644
--- a/fdbclient/CommitTransaction.h
+++ b/fdbclient/CommitTransaction.h
@@ -208,7 +208,7 @@ struct CommitTransactionRef {
 			if (ar.protocolVersion().hasReportConflictingKeys()) {
 				serializer(ar, report_conflicting_keys);
 			}
-			if (ar.protocolVersion().hasSpanContext()) {
+			if (ar.protocolVersion().hasResolverPrivateMutations()) {
 				serializer(ar, lock_aware, spanContext);
 			}
 		}
diff --git a/flow/ProtocolVersion.h b/flow/ProtocolVersion.h
index a61e1518ce8..a40c09c8c82 100644
--- a/flow/ProtocolVersion.h
+++ b/flow/ProtocolVersion.h
@@ -163,6 +163,7 @@ class ProtocolVersion {
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B071010000LL, PerpetualWiggleMetadata);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B071010000LL, Tenants);
 	PROTOCOL_VERSION_FEATURE(0x0FDB00B071010000LL, StorageInterfaceReadiness);
+	PROTOCOL_VERSION_FEATURE(0x0FDB00B071010000LL, ResolverPrivateMutations);
 };
 
 template <>

From 67be28ba2e4cf5bff5fae859d0ecfe1e149230a2 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 15 Apr 2022 09:35:41 -0700
Subject: [PATCH 333/740] Fix multiple PeekStream requests to log routers

There is a bug in how a log router handles streaming read:
* Log router has a `logRouterPeekStream` actor A running.
* Remote tlog detects some problem and starts another streaming connection (maybe just reuse the connection?)
* Log router now has a new `logRouterPeekStream` actor B running.
* B runs and found that popped version > reqBegin, so `LogRouterPeekPopped` . This is because A is still running and changed the popped version.
* A ends with `TLogPeekStreamEnd operation_obsolete`
* B become stuck at `wait(req.reply.onReady() && store(reply.rep, future)`, because the future was sent `Never()`.

As a result, the remote tlog can no longer retrieve data from this log router.

Fix by killing the `logRouterPeekStream` B.
---
 fdbserver/LogRouter.actor.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp
index e595dc315f3..8684fa5263d 100644
--- a/fdbserver/LogRouter.actor.cpp
+++ b/fdbserver/LogRouter.actor.cpp
@@ -18,21 +18,24 @@
  * limitations under the License.
  */
 
-#include "flow/ActorCollection.h"
+#include "fdbclient/Atomic.h"
 #include "fdbclient/NativeAPI.actor.h"
+#include "fdbclient/SystemData.h"
 #include "fdbrpc/Stats.h"
-#include "fdbserver/WorkerInterface.actor.h"
-#include "fdbserver/WaitFailure.h"
+#include "fdbserver/ApplyMetadataMutation.h"
 #include "fdbserver/Knobs.h"
-#include "fdbserver/ServerDBInfo.h"
 #include "fdbserver/LogSystem.h"
-#include "fdbclient/SystemData.h"
-#include "fdbserver/ApplyMetadataMutation.h"
+#include "fdbserver/WaitFailure.h"
+#include "fdbserver/WorkerInterface.actor.h"
 #include "fdbserver/RecoveryState.h"
-#include "fdbclient/Atomic.h"
+#include "fdbserver/ServerDBInfo.h"
+#include "fdbserver/TLogInterface.h"
+#include "flow/ActorCollection.h"
 #include "flow/Arena.h"
 #include "flow/Histogram.h"
 #include "flow/TDMetric.actor.h"
+#include "flow/network.h"
+
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 struct LogRouterData {
@@ -526,6 +529,10 @@ Future<Void> logRouterPeekMessages(PromiseType replyPromise,
 		    .detail("Begin", reqBegin)
 		    .detail("Popped", poppedVer)
 		    .detail("Start", self->startVersion);
+		if (std::is_same<PromiseType, Promise<TLogPeekReply>>::value) {
+			// kills logRouterPeekStream actor, otherwise that actor becomes stuck
+			throw operation_obsolete();
+		}
 		replyPromise.send(Never());
 		if (reqSequence.present()) {
 			auto& trackerData = self->peekTracker[peekId];

From ff29f3e350c4fba149425b70eedfd1f6b7839c1e Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 15 Apr 2022 21:48:12 -0700
Subject: [PATCH 334/740] ClientDBInfo may be unintentionally not set

The ClientDBInfo's comparison is through an internal UID and shrinkProxyList()
can change proxies inside ClientDBInfo. Since the UID is not changed by that
function, subsequent set can be unintentionally skipped.

This was not a big issue before. However, VV introduces a change that the
client side compares the returned proxy ID with its known set of GRV proxies
and will retry GRV if the returned proxy ID is not in the set. Due the above
bug, GRV returned by a proxy is not within the client set, and results in
indefinite retrying GRVs.
---
 fdbclient/MonitorLeader.actor.cpp | 2 +-
 fdbserver/worker.actor.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index 09bd0188638..678c47eba01 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -1055,7 +1055,7 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 
 			auto& ni = rep.get().mutate();
 			shrinkProxyList(ni, lastCommitProxyUIDs, lastCommitProxies, lastGrvProxyUIDs, lastGrvProxies);
-			clientInfo->set(ni);
+			clientInfo->setUnconditional(ni);
 			successIndex = index;
 		} else {
 			TEST(rep.getError().code() == error_code_failed_to_progress); // Coordinator cant talk to cluster controller
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index df59a5794b6..f6ae3912e03 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -143,7 +143,7 @@ ACTOR static Future<Void> extractClientInfo(Reference<AsyncVar<ServerDBInfo> con
 	loop {
 		ClientDBInfo ni = db->get().client;
 		shrinkProxyList(ni, lastCommitProxyUIDs, lastCommitProxies, lastGrvProxyUIDs, lastGrvProxies);
-		info->set(ni);
+		info->setUnconditional(ni);
 		wait(db->onChange());
 	}
 }

From a4d690c9e7a0fbddee1d3b2d1fb2bcb8e0182998 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 18 Apr 2022 13:23:48 -0700
Subject: [PATCH 335/740] Cherry pick #6857 to release-7.1 (#6860)

---
 fdbcli/fdbcli.actor.cpp   | 9 +++++++++
 flow/ThreadHelper.actor.h | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 233aa83e700..a4d6c9c2884 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -1191,6 +1191,9 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 		ccf = makeReference<ClusterConnectionFile>(resolvedClusterFile.first);
 		wait(ccf->resolveHostnames());
 	} catch (Error& e) {
+		if (e.code() == error_code_operation_cancelled) {
+			throw;
+		}
 		fprintf(stderr, "%s\n", ClusterConnectionFile::getErrorString(resolvedClusterFile, e).c_str());
 		return 1;
 	}
@@ -1236,6 +1239,9 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 			wait(delay(3.0) || success(safeThreadFutureToFuture(tr->getReadVersion())));
 			break;
 		} catch (Error& e) {
+			if (e.code() == error_code_operation_cancelled) {
+				throw;
+			}
 			if (e.code() == error_code_cluster_version_changed) {
 				wait(safeThreadFutureToFuture(tr->onError(e)));
 			} else {
@@ -2023,6 +2029,9 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 			TraceEvent(SevInfo, "CLICommandLog", randomID).detail("Command", line).detail("IsError", is_error);
 
 		} catch (Error& e) {
+			if (e.code() == error_code_operation_cancelled) {
+				throw;
+			}
 			if (e.code() == error_code_tenant_name_required) {
 				printAtCol("ERROR: tenant name required. Use the `usetenant' command to select a tenant or enable the "
 				           "`RAW_ACCESS' option to read raw keys.",
diff --git a/flow/ThreadHelper.actor.h b/flow/ThreadHelper.actor.h
index 639de040b65..7d1f7aa2e90 100644
--- a/flow/ThreadHelper.actor.h
+++ b/flow/ThreadHelper.actor.h
@@ -698,9 +698,12 @@ Future<T> safeThreadFutureToFutureImpl(ThreadFuture<T> threadFuture) {
 	try {
 		wait(onReady);
 	} catch (Error& e) {
-		ASSERT(e.code() == error_code_actor_cancelled);
+		// broken_promise can be thrown if the network is already shut down
+		ASSERT(e.code() == error_code_operation_cancelled || e.code() == error_code_broken_promise);
 		// prerequisite: we have exclusive ownership of the threadFuture
-		threadFuture.cancel();
+		if (e.code() == error_code_operation_cancelled) {
+			threadFuture.cancel();
+		}
 		throw e;
 	}
 	// threadFuture should be ready

From 13a83dc77bc221816aca93de94af92c3c8f3524b Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 18 Apr 2022 18:08:48 -0700
Subject: [PATCH 336/740] Fix failing upgrades due to non-persisted initial
 cluster version (#6864)

---
 fdbserver/storageserver.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 0ecd70adc73..50936b5950a 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -806,7 +806,7 @@ struct StorageServer {
 	Promise<UID> clusterId;
 	// The version the cluster starts on. This value is not persisted and may
 	// not be valid after a recovery.
-	Version initialClusterVersion = invalidVersion;
+	Version initialClusterVersion = 1;
 	UID thisServerID;
 	Optional<UID> tssPairID; // if this server is a tss, this is the id of its (ss) pair
 	Optional<UID> ssPairID; // if this server is an ss, this is the id of its (tss) pair

From ee4f0686e365a03423a7fab5e25cf91eca6f48e2 Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <82616783+sbodagala@users.noreply.github.com>
Date: Tue, 19 Apr 2022 14:25:48 -0400
Subject: [PATCH 337/740] Merge pull request #6843 from sbodagala/main (#6891)

Do not invoke version vector related code when the feature is disabled

Co-authored-by: Jingyu Zhou <jingyuzhou@gmail.com>
---
 fdbserver/GrvProxyServer.actor.cpp | 12 ++++++++----
 fdbserver/masterserver.actor.cpp   |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp
index d4b418d6648..61b100779ec 100644
--- a/fdbserver/GrvProxyServer.actor.cpp
+++ b/fdbserver/GrvProxyServer.actor.cpp
@@ -581,8 +581,10 @@ ACTOR Future<GetReadVersionReply> getLiveCommittedVersion(SpanID parentSpan,
 	GetRawCommittedVersionReply repFromMaster = wait(replyFromMasterFuture);
 	grvProxyData->minKnownCommittedVersion =
 	    std::max(grvProxyData->minKnownCommittedVersion, repFromMaster.minKnownCommittedVersion);
-	// TODO add to "status json"
-	grvProxyData->ssVersionVectorCache.applyDelta(repFromMaster.ssVersionVectorDelta);
+	if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+		// TODO add to "status json"
+		grvProxyData->ssVersionVectorCache.applyDelta(repFromMaster.ssVersionVectorDelta);
+	}
 	grvProxyData->stats.grvGetCommittedVersionRpcDist->sampleSeconds(now() - grvConfirmEpochLive);
 	GetReadVersionReply rep;
 	rep.version = repFromMaster.version;
@@ -646,8 +648,10 @@ ACTOR Future<Void> sendGrvReplies(Future<GetReadVersionReply> replyFuture,
 		}
 		reply.midShardSize = midShardSize;
 		reply.tagThrottleInfo.clear();
-		grvProxyData->ssVersionVectorCache.getDelta(request.maxVersion, reply.ssVersionVectorDelta);
-		grvProxyData->versionVectorSizeOnGRVReply.addMeasurement(reply.ssVersionVectorDelta.size());
+		if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+			grvProxyData->ssVersionVectorCache.getDelta(request.maxVersion, reply.ssVersionVectorDelta);
+			grvProxyData->versionVectorSizeOnGRVReply.addMeasurement(reply.ssVersionVectorDelta.size());
+		}
 		reply.proxyId = grvProxyData->dbgid;
 
 		if (!request.tags.empty()) {
diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index cfdf6e3e5d3..7cb99d8d21d 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -275,8 +275,10 @@ ACTOR Future<Void> serveLiveCommittedVersion(Reference<MasterData> self) {
 				reply.locked = self->databaseLocked;
 				reply.metadataVersion = self->proxyMetadataVersion;
 				reply.minKnownCommittedVersion = self->minKnownCommittedVersion;
-				self->ssVersionVector.getDelta(req.maxVersion, reply.ssVersionVectorDelta);
-				self->versionVectorSizeOnCVReply.addMeasurement(reply.ssVersionVectorDelta.size());
+				if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+					self->ssVersionVector.getDelta(req.maxVersion, reply.ssVersionVectorDelta);
+					self->versionVectorSizeOnCVReply.addMeasurement(reply.ssVersionVectorDelta.size());
+				}
 				req.reply.send(reply);
 			}
 			when(ReportRawCommittedVersionRequest req =

From c62d577a9a08b2c9a6802ff282dfed9c7ec099f2 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 19 Apr 2022 21:10:20 +0000
Subject: [PATCH 338/740] update version after 7.1.2 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5163d0e638..e9a0c66a4fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.2
+  VERSION 7.1.3
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From c6e91607a178a7a566570a8548d5bdec89cdee3e Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 19 Apr 2022 20:05:44 -0700
Subject: [PATCH 339/740] fix: pops which were ignored during a snapshot would
 not be replayed on the proper tlogs within a shared tlog (#6893)

Co-authored-by: Trevor Clinkenbeard <trevor.clinkenbeard@snowflake.com>
---
 fdbserver/OldTLogServer_6_0.actor.cpp | 17 ++++----
 fdbserver/OldTLogServer_6_2.actor.cpp | 17 ++++----
 fdbserver/TLogServer.actor.cpp        | 56 +++++++++++++--------------
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/fdbserver/OldTLogServer_6_0.actor.cpp b/fdbserver/OldTLogServer_6_0.actor.cpp
index e52ab4955c0..2d016d4a6a5 100644
--- a/fdbserver/OldTLogServer_6_0.actor.cpp
+++ b/fdbserver/OldTLogServer_6_0.actor.cpp
@@ -291,8 +291,6 @@ struct TLogData : NonCopyable {
 	                          // the set and for callers that unset will
 	                          // be able to match it up
 	std::string dataFolder; // folder where data is stored
-	std::map<Tag, Version> toBePopped; // map of Tag->Version for all the pops
-	                                   // that came when ignorePopRequest was set
 	Reference<AsyncVar<bool>> degraded;
 	std::vector<TagsAndMessage> tempTagMessages;
 
@@ -514,6 +512,9 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	bool execOpCommitInProgress;
 	int txsTags;
 
+	std::map<Tag, Version> toBePopped; // map of Tag->Version for all the pops
+	                                   // that came when ignorePopRequest was set
+
 	explicit LogData(TLogData* tLogData,
 	                 TLogInterface interf,
 	                 Tag remoteTag,
@@ -819,8 +820,8 @@ ACTOR Future<Void> tLogPopCore(TLogData* self, Tag inputTag, Version to, Referen
 	if (self->ignorePopRequest) {
 		TraceEvent(SevDebug, "IgnoringPopRequest").detail("IgnorePopDeadline", self->ignorePopDeadline);
 
-		if (self->toBePopped.find(inputTag) == self->toBePopped.end() || to > self->toBePopped[inputTag]) {
-			self->toBePopped[inputTag] = to;
+		if (logData->toBePopped.find(inputTag) == logData->toBePopped.end() || to > logData->toBePopped[inputTag]) {
+			logData->toBePopped[inputTag] = to;
 		}
 		// add the pop to the toBePopped map
 		TraceEvent(SevDebug, "IgnoringPopRequest")
@@ -882,11 +883,11 @@ ACTOR Future<Void> tLogPop(TLogData* self, TLogPopRequest req, Reference<LogData
 		self->ignorePopRequest = false;
 		self->ignorePopUid = "";
 		self->ignorePopDeadline = 0.0;
-		for (it = self->toBePopped.begin(); it != self->toBePopped.end(); it++) {
+		for (it = logData->toBePopped.begin(); it != logData->toBePopped.end(); it++) {
 			TraceEvent("PlayIgnoredPop").detail("Tag", it->first.toString()).detail("Version", it->second);
 			ignoredPops.push_back(tLogPopCore(self, it->first, it->second, logData));
 		}
-		self->toBePopped.clear();
+		logData->toBePopped.clear();
 		wait(waitForAll(ignoredPops));
 		TraceEvent("ResetIgnorePopRequest")
 		    .detail("Now", g_network->now())
@@ -1937,7 +1938,7 @@ ACTOR Future<Void> tLogEnablePopReq(TLogEnablePopRequest enablePopReq, TLogData*
 	self->ignorePopRequest = false;
 	self->ignorePopDeadline = 0.0;
 	self->ignorePopUid = "";
-	for (it = self->toBePopped.begin(); it != self->toBePopped.end(); it++) {
+	for (it = logData->toBePopped.begin(); it != logData->toBePopped.end(); it++) {
 		TraceEvent("PlayIgnoredPop").detail("Tag", it->first.toString()).detail("Version", it->second);
 		ignoredPops.push_back(tLogPopCore(self, it->first, it->second, logData));
 	}
@@ -1951,7 +1952,7 @@ ACTOR Future<Void> tLogEnablePopReq(TLogEnablePopRequest enablePopReq, TLogData*
 	    .detail("QueueCommittedVersion", logData->queueCommittedVersion.get())
 	    .detail("Version", logData->version.get());
 	wait(waitForAll(ignoredPops));
-	self->toBePopped.clear();
+	logData->toBePopped.clear();
 	enablePopReq.reply.send(Void());
 	return Void();
 }
diff --git a/fdbserver/OldTLogServer_6_2.actor.cpp b/fdbserver/OldTLogServer_6_2.actor.cpp
index 35818053f92..ffb449aff58 100644
--- a/fdbserver/OldTLogServer_6_2.actor.cpp
+++ b/fdbserver/OldTLogServer_6_2.actor.cpp
@@ -355,8 +355,6 @@ struct TLogData : NonCopyable {
 	                          // the set and for callers that unset will
 	                          // be able to match it up
 	std::string dataFolder; // folder where data is stored
-	std::map<Tag, Version> toBePopped; // map of Tag->Version for all the pops
-	                                   // that came when ignorePopRequest was set
 	Reference<AsyncVar<bool>> degraded;
 
 	TLogData(UID dbgid,
@@ -596,6 +594,9 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	bool execOpCommitInProgress;
 	int txsTags;
 
+	std::map<Tag, Version> toBePopped; // map of Tag->Version for all the pops
+	                                   // that came when ignorePopRequest was set
+
 	explicit LogData(TLogData* tLogData,
 	                 TLogInterface interf,
 	                 Tag remoteTag,
@@ -1400,8 +1401,8 @@ ACTOR Future<Void> tLogPopCore(TLogData* self, Tag inputTag, Version to, Referen
 	if (self->ignorePopRequest) {
 		TraceEvent(SevDebug, "IgnoringPopRequest").detail("IgnorePopDeadline", self->ignorePopDeadline);
 
-		if (self->toBePopped.find(inputTag) == self->toBePopped.end() || to > self->toBePopped[inputTag]) {
-			self->toBePopped[inputTag] = to;
+		if (logData->toBePopped.find(inputTag) == logData->toBePopped.end() || to > logData->toBePopped[inputTag]) {
+			logData->toBePopped[inputTag] = to;
 		}
 		// add the pop to the toBePopped map
 		TraceEvent(SevDebug, "IgnoringPopRequest")
@@ -1478,11 +1479,11 @@ ACTOR Future<Void> tLogPop(TLogData* self, TLogPopRequest req, Reference<LogData
 		self->ignorePopRequest = false;
 		self->ignorePopUid = "";
 		self->ignorePopDeadline = 0.0;
-		for (it = self->toBePopped.begin(); it != self->toBePopped.end(); it++) {
+		for (it = logData->toBePopped.begin(); it != logData->toBePopped.end(); it++) {
 			TraceEvent("PlayIgnoredPop").detail("Tag", it->first.toString()).detail("Version", it->second);
 			ignoredPops.push_back(tLogPopCore(self, it->first, it->second, logData));
 		}
-		self->toBePopped.clear();
+		logData->toBePopped.clear();
 		wait(waitForAll(ignoredPops));
 		TraceEvent("ResetIgnorePopRequest")
 		    .detail("Now", g_network->now())
@@ -2382,7 +2383,7 @@ ACTOR Future<Void> tLogEnablePopReq(TLogEnablePopRequest enablePopReq, TLogData*
 	self->ignorePopRequest = false;
 	self->ignorePopDeadline = 0.0;
 	self->ignorePopUid = "";
-	for (it = self->toBePopped.begin(); it != self->toBePopped.end(); it++) {
+	for (it = logData->toBePopped.begin(); it != logData->toBePopped.end(); it++) {
 		TraceEvent("PlayIgnoredPop").detail("Tag", it->first.toString()).detail("Version", it->second);
 		ignoredPops.push_back(tLogPopCore(self, it->first, it->second, logData));
 	}
@@ -2396,7 +2397,7 @@ ACTOR Future<Void> tLogEnablePopReq(TLogEnablePopRequest enablePopReq, TLogData*
 	    .detail("QueueCommittedVersion", logData->queueCommittedVersion.get())
 	    .detail("Version", logData->version.get());
 	wait(waitForAll(ignoredPops));
-	self->toBePopped.clear();
+	logData->toBePopped.clear();
 	enablePopReq.reply.send(Void());
 	return Void();
 }
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 7184da95cd6..749f63949ab 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -358,7 +358,6 @@ struct TLogData : NonCopyable {
 	FlowLock persistentDataCommitLock;
 
 	// Beginning of fields used by snapshot based backup and restore
-	bool ignorePopRequest; // ignore pop request from storage servers
 	double ignorePopDeadline; // time until which the ignorePopRequest will be
 	                          // honored
 	std::string ignorePopUid; // callers that set ignorePopRequest will set this
@@ -366,8 +365,6 @@ struct TLogData : NonCopyable {
 	                          // the set and for callers that unset will
 	                          // be able to match it up
 	std::string dataFolder; // folder where data is stored
-	std::map<Tag, Version> toBePopped; // map of Tag->Version for all the pops
-	                                   // that came when ignorePopRequest was set
 	Reference<AsyncVar<bool>> degraded;
 	// End of fields used by snapshot based backup and restore
 
@@ -388,11 +385,10 @@ struct TLogData : NonCopyable {
 	    instanceID(deterministicRandom()->randomUniqueID().first()), bytesInput(0), bytesDurable(0),
 	    targetVolatileBytes(SERVER_KNOBS->TLOG_SPILL_THRESHOLD), overheadBytesInput(0), overheadBytesDurable(0),
 	    peekMemoryLimiter(SERVER_KNOBS->TLOG_SPILL_REFERENCE_MAX_PEEK_MEMORY_BYTES),
-	    concurrentLogRouterReads(SERVER_KNOBS->CONCURRENT_LOG_ROUTER_READS), ignorePopRequest(false),
-	    dataFolder(folder), degraded(degraded),
-	    commitLatencyDist(Histogram::getHistogram(LiteralStringRef("tLog"),
-	                                              LiteralStringRef("commit"),
-	                                              Histogram::Unit::microseconds)) {
+	    concurrentLogRouterReads(SERVER_KNOBS->CONCURRENT_LOG_ROUTER_READS), ignorePopDeadline(0), dataFolder(folder),
+	    degraded(degraded), commitLatencyDist(Histogram::getHistogram(LiteralStringRef("tLog"),
+	                                                                  LiteralStringRef("commit"),
+	                                                                  Histogram::Unit::microseconds)) {
 		cx = openDBOnServer(dbInfo, TaskPriority::DefaultEndpoint, LockAware::True);
 	}
 };
@@ -629,6 +625,9 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	bool execOpCommitInProgress;
 	int txsTags;
 
+	std::map<Tag, Version> toBePopped; // map of Tag->Version for all the pops
+	                                   // that came when ignorePopRequest was set
+
 	explicit LogData(TLogData* tLogData,
 	                 TLogInterface interf,
 	                 Tag remoteTag,
@@ -1234,14 +1233,17 @@ ACTOR Future<Void> processPopRequests(TLogData* self, Reference<LogData> logData
 	state std::map<Tag, Version>::const_iterator it;
 	state int ignoredPopsPlayed = 0;
 	state std::map<Tag, Version> toBePopped;
-	toBePopped = std::move(self->toBePopped);
-	self->toBePopped.clear();
-	self->ignorePopRequest = false;
-	self->ignorePopDeadline = 0.0;
+
+	while (now() < self->ignorePopDeadline) {
+		wait(delayUntil(self->ignorePopDeadline + 0.0001));
+	}
+
+	toBePopped = std::move(logData->toBePopped);
+	logData->toBePopped.clear();
 	self->ignorePopUid = "";
 	for (it = toBePopped.cbegin(); it != toBePopped.cend(); ++it) {
 		const auto& [tag, version] = *it;
-		TraceEvent("PlayIgnoredPop").detail("Tag", tag.toString()).detail("Version", version);
+		TraceEvent("PlayIgnoredPop", logData->logId).detail("Tag", tag.toString()).detail("Version", version);
 		ignoredPops.push_back(tLogPopCore(self, tag, version, logData));
 		if (++ignoredPopsPlayed % SERVER_KNOBS->TLOG_POP_BATCH_SIZE == 0) {
 			TEST(true); // Yielding while processing pop requests
@@ -1249,20 +1251,22 @@ ACTOR Future<Void> processPopRequests(TLogData* self, Reference<LogData> logData
 		}
 	}
 	wait(waitForAll(ignoredPops));
-	TraceEvent("ResetIgnorePopRequest")
-	    .detail("IgnorePopRequest", self->ignorePopRequest)
-	    .detail("IgnorePopDeadline", self->ignorePopDeadline);
+	TraceEvent("ResetIgnorePopRequest", logData->logId).detail("IgnorePopDeadline", self->ignorePopDeadline);
 	return Void();
 }
 
 ACTOR Future<Void> tLogPop(TLogData* self, TLogPopRequest req, Reference<LogData> logData) {
-	if (self->ignorePopRequest) {
-		TraceEvent(SevDebug, "IgnoringPopRequest").detail("IgnorePopDeadline", self->ignorePopDeadline);
+	if (now() < self->ignorePopDeadline) {
+		TraceEvent(SevDebug, "IgnoringPopRequest", logData->logId).detail("IgnorePopDeadline", self->ignorePopDeadline);
+
+		if (logData->toBePopped.empty()) {
+			logData->addActor.send(processPopRequests(self, logData));
+		}
 
-		auto& v = self->toBePopped[req.tag];
+		auto& v = logData->toBePopped[req.tag];
 		v = std::max(v, req.to);
 
-		TraceEvent(SevDebug, "IgnoringPopRequest")
+		TraceEvent(SevDebug, "IgnoringPopRequest", logData->logId)
 		    .detail("IgnorePopDeadline", self->ignorePopDeadline)
 		    .detail("Tag", req.tag.toString())
 		    .detail("Version", req.to);
@@ -2571,15 +2575,15 @@ ACTOR Future<Void> tLogEnablePopReq(TLogEnablePopRequest enablePopReq, TLogData*
 		enablePopReq.reply.sendError(operation_failed());
 		return Void();
 	}
-	TraceEvent("EnableTLogPlayAllIgnoredPops2")
+	TraceEvent("EnableTLogPlayAllIgnoredPops2", logData->logId)
 	    .detail("UidStr", enablePopReq.snapUID.toString())
 	    .detail("IgnorePopUid", self->ignorePopUid)
-	    .detail("IgnorePopRequest", self->ignorePopRequest)
 	    .detail("IgnorePopDeadline", self->ignorePopDeadline)
 	    .detail("PersistentDataVersion", logData->persistentDataVersion)
 	    .detail("PersistentDataDurableVersion", logData->persistentDataDurableVersion)
 	    .detail("QueueCommittedVersion", logData->queueCommittedVersion.get())
 	    .detail("Version", logData->version.get());
+	self->ignorePopDeadline = 0;
 	wait(processPopRequests(self, logData));
 	enablePopReq.reply.send(Void());
 	return Void();
@@ -2681,9 +2685,8 @@ ACTOR Future<Void> serveTLogInterface(TLogData* self,
 				req.reply.sendError(operation_failed());
 			} else {
 				// FIXME: As part of reverting snapshot V1, make ignorePopUid a UID instead of string
-				self->ignorePopRequest = true;
 				self->ignorePopUid = req.snapUID.toString();
-				self->ignorePopDeadline = g_network->now() + SERVER_KNOBS->TLOG_IGNORE_POP_AUTO_ENABLE_DELAY;
+				self->ignorePopDeadline = now() + SERVER_KNOBS->TLOG_IGNORE_POP_AUTO_ENABLE_DELAY;
 				req.reply.send(Void());
 			}
 		}
@@ -2693,11 +2696,6 @@ ACTOR Future<Void> serveTLogInterface(TLogData* self,
 		when(TLogSnapRequest snapReq = waitNext(tli.snapRequest.getFuture())) {
 			logData->addActor.send(tLogSnapCreate(snapReq, self, logData));
 		}
-		when(wait(self->ignorePopRequest ? delayUntil(self->ignorePopDeadline) : Never())) {
-			TEST(true); // Hit ignorePopDeadline
-			TraceEvent("EnableTLogPlayAllIgnoredPops").detail("IgnoredPopDeadline", self->ignorePopDeadline);
-			logData->addActor.send(processPopRequests(self, logData));
-		}
 	}
 }
 

From 35dd5e8b8e96c58058230ae8d5dbe3d44946114c Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Wed, 20 Apr 2022 10:10:51 -0700
Subject: [PATCH 340/740] The tenant deletion test now deletes multiple tenants
 concurrently rather than serially. Fix some variable shadowing in the delete
 test.

---
 .../workloads/TenantManagement.actor.cpp      | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/fdbserver/workloads/TenantManagement.actor.cpp b/fdbserver/workloads/TenantManagement.actor.cpp
index 784c97bd72c..2d696fc7454 100644
--- a/fdbserver/workloads/TenantManagement.actor.cpp
+++ b/fdbserver/workloads/TenantManagement.actor.cpp
@@ -221,41 +221,41 @@ struct TenantManagementWorkload : TestWorkload {
 	}
 
 	ACTOR Future<Void> deleteTenant(Database cx, TenantManagementWorkload* self) {
-		state TenantName tenant = self->chooseTenantName(true);
+		state TenantName beginTenant = self->chooseTenantName(true);
 		state OperationType operationType = TenantManagementWorkload::randomOperationType();
 		state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(cx);
 
 		state Optional<TenantName> endTenant = operationType != OperationType::MANAGEMENT_DATABASE &&
-		                                               !tenant.startsWith("\xff"_sr) &&
+		                                               !beginTenant.startsWith("\xff"_sr) &&
 		                                               deterministicRandom()->random01() < 0.2
 		                                           ? Optional<TenantName>(self->chooseTenantName(false))
 		                                           : Optional<TenantName>();
 
-		if (endTenant.present() && endTenant < tenant) {
-			TenantName temp = tenant;
-			tenant = endTenant.get();
+		if (endTenant.present() && endTenant < beginTenant) {
+			TenantName temp = beginTenant;
+			beginTenant = endTenant.get();
 			endTenant = temp;
 		}
 
-		auto itr = self->createdTenants.find(tenant);
+		auto itr = self->createdTenants.find(beginTenant);
 		state bool alreadyExists = itr != self->createdTenants.end();
 		state bool isEmpty = true;
 
 		state std::vector<TenantName> tenants;
 		if (!endTenant.present()) {
-			tenants.push_back(tenant);
+			tenants.push_back(beginTenant);
 		} else if (endTenant.present()) {
-			for (auto itr = self->createdTenants.lower_bound(tenant);
+			for (auto itr = self->createdTenants.lower_bound(beginTenant);
 			     itr != self->createdTenants.end() && itr->first < endTenant.get();
 			     ++itr) {
 				tenants.push_back(itr->first);
 			}
 		}
 
+		state int tenantIndex;
 		try {
 			if (alreadyExists || endTenant.present()) {
-				state int tenantIndex = 0;
-				for (; tenantIndex < tenants.size(); ++tenantIndex) {
+				for (tenantIndex = 0; tenantIndex < tenants.size(); ++tenantIndex) {
 					if (deterministicRandom()->random01() < 0.9) {
 						state Transaction clearTr(cx, tenants[tenantIndex]);
 						loop {
@@ -280,7 +280,7 @@ struct TenantManagementWorkload : TestWorkload {
 		} catch (Error& e) {
 			TraceEvent(SevError, "DeleteTenantFailure")
 			    .error(e)
-			    .detail("TenantName", tenant)
+			    .detail("TenantName", beginTenant)
 			    .detail("EndTenant", endTenant);
 			return Void();
 		}
@@ -289,7 +289,7 @@ struct TenantManagementWorkload : TestWorkload {
 			try {
 				if (operationType == OperationType::SPECIAL_KEYS) {
 					tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
-					Key key = self->specialKeysTenantMapPrefix.withSuffix(tenant);
+					Key key = self->specialKeysTenantMapPrefix.withSuffix(beginTenant);
 					if (endTenant.present()) {
 						tr->clear(KeyRangeRef(key, self->specialKeysTenantMapPrefix.withSuffix(endTenant.get())));
 					} else {
@@ -298,15 +298,17 @@ struct TenantManagementWorkload : TestWorkload {
 					wait(tr->commit());
 				} else if (operationType == OperationType::MANAGEMENT_DATABASE) {
 					ASSERT(tenants.size() == 1);
-					for (auto tenant : tenants) {
-						wait(ManagementAPI::deleteTenant(cx.getReference(), tenant));
+					for (tenantIndex = 0; tenantIndex != tenants.size(); ++tenantIndex) {
+						wait(ManagementAPI::deleteTenant(cx.getReference(), tenants[tenantIndex]));
 					}
 				} else {
 					tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-					for (auto tenant : tenants) {
-						wait(ManagementAPI::deleteTenantTransaction(tr, tenant));
+					std::vector<Future<Void>> deleteFutures;
+					for (tenantIndex = 0; tenantIndex != tenants.size(); ++tenantIndex) {
+						deleteFutures.push_back(ManagementAPI::deleteTenantTransaction(tr, tenants[tenantIndex]));
 					}
 
+					wait(waitForAll(deleteFutures));
 					wait(tr->commit());
 				}
 
@@ -330,7 +332,7 @@ struct TenantManagementWorkload : TestWorkload {
 					} else {
 						TraceEvent(SevError, "DeleteTenantFailure")
 						    .error(e)
-						    .detail("TenantName", tenant)
+						    .detail("TenantName", beginTenant)
 						    .detail("EndTenant", endTenant);
 					}
 					return Void();
@@ -340,7 +342,7 @@ struct TenantManagementWorkload : TestWorkload {
 					} catch (Error& e) {
 						TraceEvent(SevError, "DeleteTenantFailure")
 						    .error(e)
-						    .detail("TenantName", tenant)
+						    .detail("TenantName", beginTenant)
 						    .detail("EndTenant", endTenant);
 						return Void();
 					}

From c1a3e27aebba81c533d4972dce53148c367988ce Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Wed, 20 Apr 2022 14:56:45 -0700
Subject: [PATCH 341/740] A few hostname improvements (release-7.1). (#6883)

* Add tryResolveHostnames() in connection string.

* Add missing hostname to related interfaces.

* Do not pass RequestStream into *GetReplyFromHostname() functions.

Because we are using new RequestStream for each request anyways. Also, the passed in pointer could be nullptr, which results in seg faults.

* Add dynamic hostname resolve and reconnect intervals.

* Address comments.
---
 fdbclient/ConfigTransactionInterface.cpp |  6 ++-
 fdbclient/ConfigTransactionInterface.h   |  5 ++-
 fdbclient/CoordinationInterface.h        |  4 ++
 fdbclient/MonitorLeader.actor.cpp        | 41 +++++++++++++-------
 fdbrpc/genericactors.actor.h             | 38 +++++++++----------
 fdbserver/ClusterController.actor.cpp    | 48 ++++++++++--------------
 fdbserver/Coordination.actor.cpp         |  4 +-
 fdbserver/CoordinationInterface.h        | 10 ++---
 fdbserver/LeaderElection.actor.cpp       |  2 +-
 flow/Hostname.actor.cpp                  |  4 +-
 flow/Hostname.h                          |  6 +++
 flow/Knobs.cpp                           |  5 ++-
 flow/Knobs.h                             |  5 ++-
 13 files changed, 102 insertions(+), 76 deletions(-)

diff --git a/fdbclient/ConfigTransactionInterface.cpp b/fdbclient/ConfigTransactionInterface.cpp
index fab26f34985..1f053a00524 100644
--- a/fdbclient/ConfigTransactionInterface.cpp
+++ b/fdbclient/ConfigTransactionInterface.cpp
@@ -34,12 +34,16 @@ void ConfigTransactionInterface::setupWellKnownEndpoints() {
 }
 
 ConfigTransactionInterface::ConfigTransactionInterface(NetworkAddress const& remote)
-  : getGeneration(Endpoint::wellKnown({ remote }, WLTOKEN_CONFIGTXN_GETGENERATION)),
+  : _id(deterministicRandom()->randomUniqueID()),
+    getGeneration(Endpoint::wellKnown({ remote }, WLTOKEN_CONFIGTXN_GETGENERATION)),
     get(Endpoint::wellKnown({ remote }, WLTOKEN_CONFIGTXN_GET)),
     getClasses(Endpoint::wellKnown({ remote }, WLTOKEN_CONFIGTXN_GETCLASSES)),
     getKnobs(Endpoint::wellKnown({ remote }, WLTOKEN_CONFIGTXN_GETKNOBS)),
     commit(Endpoint::wellKnown({ remote }, WLTOKEN_CONFIGTXN_COMMIT)) {}
 
+ConfigTransactionInterface::ConfigTransactionInterface(Hostname const& remote)
+  : _id(deterministicRandom()->randomUniqueID()), hostname(remote) {}
+
 bool ConfigTransactionInterface::operator==(ConfigTransactionInterface const& rhs) const {
 	return _id == rhs._id;
 }
diff --git a/fdbclient/ConfigTransactionInterface.h b/fdbclient/ConfigTransactionInterface.h
index 7489594ad03..98b65e4c4b5 100644
--- a/fdbclient/ConfigTransactionInterface.h
+++ b/fdbclient/ConfigTransactionInterface.h
@@ -200,9 +200,12 @@ struct ConfigTransactionInterface {
 	class RequestStream<ConfigTransactionGetKnobsRequest> getKnobs;
 	class RequestStream<ConfigTransactionCommitRequest> commit;
 
+	Optional<Hostname> hostname;
+
 	ConfigTransactionInterface();
 	void setupWellKnownEndpoints();
 	ConfigTransactionInterface(NetworkAddress const& remote);
+	ConfigTransactionInterface(Hostname const& remote);
 
 	bool operator==(ConfigTransactionInterface const& rhs) const;
 	bool operator!=(ConfigTransactionInterface const& rhs) const;
@@ -210,6 +213,6 @@ struct ConfigTransactionInterface {
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, getGeneration, get, getClasses, getKnobs, commit);
+		serializer(ar, getGeneration, get, getClasses, getKnobs, commit, hostname);
 	}
 };
diff --git a/fdbclient/CoordinationInterface.h b/fdbclient/CoordinationInterface.h
index cc28dd5e252..73a728213dd 100644
--- a/fdbclient/CoordinationInterface.h
+++ b/fdbclient/CoordinationInterface.h
@@ -104,6 +104,10 @@ class ClusterConnectionString {
 
 	ConnectionStringStatus status = RESOLVED;
 	AsyncTrigger resolveFinish;
+	// This function tries to resolve all hostnames once, and return them with coords.
+	// Best effort, does not guarantee that the resolves succeed.
+	Future<std::vector<NetworkAddress>> tryResolveHostnames();
+
 	std::vector<NetworkAddress> coords;
 	std::vector<Hostname> hostnames;
 	std::unordered_map<NetworkAddress, Hostname> networkAddressToHostname;
diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index 678c47eba01..0b80e5076ca 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -364,6 +364,29 @@ TEST_CASE("/fdbclient/MonitorLeader/ConnectionString") {
 	return Void();
 }
 
+ACTOR Future<std::vector<NetworkAddress>> tryResolveHostnamesImpl(ClusterConnectionString* self) {
+	state std::set<NetworkAddress> allCoordinatorsSet;
+	std::vector<Future<Void>> fs;
+	for (auto& hostname : self->hostnames) {
+		fs.push_back(map(hostname.resolve(), [&](Optional<NetworkAddress> const& addr) -> Void {
+			if (addr.present()) {
+				allCoordinatorsSet.insert(addr.get());
+			}
+			return Void();
+		}));
+	}
+	wait(waitForAll(fs));
+	for (const auto& coord : self->coords) {
+		allCoordinatorsSet.insert(coord);
+	}
+	std::vector<NetworkAddress> allCoordinators(allCoordinatorsSet.begin(), allCoordinatorsSet.end());
+	return allCoordinators;
+}
+
+Future<std::vector<NetworkAddress>> ClusterConnectionString::tryResolveHostnames() {
+	return tryResolveHostnamesImpl(this);
+}
+
 TEST_CASE("/fdbclient/MonitorLeader/PartialResolve") {
 	std::string connectionString = "TestCluster:0@host.name:1234,host-name:5678";
 	std::string hn = "host-name", port = "5678";
@@ -373,19 +396,9 @@ TEST_CASE("/fdbclient/MonitorLeader/PartialResolve") {
 	INetworkConnections::net()->addMockTCPEndpoint(hn, port, { address });
 
 	state ClusterConnectionString cs(connectionString);
-
-	state std::unordered_set<NetworkAddress> coordinatorAddresses;
-	std::vector<Future<Void>> fs;
-	for (auto& hostname : cs.hostnames) {
-		fs.push_back(map(hostname.resolve(), [&](Optional<NetworkAddress> const& addr) -> Void {
-			if (addr.present()) {
-				coordinatorAddresses.insert(addr.get());
-			}
-			return Void();
-		}));
-	}
-	wait(waitForAll(fs));
-	ASSERT(coordinatorAddresses.size() == 1 && coordinatorAddresses.count(address) == 1);
+	state std::vector<NetworkAddress> allCoordinators = wait(cs.tryResolveHostnames());
+	ASSERT(allCoordinators.size() == 1 &&
+	       std::find(allCoordinators.begin(), allCoordinators.end(), address) != allCoordinators.end());
 
 	return Void();
 }
@@ -585,7 +598,7 @@ ACTOR Future<Void> monitorNominee(Key key,
 				    .detail("OldAddr", coord.getLeader.getEndpoint().getPrimaryAddress().toString());
 				if (rep.getError().code() == error_code_request_maybe_delivered) {
 					// Delay to prevent tight resolving loop due to outdated DNS cache
-					wait(delay(FLOW_KNOBS->HOSTNAME_RESOLVE_DELAY));
+					wait(delay(FLOW_KNOBS->HOSTNAME_RECONNECT_INIT_INTERVAL));
 					throw coordinators_changed();
 				} else {
 					throw rep.getError();
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 821c93d5fb6..6344e312692 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -73,10 +73,7 @@ Future<REPLY_TYPE(Req)> retryBrokenPromise(RequestStream<Req> to, Req request, T
 }
 
 ACTOR template <class Req>
-Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(RequestStream<Req>* to,
-                                                         Req request,
-                                                         Hostname hostname,
-                                                         WellKnownEndpoints token) {
+Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(Req request, Hostname hostname, WellKnownEndpoints token) {
 	// A wrapper of tryGetReply(request), except that the request is sent to an address resolved from a hostname.
 	// If resolving fails, return lookup_failed().
 	// Otherwise, return tryGetReply(request).
@@ -84,8 +81,8 @@ Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(RequestStream<Req>* to,
 	if (!address.present()) {
 		return ErrorOr<REPLY_TYPE(Req)>(lookup_failed());
 	}
-	*to = RequestStream<Req>(Endpoint::wellKnown({ address.get() }, token));
-	ErrorOr<REPLY_TYPE(Req)> reply = wait(to->tryGetReply(request));
+	RequestStream<Req> to(Endpoint::wellKnown({ address.get() }, token));
+	state ErrorOr<REPLY_TYPE(Req)> reply = wait(to.tryGetReply(request));
 	if (reply.isError()) {
 		resetReply(request);
 		if (reply.getError().code() == error_code_request_maybe_delivered) {
@@ -98,8 +95,7 @@ Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(RequestStream<Req>* to,
 }
 
 ACTOR template <class Req>
-Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(RequestStream<Req>* to,
-                                                         Req request,
+Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(Req request,
                                                          Hostname hostname,
                                                          WellKnownEndpoints token,
                                                          TaskPriority taskID) {
@@ -110,8 +106,8 @@ Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(RequestStream<Req>* to,
 	if (!address.present()) {
 		return ErrorOr<REPLY_TYPE(Req)>(lookup_failed());
 	}
-	*to = RequestStream<Req>(Endpoint::wellKnown({ address.get() }, token));
-	ErrorOr<REPLY_TYPE(Req)> reply = wait(to->tryGetReply(request, taskID));
+	RequestStream<Req> to(Endpoint::wellKnown({ address.get() }, token));
+	state ErrorOr<REPLY_TYPE(Req)> reply = wait(to.tryGetReply(request, taskID));
 	if (reply.isError()) {
 		resetReply(request);
 		if (reply.getError().code() == error_code_request_maybe_delivered) {
@@ -124,21 +120,21 @@ Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(RequestStream<Req>* to,
 }
 
 ACTOR template <class Req>
-Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(RequestStream<Req>* to,
-                                                  Req request,
-                                                  Hostname hostname,
-                                                  WellKnownEndpoints token) {
+Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(Req request, Hostname hostname, WellKnownEndpoints token) {
 	// Like tryGetReplyFromHostname, except that request_maybe_delivered results in re-resolving the hostname.
 	// Suitable for use with hostname, where RequestStream is NOT initialized yet.
 	// Not normally useful for endpoints initialized with NetworkAddress.
+	state double reconnetInterval = FLOW_KNOBS->HOSTNAME_RECONNECT_INIT_INTERVAL;
 	loop {
 		NetworkAddress address = wait(hostname.resolveWithRetry());
-		*to = RequestStream<Req>(Endpoint::wellKnown({ address }, token));
-		ErrorOr<REPLY_TYPE(Req)> reply = wait(to->tryGetReply(request));
+		RequestStream<Req> to(Endpoint::wellKnown({ address }, token));
+		state ErrorOr<REPLY_TYPE(Req)> reply = wait(to.tryGetReply(request));
 		if (reply.isError()) {
 			resetReply(request);
 			if (reply.getError().code() == error_code_request_maybe_delivered) {
 				// Connection failure.
+				wait(delay(reconnetInterval));
+				reconnetInterval = std::min(2 * reconnetInterval, FLOW_KNOBS->HOSTNAME_RECONNECT_MAX_INTERVAL);
 				hostname.resetToUnresolved();
 				INetworkConnections::net()->removeCachedDNS(hostname.host, hostname.service);
 			} else {
@@ -151,22 +147,24 @@ Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(RequestStream<Req>* to,
 }
 
 ACTOR template <class Req>
-Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(RequestStream<Req>* to,
-                                                  Req request,
+Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(Req request,
                                                   Hostname hostname,
                                                   WellKnownEndpoints token,
                                                   TaskPriority taskID) {
 	// Like tryGetReplyFromHostname, except that request_maybe_delivered results in re-resolving the hostname.
 	// Suitable for use with hostname, where RequestStream is NOT initialized yet.
 	// Not normally useful for endpoints initialized with NetworkAddress.
+	state double reconnetInterval = FLOW_KNOBS->HOSTNAME_RECONNECT_INIT_INTERVAL;
 	loop {
 		NetworkAddress address = wait(hostname.resolveWithRetry());
-		*to = RequestStream<Req>(Endpoint::wellKnown({ address }, token));
-		ErrorOr<REPLY_TYPE(Req)> reply = wait(to->tryGetReply(request, taskID));
+		RequestStream<Req> to(Endpoint::wellKnown({ address }, token));
+		state ErrorOr<REPLY_TYPE(Req)> reply = wait(to.tryGetReply(request, taskID));
 		if (reply.isError()) {
 			resetReply(request);
 			if (reply.getError().code() == error_code_request_maybe_delivered) {
 				// Connection failure.
+				wait(delay(reconnetInterval));
+				reconnetInterval = std::min(2 * reconnetInterval, FLOW_KNOBS->HOSTNAME_RECONNECT_MAX_INTERVAL);
 				hostname.resetToUnresolved();
 				INetworkConnections::net()->removeCachedDNS(hostname.host, hostname.service);
 			} else {
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index c47f52c78f8..a5872647ece 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -1097,18 +1097,24 @@ void haltRegisteringOrCurrentSingleton(ClusterControllerData* self,
 	}
 }
 
-void registerWorker(RegisterWorkerRequest req,
-                    ClusterControllerData* self,
-                    std::unordered_set<NetworkAddress> coordinatorAddresses,
-                    ConfigBroadcaster* configBroadcaster) {
+ACTOR Future<Void> registerWorker(RegisterWorkerRequest req,
+                                  ClusterControllerData* self,
+                                  ClusterConnectionString cs,
+                                  ConfigBroadcaster* configBroadcaster) {
+	std::vector<NetworkAddress> coordinatorAddresses = wait(cs.tryResolveHostnames());
+
 	const WorkerInterface& w = req.wi;
 	ProcessClass newProcessClass = req.processClass;
 	auto info = self->id_worker.find(w.locality.processId());
 	ClusterControllerPriorityInfo newPriorityInfo = req.priorityInfo;
 	newPriorityInfo.processClassFitness = newProcessClass.machineClassFitness(ProcessClass::ClusterController);
+
 	bool isCoordinator =
-	    (coordinatorAddresses.count(req.wi.address()) > 0) ||
-	    (req.wi.secondaryAddress().present() && coordinatorAddresses.count(req.wi.secondaryAddress().get()) > 0);
+	    (std::find(coordinatorAddresses.begin(), coordinatorAddresses.end(), req.wi.address()) !=
+	     coordinatorAddresses.end()) ||
+	    (req.wi.secondaryAddress().present() &&
+	     std::find(coordinatorAddresses.begin(), coordinatorAddresses.end(), req.wi.secondaryAddress().get()) !=
+	         coordinatorAddresses.end());
 
 	for (auto it : req.incompatiblePeers) {
 		self->db.incompatibleConnections[it] = now() + SERVER_KNOBS->INCOMPATIBLE_PEERS_LOGGING_INTERVAL;
@@ -1271,6 +1277,8 @@ void registerWorker(RegisterWorkerRequest req,
 	if (!req.reply.isSet() && newPriorityInfo != req.priorityInfo) {
 		req.reply.send(RegisterWorkerReply(newProcessClass, newPriorityInfo));
 	}
+
+	return Void();
 }
 
 #define TIME_KEEPER_VERSION LiteralStringRef("1")
@@ -2542,30 +2550,12 @@ ACTOR Future<Void> clusterControllerCore(Reference<IClusterConnectionRecord> con
 		when(RecruitBlobWorkerRequest req = waitNext(interf.recruitBlobWorker.getFuture())) {
 			clusterRecruitBlobWorker(&self, req);
 		}
-		when(state RegisterWorkerRequest req = waitNext(interf.registerWorker.getFuture())) {
+		when(RegisterWorkerRequest req = waitNext(interf.registerWorker.getFuture())) {
 			++self.registerWorkerRequests;
-			state ClusterConnectionString ccs = coordinators.ccr->getConnectionString();
-
-			state std::unordered_set<NetworkAddress> coordinatorAddresses;
-			std::vector<Future<Void>> fs;
-			for (auto& hostname : ccs.hostnames) {
-				fs.push_back(map(hostname.resolve(), [&](Optional<NetworkAddress> const& addr) -> Void {
-					if (addr.present()) {
-						coordinatorAddresses.insert(addr.get());
-					}
-					return Void();
-				}));
-			}
-			wait(waitForAll(fs));
-
-			for (const auto& coord : ccs.coordinators()) {
-				coordinatorAddresses.insert(coord);
-			}
-
-			registerWorker(req,
-			               &self,
-			               coordinatorAddresses,
-			               (configDBType == ConfigDBType::DISABLED) ? nullptr : &configBroadcaster);
+			self.addActor.send(registerWorker(req,
+			                                  &self,
+			                                  coordinators.ccr->getConnectionString(),
+			                                  (configDBType == ConfigDBType::DISABLED) ? nullptr : &configBroadcaster));
 		}
 		when(GetWorkersRequest req = waitNext(interf.getWorkers.getFuture())) {
 			++self.getWorkersRequests;
diff --git a/fdbserver/Coordination.actor.cpp b/fdbserver/Coordination.actor.cpp
index 851007fef75..53086e55162 100644
--- a/fdbserver/Coordination.actor.cpp
+++ b/fdbserver/Coordination.actor.cpp
@@ -75,7 +75,7 @@ struct GenerationRegVal {
 	}
 };
 
-GenerationRegInterface::GenerationRegInterface(NetworkAddress remote)
+GenerationRegInterface::GenerationRegInterface(NetworkAddress const& remote)
   : read(Endpoint::wellKnown({ remote }, WLTOKEN_GENERATIONREG_READ)),
     write(Endpoint::wellKnown({ remote }, WLTOKEN_GENERATIONREG_WRITE)) {}
 
@@ -84,7 +84,7 @@ GenerationRegInterface::GenerationRegInterface(INetwork* local) {
 	write.makeWellKnownEndpoint(WLTOKEN_GENERATIONREG_WRITE, TaskPriority::Coordination);
 }
 
-LeaderElectionRegInterface::LeaderElectionRegInterface(NetworkAddress remote)
+LeaderElectionRegInterface::LeaderElectionRegInterface(NetworkAddress const& remote)
   : ClientLeaderRegInterface(remote), candidacy(Endpoint::wellKnown({ remote }, WLTOKEN_LEADERELECTIONREG_CANDIDACY)),
     electionResult(Endpoint::wellKnown({ remote }, WLTOKEN_LEADERELECTIONREG_ELECTIONRESULT)),
     leaderHeartbeat(Endpoint::wellKnown({ remote }, WLTOKEN_LEADERELECTIONREG_LEADERHEARTBEAT)),
diff --git a/fdbserver/CoordinationInterface.h b/fdbserver/CoordinationInterface.h
index 461904787c8..b966678cc6a 100644
--- a/fdbserver/CoordinationInterface.h
+++ b/fdbserver/CoordinationInterface.h
@@ -53,9 +53,9 @@ struct GenerationRegInterface {
 	// the v2 of the previous generation is the v1 of the next.
 
 	GenerationRegInterface() {}
-	GenerationRegInterface(NetworkAddress remote);
+	GenerationRegInterface(NetworkAddress const& remote);
 	GenerationRegInterface(INetwork* local);
-	GenerationRegInterface(Hostname hostname) : hostname(hostname){};
+	GenerationRegInterface(Hostname const& hostname) : hostname(hostname){};
 };
 
 struct UniqueGeneration {
@@ -128,9 +128,9 @@ struct LeaderElectionRegInterface : ClientLeaderRegInterface {
 	RequestStream<struct ForwardRequest> forward;
 
 	LeaderElectionRegInterface() {}
-	LeaderElectionRegInterface(NetworkAddress remote);
+	LeaderElectionRegInterface(NetworkAddress const& remote);
 	LeaderElectionRegInterface(INetwork* local);
-	LeaderElectionRegInterface(Hostname hostname) : ClientLeaderRegInterface(hostname) {}
+	LeaderElectionRegInterface(Hostname const& hostname) : ClientLeaderRegInterface(hostname) {}
 };
 
 struct CandidacyRequest {
@@ -220,7 +220,7 @@ class ConfigNode;
 
 class ServerCoordinators : public ClientCoordinators {
 public:
-	explicit ServerCoordinators(Reference<IClusterConnectionRecord>);
+	explicit ServerCoordinators(Reference<IClusterConnectionRecord> ccr);
 
 	std::vector<LeaderElectionRegInterface> leaderElectionServers;
 	std::vector<GenerationRegInterface> stateServers;
diff --git a/fdbserver/LeaderElection.actor.cpp b/fdbserver/LeaderElection.actor.cpp
index 04f7923a1aa..272e07c1ec3 100644
--- a/fdbserver/LeaderElection.actor.cpp
+++ b/fdbserver/LeaderElection.actor.cpp
@@ -51,7 +51,7 @@ ACTOR Future<Void> submitCandidacy(Key key,
 				    .detail("OldAddr", coord.candidacy.getEndpoint().getPrimaryAddress().toString());
 				if (rep.getError().code() == error_code_request_maybe_delivered) {
 					// Delay to prevent tight resolving loop due to outdated DNS cache
-					wait(delay(FLOW_KNOBS->HOSTNAME_RESOLVE_DELAY));
+					wait(delay(FLOW_KNOBS->HOSTNAME_RECONNECT_INIT_INTERVAL));
 					throw coordinators_changed();
 				} else {
 					throw rep.getError();
diff --git a/flow/Hostname.actor.cpp b/flow/Hostname.actor.cpp
index 6562f2d4842..ab89280a44f 100644
--- a/flow/Hostname.actor.cpp
+++ b/flow/Hostname.actor.cpp
@@ -84,13 +84,15 @@ ACTOR Future<Optional<NetworkAddress>> resolveImpl(Hostname* self) {
 }
 
 ACTOR Future<NetworkAddress> resolveWithRetryImpl(Hostname* self) {
+	state double resolveInterval = FLOW_KNOBS->HOSTNAME_RESOLVE_INIT_INTERVAL;
 	loop {
 		try {
 			Optional<NetworkAddress> address = wait(resolveImpl(self));
 			if (address.present()) {
 				return address.get();
 			}
-			wait(delay(FLOW_KNOBS->HOSTNAME_RESOLVE_DELAY));
+			wait(delay(resolveInterval));
+			resolveInterval = std::min(2 * resolveInterval, FLOW_KNOBS->HOSTNAME_RESOLVE_MAX_INTERVAL);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_actor_cancelled);
 			throw;
diff --git a/flow/Hostname.h b/flow/Hostname.h
index 0faa4c53df5..2492a17370e 100644
--- a/flow/Hostname.h
+++ b/flow/Hostname.h
@@ -74,6 +74,7 @@ struct Hostname {
 
 	Optional<NetworkAddress> resolvedAddress;
 	enum HostnameStatus { UNRESOLVED, RESOLVING, RESOLVED };
+	// The resolve functions below use DNS cache.
 	Future<Optional<NetworkAddress>> resolve();
 	Future<NetworkAddress> resolveWithRetry();
 	Optional<NetworkAddress> resolveBlocking(); // This one should only be used when resolving asynchronously is
@@ -81,6 +82,11 @@ struct Hostname {
 	void resetToUnresolved();
 	HostnameStatus status = UNRESOLVED;
 	AsyncTrigger resolveFinish;
+
+	template <class Ar>
+	void serialize(Ar& ar) {
+		serializer(ar, host, service, isTLS, resolvedAddress, status);
+	}
 };
 
 #endif
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index 7765786e69c..f78427002e3 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -40,7 +40,10 @@ FlowKnobs const* FLOW_KNOBS = &bootstrapGlobalFlowKnobs;
 void FlowKnobs::initialize(Randomize randomize, IsSimulated isSimulated) {
 	init( AUTOMATIC_TRACE_DUMP,                                  1 );
 	init( PREVENT_FAST_SPIN_DELAY,                             .01 );
-	init( HOSTNAME_RESOLVE_DELAY,                              .05 );
+	init( HOSTNAME_RESOLVE_INIT_INTERVAL,                      .05 );
+	init( HOSTNAME_RESOLVE_MAX_INTERVAL,                       1.0 );
+	init( HOSTNAME_RECONNECT_INIT_INTERVAL,                    .05 );
+	init( HOSTNAME_RECONNECT_MAX_INTERVAL,                     1.0 );
 	init( CACHE_REFRESH_INTERVAL_WHEN_ALL_ALTERNATIVES_FAILED, 1.0 );
 
 	init( DELAY_JITTER_OFFSET,                                 0.9 );
diff --git a/flow/Knobs.h b/flow/Knobs.h
index 4186304991f..ae34659939a 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -113,7 +113,10 @@ class FlowKnobs : public KnobsImpl<FlowKnobs> {
 public:
 	int AUTOMATIC_TRACE_DUMP;
 	double PREVENT_FAST_SPIN_DELAY;
-	double HOSTNAME_RESOLVE_DELAY;
+	double HOSTNAME_RESOLVE_INIT_INTERVAL;
+	double HOSTNAME_RESOLVE_MAX_INTERVAL;
+	double HOSTNAME_RECONNECT_INIT_INTERVAL;
+	double HOSTNAME_RECONNECT_MAX_INTERVAL;
 	double CACHE_REFRESH_INTERVAL_WHEN_ALL_ALTERNATIVES_FAILED;
 
 	double DELAY_JITTER_OFFSET;

From 6127cce2a35950badf61c4a94ad6a3349adc0121 Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Thu, 21 Apr 2022 16:24:26 -0400
Subject: [PATCH 342/740] Add new c libs to client package

---
 bindings/c/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
index 57a17a766a0..676fe824e30 100644
--- a/bindings/c/CMakeLists.txt
+++ b/bindings/c/CMakeLists.txt
@@ -295,6 +295,7 @@ fdb_install(
   FILES foundationdb/fdb_c.h
   ${CMAKE_CURRENT_BINARY_DIR}/foundationdb/fdb_c_options.g.h
   ${CMAKE_SOURCE_DIR}/fdbclient/vexillographer/fdb.options
+  ${CMAKE_SOURCE_DIR}/bindings/c/foundationdb/fdb_c_types.h
   DESTINATION include
   DESTINATION_SUFFIX /foundationdb
   COMPONENT clients)

From 00049b9584e70809a9c0c529ec3f69111209595d Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 12 Apr 2022 15:23:47 -0700
Subject: [PATCH 343/740] update release note

---
 .../source/mr-status-json-schemas.rst.inc     | 34 +++++++++++++++++++
 .../source/perpetual-storage-wiggle.rst       |  7 ++--
 .../release-notes/release-notes-710.rst       |  2 ++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index be1bbebb299..d68f4d82b1b 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -3,6 +3,40 @@
 .. code-block:: javascript
 
    "cluster":{
+        "storage_wiggler": {
+            "wiggle_server_ids":["0ccb4e0feddb55"],
+            "wiggle_server_addresses": ["127.0.0.1"],
+            "primary": { // primary DC storage wiggler stats
+                // One StorageServer wiggle round is considered 'complete', when all StorageServers with creationTime < T are wiggled
+               "last_round_start_datetime": "2022-04-02 00:05:05.123 +0000",
+               "last_round_start_timestamp": 1648857905.123, // when did the latest round start
+               "last_round_finish_datetime": "1970-01-01 00:00:00.000 +0000",
+               "last_round_finish_timestamp": 0, // when did the latest finished round finish
+               "smoothed_round_seconds": 1, // moving average duration of a wiggle round
+               "finished_round": 1,
+               // 1 wiggle step as 1 storage server is wiggled in the current round
+               "last_wiggle_start_datetime": "2022-04-02 00:05:05.123 +0000",
+               "last_wiggle_start_timestamp": 1648857905.123, // when did the latest wiggle step start
+               "last_wiggle_finish_datetime": "1970-01-01 00:00:00.000 +0000",
+               "last_wiggle_finish_timestamp": 0,
+               "smoothed_wiggle_seconds": 1,
+               "finished_wiggle": 1
+            },
+            "remote": { // remote DC storage wiggler stats
+               "last_round_start_datetime": "2022-04-02 00:05:05.123 +0000",
+               "last_round_start_timestamp": 1648857905.123,
+               "last_round_finish_datetime": "1970-01-01 00:00:00.000 +0000",
+               "last_round_finish_timestamp": 0,
+               "smoothed_round_seconds": 1,
+               "finished_round": 1,
+               "last_wiggle_start_datetime": "2022-04-02 00:05:05.123 +0000",
+               "last_wiggle_start_timestamp": 1648857905.123,
+               "last_wiggle_finish_datetime": "1970-01-01 00:00:00.000 +0000",
+               "last_wiggle_finish_timestamp": 0,
+               "smoothed_wiggle_seconds": 1,
+               "finished_wiggle": 1
+            }
+       },
       "layers":{
          "_valid":true,
          "_error":"some error description"
diff --git a/documentation/sphinx/source/perpetual-storage-wiggle.rst b/documentation/sphinx/source/perpetual-storage-wiggle.rst
index 43c40653622..fd360bc54b0 100644
--- a/documentation/sphinx/source/perpetual-storage-wiggle.rst
+++ b/documentation/sphinx/source/perpetual-storage-wiggle.rst
@@ -14,7 +14,7 @@ Summary
 ============
 Perpetual storage wiggle is a feature that forces the data distributor to constantly build new storage teams when the cluster is healthy. On a high-level note, the process is like this:
 
-Order storage servers by process id. For each storage server n:
+Order storage servers by their created time, from oldest to newest. For each storage server n:
 
 a. Exclude storage server n.
 
@@ -22,7 +22,7 @@ b. Wait until all data has been moved off the storage server.
 
 c. Include storage n
 
-Goto a to wiggle the next storage process with different process id.
+Goto step a to wiggle the next storage server.
 
 With a perpetual wiggle, storage migrations will be much less impactful. The wiggler will detect the healthy status based on healthy teams, available disk space and the number of unhealthy relocations. It will pause the wiggle until the cluster is healthy again.
 
@@ -47,7 +47,8 @@ Disable perpetual storage wiggle locality matching filter, which wiggles all the
 Monitor
 =======
 
-The ``status`` command in the FDB :ref:`command line interface <command-line-interface>` will show the current perpetual_storage_wiggle value.
+* The ``status`` command will report the IP address of the Storage Server under wiggling.
+* The ``status json`` command in the FDB :ref:`command line interface <command-line-interface>` will show the current `perpetual_storage_wiggle` value. Plus, the ``cluster.storage_wiggler`` field reports storage wiggle details.
 
 Trace Events
 ----------------------
diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 78412c15bbf..84a3405b709 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -23,6 +23,7 @@ Fixes
 
 Status
 ------
+* Added ``cluster.storage_wiggler`` field report storage wiggle stats `(PR #6219) <https://github.com/apple/foundationdb/pull/6219>`_
 
 Bindings
 --------
@@ -33,6 +34,7 @@ Other Changes
 -------------
 * OpenTracing support is now deprecated in favor of OpenTelemetry tracing, which will be enabled in a future release. `(PR #6478) <https://github.com/apple/foundationdb/pull/6478/files>`_
 * Changed ``memory`` option to limit resident memory instead of virtual memory. Added a new ``memory_vsize`` option if limiting virtual memory is desired. `(PR #6719) <https://github.com/apple/foundationdb/pull/6719>`_
+* Change ``perpetual storage wiggle`` to wiggle the storage servers based on their created time. `(PR #6219) <https://github.com/apple/foundationdb/pull/6219>`_
 
 Earlier release notes
 ---------------------

From c7c29f4c0a62d17e67bdc24dd98dc9c127bd42a5 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Thu, 14 Apr 2022 12:14:42 -0700
Subject: [PATCH 344/740] fix doc compilation

---
 documentation/sphinx/source/perpetual-storage-wiggle.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/perpetual-storage-wiggle.rst b/documentation/sphinx/source/perpetual-storage-wiggle.rst
index fd360bc54b0..7b1670c971e 100644
--- a/documentation/sphinx/source/perpetual-storage-wiggle.rst
+++ b/documentation/sphinx/source/perpetual-storage-wiggle.rst
@@ -48,7 +48,7 @@ Monitor
 =======
 
 * The ``status`` command will report the IP address of the Storage Server under wiggling.
-* The ``status json`` command in the FDB :ref:`command line interface <command-line-interface>` will show the current `perpetual_storage_wiggle` value. Plus, the ``cluster.storage_wiggler`` field reports storage wiggle details.
+* The ``status json`` command in the FDB :ref:`command line interface <command-line-interface>` will show the current ``perpetual_storage_wiggle`` value. Plus, the ``cluster.storage_wiggler`` field reports storage wiggle details.
 
 Trace Events
 ----------------------

From f120b3f1a07b5804fee3d57a019df1a6ae410119 Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <sbodagala@apple.com>
Date: Thu, 21 Apr 2022 20:59:42 +0000
Subject: [PATCH 345/740] - Address seg fault in "storageRecruiter" actor

---
 fdbserver/DDTeamCollection.actor.cpp | 6 ++++++
 fdbserver/DDTeamCollection.h         | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/fdbserver/DDTeamCollection.actor.cpp b/fdbserver/DDTeamCollection.actor.cpp
index bdc6259a98c..5f8e5b17d78 100644
--- a/fdbserver/DDTeamCollection.actor.cpp
+++ b/fdbserver/DDTeamCollection.actor.cpp
@@ -2626,7 +2626,11 @@ class DDTeamCollectionImpl {
 										    .detail("TSSID", tssId)
 										    .detail("Reason",
 										            self->zeroHealthyTeams->get() ? "ZeroHealthyTeams" : "TooMany");
+										Promise<Void> shutdown = self->shutdown;
 										killPromise.send(Void());
+										if (!shutdown.canBeSet()) {
+											return Void(); // "self" got destroyed, so return.
+										}
 									}
 								}
 							}
@@ -3577,6 +3581,8 @@ DDTeamCollection::DDTeamCollection(Database const& cx,
 
 DDTeamCollection::~DDTeamCollection() {
 	TraceEvent("DDTeamCollectionDestructed", distributorId).detail("Primary", primary);
+	// Signal that the object is being destroyed.
+	shutdown.send(Void());
 
 	// Cancel the teamBuilder to avoid creating new teams after teams are cancelled.
 	teamBuilder.cancel();
diff --git a/fdbserver/DDTeamCollection.h b/fdbserver/DDTeamCollection.h
index bf5fda8b282..529d2ead938 100644
--- a/fdbserver/DDTeamCollection.h
+++ b/fdbserver/DDTeamCollection.h
@@ -272,6 +272,12 @@ class DDTeamCollection : public ReferenceCounted<DDTeamCollection> {
 
 	LocalityMap<UID> machineLocalityMap; // locality info of machines
 
+	// A mechanism to tell actors that reference a DDTeamCollection object through a direct
+	// pointer (without doing reference counting) that the object is being destroyed.
+	// (Introduced to solve the problem of "self" getting destroyed from underneath the
+	// "storageRecruiter" actor).
+	Promise<Void> shutdown;
+
 	// Randomly choose one machine team that has chosenServer and has the correct size
 	// When configuration is changed, we may have machine teams with old storageTeamSize
 	Reference<TCMachineTeamInfo> findOneRandomMachineTeam(TCServerInfo const& chosenServer) const;

From 57fc7c7faa82170f83647f8dcb00820a1fdbabab Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 22 Apr 2022 09:53:33 -0700
Subject: [PATCH 346/740] fix: perpetual wiggle would not react to a pause that
 happened while starting the wiggle

---
 fdbserver/DDTeamCollection.actor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fdbserver/DDTeamCollection.actor.cpp b/fdbserver/DDTeamCollection.actor.cpp
index 5f8e5b17d78..1ed1fa7b401 100644
--- a/fdbserver/DDTeamCollection.actor.cpp
+++ b/fdbserver/DDTeamCollection.actor.cpp
@@ -2034,6 +2034,8 @@ class DDTeamCollectionImpl {
 		}
 
 		loop {
+			state Future<Void> pauseChanged = self->pauseWiggle->onChange();
+			state Future<Void> stopChanged = stopSignal->onChange();
 			if (self->wigglingId.present()) {
 				state UID id = self->wigglingId.get();
 				if (self->pauseWiggle->get()) {
@@ -2062,7 +2064,7 @@ class DDTeamCollectionImpl {
 							    .detail("ExtraHealthyTeamCount", extraTeamCount)
 							    .detail("HealthyTeamCount", self->healthyTeamCount);
 						}
-						when(wait(self->pauseWiggle->onChange())) { continue; }
+						when(wait(pauseChanged)) { continue; }
 					}
 				}
 			}
@@ -2093,7 +2095,7 @@ class DDTeamCollectionImpl {
 					finishStorageWiggleSignal.send(Void());
 					extraTeamCount = std::max(0, extraTeamCount - 1);
 				}
-				when(wait(ddQueueCheck || self->pauseWiggle->onChange() || stopSignal->onChange())) {}
+				when(wait(ddQueueCheck || pauseChanged || stopChanged)) {}
 			}
 
 			if (stopSignal->get()) {

From 5ef91f63e6dc0943dcc90aa704cb8469973d90c5 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Mon, 25 Apr 2022 09:51:11 -0700
Subject: [PATCH 347/740] Disable hostname in simulations.

Hostnames are causing simulation failures. Turn on again in #6926.
---
 fdbserver/SimulatedCluster.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index f209ab51d6b..0d9f2836ad1 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -1962,8 +1962,8 @@ void setupSimulatedSystem(std::vector<Future<Void>>* systemActors,
 	TEST(useIPv6); // Use IPv6
 	TEST(!useIPv6); // Use IPv4
 
-	// Use hostname 25% of the time, unless it is disabled
-	bool useHostname = !testConfig.disableHostname && deterministicRandom()->random01() < 0.25;
+	// TODO(renxuan): Use hostname 25% of the time, unless it is disabled
+	bool useHostname = false; // !testConfig.disableHostname && deterministicRandom()->random01() < 0.25;
 	TEST(useHostname); // Use hostname
 	TEST(!useHostname); // Use IP address
 	NetworkAddressFromHostname fromHostname =

From 8e7a464a515dcd0e4e1f89adfbc1a4c9cf1c7d24 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 25 Apr 2022 19:33:08 -0700
Subject: [PATCH 348/740] [release-7.1] Fix metadata status type (#6953)

* fix metadata status type
---
 fdbserver/Status.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index f30f1638b25..aea2e2c362c 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -587,7 +587,7 @@ struct RolesInfo {
 				TraceEventFields const& metadata = metrics.at("Metadata");
 				JsonBuilderObject metadataObj;
 				metadataObj["created_time_datetime"] = metadata.getValue("CreatedTimeDatetime");
-				metadataObj["created_time_timestamp"] = metadata.getUint64("CreatedTimeTimestamp");
+				metadataObj["created_time_timestamp"] = metadata.getDouble("CreatedTimeTimestamp");
 				obj["storage_metadata"] = metadataObj;
 			}
 

From 7535139304f89694905fb42830e9a0f5dc849a94 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 18 Apr 2022 21:57:00 -0700
Subject: [PATCH 349/740] Fix spurious test failure

The timed_out error, if happens, could cause the test to fail, even though
there is nothing wrong with the database.
---
 fdbserver/workloads/DataLossRecovery.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/workloads/DataLossRecovery.actor.cpp b/fdbserver/workloads/DataLossRecovery.actor.cpp
index 915e40577d3..dce83880804 100644
--- a/fdbserver/workloads/DataLossRecovery.actor.cpp
+++ b/fdbserver/workloads/DataLossRecovery.actor.cpp
@@ -134,7 +134,7 @@ struct DataLossRecoveryWorkload : TestWorkload {
 				} else {
 					tr.clear(key);
 				}
-				wait(timeoutError(tr.commit(), 30.0));
+				wait(tr.commit());
 				break;
 			} catch (Error& e) {
 				wait(tr.onError(e));

From 1496e8471c6d2ce0a4434b8378ba3c12457dc78f Mon Sep 17 00:00:00 2001
From: Tao Lin <tao_lin@apple.com>
Date: Wed, 20 Apr 2022 10:07:30 -0700
Subject: [PATCH 350/740] Fix GetMappedRange test when rangeResult has more

---
 fdbserver/workloads/GetMappedRange.actor.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/fdbserver/workloads/GetMappedRange.actor.cpp b/fdbserver/workloads/GetMappedRange.actor.cpp
index 197ccbb29c4..cb454b6ef6c 100644
--- a/fdbserver/workloads/GetMappedRange.actor.cpp
+++ b/fdbserver/workloads/GetMappedRange.actor.cpp
@@ -144,7 +144,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		return Void();
 	}
 
-	static void validateRecord(int expectedId, const MappedKeyValueRef* it, GetMappedRangeWorkload* self) {
+	// Return true if need to retry.
+	static bool validateRecord(int expectedId, const MappedKeyValueRef* it, GetMappedRangeWorkload* self) {
 		//		std::cout << "validateRecord expectedId " << expectedId << " it->key " << printable(it->key) << "
 		// indexEntryKey(expectedId) " << printable(indexEntryKey(expectedId)) << std::endl;
 		ASSERT(it->key == indexEntryKey(expectedId));
@@ -155,7 +156,12 @@ struct GetMappedRangeWorkload : ApiWorkload {
 			auto& getRange = std::get<GetRangeReqAndResultRef>(it->reqAndResult);
 			auto& rangeResult = getRange.result;
 			//					std::cout << "rangeResult.size()=" << rangeResult.size() << std::endl;
-			ASSERT(rangeResult.more == false);
+			// In the future, we may be able to do the continuation more efficiently by combining partial results
+			// together and then validate.
+			if (rangeResult.more) {
+				// Retry if the underlying request is not fully completed.
+				return true;
+			}
 			ASSERT(rangeResult.size() == SPLIT_SIZE);
 			for (int split = 0; split < SPLIT_SIZE; split++) {
 				auto& kv = rangeResult[split];
@@ -174,6 +180,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 			ASSERT(getValue.result.present());
 			ASSERT(getValue.result.get() == recordValue(expectedId));
 		}
+		return false;
 	}
 
 	ACTOR Future<MappedRangeResult> scanMappedRangeWithLimits(Database cx,
@@ -200,10 +207,17 @@ struct GetMappedRangeWorkload : ApiWorkload {
 				std::cout << "result.more=" << result.more << std::endl;
 				ASSERT(result.size() <= limit);
 				int expectedId = expectedBeginId;
+				bool needRetry = false;
 				for (const MappedKeyValueRef* it = result.begin(); it != result.end(); it++) {
-					validateRecord(expectedId, it, self);
+					if (validateRecord(expectedId, it, self)) {
+						needRetry = true;
+						break;
+					}
 					expectedId++;
 				}
+				if (needRetry) {
+					continue;
+				}
 				std::cout << "finished scanMappedRangeWithLimits" << std::endl;
 				return result;
 			} catch (Error& e) {

From c90edff13c03187770185d237a63f9ef1e676629 Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Thu, 14 Apr 2022 18:08:42 -0700
Subject: [PATCH 351/740] RocksDb using aggr property metrics for
 pendingCompactionBytes.

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 3b7b169133a..7e657ee7c89 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -1807,11 +1807,13 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	ACTOR Future<Void> checkRocksdbState(RocksDBKeyValueStore* self) {
 		state uint64_t estPendCompactBytes;
 		state int count = SERVER_KNOBS->ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD;
-		self->db->GetIntProperty(rocksdb::DB::Properties::kEstimatePendingCompactionBytes, &estPendCompactBytes);
+		self->db->GetAggregatedIntProperty(rocksdb::DB::Properties::kEstimatePendingCompactionBytes,
+		                                   &estPendCompactBytes);
 		while (count && estPendCompactBytes > SERVER_KNOBS->ROCKSDB_CAN_COMMIT_COMPACT_BYTES_LIMIT) {
 			wait(delay(SERVER_KNOBS->ROCKSDB_CAN_COMMIT_DELAY_ON_OVERLOAD));
 			count--;
-			self->db->GetIntProperty(rocksdb::DB::Properties::kEstimatePendingCompactionBytes, &estPendCompactBytes);
+			self->db->GetAggregatedIntProperty(rocksdb::DB::Properties::kEstimatePendingCompactionBytes,
+			                                   &estPendCompactBytes);
 		}
 
 		return Void();

From 14e43cd18ae013b7d9f12e803412f3587410bc04 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Wed, 20 Apr 2022 14:31:14 -0700
Subject: [PATCH 352/740] Add logging measuring commit compute duration

---
 fdbclient/ServerKnobs.cpp             |  1 +
 fdbclient/ServerKnobs.h               |  1 +
 fdbserver/CommitProxyServer.actor.cpp | 13 +++++++++++++
 fdbserver/ProxyCommitData.actor.h     |  6 ++++++
 4 files changed, 21 insertions(+)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 2a54b461488..edfaa9cba23 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -449,6 +449,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( MAX_COMMIT_UPDATES,                                    2000 ); if( randomize && BUGGIFY ) MAX_COMMIT_UPDATES = 1;
 	init( MAX_PROXY_COMPUTE,                                      2.0 );
 	init( MAX_COMPUTE_PER_OPERATION,                              0.1 );
+	init( MAX_COMPUTE_DURATION_LOG_CUTOFF,                       0.15 );
 	init( PROXY_COMPUTE_BUCKETS,                                20000 );
 	init( PROXY_COMPUTE_GROWTH_RATE,                             0.01 );
 	init( TXN_STATE_SEND_AMOUNT,                                    4 );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index e4df86bc304..5eec2ef57a6 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -373,6 +373,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int MAX_COMMIT_UPDATES;
 	double MAX_PROXY_COMPUTE;
 	double MAX_COMPUTE_PER_OPERATION;
+	double MAX_COMPUTE_DURATION_LOG_CUTOFF;
 	int PROXY_COMPUTE_BUCKETS;
 	double PROXY_COMPUTE_GROWTH_RATE;
 	int TXN_STATE_SEND_AMOUNT;
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 097c6f632fd..18e255f03ca 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -708,6 +708,7 @@ ACTOR Future<Void> preresolutionProcessing(CommitBatchContext* self) {
 	// Pre-resolution the commits
 	TEST(pProxyCommitData->latestLocalCommitBatchResolving.get() < localBatchNumber - 1); // Wait for local batch
 	wait(pProxyCommitData->latestLocalCommitBatchResolving.whenAtLeast(localBatchNumber - 1));
+	pProxyCommitData->stats.computeLatency.addMeasurement(now() - timeStart);
 	double queuingDelay = g_network->now() - timeStart;
 	pProxyCommitData->stats.commitBatchQueuingDist->sampleSeconds(queuingDelay);
 	if ((queuingDelay > (double)SERVER_KNOBS->MAX_READ_TRANSACTION_LIFE_VERSIONS / SERVER_KNOBS->VERSIONS_PER_SECOND ||
@@ -1401,6 +1402,18 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 		pProxyCommitData->stats.minComputeNS =
 		    std::min<int64_t>(pProxyCommitData->stats.minComputeNS,
 		                      1e9 * pProxyCommitData->commitComputePerOperation[self->latencyBucket]);
+
+		if (self->computeDuration >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF) {
+			TraceEvent(SevInfo, "LongComputeDuration")
+			    .suppressFor(5.0)
+			    .detail("ComputeDuration", self->computeDuration)
+			    .detail("ComputePerOperation", computePerOperation)
+			    .detail("LatencyBucket", self->latencyBucket)
+			    .detail("UpdatedComputePerOperationEstimate",
+			            pProxyCommitData->commitComputePerOperation[self->latencyBucket])
+			    .detail("BatchBytes", self->batchBytes)
+			    .detail("BatchOperations", self->batchOperations);
+		}
 	}
 
 	pProxyCommitData->stats.processingMutationDist->sampleSeconds(now() - postResolutionQueuing);
diff --git a/fdbserver/ProxyCommitData.actor.h b/fdbserver/ProxyCommitData.actor.h
index 0bef13a3634..309df78bfe8 100644
--- a/fdbserver/ProxyCommitData.actor.h
+++ b/fdbserver/ProxyCommitData.actor.h
@@ -70,6 +70,8 @@ struct ProxyStats {
 
 	LatencySample commitBatchingWindowSize;
 
+	LatencySample computeLatency;
+
 	Future<Void> logger;
 
 	int64_t maxComputeNS;
@@ -123,6 +125,10 @@ struct ProxyStats {
 	                             id,
 	                             SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 	                             SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+	    computeLatency("ComputeLatency",
+	                   id,
+	                   SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+	                   SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 	    maxComputeNS(0), minComputeNS(1e12),
 	    commitBatchQueuingDist(Histogram::getHistogram(LiteralStringRef("CommitProxy"),
 	                                                   LiteralStringRef("CommitBatchQueuing"),

From 85b5d778a166660b47ebdcc48995c185edada11f Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Wed, 20 Apr 2022 15:02:08 -0700
Subject: [PATCH 353/740] Add estimated compute duration

---
 fdbserver/CommitProxyServer.actor.cpp | 38 ++++++++++++++++-----------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 18e255f03ca..f1add616f14 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -685,6 +685,11 @@ bool canReject(const std::vector<CommitTransactionRequest>& trs) {
 	return true;
 }
 
+double computeReleaseDelay(CommitBatchContext* self, double latencyBucket) {
+	return std::min(SERVER_KNOBS->MAX_PROXY_COMPUTE,
+	                self->batchOperations * self->pProxyCommitData->commitComputePerOperation[latencyBucket]);
+}
+
 ACTOR Future<Void> preresolutionProcessing(CommitBatchContext* self) {
 
 	state ProxyCommitData* const pProxyCommitData = self->pProxyCommitData;
@@ -737,10 +742,7 @@ ACTOR Future<Void> preresolutionProcessing(CommitBatchContext* self) {
 		return Void();
 	}
 
-	self->releaseDelay =
-	    delay(std::min(SERVER_KNOBS->MAX_PROXY_COMPUTE,
-	                   self->batchOperations * pProxyCommitData->commitComputePerOperation[latencyBucket]),
-	          TaskPriority::ProxyMasterVersionReply);
+	self->releaseDelay = delay(computeReleaseDelay(self, latencyBucket), TaskPriority::ProxyMasterVersionReply);
 
 	if (debugID.present()) {
 		g_traceBatch.addEvent(
@@ -1388,6 +1390,22 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 	if (self->batchOperations > 0) {
 		double computePerOperation =
 		    std::min(SERVER_KNOBS->MAX_COMPUTE_PER_OPERATION, self->computeDuration / self->batchOperations);
+
+		double estimatedDelay = computeReleaseDelay(self, self->latencyBucket);
+		if (estimatedDelay >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF ||
+		    self->computeDuration >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF) {
+			TraceEvent(SevInfo, "LongComputeDuration")
+			    .suppressFor(5.0)
+			    .detail("EstimatedComputeDuration", estimatedDelay)
+			    .detail("ComputeDuration", self->computeDuration)
+			    .detail("ComputePerOperation", computePerOperation)
+			    .detail("LatencyBucket", self->latencyBucket)
+			    .detail("UpdatedComputePerOperationEstimate",
+			            pProxyCommitData->commitComputePerOperation[self->latencyBucket])
+			    .detail("BatchBytes", self->batchBytes)
+			    .detail("BatchOperations", self->batchOperations);
+		}
+
 		if (computePerOperation <= pProxyCommitData->commitComputePerOperation[self->latencyBucket]) {
 			pProxyCommitData->commitComputePerOperation[self->latencyBucket] = computePerOperation;
 		} else {
@@ -1402,18 +1420,6 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 		pProxyCommitData->stats.minComputeNS =
 		    std::min<int64_t>(pProxyCommitData->stats.minComputeNS,
 		                      1e9 * pProxyCommitData->commitComputePerOperation[self->latencyBucket]);
-
-		if (self->computeDuration >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF) {
-			TraceEvent(SevInfo, "LongComputeDuration")
-			    .suppressFor(5.0)
-			    .detail("ComputeDuration", self->computeDuration)
-			    .detail("ComputePerOperation", computePerOperation)
-			    .detail("LatencyBucket", self->latencyBucket)
-			    .detail("UpdatedComputePerOperationEstimate",
-			            pProxyCommitData->commitComputePerOperation[self->latencyBucket])
-			    .detail("BatchBytes", self->batchBytes)
-			    .detail("BatchOperations", self->batchOperations);
-		}
 	}
 
 	pProxyCommitData->stats.processingMutationDist->sampleSeconds(now() - postResolutionQueuing);

From 1fb8e40ee782858a86f4899c85782105841bd1a6 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Wed, 20 Apr 2022 15:42:17 -0700
Subject: [PATCH 354/740] Lower max compute duration cutoff and increase
 suppression duration

---
 fdbclient/ServerKnobs.cpp             | 2 +-
 fdbserver/CommitProxyServer.actor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index edfaa9cba23..8b60369eeb4 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -449,7 +449,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( MAX_COMMIT_UPDATES,                                    2000 ); if( randomize && BUGGIFY ) MAX_COMMIT_UPDATES = 1;
 	init( MAX_PROXY_COMPUTE,                                      2.0 );
 	init( MAX_COMPUTE_PER_OPERATION,                              0.1 );
-	init( MAX_COMPUTE_DURATION_LOG_CUTOFF,                       0.15 );
+	init( MAX_COMPUTE_DURATION_LOG_CUTOFF,                       0.05 );
 	init( PROXY_COMPUTE_BUCKETS,                                20000 );
 	init( PROXY_COMPUTE_GROWTH_RATE,                             0.01 );
 	init( TXN_STATE_SEND_AMOUNT,                                    4 );
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index f1add616f14..30c0753acff 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1395,7 +1395,7 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 		if (estimatedDelay >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF ||
 		    self->computeDuration >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF) {
 			TraceEvent(SevInfo, "LongComputeDuration")
-			    .suppressFor(5.0)
+			    .suppressFor(10.0)
 			    .detail("EstimatedComputeDuration", estimatedDelay)
 			    .detail("ComputeDuration", self->computeDuration)
 			    .detail("ComputePerOperation", computePerOperation)

From 485c5fcf9cda70cfb804c2eb0eb469f0771ec512 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Wed, 20 Apr 2022 15:46:41 -0700
Subject: [PATCH 355/740] Move trace below where is updated

---
 fdbserver/CommitProxyServer.actor.cpp | 30 +++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 30c0753acff..cddd5c929eb 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1388,24 +1388,10 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 
 	self->computeDuration += g_network->timer() - self->computeStart;
 	if (self->batchOperations > 0) {
+		double estimatedDelay = computeReleaseDelay(self, self->latencyBucket);
 		double computePerOperation =
 		    std::min(SERVER_KNOBS->MAX_COMPUTE_PER_OPERATION, self->computeDuration / self->batchOperations);
 
-		double estimatedDelay = computeReleaseDelay(self, self->latencyBucket);
-		if (estimatedDelay >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF ||
-		    self->computeDuration >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF) {
-			TraceEvent(SevInfo, "LongComputeDuration")
-			    .suppressFor(10.0)
-			    .detail("EstimatedComputeDuration", estimatedDelay)
-			    .detail("ComputeDuration", self->computeDuration)
-			    .detail("ComputePerOperation", computePerOperation)
-			    .detail("LatencyBucket", self->latencyBucket)
-			    .detail("UpdatedComputePerOperationEstimate",
-			            pProxyCommitData->commitComputePerOperation[self->latencyBucket])
-			    .detail("BatchBytes", self->batchBytes)
-			    .detail("BatchOperations", self->batchOperations);
-		}
-
 		if (computePerOperation <= pProxyCommitData->commitComputePerOperation[self->latencyBucket]) {
 			pProxyCommitData->commitComputePerOperation[self->latencyBucket] = computePerOperation;
 		} else {
@@ -1420,6 +1406,20 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 		pProxyCommitData->stats.minComputeNS =
 		    std::min<int64_t>(pProxyCommitData->stats.minComputeNS,
 		                      1e9 * pProxyCommitData->commitComputePerOperation[self->latencyBucket]);
+
+		if (estimatedDelay >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF ||
+		    self->computeDuration >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF) {
+			TraceEvent(SevInfo, "LongComputeDuration")
+			    .suppressFor(10.0)
+			    .detail("EstimatedComputeDuration", estimatedDelay)
+			    .detail("ComputeDuration", self->computeDuration)
+			    .detail("ComputePerOperation", computePerOperation)
+			    .detail("LatencyBucket", self->latencyBucket)
+			    .detail("UpdatedComputePerOperationEstimate",
+			            pProxyCommitData->commitComputePerOperation[self->latencyBucket])
+			    .detail("BatchBytes", self->batchBytes)
+			    .detail("BatchOperations", self->batchOperations);
+		}
 	}
 
 	pProxyCommitData->stats.processingMutationDist->sampleSeconds(now() - postResolutionQueuing);

From e09d75f4a724b9c4ba73f88868a37389f6bb1bb3 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Wed, 27 Apr 2022 10:31:04 -0400
Subject: [PATCH 356/740] Add proxy debug ID

---
 fdbserver/CommitProxyServer.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index cddd5c929eb..8272cb3c075 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1409,7 +1409,7 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
 
 		if (estimatedDelay >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF ||
 		    self->computeDuration >= SERVER_KNOBS->MAX_COMPUTE_DURATION_LOG_CUTOFF) {
-			TraceEvent(SevInfo, "LongComputeDuration")
+			TraceEvent(SevInfo, "LongComputeDuration", pProxyCommitData->dbgid)
 			    .suppressFor(10.0)
 			    .detail("EstimatedComputeDuration", estimatedDelay)
 			    .detail("ComputeDuration", self->computeDuration)

From f55ebc05f4bb4b7f40f19e0ac5f931aacb272d34 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Thu, 28 Apr 2022 12:58:47 -0700
Subject: [PATCH 357/740] update build-images.sh to play nice with AWS IMDSv2

---
 packaging/docker/build-images.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packaging/docker/build-images.sh b/packaging/docker/build-images.sh
index c9e9a586f70..4d4774b213b 100755
--- a/packaging/docker/build-images.sh
+++ b/packaging/docker/build-images.sh
@@ -254,7 +254,8 @@ push_docker_images="false"
 if [ -n "${OKTETO_NAMESPACE+x}" ]; then
     logg "RUNNING IN OKTETO/AWS"
     # these are defaults for the Apple development environment
-    aws_region=$(curl -s "http://169.254.169.254/latest/meta-data/placement/region")
+    imdsv2_token=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
+    aws_region=$(curl -H "X-aws-ec2-metadata-token: ${imdsv2_token}" "http://169.254.169.254/latest/meta-data/placement/region")
     aws_account_id=$(aws --output text sts get-caller-identity --query 'Account')
     build_output_directory="${HOME}/build_output"
     fdb_library_versions=( "${fdb_version}" )

From e75bdf7fbd7784744558e372293ef37932a1d955 Mon Sep 17 00:00:00 2001
From: hao fu <hfu5@apple.com>
Date: Thu, 28 Apr 2022 15:49:38 -0700
Subject: [PATCH 358/740] Fix limit bug in indexPrefetch

limit for getRange was incorrectly set to 1, while
a single logical record is consists of at least 2
keyValue, causing record layer fail to unsplit the
logical record.
---
 fdbserver/storageserver.actor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 50936b5950a..d7f34445827 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3455,7 +3455,8 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 		tr.setVersion(version);
 		// TODO: is DefaultPromiseEndpoint the best priority for this?
 		tr.trState->taskID = TaskPriority::DefaultPromiseEndpoint;
-		Future<RangeResult> rangeResultFuture = tr.getRange(prefixRange(prefix), Snapshot::True);
+		Future<RangeResult> rangeResultFuture =
+		    tr.getRange(prefixRange(prefix), GetRangeLimits::ROW_LIMIT_UNLIMITED, Snapshot::True);
 		// TODO: async in case it needs to read from other servers.
 		RangeResult rangeResult = wait(rangeResultFuture);
 		a->dependsOn(rangeResult.arena());

From 808330d5dd9efb14add6e0686fd8c144b536bf47 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Fri, 29 Apr 2022 04:58:51 +0000
Subject: [PATCH 359/740] update version after 7.1.3 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9a0c66a4fc..2155d182ae3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.3
+  VERSION 7.1.4
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 837b4c7193b38bf9a7b8c5a5a34355289cc5e2eb Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Thu, 28 Apr 2022 23:32:07 -0700
Subject: [PATCH 360/740] Check in the new Hostname logic (release-7.1).
 (#6998)

* Check in the new Hostname logic. (#6926)

* Revert #6655.

20220407-031010-renxuan-c101052c21da8346           compressed=True data_size=31004844 duration=4310801 ended=100000 fail_fast=10 max_runs=100000 pass=100000 priority=100 remaining=0 runtime=1:04:15 sanity=False started=100047 stopped=20220407-041425 submitted=20220407-031010 timeout=5400 username=renxuan

* Revert #6271.

20220407-051532-renxuan-470f0fe6aac1c217           compressed=True data_size=30982370 duration=3491067 ended=100002 fail_fast=10 max_runs=100000 pass=100002 priority=100 remaining=0 runtime=0:59:57 sanity=False started=100141 stopped=20220407-061529 submitted=20220407-051532 timeout=5400 username=renxuan

* Revert #6266.

Remove resolving-related functionalities in connection string. Connection string will be used for storing purpose only, and non-mutable.

20220407-175119-renxuan-55d30ee1a4b42c2f           compressed=True data_size=30970443 duration=5437659 ended=100000 fail_fast=10 max_runs=100000 pass=100000 priority=100 remaining=0 runtime=0:59:31 sanity=False started=100154 stopped=20220407-185050 submitted=20220407-175119 timeout=5400 username=renxuan

* Add hostname to coordinator interfaces.

* Turn on the new hostname logic.

* Add the corresponding change in config txns.

The most notable change is before calling basicLoadBalance(), we need to call tryInitializeRequestStream() to initialize request streams first.

Passed correctness tests.

* Return error when hostnames cannot be resolved in coordinators command.

* Minor fixes.

* One place in PaxosConfigConsumer was missed out.

* Minor improvements.
---
 fdbcli/fdbcli.actor.cpp                       |   1 -
 fdbclient/AutoPublicAddress.cpp               |  62 ++-
 fdbclient/CoordinationInterface.h             |  51 +-
 fdbclient/ManagementAPI.actor.cpp             |  59 ++-
 fdbclient/ManagementAPI.actor.h               |   4 +-
 fdbclient/MonitorLeader.actor.cpp             | 494 +++++++-----------
 fdbclient/MonitorLeader.h                     |   4 +-
 fdbclient/NativeAPI.actor.cpp                 |  48 +-
 fdbclient/PaxosConfigTransaction.actor.cpp    |  81 ++-
 fdbclient/SimpleConfigTransaction.actor.cpp   |  66 ++-
 fdbclient/SpecialKeySpace.actor.cpp           |  45 +-
 fdbclient/StatusClient.actor.cpp              |  36 +-
 fdbrpc/genericactors.actor.h                  |  14 +
 fdbserver/ClusterController.actor.cpp         |  21 +-
 fdbserver/ClusterRecovery.actor.cpp           |   3 +-
 fdbserver/CoordinatedState.actor.cpp          |  25 +-
 fdbserver/Coordination.actor.cpp              |  60 +--
 fdbserver/CoordinationInterface.h             |  10 +-
 fdbserver/LeaderElection.actor.cpp            | 113 ++--
 fdbserver/LeaderElection.h                    |   8 +-
 fdbserver/PaxosConfigConsumer.actor.cpp       |  82 ++-
 fdbserver/QuietDatabase.actor.cpp             |   5 +-
 fdbserver/SimpleConfigConsumer.actor.cpp      |  47 +-
 fdbserver/SimulatedCluster.actor.cpp          |   4 +-
 fdbserver/Status.actor.cpp                    |  17 +-
 fdbserver/fdbserver.actor.cpp                 |  23 +-
 fdbserver/worker.actor.cpp                    |  58 +-
 .../workloads/ConsistencyCheck.actor.cpp      |   5 +-
 .../workloads/RemoveServersSafely.actor.cpp   |   7 +-
 .../SpecialKeySpaceCorrectness.actor.cpp      |  17 +-
 30 files changed, 780 insertions(+), 690 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index a4d6c9c2884..66f695b386c 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -1189,7 +1189,6 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 	    ClusterConnectionFile::lookupClusterFileName(opt.clusterFile);
 	try {
 		ccf = makeReference<ClusterConnectionFile>(resolvedClusterFile.first);
-		wait(ccf->resolveHostnames());
 	} catch (Error& e) {
 		if (e.code() == error_code_operation_cancelled) {
 			throw;
diff --git a/fdbclient/AutoPublicAddress.cpp b/fdbclient/AutoPublicAddress.cpp
index c77414ded36..9b94d89e2cb 100644
--- a/fdbclient/AutoPublicAddress.cpp
+++ b/fdbclient/AutoPublicAddress.cpp
@@ -28,28 +28,46 @@
 
 #include "fdbclient/CoordinationInterface.h"
 
-// Determine public IP address by calling the first coordinator.
+// Determine public IP address by calling the first available coordinator.
+// If fail connecting all coordinators, throw bind_failed().
 IPAddress determinePublicIPAutomatically(ClusterConnectionString& ccs) {
-	try {
-		using namespace boost::asio;
-
-		io_service ioService;
-		ip::udp::socket socket(ioService);
-
-		ccs.resolveHostnamesBlocking();
-		const auto& coordAddr = ccs.coordinators()[0];
-		const auto boostIp = coordAddr.ip.isV6() ? ip::address(ip::address_v6(coordAddr.ip.toV6()))
-		                                         : ip::address(ip::address_v4(coordAddr.ip.toV4()));
-
-		ip::udp::endpoint endpoint(boostIp, coordAddr.port);
-		socket.connect(endpoint);
-		IPAddress ip = coordAddr.ip.isV6() ? IPAddress(socket.local_endpoint().address().to_v6().to_bytes())
-		                                   : IPAddress(socket.local_endpoint().address().to_v4().to_ulong());
-		socket.close();
-
-		return ip;
-	} catch (boost::system::system_error e) {
-		fprintf(stderr, "Error determining public address: %s\n", e.what());
-		throw bind_failed();
+	int size = ccs.coordinators().size() + ccs.hostnames.size();
+	int index = 0;
+	loop {
+		try {
+			using namespace boost::asio;
+
+			io_service ioService;
+			ip::udp::socket socket(ioService);
+
+			NetworkAddress coordAddr;
+			// Try coords first, because they don't need to be resolved.
+			if (index < ccs.coordinators().size()) {
+				coordAddr = ccs.coordinators()[index];
+			} else {
+				Hostname& h = ccs.hostnames[index - ccs.coordinators().size()];
+				Optional<NetworkAddress> resolvedAddr = h.resolveBlocking();
+				if (!resolvedAddr.present()) {
+					throw lookup_failed();
+				}
+				coordAddr = resolvedAddr.get();
+			}
+			const auto boostIp = coordAddr.ip.isV6() ? ip::address(ip::address_v6(coordAddr.ip.toV6()))
+			                                         : ip::address(ip::address_v4(coordAddr.ip.toV4()));
+
+			ip::udp::endpoint endpoint(boostIp, coordAddr.port);
+			socket.connect(endpoint);
+			IPAddress ip = coordAddr.ip.isV6() ? IPAddress(socket.local_endpoint().address().to_v6().to_bytes())
+			                                   : IPAddress(socket.local_endpoint().address().to_v4().to_ulong());
+			socket.close();
+
+			return ip;
+		} catch (...) {
+			++index;
+			if (index == size) {
+				fprintf(stderr, "Error determining public address.\n");
+				throw bind_failed();
+			}
+		}
 	}
 }
diff --git a/fdbclient/CoordinationInterface.h b/fdbclient/CoordinationInterface.h
index 73a728213dd..38c654b3e66 100644
--- a/fdbclient/CoordinationInterface.h
+++ b/fdbclient/CoordinationInterface.h
@@ -61,61 +61,31 @@ struct ClientLeaderRegInterface {
 //  - There is no address present more than once
 class ClusterConnectionString {
 public:
-	enum ConnectionStringStatus { RESOLVED, RESOLVING, UNRESOLVED };
-
 	ClusterConnectionString() {}
-	ClusterConnectionString(const std::string& connStr);
+	ClusterConnectionString(const std::string& connectionString);
 	ClusterConnectionString(const std::vector<NetworkAddress>& coordinators, Key key);
 	ClusterConnectionString(const std::vector<Hostname>& hosts, Key key);
 
-	ClusterConnectionString(const ClusterConnectionString& rhs) { operator=(rhs); }
-	ClusterConnectionString& operator=(const ClusterConnectionString& rhs) {
-		// Copy everything except AsyncTrigger resolveFinish.
-		status = rhs.status;
-		coords = rhs.coords;
-		hostnames = rhs.hostnames;
-		networkAddressToHostname = rhs.networkAddressToHostname;
-		key = rhs.key;
-		keyDesc = rhs.keyDesc;
-		connectionString = rhs.connectionString;
-		return *this;
-	}
-
 	std::vector<NetworkAddress> const& coordinators() const { return coords; }
-	void addResolved(const Hostname& hostname, const NetworkAddress& address) {
-		coords.push_back(address);
-		networkAddressToHostname.emplace(address, hostname);
-	}
 	Key clusterKey() const { return key; }
 	Key clusterKeyName() const {
 		return keyDesc;
 	} // Returns the "name" or "description" part of the clusterKey (the part before the ':')
 	std::string toString() const;
 	static std::string getErrorString(std::string const& source, Error const& e);
-	Future<Void> resolveHostnames();
-	// This one should only be used when resolving asynchronously is impossible. For all other cases, resolveHostnames()
-	// should be preferred.
-	void resolveHostnamesBlocking();
-	// This function derives the member connectionString from the current key, coordinators and hostnames.
-	void resetConnectionString();
-
-	void resetToUnresolved();
+
 	void parseKey(const std::string& key);
 
-	ConnectionStringStatus status = RESOLVED;
-	AsyncTrigger resolveFinish;
 	// This function tries to resolve all hostnames once, and return them with coords.
 	// Best effort, does not guarantee that the resolves succeed.
 	Future<std::vector<NetworkAddress>> tryResolveHostnames();
 
 	std::vector<NetworkAddress> coords;
 	std::vector<Hostname> hostnames;
-	std::unordered_map<NetworkAddress, Hostname> networkAddressToHostname;
 
 private:
 	void parseConnString();
 	Key key, keyDesc;
-	std::string connectionString;
 };
 
 FDB_DECLARE_BOOLEAN_PARAM(ConnectionStringNeedsPersisted);
@@ -165,12 +135,6 @@ class IClusterConnectionRecord {
 	// Signals to the connection record that it was successfully used to connect to a cluster.
 	void notifyConnected();
 
-	ClusterConnectionString::ConnectionStringStatus connectionStringStatus() const;
-	Future<Void> resolveHostnames();
-	// This one should only be used when resolving asynchronously is impossible. For all other cases, resolveHostnames()
-	// should be preferred.
-	void resolveHostnamesBlocking();
-
 	virtual void addref() = 0;
 	virtual void delref() = 0;
 
@@ -275,12 +239,21 @@ struct OpenDatabaseCoordRequest {
 	Standalone<VectorRef<ClientVersionRef>> supportedVersions;
 	UID knownClientInfoID;
 	Key clusterKey;
+	std::vector<Hostname> hostnames;
 	std::vector<NetworkAddress> coordinators;
 	ReplyPromise<CachedSerialization<struct ClientDBInfo>> reply;
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, issues, supportedVersions, traceLogGroup, knownClientInfoID, clusterKey, coordinators, reply);
+		serializer(ar,
+		           issues,
+		           supportedVersions,
+		           traceLogGroup,
+		           knownClientInfoID,
+		           clusterKey,
+		           hostnames,
+		           coordinators,
+		           reply);
 	}
 };
 
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index d4633807b83..04648144e63 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -779,7 +779,7 @@ ACTOR Future<std::vector<ProcessData>> getWorkers(Database cx) {
 	}
 }
 
-ACTOR Future<std::vector<NetworkAddress>> getCoordinators(Database cx) {
+ACTOR Future<Optional<ClusterConnectionString>> getConnectionString(Database cx) {
 	state Transaction tr(cx);
 	loop {
 		try {
@@ -787,9 +787,8 @@ ACTOR Future<std::vector<NetworkAddress>> getCoordinators(Database cx) {
 			tr.setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
 			Optional<Value> currentKey = wait(tr.get(coordinatorsKey));
 			if (!currentKey.present())
-				return std::vector<NetworkAddress>();
-
-			return ClusterConnectionString(currentKey.get().toString()).coordinators();
+				return Optional<ClusterConnectionString>();
+			return ClusterConnectionString(currentKey.get().toString());
 		} catch (Error& e) {
 			wait(tr.onError(e));
 		}
@@ -798,7 +797,7 @@ ACTOR Future<std::vector<NetworkAddress>> getCoordinators(Database cx) {
 
 ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
                                                                Reference<IQuorumChange> change,
-                                                               ClusterConnectionString* conn) {
+                                                               std::vector<NetworkAddress> desiredCoordinators) {
 	tr->setOption(FDBTransactionOptions::LOCK_AWARE);
 	tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 	tr->setOption(FDBTransactionOptions::USE_PROVISIONAL_PROXIES);
@@ -809,47 +808,45 @@ ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
 		return CoordinatorsResult::BAD_DATABASE_STATE; // Someone deleted this key entirely?
 
 	state ClusterConnectionString old(currentKey.get().toString());
-	wait(old.resolveHostnames());
 	if (tr->getDatabase()->getConnectionRecord() &&
 	    old.clusterKeyName().toString() !=
 	        tr->getDatabase()->getConnectionRecord()->getConnectionString().clusterKeyName())
 		return CoordinatorsResult::BAD_DATABASE_STATE; // Someone changed the "name" of the database??
 
+	state std::vector<NetworkAddress> oldCoordinators = wait(old.tryResolveHostnames());
 	state CoordinatorsResult result = CoordinatorsResult::SUCCESS;
-	if (!conn->coords.size()) {
-		std::vector<NetworkAddress> desiredCoordinatorAddresses = wait(change->getDesiredCoordinators(
+	if (!desiredCoordinators.size()) {
+		std::vector<NetworkAddress> _desiredCoordinators = wait(change->getDesiredCoordinators(
 		    tr,
-		    old.coordinators(),
+		    oldCoordinators,
 		    Reference<ClusterConnectionMemoryRecord>(new ClusterConnectionMemoryRecord(old)),
 		    result));
-		conn->coords = desiredCoordinatorAddresses;
+		desiredCoordinators = _desiredCoordinators;
 	}
 
 	if (result != CoordinatorsResult::SUCCESS)
 		return result;
 
-	if (!conn->coordinators().size())
+	if (!desiredCoordinators.size())
 		return CoordinatorsResult::INVALID_NETWORK_ADDRESSES;
 
-	std::sort(conn->coords.begin(), conn->coords.end());
-	std::sort(conn->hostnames.begin(), conn->hostnames.end());
+	std::sort(desiredCoordinators.begin(), desiredCoordinators.end());
 
 	std::string newName = change->getDesiredClusterKeyName();
 	if (newName.empty())
 		newName = old.clusterKeyName().toString();
 
-	if (old.coordinators() == conn->coordinators() && old.clusterKeyName() == newName)
+	if (oldCoordinators == desiredCoordinators && old.clusterKeyName() == newName)
 		return CoordinatorsResult::SAME_NETWORK_ADDRESSES;
 
-	std::string key(newName + ':' + deterministicRandom()->randomAlphaNumeric(32));
-	conn->parseKey(key);
-	conn->resetConnectionString();
+	state ClusterConnectionString conn(desiredCoordinators,
+	                                   StringRef(newName + ':' + deterministicRandom()->randomAlphaNumeric(32)));
 
 	if (g_network->isSimulated()) {
 		int i = 0;
 		int protectedCount = 0;
-		while ((protectedCount < ((conn->coordinators().size() / 2) + 1)) && (i < conn->coordinators().size())) {
-			auto process = g_simulator.getProcessByAddress(conn->coordinators()[i]);
+		while ((protectedCount < ((desiredCoordinators.size() / 2) + 1)) && (i < desiredCoordinators.size())) {
+			auto process = g_simulator.getProcessByAddress(desiredCoordinators[i]);
 			auto addresses = process->addresses;
 
 			if (!process->isReliable()) {
@@ -861,14 +858,14 @@ ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
 			if (addresses.secondaryAddress.present()) {
 				g_simulator.protectedAddresses.insert(process->addresses.secondaryAddress.get());
 			}
-			TraceEvent("ProtectCoordinator").detail("Address", conn->coordinators()[i]).backtrace();
+			TraceEvent("ProtectCoordinator").detail("Address", desiredCoordinators[i]).backtrace();
 			protectedCount++;
 			i++;
 		}
 	}
 
 	std::vector<Future<Optional<LeaderInfo>>> leaderServers;
-	ClientCoordinators coord(Reference<ClusterConnectionMemoryRecord>(new ClusterConnectionMemoryRecord(*conn)));
+	ClientCoordinators coord(Reference<ClusterConnectionMemoryRecord>(new ClusterConnectionMemoryRecord(conn)));
 
 	leaderServers.reserve(coord.clientLeaderServers.size());
 	for (int i = 0; i < coord.clientLeaderServers.size(); i++)
@@ -880,7 +877,7 @@ ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
 		when(wait(waitForAll(leaderServers))) {}
 		when(wait(delay(5.0))) { return CoordinatorsResult::COORDINATOR_UNREACHABLE; }
 	}
-	tr->set(coordinatorsKey, conn->toString());
+	tr->set(coordinatorsKey, conn.toString());
 	return Optional<CoordinatorsResult>();
 }
 
@@ -906,11 +903,12 @@ ACTOR Future<CoordinatorsResult> changeQuorum(Database cx, Reference<IQuorumChan
 			    old.clusterKeyName().toString() != cx->getConnectionRecord()->getConnectionString().clusterKeyName())
 				return CoordinatorsResult::BAD_DATABASE_STATE; // Someone changed the "name" of the database??
 
+			state std::vector<NetworkAddress> oldCoordinators = wait(old.tryResolveHostnames());
 			state CoordinatorsResult result = CoordinatorsResult::SUCCESS;
 			if (!desiredCoordinators.size()) {
 				std::vector<NetworkAddress> _desiredCoordinators = wait(change->getDesiredCoordinators(
 				    &tr,
-				    old.coordinators(),
+				    oldCoordinators,
 				    Reference<ClusterConnectionMemoryRecord>(new ClusterConnectionMemoryRecord(old)),
 				    result));
 				desiredCoordinators = _desiredCoordinators;
@@ -934,7 +932,7 @@ ACTOR Future<CoordinatorsResult> changeQuorum(Database cx, Reference<IQuorumChan
 			if (newName.empty())
 				newName = old.clusterKeyName().toString();
 
-			if (old.coordinators() == desiredCoordinators && old.clusterKeyName() == newName)
+			if (oldCoordinators == desiredCoordinators && old.clusterKeyName() == newName)
 				return retries ? CoordinatorsResult::SUCCESS : CoordinatorsResult::SAME_NETWORK_ADDRESSES;
 
 			state ClusterConnectionString conn(
@@ -1072,9 +1070,16 @@ struct AutoQuorumChange final : IQuorumChange {
 		std::vector<Future<Optional<LeaderInfo>>> leaderServers;
 		leaderServers.reserve(coord.clientLeaderServers.size());
 		for (int i = 0; i < coord.clientLeaderServers.size(); i++) {
-			leaderServers.push_back(retryBrokenPromise(coord.clientLeaderServers[i].getLeader,
-			                                           GetLeaderRequest(coord.clusterKey, UID()),
-			                                           TaskPriority::CoordinationReply));
+			if (coord.clientLeaderServers[i].hostname.present()) {
+				leaderServers.push_back(retryGetReplyFromHostname(GetLeaderRequest(coord.clusterKey, UID()),
+				                                                  coord.clientLeaderServers[i].hostname.get(),
+				                                                  WLTOKEN_CLIENTLEADERREG_GETLEADER,
+				                                                  TaskPriority::CoordinationReply));
+			} else {
+				leaderServers.push_back(retryBrokenPromise(coord.clientLeaderServers[i].getLeader,
+				                                           GetLeaderRequest(coord.clusterKey, UID()),
+				                                           TaskPriority::CoordinationReply));
+			}
 		}
 		Optional<std::vector<Optional<LeaderInfo>>> results =
 		    wait(timeout(getAll(leaderServers), CLIENT_KNOBS->IS_ACCEPTABLE_DELAY));
diff --git a/fdbclient/ManagementAPI.actor.h b/fdbclient/ManagementAPI.actor.h
index 64c54447a7f..82c8bb4ee91 100644
--- a/fdbclient/ManagementAPI.actor.h
+++ b/fdbclient/ManagementAPI.actor.h
@@ -56,7 +56,7 @@ struct IQuorumChange : ReferenceCounted<IQuorumChange> {
 // Change to use the given set of coordination servers
 ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
                                                                Reference<IQuorumChange> change,
-                                                               ClusterConnectionString* conn);
+                                                               std::vector<NetworkAddress> desiredCoordinators);
 ACTOR Future<CoordinatorsResult> changeQuorum(Database cx, Reference<IQuorumChange> change);
 Reference<IQuorumChange> autoQuorumChange(int desired = -1);
 Reference<IQuorumChange> noQuorumChange();
@@ -146,7 +146,7 @@ ACTOR Future<bool> setHealthyZone(Database cx, StringRef zoneId, double seconds,
 ACTOR Future<Void> waitForPrimaryDC(Database cx, StringRef dcId);
 
 // Gets the cluster connection string
-ACTOR Future<std::vector<NetworkAddress>> getCoordinators(Database cx);
+ACTOR Future<Optional<ClusterConnectionString>> getConnectionString(Database cx);
 
 void schemaCoverage(std::string const& spath, bool covered = true);
 bool schemaMatch(json_spirit::mValue const& schema,
diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index 0b80e5076ca..7f76fcfdb25 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -77,18 +77,6 @@ void IClusterConnectionRecord::setPersisted() {
 	connectionStringNeedsPersisted = false;
 }
 
-ClusterConnectionString::ConnectionStringStatus IClusterConnectionRecord::connectionStringStatus() const {
-	return cs.status;
-}
-
-Future<Void> IClusterConnectionRecord::resolveHostnames() {
-	return cs.resolveHostnames();
-}
-
-void IClusterConnectionRecord::resolveHostnamesBlocking() {
-	cs.resolveHostnamesBlocking();
-}
-
 std::string ClusterConnectionString::getErrorString(std::string const& source, Error const& e) {
 	if (e.code() == error_code_connection_string_invalid) {
 		return format("Invalid connection string `%s: %d %s", source.c_str(), e.code(), e.what());
@@ -97,101 +85,19 @@ std::string ClusterConnectionString::getErrorString(std::string const& source, E
 	}
 }
 
-ACTOR Future<Void> resolveHostnamesImpl(ClusterConnectionString* self) {
-	loop {
-		if (self->status == ClusterConnectionString::UNRESOLVED) {
-			self->status = ClusterConnectionString::RESOLVING;
-			std::vector<Future<Void>> fs;
-			for (auto const& hostname : self->hostnames) {
-				fs.push_back(map(INetworkConnections::net()->resolveTCPEndpoint(hostname.host, hostname.service),
-				                 [=](std::vector<NetworkAddress> const& addresses) -> Void {
-					                 NetworkAddress address =
-					                     addresses[deterministicRandom()->randomInt(0, addresses.size())];
-					                 address.flags = 0; // Reset the parsed address to public
-					                 address.fromHostname = NetworkAddressFromHostname::True;
-					                 if (hostname.isTLS) {
-						                 address.flags |= NetworkAddress::FLAG_TLS;
-					                 }
-					                 self->addResolved(hostname, address);
-					                 return Void();
-				                 }));
-			}
-			wait(waitForAll(fs));
-			std::sort(self->coords.begin(), self->coords.end());
-			if (std::unique(self->coords.begin(), self->coords.end()) != self->coords.end()) {
-				self->status = ClusterConnectionString::UNRESOLVED;
-				self->resolveFinish.trigger();
-				throw connection_string_invalid();
-			}
-			self->status = ClusterConnectionString::RESOLVED;
-			self->resolveFinish.trigger();
-			break;
-		} else if (self->status == ClusterConnectionString::RESOLVING) {
-			wait(self->resolveFinish.onTrigger());
-			if (self->status == ClusterConnectionString::RESOLVED) {
-				break;
-			}
-			// Otherwise, this means other threads failed on resolve, so here we go back to the loop and try to resolve
-			// again.
-		} else {
-			// status is RESOLVED, nothing to do.
-			break;
-		}
-	}
-	return Void();
-}
-
-Future<Void> ClusterConnectionString::resolveHostnames() {
-	return resolveHostnamesImpl(this);
-}
-
-void ClusterConnectionString::resolveHostnamesBlocking() {
-	if (status != RESOLVED) {
-		status = RESOLVING;
-		for (auto const& hostname : hostnames) {
-			std::vector<NetworkAddress> addresses =
-			    INetworkConnections::net()->resolveTCPEndpointBlocking(hostname.host, hostname.service);
-			NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
-			address.flags = 0; // Reset the parsed address to public
-			address.fromHostname = NetworkAddressFromHostname::True;
-			if (hostname.isTLS) {
-				address.flags |= NetworkAddress::FLAG_TLS;
-			}
-			addResolved(hostname, address);
-		}
-		std::sort(coords.begin(), coords.end());
-		if (std::unique(coords.begin(), coords.end()) != coords.end()) {
-			status = UNRESOLVED;
-			throw connection_string_invalid();
-		}
-		status = RESOLVED;
-	}
-}
-
-void ClusterConnectionString::resetToUnresolved() {
-	if (status == RESOLVED && hostnames.size() > 0) {
-		coords.clear();
-		hostnames.clear();
-		networkAddressToHostname.clear();
-		status = UNRESOLVED;
-		parseConnString();
-	}
-}
-
-void ClusterConnectionString::resetConnectionString() {
-	connectionString = toString();
-}
-
-void ClusterConnectionString::parseConnString() {
+ClusterConnectionString::ClusterConnectionString(const std::string& connectionString) {
+	auto trimmed = trim(connectionString);
 	// Split on '@' into key@addrs
-	int pAt = connectionString.find_first_of('@');
-	if (pAt == connectionString.npos) {
+	int pAt = trimmed.find_first_of('@');
+	if (pAt == trimmed.npos) {
 		throw connection_string_invalid();
 	}
-	std::string key = connectionString.substr(0, pAt);
-	std::string addrs = connectionString.substr(pAt + 1);
+	std::string key = trimmed.substr(0, pAt);
+	std::string addrs = trimmed.substr(pAt + 1);
 
 	parseKey(key);
+	std::set<Hostname> hostnameSet;
+	std::set<NetworkAddress> addressSet;
 	std::string curAddr;
 	for (int p = 0; p <= addrs.size();) {
 		int pComma = addrs.find_first_of(',', p);
@@ -199,31 +105,29 @@ void ClusterConnectionString::parseConnString() {
 			pComma = addrs.size();
 		curAddr = addrs.substr(p, pComma - p);
 		if (Hostname::isHostname(curAddr)) {
+			Hostname h = Hostname::parse(curAddr);
+			// Check that there are no duplicate hostnames
+			if (hostnameSet.find(h) != hostnameSet.end()) {
+				throw connection_string_invalid();
+			}
 			hostnames.push_back(Hostname::parse(curAddr));
+			hostnameSet.insert(h);
 		} else {
-			coords.push_back(NetworkAddress::parse(curAddr));
+			NetworkAddress n = NetworkAddress::parse(curAddr);
+			// Check that there are no duplicate addresses
+			if (addressSet.find(n) != addressSet.end()) {
+				throw connection_string_invalid();
+			}
+			coords.push_back(n);
+			addressSet.insert(n);
 		}
 		p = pComma + 1;
 	}
-	if (hostnames.size() > 0) {
-		status = UNRESOLVED;
-	}
 	ASSERT((coords.size() + hostnames.size()) > 0);
-
-	std::sort(coords.begin(), coords.end());
-	// Check that there are no duplicate addresses
-	if (std::unique(coords.begin(), coords.end()) != coords.end()) {
-		throw connection_string_invalid();
-	}
-}
-
-ClusterConnectionString::ClusterConnectionString(const std::string& connStr) {
-	connectionString = trim(connStr);
-	parseConnString();
 }
 
 TEST_CASE("/fdbclient/MonitorLeader/parseConnectionString/addresses") {
-	std::string input;
+	state std::string input;
 
 	{
 		input = "asdf:2345@1.1.1.1:345";
@@ -231,6 +135,15 @@ TEST_CASE("/fdbclient/MonitorLeader/parseConnectionString/addresses") {
 		ASSERT(input == cs.toString());
 	}
 
+	{
+		input = "asdf:2345@1.1.1.1:345,1.1.1.1:345";
+		try {
+			ClusterConnectionString cs(input);
+		} catch (Error& e) {
+			ASSERT(e.code() == error_code_connection_string_invalid);
+		}
+	}
+
 	{
 		input = "0xxdeadbeef:100100100@1.1.1.1:34534,5.1.5.3:23443";
 		ClusterConnectionString cs(input);
@@ -274,20 +187,27 @@ TEST_CASE("/fdbclient/MonitorLeader/parseConnectionString/addresses") {
 }
 
 TEST_CASE("/fdbclient/MonitorLeader/parseConnectionString/hostnames") {
-	std::string input;
+	state std::string input;
 
 	{
 		input = "asdf:2345@localhost:1234";
 		ClusterConnectionString cs(input);
-		ASSERT(cs.status == ClusterConnectionString::UNRESOLVED);
 		ASSERT(cs.hostnames.size() == 1);
 		ASSERT(input == cs.toString());
 	}
 
+	{
+		input = "asdf:2345@localhost:1234,localhost:1234";
+		try {
+			ClusterConnectionString cs(input);
+		} catch (Error& e) {
+			ASSERT(e.code() == error_code_connection_string_invalid);
+		}
+	}
+
 	{
 		input = "0xxdeadbeef:100100100@localhost:34534,host-name:23443";
 		ClusterConnectionString cs(input);
-		ASSERT(cs.status == ClusterConnectionString::UNRESOLVED);
 		ASSERT(cs.hostnames.size() == 2);
 		ASSERT(input == cs.toString());
 	}
@@ -300,7 +220,6 @@ TEST_CASE("/fdbclient/MonitorLeader/parseConnectionString/hostnames") {
 		commented += "# asdfasdf ##";
 
 		ClusterConnectionString cs(commented);
-		ASSERT(cs.status == ClusterConnectionString::UNRESOLVED);
 		ASSERT(cs.hostnames.size() == 2);
 		ASSERT(input == cs.toString());
 	}
@@ -313,7 +232,6 @@ TEST_CASE("/fdbclient/MonitorLeader/parseConnectionString/hostnames") {
 		commented += "# asdfasdf ##";
 
 		ClusterConnectionString cs(commented);
-		ASSERT(cs.status == ClusterConnectionString::UNRESOLVED);
 		ASSERT(cs.hostnames.size() == 2);
 		ASSERT(input == cs.toString());
 	}
@@ -321,44 +239,30 @@ TEST_CASE("/fdbclient/MonitorLeader/parseConnectionString/hostnames") {
 	return Void();
 }
 
-TEST_CASE("/fdbclient/MonitorLeader/ConnectionString") {
-	state std::string connectionString = "TestCluster:0@localhost:1234,host-name:5678";
-	std::string hn1 = "localhost", port1 = "1234";
-	state std::string hn2 = "host-name";
-	state std::string port2 = "5678";
-	state std::vector<Hostname> hostnames;
-	hostnames.push_back(Hostname::parse(hn1 + ":" + port1));
-	hostnames.push_back(Hostname::parse(hn2 + ":" + port2));
-
-	NetworkAddress address1 = NetworkAddress::parse("127.0.0.0:1234");
-	NetworkAddress address2 = NetworkAddress::parse("127.0.0.1:5678");
-
-	INetworkConnections::net()->addMockTCPEndpoint(hn1, port1, { address1 });
-	INetworkConnections::net()->addMockTCPEndpoint(hn2, port2, { address2 });
-
-	state ClusterConnectionString cs(hostnames, LiteralStringRef("TestCluster:0"));
-	ASSERT(cs.status == ClusterConnectionString::UNRESOLVED);
-	ASSERT(cs.hostnames.size() == 2);
-	ASSERT(cs.coordinators().size() == 0);
-	wait(cs.resolveHostnames());
-	ASSERT(cs.status == ClusterConnectionString::RESOLVED);
-	ASSERT(cs.hostnames.size() == 2);
-	ASSERT(cs.coordinators().size() == 2);
-	ASSERT(cs.toString() == connectionString);
-	cs.resetToUnresolved();
-	ASSERT(cs.status == ClusterConnectionString::UNRESOLVED);
-	ASSERT(cs.hostnames.size() == 2);
-	ASSERT(cs.coordinators().size() == 0);
-	ASSERT(cs.toString() == connectionString);
-
-	INetworkConnections::net()->removeMockTCPEndpoint(hn2, port2);
-	NetworkAddress address3 = NetworkAddress::parse("127.0.0.0:5678");
-	INetworkConnections::net()->addMockTCPEndpoint(hn2, port2, { address3 });
-
-	try {
-		wait(cs.resolveHostnames());
-	} catch (Error& e) {
-		ASSERT(e.code() == error_code_connection_string_invalid);
+TEST_CASE("/fdbclient/MonitorLeader/ConnectionString/hostname") {
+	std::string connectionString = "TestCluster:0@localhost:1234,host-name:5678";
+	std::string hn1 = "localhost", port1 = "1234", hn2 = "host-name", port2 = "5678";
+	std::vector<Hostname> hostnames;
+
+	{
+		hostnames.push_back(Hostname::parse(hn1 + ":" + port1));
+		hostnames.push_back(Hostname::parse(hn2 + ":" + port2));
+
+		ClusterConnectionString cs(hostnames, LiteralStringRef("TestCluster:0"));
+		ASSERT(cs.hostnames.size() == 2);
+		ASSERT(cs.coordinators().size() == 0);
+		ASSERT(cs.toString() == connectionString);
+	}
+
+	{
+		hostnames.clear();
+		hostnames.push_back(Hostname::parse(hn1 + ":" + port1));
+		hostnames.push_back(Hostname::parse(hn1 + ":" + port1));
+		try {
+			ClusterConnectionString cs(hostnames, LiteralStringRef("TestCluster:0"));
+		} catch (Error& e) {
+			ASSERT(e.code() == error_code_connection_string_invalid);
+		}
 	}
 
 	return Void();
@@ -380,6 +284,7 @@ ACTOR Future<std::vector<NetworkAddress>> tryResolveHostnamesImpl(ClusterConnect
 		allCoordinatorsSet.insert(coord);
 	}
 	std::vector<NetworkAddress> allCoordinators(allCoordinatorsSet.begin(), allCoordinatorsSet.end());
+	std::sort(allCoordinators.begin(), allCoordinators.end());
 	return allCoordinators;
 }
 
@@ -484,17 +389,22 @@ TEST_CASE("/fdbclient/MonitorLeader/parseConnectionString/fuzz") {
 }
 
 ClusterConnectionString::ClusterConnectionString(const std::vector<NetworkAddress>& servers, Key key)
-  : status(RESOLVED), coords(servers) {
+  : coords(servers) {
+	std::set<NetworkAddress> s(servers.begin(), servers.end());
+	if (s.size() != servers.size()) {
+		throw connection_string_invalid();
+	}
 	std::string keyString = key.toString();
 	parseKey(keyString);
-	resetConnectionString();
 }
 
-ClusterConnectionString::ClusterConnectionString(const std::vector<Hostname>& hosts, Key key)
-  : status(UNRESOLVED), hostnames(hosts) {
+ClusterConnectionString::ClusterConnectionString(const std::vector<Hostname>& hosts, Key key) : hostnames(hosts) {
+	std::set<Hostname> h(hosts.begin(), hosts.end());
+	if (h.size() != hosts.size()) {
+		throw connection_string_invalid();
+	}
 	std::string keyString = key.toString();
 	parseKey(keyString);
-	resetConnectionString();
 }
 
 void ClusterConnectionString::parseKey(const std::string& key) {
@@ -529,13 +439,11 @@ void ClusterConnectionString::parseKey(const std::string& key) {
 std::string ClusterConnectionString::toString() const {
 	std::string s = key.toString();
 	s += '@';
-	for (int i = 0; i < coords.size(); i++) {
-		if (networkAddressToHostname.find(coords[i]) == networkAddressToHostname.end()) {
-			if (s.find('@') != s.length() - 1) {
-				s += ',';
-			}
-			s += coords[i].toString();
+	for (auto const& coord : coords) {
+		if (s.find('@') != s.length() - 1) {
+			s += ',';
 		}
+		s += coord.toString();
 	}
 	for (auto const& host : hostnames) {
 		if (s.find('@') != s.length() - 1) {
@@ -547,11 +455,14 @@ std::string ClusterConnectionString::toString() const {
 }
 
 ClientCoordinators::ClientCoordinators(Reference<IClusterConnectionRecord> ccr) : ccr(ccr) {
-	ASSERT(ccr->connectionStringStatus() == ClusterConnectionString::RESOLVED);
 	ClusterConnectionString cs = ccr->getConnectionString();
-	for (auto s = cs.coordinators().begin(); s != cs.coordinators().end(); ++s)
-		clientLeaderServers.push_back(ClientLeaderRegInterface(*s));
 	clusterKey = cs.clusterKey();
+	for (auto h : cs.hostnames) {
+		clientLeaderServers.push_back(ClientLeaderRegInterface(h));
+	}
+	for (auto s : cs.coordinators()) {
+		clientLeaderServers.push_back(ClientLeaderRegInterface(s));
+	}
 }
 
 ClientCoordinators::ClientCoordinators(Key clusterKey, std::vector<NetworkAddress> coordinators)
@@ -576,49 +487,32 @@ ClientLeaderRegInterface::ClientLeaderRegInterface(INetwork* local) {
 
 // Nominee is the worker among all workers that are considered as leader by one coordinator
 // This function contacts a coordinator coord to ask who is its nominee.
-// Note: for coordinators whose NetworkAddress is parsed out of a hostname, a connection failure will cause this actor
-// to throw `coordinators_changed()` error
 ACTOR Future<Void> monitorNominee(Key key,
                                   ClientLeaderRegInterface coord,
                                   AsyncTrigger* nomineeChange,
-                                  Optional<LeaderInfo>* info,
-                                  Optional<Hostname> hostname = Optional<Hostname>()) {
+                                  Optional<LeaderInfo>* info) {
 	loop {
 		state Optional<LeaderInfo> li;
-
-		if (coord.getLeader.getEndpoint().getPrimaryAddress().fromHostname) {
-			state ErrorOr<Optional<LeaderInfo>> rep =
-			    wait(coord.getLeader.tryGetReply(GetLeaderRequest(key, info->present() ? info->get().changeID : UID()),
-			                                     TaskPriority::CoordinationReply));
-			if (rep.isError()) {
-				// Connecting to nominee failed, most likely due to connection failed.
-				TraceEvent("MonitorNomineeError")
-				    .error(rep.getError())
-				    .detail("Hostname", hostname.present() ? hostname.get().toString() : "UnknownHostname")
-				    .detail("OldAddr", coord.getLeader.getEndpoint().getPrimaryAddress().toString());
-				if (rep.getError().code() == error_code_request_maybe_delivered) {
-					// Delay to prevent tight resolving loop due to outdated DNS cache
-					wait(delay(FLOW_KNOBS->HOSTNAME_RECONNECT_INIT_INTERVAL));
-					throw coordinators_changed();
-				} else {
-					throw rep.getError();
-				}
-			} else if (rep.present()) {
-				li = rep.get();
-			}
+		if (coord.hostname.present()) {
+			wait(store(li,
+			           retryGetReplyFromHostname(GetLeaderRequest(key, info->present() ? info->get().changeID : UID()),
+			                                     coord.hostname.get(),
+			                                     WLTOKEN_CLIENTLEADERREG_GETLEADER,
+			                                     TaskPriority::CoordinationReply)));
 		} else {
-			Optional<LeaderInfo> tmp =
-			    wait(retryBrokenPromise(coord.getLeader,
-			                            GetLeaderRequest(key, info->present() ? info->get().changeID : UID()),
-			                            TaskPriority::CoordinationReply));
-			li = tmp;
+			wait(store(li,
+			           retryBrokenPromise(coord.getLeader,
+			                              GetLeaderRequest(key, info->present() ? info->get().changeID : UID()),
+			                              TaskPriority::CoordinationReply)));
 		}
 
 		wait(Future<Void>(Void())); // Make sure we weren't cancelled
 
 		TraceEvent("GetLeaderReply")
 		    .suppressFor(1.0)
-		    .detail("Coordinator", coord.getLeader.getEndpoint().getPrimaryAddress())
+		    .detail("Coordinator",
+		            coord.hostname.present() ? coord.hostname.get().toString()
+		                                     : coord.getLeader.getEndpoint().getPrimaryAddress().toString())
 		    .detail("Nominee", li.present() ? li.get().changeID : UID())
 		    .detail("ClusterKey", key.printable());
 
@@ -687,74 +581,54 @@ Optional<std::pair<LeaderInfo, bool>> getLeader(const std::vector<Optional<Leade
 ACTOR Future<MonitorLeaderInfo> monitorLeaderOneGeneration(Reference<IClusterConnectionRecord> connRecord,
                                                            Reference<AsyncVar<Value>> outSerializedLeaderInfo,
                                                            MonitorLeaderInfo info) {
-	loop {
-		wait(connRecord->resolveHostnames());
-		wait(info.intermediateConnRecord->resolveHostnames());
-		state ClientCoordinators coordinators(info.intermediateConnRecord);
-		state AsyncTrigger nomineeChange;
-		state std::vector<Optional<LeaderInfo>> nominees;
-		state Future<Void> allActors;
-
-		nominees.resize(coordinators.clientLeaderServers.size());
-
-		state std::vector<Future<Void>> actors;
-		// Ask all coordinators if the worker is considered as a leader (leader nominee) by the coordinator.
-		actors.reserve(coordinators.clientLeaderServers.size());
-		for (int i = 0; i < coordinators.clientLeaderServers.size(); i++) {
-			Optional<Hostname> hostname;
-			auto r = connRecord->getConnectionString().networkAddressToHostname.find(
-			    coordinators.clientLeaderServers[i].getLeader.getEndpoint().getPrimaryAddress());
-			if (r != connRecord->getConnectionString().networkAddressToHostname.end()) {
-				hostname = r->second;
-			}
-			actors.push_back(monitorNominee(
-			    coordinators.clusterKey, coordinators.clientLeaderServers[i], &nomineeChange, &nominees[i], hostname));
-		}
-		allActors = waitForAll(actors);
-
-		loop {
-			Optional<std::pair<LeaderInfo, bool>> leader = getLeader(nominees);
-			TraceEvent("MonitorLeaderChange")
-			    .detail("NewLeader", leader.present() ? leader.get().first.changeID : UID(1, 1));
-			if (leader.present()) {
-				if (leader.get().first.forward) {
-					TraceEvent("MonitorLeaderForwarding")
-					    .detail("NewConnStr", leader.get().first.serializedInfo.toString())
-					    .detail("OldConnStr", info.intermediateConnRecord->getConnectionString().toString())
-					    .trackLatest("MonitorLeaderForwarding");
-					info.intermediateConnRecord = connRecord->makeIntermediateRecord(
-					    ClusterConnectionString(leader.get().first.serializedInfo.toString()));
-					return info;
-				}
-				if (connRecord != info.intermediateConnRecord) {
-					if (!info.hasConnected) {
-						TraceEvent(SevWarnAlways, "IncorrectClusterFileContentsAtConnection")
-						    .detail("ClusterFile", connRecord->toString())
-						    .detail("StoredConnectionString", connRecord->getConnectionString().toString())
-						    .detail("CurrentConnectionString",
-						            info.intermediateConnRecord->getConnectionString().toString());
-					}
-					connRecord->setAndPersistConnectionString(info.intermediateConnRecord->getConnectionString());
-					info.intermediateConnRecord = connRecord;
-				}
+	state ClientCoordinators coordinators(info.intermediateConnRecord);
+	state AsyncTrigger nomineeChange;
+	state std::vector<Optional<LeaderInfo>> nominees;
+	state Future<Void> allActors;
+
+	nominees.resize(coordinators.clientLeaderServers.size());
 
-				info.hasConnected = true;
-				connRecord->notifyConnected();
+	state std::vector<Future<Void>> actors;
+	// Ask all coordinators if the worker is considered as a leader (leader nominee) by the coordinator.
+	actors.reserve(coordinators.clientLeaderServers.size());
+	for (int i = 0; i < coordinators.clientLeaderServers.size(); i++) {
+		actors.push_back(
+		    monitorNominee(coordinators.clusterKey, coordinators.clientLeaderServers[i], &nomineeChange, &nominees[i]));
+	}
+	allActors = waitForAll(actors);
 
-				outSerializedLeaderInfo->set(leader.get().first.serializedInfo);
+	loop {
+		Optional<std::pair<LeaderInfo, bool>> leader = getLeader(nominees);
+		TraceEvent("MonitorLeaderChange")
+		    .detail("NewLeader", leader.present() ? leader.get().first.changeID : UID(1, 1));
+		if (leader.present()) {
+			if (leader.get().first.forward) {
+				TraceEvent("MonitorLeaderForwarding")
+				    .detail("NewConnStr", leader.get().first.serializedInfo.toString())
+				    .detail("OldConnStr", info.intermediateConnRecord->getConnectionString().toString())
+				    .trackLatest("MonitorLeaderForwarding");
+				info.intermediateConnRecord = connRecord->makeIntermediateRecord(
+				    ClusterConnectionString(leader.get().first.serializedInfo.toString()));
+				return info;
 			}
-			try {
-				wait(nomineeChange.onTrigger() || allActors);
-			} catch (Error& e) {
-				if (e.code() == error_code_coordinators_changed) {
-					TraceEvent("MonitorLeaderCoordinatorsChanged").suppressFor(1.0);
-					connRecord->getConnectionString().resetToUnresolved();
-					break;
-				} else {
-					throw e;
+			if (connRecord != info.intermediateConnRecord) {
+				if (!info.hasConnected) {
+					TraceEvent(SevWarnAlways, "IncorrectClusterFileContentsAtConnection")
+					    .detail("ClusterFile", connRecord->toString())
+					    .detail("StoredConnectionString", connRecord->getConnectionString().toString())
+					    .detail("CurrentConnectionString",
+					            info.intermediateConnRecord->getConnectionString().toString());
 				}
+				connRecord->setAndPersistConnectionString(info.intermediateConnRecord->getConnectionString());
+				info.intermediateConnRecord = connRecord;
 			}
+
+			info.hasConnected = true;
+			connRecord->notifyConnected();
+
+			outSerializedLeaderInfo->set(leader.get().first.serializedInfo);
 		}
+		wait(nomineeChange.onTrigger() || allActors);
 	}
 }
 
@@ -885,10 +759,10 @@ ACTOR Future<Void> getClientInfoFromLeader(Reference<AsyncVar<Optional<ClusterCo
 }
 
 ACTOR Future<Void> monitorLeaderAndGetClientInfo(Key clusterKey,
+                                                 std::vector<Hostname> hostnames,
                                                  std::vector<NetworkAddress> coordinators,
                                                  ClientData* clientData,
-                                                 Reference<AsyncVar<Optional<LeaderInfo>>> leaderInfo,
-                                                 Reference<AsyncVar<Void>> coordinatorsChanged) {
+                                                 Reference<AsyncVar<Optional<LeaderInfo>>> leaderInfo) {
 	state std::vector<ClientLeaderRegInterface> clientLeaderServers;
 	state AsyncTrigger nomineeChange;
 	state std::vector<Optional<LeaderInfo>> nominees;
@@ -896,8 +770,12 @@ ACTOR Future<Void> monitorLeaderAndGetClientInfo(Key clusterKey,
 	state Reference<AsyncVar<Optional<ClusterControllerClientInterface>>> knownLeader(
 	    new AsyncVar<Optional<ClusterControllerClientInterface>>{});
 
-	for (auto s = coordinators.begin(); s != coordinators.end(); ++s) {
-		clientLeaderServers.push_back(ClientLeaderRegInterface(*s));
+	clientLeaderServers.reserve(hostnames.size() + coordinators.size());
+	for (auto h : hostnames) {
+		clientLeaderServers.push_back(ClientLeaderRegInterface(h));
+	}
+	for (auto s : coordinators) {
+		clientLeaderServers.push_back(ClientLeaderRegInterface(s));
 	}
 
 	nominees.resize(clientLeaderServers.size());
@@ -936,14 +814,7 @@ ACTOR Future<Void> monitorLeaderAndGetClientInfo(Key clusterKey,
 				leaderInfo->set(leader.get().first);
 			}
 		}
-		try {
-			wait(nomineeChange.onTrigger() || allActors);
-		} catch (Error& e) {
-			if (e.code() == error_code_coordinators_changed) {
-				coordinatorsChanged->trigger();
-			}
-			throw e;
-		}
+		wait(nomineeChange.onTrigger() || allActors);
 	}
 }
 
@@ -995,7 +866,7 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
     Reference<ReferencedObject<Standalone<VectorRef<ClientVersionRef>>>> supportedVersions,
     Key traceLogGroup) {
 	state ClusterConnectionString cs = info.intermediateConnRecord->getConnectionString();
-	state std::vector<NetworkAddress> addrs = cs.coordinators();
+	state int coordinatorsSize = cs.hostnames.size() + cs.coordinators().size();
 	state int index = 0;
 	state int successIndex = 0;
 	state Optional<double> incorrectTime;
@@ -1003,15 +874,26 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 	state std::vector<CommitProxyInterface> lastCommitProxies;
 	state std::vector<UID> lastGrvProxyUIDs;
 	state std::vector<GrvProxyInterface> lastGrvProxies;
+	state std::vector<ClientLeaderRegInterface> clientLeaderServers;
+
+	clientLeaderServers.reserve(coordinatorsSize);
+	for (const auto& h : cs.hostnames) {
+		clientLeaderServers.push_back(ClientLeaderRegInterface(h));
+	}
+	for (const auto& c : cs.coordinators()) {
+		clientLeaderServers.push_back(ClientLeaderRegInterface(c));
+	}
+
+	deterministicRandom()->randomShuffle(clientLeaderServers);
 
-	deterministicRandom()->randomShuffle(addrs);
 	loop {
-		state ClientLeaderRegInterface clientLeaderServer(addrs[index]);
+		state ClientLeaderRegInterface clientLeaderServer = clientLeaderServers[index];
 		state OpenDatabaseCoordRequest req;
 
 		coordinator->set(clientLeaderServer);
 
 		req.clusterKey = cs.clusterKey();
+		req.hostnames = cs.hostnames;
 		req.coordinators = cs.coordinators();
 		req.knownClientInfoID = clientInfo->get().id;
 		req.supportedVersions = supportedVersions->get();
@@ -1040,8 +922,16 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 			incorrectTime = Optional<double>();
 		}
 
-		state ErrorOr<CachedSerialization<ClientDBInfo>> rep =
-		    wait(clientLeaderServer.openDatabase.tryGetReply(req, TaskPriority::CoordinationReply));
+		state ErrorOr<CachedSerialization<ClientDBInfo>> rep;
+		if (clientLeaderServer.hostname.present()) {
+			wait(store(rep,
+			           tryGetReplyFromHostname(req,
+			                                   clientLeaderServer.hostname.get(),
+			                                   WLTOKEN_CLIENTLEADERREG_OPENDATABASE,
+			                                   TaskPriority::CoordinationReply)));
+		} else {
+			wait(store(rep, clientLeaderServer.openDatabase.tryGetReply(req, TaskPriority::CoordinationReply)));
+		}
 		if (rep.present()) {
 			if (rep.get().read().forward.present()) {
 				TraceEvent("MonitorProxiesForwarding")
@@ -1072,15 +962,10 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 			successIndex = index;
 		} else {
 			TEST(rep.getError().code() == error_code_failed_to_progress); // Coordinator cant talk to cluster controller
-			if (rep.getError().code() == error_code_coordinators_changed) {
-				throw coordinators_changed();
-			}
-			index = (index + 1) % addrs.size();
+			TEST(rep.getError().code() == error_code_lookup_failed); // Coordinator hostname resolving failure
+			index = (index + 1) % coordinatorsSize;
 			if (index == successIndex) {
 				wait(delay(CLIENT_KNOBS->COORDINATOR_RECONNECTION_DELAY));
-				// When the client fails talking to all coordinators, we throw coordinators_changed() and let the caller
-				// re-resolve the connection string and retry.
-				throw coordinators_changed();
 			}
 		}
 	}
@@ -1092,27 +977,16 @@ ACTOR Future<Void> monitorProxies(
     Reference<AsyncVar<Optional<ClientLeaderRegInterface>>> coordinator,
     Reference<ReferencedObject<Standalone<VectorRef<ClientVersionRef>>>> supportedVersions,
     Key traceLogGroup) {
-	wait(connRecord->get()->resolveHostnames());
 	state MonitorLeaderInfo info(connRecord->get());
 	loop {
-		try {
-			wait(info.intermediateConnRecord->resolveHostnames());
-			choose {
-				when(MonitorLeaderInfo _info = wait(monitorProxiesOneGeneration(
-				         connRecord->get(), clientInfo, coordinator, info, supportedVersions, traceLogGroup))) {
-					info = _info;
-				}
-				when(wait(connRecord->onChange())) {
-					info.hasConnected = false;
-					info.intermediateConnRecord = connRecord->get();
-				}
+		choose {
+			when(MonitorLeaderInfo _info = wait(monitorProxiesOneGeneration(
+			         connRecord->get(), clientInfo, coordinator, info, supportedVersions, traceLogGroup))) {
+				info = _info;
 			}
-		} catch (Error& e) {
-			if (e.code() == error_code_coordinators_changed) {
-				TraceEvent("MonitorProxiesCoordinatorsChanged").suppressFor(1.0);
-				info.intermediateConnRecord->getConnectionString().resetToUnresolved();
-			} else {
-				throw e;
+			when(wait(connRecord->onChange())) {
+				info.hasConnected = false;
+				info.intermediateConnRecord = connRecord->get();
 			}
 		}
 	}
diff --git a/fdbclient/MonitorLeader.h b/fdbclient/MonitorLeader.h
index 6ceed69a634..8819b5702b4 100644
--- a/fdbclient/MonitorLeader.h
+++ b/fdbclient/MonitorLeader.h
@@ -75,10 +75,10 @@ Future<Void> monitorLeader(Reference<IClusterConnectionRecord> const& connFile,
 // nominees, the nominee with the most nomination is the leader, and collects client data from the leader. This function
 // also monitors the change of the leader.
 Future<Void> monitorLeaderAndGetClientInfo(Key const& clusterKey,
+                                           std::vector<Hostname> const& hostnames,
                                            std::vector<NetworkAddress> const& coordinators,
                                            ClientData* const& clientData,
-                                           Reference<AsyncVar<Optional<LeaderInfo>>> const& leaderInfo,
-                                           Reference<AsyncVar<Void>> const& coordinatorsChanged);
+                                           Reference<AsyncVar<Optional<LeaderInfo>>> const& leaderInfo);
 
 Future<Void> monitorProxies(
     Reference<AsyncVar<Reference<IClusterConnectionRecord>>> const& connRecord,
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 96fd7bed781..6f6f8ec9e38 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -6937,11 +6937,18 @@ Future<Standalone<StringRef>> Transaction::getVersionstamp() {
 }
 
 // Gets the protocol version reported by a coordinator via the protocol info interface
-ACTOR Future<ProtocolVersion> getCoordinatorProtocol(NetworkAddressList coordinatorAddresses) {
-	RequestStream<ProtocolInfoRequest> requestStream{ Endpoint::wellKnown({ coordinatorAddresses },
-		                                                                  WLTOKEN_PROTOCOL_INFO) };
-	ProtocolInfoReply reply = wait(retryBrokenPromise(requestStream, ProtocolInfoRequest{}));
-
+ACTOR Future<ProtocolVersion> getCoordinatorProtocol(
+    Reference<AsyncVar<Optional<ClientLeaderRegInterface>> const> coordinator) {
+	state ProtocolInfoReply reply;
+	if (coordinator->get().get().hostname.present()) {
+		wait(store(reply,
+		           retryGetReplyFromHostname(
+		               ProtocolInfoRequest{}, coordinator->get().get().hostname.get(), WLTOKEN_PROTOCOL_INFO)));
+	} else {
+		RequestStream<ProtocolInfoRequest> requestStream(
+		    Endpoint::wellKnown({ coordinator->get().get().getLeader.getEndpoint().addresses }, WLTOKEN_PROTOCOL_INFO));
+		wait(store(reply, retryBrokenPromise(requestStream, ProtocolInfoRequest{})));
+	}
 	return reply.version;
 }
 
@@ -6950,8 +6957,16 @@ ACTOR Future<ProtocolVersion> getCoordinatorProtocol(NetworkAddressList coordina
 // function will return with an unset result.
 // If an expected version is given, this future won't return if the actual protocol version matches the expected version
 ACTOR Future<Optional<ProtocolVersion>> getCoordinatorProtocolFromConnectPacket(
-    NetworkAddress coordinatorAddress,
+    Reference<AsyncVar<Optional<ClientLeaderRegInterface>> const> coordinator,
     Optional<ProtocolVersion> expectedVersion) {
+	state NetworkAddress coordinatorAddress;
+	if (coordinator->get().get().hostname.present()) {
+		Hostname h = coordinator->get().get().hostname.get();
+		wait(store(coordinatorAddress, h.resolveWithRetry()));
+	} else {
+		coordinatorAddress = coordinator->get().get().getLeader.getEndpoint().getPrimaryAddress();
+	}
+
 	state Reference<AsyncVar<Optional<ProtocolVersion>> const> protocolVersion =
 	    FlowTransport::transport().getPeerProtocolAsyncVar(coordinatorAddress);
 
@@ -6986,11 +7001,10 @@ ACTOR Future<ProtocolVersion> getClusterProtocolImpl(
 		if (!coordinator->get().present()) {
 			wait(coordinator->onChange());
 		} else {
-			Endpoint coordinatorEndpoint = coordinator->get().get().getLeader.getEndpoint();
 			if (needToConnect) {
 				// Even though we typically rely on the connect packet to get the protocol version, we need to send some
 				// request in order to start a connection. This protocol version request serves that purpose.
-				protocolVersion = getCoordinatorProtocol(coordinatorEndpoint.addresses);
+				protocolVersion = getCoordinatorProtocol(coordinator);
 				needToConnect = false;
 			}
 			choose {
@@ -7006,8 +7020,8 @@ ACTOR Future<ProtocolVersion> getClusterProtocolImpl(
 
 				// Older versions of FDB don't have an endpoint to return the protocol version, so we get this info from
 				// the connect packet
-				when(Optional<ProtocolVersion> pv = wait(getCoordinatorProtocolFromConnectPacket(
-				         coordinatorEndpoint.getPrimaryAddress(), expectedVersion))) {
+				when(Optional<ProtocolVersion> pv =
+				         wait(getCoordinatorProtocolFromConnectPacket(coordinator, expectedVersion))) {
 					if (pv.present()) {
 						return pv.get();
 					} else {
@@ -8181,14 +8195,20 @@ ACTOR Future<bool> checkSafeExclusions(Database cx, std::vector<AddressExclusion
 		throw;
 	}
 	TraceEvent("ExclusionSafetyCheckCoordinators").log();
-	wait(cx->getConnectionRecord()->resolveHostnames());
 	state ClientCoordinators coordinatorList(cx->getConnectionRecord());
 	state std::vector<Future<Optional<LeaderInfo>>> leaderServers;
 	leaderServers.reserve(coordinatorList.clientLeaderServers.size());
 	for (int i = 0; i < coordinatorList.clientLeaderServers.size(); i++) {
-		leaderServers.push_back(retryBrokenPromise(coordinatorList.clientLeaderServers[i].getLeader,
-		                                           GetLeaderRequest(coordinatorList.clusterKey, UID()),
-		                                           TaskPriority::CoordinationReply));
+		if (coordinatorList.clientLeaderServers[i].hostname.present()) {
+			leaderServers.push_back(retryGetReplyFromHostname(GetLeaderRequest(coordinatorList.clusterKey, UID()),
+			                                                  coordinatorList.clientLeaderServers[i].hostname.get(),
+			                                                  WLTOKEN_CLIENTLEADERREG_GETLEADER,
+			                                                  TaskPriority::CoordinationReply));
+		} else {
+			leaderServers.push_back(retryBrokenPromise(coordinatorList.clientLeaderServers[i].getLeader,
+			                                           GetLeaderRequest(coordinatorList.clusterKey, UID()),
+			                                           TaskPriority::CoordinationReply));
+		}
 	}
 	// Wait for quorum so we don't dismiss live coordinators as unreachable by acting too fast
 	choose {
diff --git a/fdbclient/PaxosConfigTransaction.actor.cpp b/fdbclient/PaxosConfigTransaction.actor.cpp
index b6fc75fec98..50ebbd1a4c0 100644
--- a/fdbclient/PaxosConfigTransaction.actor.cpp
+++ b/fdbclient/PaxosConfigTransaction.actor.cpp
@@ -59,8 +59,14 @@ class CommitQuorum {
 	                                          ConfigGeneration generation,
 	                                          ConfigTransactionInterface cti) {
 		try {
-			wait(timeoutError(cti.commit.getReply(self->getCommitRequest(generation)),
-			                  CLIENT_KNOBS->COMMIT_QUORUM_TIMEOUT));
+			if (cti.hostname.present()) {
+				wait(timeoutError(retryGetReplyFromHostname(
+				                      self->getCommitRequest(generation), cti.hostname.get(), WLTOKEN_CONFIGTXN_COMMIT),
+				                  CLIENT_KNOBS->COMMIT_QUORUM_TIMEOUT));
+			} else {
+				wait(timeoutError(cti.commit.getReply(self->getCommitRequest(generation)),
+				                  CLIENT_KNOBS->COMMIT_QUORUM_TIMEOUT));
+			}
 			++self->successful;
 		} catch (Error& e) {
 			// self might be destroyed if this actor is cancelled
@@ -122,9 +128,20 @@ class GetGenerationQuorum {
 	ACTOR static Future<Void> addRequestActor(GetGenerationQuorum* self, ConfigTransactionInterface cti) {
 		loop {
 			try {
-				ConfigTransactionGetGenerationReply reply = wait(timeoutError(
-				    cti.getGeneration.getReply(ConfigTransactionGetGenerationRequest{ self->lastSeenLiveVersion }),
-				    CLIENT_KNOBS->GET_GENERATION_QUORUM_TIMEOUT));
+				state ConfigTransactionGetGenerationReply reply;
+				if (cti.hostname.present()) {
+					wait(timeoutError(store(reply,
+					                        retryGetReplyFromHostname(
+					                            ConfigTransactionGetGenerationRequest{ self->lastSeenLiveVersion },
+					                            cti.hostname.get(),
+					                            WLTOKEN_CONFIGTXN_GETGENERATION)),
+					                  CLIENT_KNOBS->GET_GENERATION_QUORUM_TIMEOUT));
+				} else {
+					wait(timeoutError(store(reply,
+					                        cti.getGeneration.getReply(
+					                            ConfigTransactionGetGenerationRequest{ self->lastSeenLiveVersion })),
+					                  CLIENT_KNOBS->GET_GENERATION_QUORUM_TIMEOUT));
+				}
 
 				++self->totalRepliesReceived;
 				auto gen = reply.generation;
@@ -225,9 +242,18 @@ class PaxosConfigTransactionImpl {
 		state ConfigKey configKey = ConfigKey::decodeKey(key);
 		loop {
 			try {
-				ConfigGeneration generation = wait(self->getGenerationQuorum.getGeneration());
-				state Reference<ConfigTransactionInfo> configNodes(
-				    new ConfigTransactionInfo(self->getGenerationQuorum.getReadReplicas()));
+				state ConfigGeneration generation = wait(self->getGenerationQuorum.getGeneration());
+				state std::vector<ConfigTransactionInterface> readReplicas =
+				    self->getGenerationQuorum.getReadReplicas();
+				std::vector<Future<Void>> fs;
+				for (ConfigTransactionInterface& readReplica : readReplicas) {
+					if (readReplica.hostname.present()) {
+						fs.push_back(tryInitializeRequestStream(
+						    &readReplica.get, readReplica.hostname.get(), WLTOKEN_CONFIGTXN_GET));
+					}
+				}
+				wait(waitForAll(fs));
+				state Reference<ConfigTransactionInfo> configNodes(new ConfigTransactionInfo(readReplicas));
 				ConfigTransactionGetReply reply =
 				    wait(timeoutError(basicLoadBalance(configNodes,
 				                                       &ConfigTransactionInterface::get,
@@ -248,9 +274,17 @@ class PaxosConfigTransactionImpl {
 	}
 
 	ACTOR static Future<RangeResult> getConfigClasses(PaxosConfigTransactionImpl* self) {
-		ConfigGeneration generation = wait(self->getGenerationQuorum.getGeneration());
-		state Reference<ConfigTransactionInfo> configNodes(
-		    new ConfigTransactionInfo(self->getGenerationQuorum.getReadReplicas()));
+		state ConfigGeneration generation = wait(self->getGenerationQuorum.getGeneration());
+		state std::vector<ConfigTransactionInterface> readReplicas = self->getGenerationQuorum.getReadReplicas();
+		std::vector<Future<Void>> fs;
+		for (ConfigTransactionInterface& readReplica : readReplicas) {
+			if (readReplica.hostname.present()) {
+				fs.push_back(tryInitializeRequestStream(
+				    &readReplica.getClasses, readReplica.hostname.get(), WLTOKEN_CONFIGTXN_GETCLASSES));
+			}
+		}
+		wait(waitForAll(fs));
+		state Reference<ConfigTransactionInfo> configNodes(new ConfigTransactionInfo(readReplicas));
 		ConfigTransactionGetConfigClassesReply reply =
 		    wait(basicLoadBalance(configNodes,
 		                          &ConfigTransactionInterface::getClasses,
@@ -264,9 +298,17 @@ class PaxosConfigTransactionImpl {
 	}
 
 	ACTOR static Future<RangeResult> getKnobs(PaxosConfigTransactionImpl* self, Optional<Key> configClass) {
-		ConfigGeneration generation = wait(self->getGenerationQuorum.getGeneration());
-		state Reference<ConfigTransactionInfo> configNodes(
-		    new ConfigTransactionInfo(self->getGenerationQuorum.getReadReplicas()));
+		state ConfigGeneration generation = wait(self->getGenerationQuorum.getGeneration());
+		state std::vector<ConfigTransactionInterface> readReplicas = self->getGenerationQuorum.getReadReplicas();
+		std::vector<Future<Void>> fs;
+		for (ConfigTransactionInterface& readReplica : readReplicas) {
+			if (readReplica.hostname.present()) {
+				fs.push_back(tryInitializeRequestStream(
+				    &readReplica.getKnobs, readReplica.hostname.get(), WLTOKEN_CONFIGTXN_GETKNOBS));
+			}
+		}
+		wait(waitForAll(fs));
+		state Reference<ConfigTransactionInfo> configNodes(new ConfigTransactionInfo(readReplicas));
 		ConfigTransactionGetKnobsReply reply =
 		    wait(basicLoadBalance(configNodes,
 		                          &ConfigTransactionInterface::getKnobs,
@@ -366,10 +408,13 @@ class PaxosConfigTransactionImpl {
 	Future<Void> commit() { return commit(this); }
 
 	PaxosConfigTransactionImpl(Database const& cx) : cx(cx) {
-		auto coordinators = cx->getConnectionRecord()->getConnectionString().coordinators();
-		ctis.reserve(coordinators.size());
-		for (const auto& coordinator : coordinators) {
-			ctis.emplace_back(coordinator);
+		const ClusterConnectionString& cs = cx->getConnectionRecord()->getConnectionString();
+		ctis.reserve(cs.hostnames.size() + cs.coordinators().size());
+		for (const auto& h : cs.hostnames) {
+			ctis.emplace_back(h);
+		}
+		for (const auto& c : cs.coordinators()) {
+			ctis.emplace_back(c);
 		}
 		getGenerationQuorum = GetGenerationQuorum{ ctis };
 		commitQuorum = CommitQuorum{ ctis };
diff --git a/fdbclient/SimpleConfigTransaction.actor.cpp b/fdbclient/SimpleConfigTransaction.actor.cpp
index ecb8380d4c6..2e71cd73c4c 100644
--- a/fdbclient/SimpleConfigTransaction.actor.cpp
+++ b/fdbclient/SimpleConfigTransaction.actor.cpp
@@ -41,9 +41,15 @@ class SimpleConfigTransactionImpl {
 		if (self->dID.present()) {
 			TraceEvent("SimpleConfigTransactionGettingReadVersion", self->dID.get());
 		}
-		ConfigTransactionGetGenerationRequest req;
-		ConfigTransactionGetGenerationReply reply =
-		    wait(retryBrokenPromise(self->cti.getGeneration, ConfigTransactionGetGenerationRequest{}));
+		state ConfigTransactionGetGenerationReply reply;
+		if (self->cti.hostname.present()) {
+			wait(store(reply,
+			           retryGetReplyFromHostname(ConfigTransactionGetGenerationRequest{},
+			                                     self->cti.hostname.get(),
+			                                     WLTOKEN_CONFIGTXN_GETGENERATION)));
+		} else {
+			wait(store(reply, retryBrokenPromise(self->cti.getGeneration, ConfigTransactionGetGenerationRequest{})));
+		}
 		if (self->dID.present()) {
 			TraceEvent("SimpleConfigTransactionGotReadVersion", self->dID.get())
 			    .detail("Version", reply.generation.liveVersion);
@@ -62,8 +68,15 @@ class SimpleConfigTransactionImpl {
 			    .detail("ConfigClass", configKey.configClass)
 			    .detail("KnobName", configKey.knobName);
 		}
-		ConfigTransactionGetReply reply =
-		    wait(retryBrokenPromise(self->cti.get, ConfigTransactionGetRequest{ generation, configKey }));
+		state ConfigTransactionGetReply reply;
+		if (self->cti.hostname.present()) {
+			wait(store(reply,
+			           retryGetReplyFromHostname(ConfigTransactionGetRequest{ generation, configKey },
+			                                     self->cti.hostname.get(),
+			                                     WLTOKEN_CONFIGTXN_GET)));
+		} else {
+			wait(store(reply, retryBrokenPromise(self->cti.get, ConfigTransactionGetRequest{ generation, configKey })));
+		}
 		if (self->dID.present()) {
 			TraceEvent("SimpleConfigTransactionGotValue", self->dID.get())
 			    .detail("Value", reply.value.get().toString());
@@ -80,8 +93,17 @@ class SimpleConfigTransactionImpl {
 			self->getGenerationFuture = getGeneration(self);
 		}
 		ConfigGeneration generation = wait(self->getGenerationFuture);
-		ConfigTransactionGetConfigClassesReply reply =
-		    wait(retryBrokenPromise(self->cti.getClasses, ConfigTransactionGetConfigClassesRequest{ generation }));
+		state ConfigTransactionGetConfigClassesReply reply;
+		if (self->cti.hostname.present()) {
+			wait(store(reply,
+			           retryGetReplyFromHostname(ConfigTransactionGetConfigClassesRequest{ generation },
+			                                     self->cti.hostname.get(),
+			                                     WLTOKEN_CONFIGTXN_GETCLASSES)));
+		} else {
+			wait(store(
+			    reply,
+			    retryBrokenPromise(self->cti.getClasses, ConfigTransactionGetConfigClassesRequest{ generation })));
+		}
 		RangeResult result;
 		for (const auto& configClass : reply.configClasses) {
 			result.push_back_deep(result.arena(), KeyValueRef(configClass, ""_sr));
@@ -94,8 +116,17 @@ class SimpleConfigTransactionImpl {
 			self->getGenerationFuture = getGeneration(self);
 		}
 		ConfigGeneration generation = wait(self->getGenerationFuture);
-		ConfigTransactionGetKnobsReply reply =
-		    wait(retryBrokenPromise(self->cti.getKnobs, ConfigTransactionGetKnobsRequest{ generation, configClass }));
+		state ConfigTransactionGetKnobsReply reply;
+		if (self->cti.hostname.present()) {
+			wait(store(reply,
+			           retryGetReplyFromHostname(ConfigTransactionGetKnobsRequest{ generation, configClass },
+			                                     self->cti.hostname.get(),
+			                                     WLTOKEN_CONFIGTXN_GETKNOBS)));
+		} else {
+			wait(store(
+			    reply,
+			    retryBrokenPromise(self->cti.getKnobs, ConfigTransactionGetKnobsRequest{ generation, configClass })));
+		}
 		RangeResult result;
 		for (const auto& knobName : reply.knobNames) {
 			result.push_back_deep(result.arena(), KeyValueRef(knobName, ""_sr));
@@ -109,7 +140,11 @@ class SimpleConfigTransactionImpl {
 		}
 		wait(store(self->toCommit.generation, self->getGenerationFuture));
 		self->toCommit.annotation.timestamp = now();
-		wait(retryBrokenPromise(self->cti.commit, self->toCommit));
+		if (self->cti.hostname.present()) {
+			wait(retryGetReplyFromHostname(self->toCommit, self->cti.hostname.get(), WLTOKEN_CONFIGTXN_COMMIT));
+		} else {
+			wait(retryBrokenPromise(self->cti.commit, self->toCommit));
+		}
 		self->committed = true;
 		return Void();
 	}
@@ -126,9 +161,14 @@ class SimpleConfigTransactionImpl {
 
 public:
 	SimpleConfigTransactionImpl(Database const& cx) : cx(cx) {
-		auto coordinators = cx->getConnectionRecord()->getConnectionString().coordinators();
-		std::sort(coordinators.begin(), coordinators.end());
-		cti = ConfigTransactionInterface(coordinators[0]);
+		const ClusterConnectionString& cs = cx->getConnectionRecord()->getConnectionString();
+		if (cs.coordinators().size()) {
+			std::vector<NetworkAddress> coordinators = cs.coordinators();
+			std::sort(coordinators.begin(), coordinators.end());
+			cti = ConfigTransactionInterface(coordinators[0]);
+		} else {
+			cti = ConfigTransactionInterface(cs.hostnames[0]);
+		}
 	}
 
 	SimpleConfigTransactionImpl(ConfigTransactionInterface const& cti) : cti(cti) {}
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 52153a0d71a..6be5c903c74 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -1642,13 +1642,10 @@ void TracingOptionsImpl::clear(ReadYourWritesTransaction* ryw, const KeyRef& key
 
 CoordinatorsImpl::CoordinatorsImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
 
-Future<RangeResult> CoordinatorsImpl::getRange(ReadYourWritesTransaction* ryw,
-                                               KeyRangeRef kr,
-                                               GetRangeLimits limitsHint) const {
+ACTOR Future<RangeResult> coordinatorsGetRangeActor(ReadYourWritesTransaction* ryw, KeyRef prefix, KeyRangeRef kr) {
+	state ClusterConnectionString cs = ryw->getDatabase()->getConnectionRecord()->getConnectionString();
+	state std::vector<NetworkAddress> coordinator_processes = wait(cs.tryResolveHostnames());
 	RangeResult result;
-	KeyRef prefix(getKeyRange().begin);
-	auto cs = ryw->getDatabase()->getConnectionRecord()->getConnectionString();
-	auto coordinator_processes = cs.coordinators();
 	Key cluster_decription_key = prefix.withSuffix(LiteralStringRef("cluster_description"));
 	if (kr.contains(cluster_decription_key)) {
 		result.push_back_deep(result.arena(), KeyValueRef(cluster_decription_key, cs.clusterKeyName()));
@@ -1671,10 +1668,16 @@ Future<RangeResult> CoordinatorsImpl::getRange(ReadYourWritesTransaction* ryw,
 	return rywGetRange(ryw, kr, result);
 }
 
+Future<RangeResult> CoordinatorsImpl::getRange(ReadYourWritesTransaction* ryw,
+                                               KeyRangeRef kr,
+                                               GetRangeLimits limitsHint) const {
+	KeyRef prefix(getKeyRange().begin);
+	return coordinatorsGetRangeActor(ryw, prefix, kr);
+}
+
 ACTOR static Future<Optional<std::string>> coordinatorsCommitActor(ReadYourWritesTransaction* ryw, KeyRangeRef kr) {
 	state Reference<IQuorumChange> change;
-	state ClusterConnectionString
-	    conn; // We don't care about the Key here, it will be overrode in changeQuorumChecker().
+	state ClusterConnectionString conn; // We don't care about the Key here.
 	state std::vector<std::string> process_address_or_hostname_strs;
 	state Optional<std::string> msg;
 	state int index;
@@ -1698,7 +1701,6 @@ ACTOR static Future<Optional<std::string>> coordinatorsCommitActor(ReadYourWrite
 			try {
 				if (Hostname::isHostname(process_address_or_hostname_strs[index])) {
 					conn.hostnames.push_back(Hostname::parse(process_address_or_hostname_strs[index]));
-					conn.status = ClusterConnectionString::ConnectionStringStatus::UNRESOLVED;
 				} else {
 					NetworkAddress a = NetworkAddress::parse(process_address_or_hostname_strs[index]);
 					if (!a.isValid()) {
@@ -1715,18 +1717,19 @@ ACTOR static Future<Optional<std::string>> coordinatorsCommitActor(ReadYourWrite
 			if (parse_error) {
 				std::string error = "ERROR: \'" + process_address_or_hostname_strs[index] +
 				                    "\' is not a valid network endpoint address\n";
-				if (process_address_or_hostname_strs[index].find(":tls") != std::string::npos)
-					error += "        Do not include the `:tls' suffix when naming a process\n";
 				return ManagementAPIError::toJsonString(false, "coordinators", error);
 			}
 		}
 	}
 
-	wait(conn.resolveHostnames());
-	if (conn.coordinators().size())
-		change = specifiedQuorumChange(conn.coordinators());
-	else
+	std::vector<NetworkAddress> addressesVec = wait(conn.tryResolveHostnames());
+	if (addressesVec.size() != conn.hostnames.size() + conn.coordinators().size()) {
+		return ManagementAPIError::toJsonString(false, "coordinators", "One or more hostnames are not resolvable.");
+	} else if (addressesVec.size()) {
+		change = specifiedQuorumChange(addressesVec);
+	} else {
 		change = noQuorumChange();
+	}
 
 	// check update for cluster_description
 	Key cluster_decription_key = LiteralStringRef("cluster_description").withPrefix(kr.begin);
@@ -1738,19 +1741,18 @@ ACTOR static Future<Optional<std::string>> coordinatorsCommitActor(ReadYourWrite
 			change = nameQuorumChange(entry.second.get().toString(), change);
 		} else {
 			// throw the error
-			return Optional<std::string>(ManagementAPIError::toJsonString(
-			    false, "coordinators", "Cluster description must match [A-Za-z0-9_]+"));
+			return ManagementAPIError::toJsonString(
+			    false, "coordinators", "Cluster description must match [A-Za-z0-9_]+");
 		}
 	}
 
 	ASSERT(change.isValid());
 
 	TraceEvent(SevDebug, "SKSChangeCoordinatorsStart")
-	    .detail("NewHostnames", conn.hostnames.size() ? describe(conn.hostnames) : "N/A")
-	    .detail("NewAddresses", describe(conn.coordinators()))
+	    .detail("NewAddresses", describe(addressesVec))
 	    .detail("Description", entry.first ? entry.second.get().toString() : "");
 
-	Optional<CoordinatorsResult> r = wait(changeQuorumChecker(&ryw->getTransaction(), change, &conn));
+	Optional<CoordinatorsResult> r = wait(changeQuorumChecker(&ryw->getTransaction(), change, addressesVec));
 
 	TraceEvent(SevDebug, "SKSChangeCoordinatorsFinish")
 	    .detail("Result", r.present() ? static_cast<int>(r.get()) : -1); // -1 means success
@@ -1802,9 +1804,10 @@ ACTOR static Future<RangeResult> CoordinatorsAutoImplActor(ReadYourWritesTransac
 	state ClusterConnectionString old(currentKey.get().toString());
 	state CoordinatorsResult result = CoordinatorsResult::SUCCESS;
 
+	std::vector<NetworkAddress> oldCoordinators = wait(old.tryResolveHostnames());
 	std::vector<NetworkAddress> _desiredCoordinators = wait(autoQuorumChange()->getDesiredCoordinators(
 	    &tr,
-	    old.coordinators(),
+	    oldCoordinators,
 	    Reference<ClusterConnectionMemoryRecord>(new ClusterConnectionMemoryRecord(old)),
 	    result));
 
diff --git a/fdbclient/StatusClient.actor.cpp b/fdbclient/StatusClient.actor.cpp
index 6b329ba1b92..653b8496e8c 100644
--- a/fdbclient/StatusClient.actor.cpp
+++ b/fdbclient/StatusClient.actor.cpp
@@ -307,23 +307,35 @@ ACTOR Future<Optional<StatusObject>> clientCoordinatorsStatusFetcher(Reference<I
                                                                      bool* quorum_reachable,
                                                                      int* coordinatorsFaultTolerance) {
 	try {
-		wait(connRecord->resolveHostnames());
 		state ClientCoordinators coord(connRecord);
 		state StatusObject statusObj;
 
 		state std::vector<Future<Optional<LeaderInfo>>> leaderServers;
 		leaderServers.reserve(coord.clientLeaderServers.size());
-		for (int i = 0; i < coord.clientLeaderServers.size(); i++)
-			leaderServers.push_back(retryBrokenPromise(coord.clientLeaderServers[i].getLeader,
-			                                           GetLeaderRequest(coord.clusterKey, UID()),
-			                                           TaskPriority::CoordinationReply));
+		for (int i = 0; i < coord.clientLeaderServers.size(); i++) {
+			if (coord.clientLeaderServers[i].hostname.present()) {
+				leaderServers.push_back(retryGetReplyFromHostname(GetLeaderRequest(coord.clusterKey, UID()),
+				                                                  coord.clientLeaderServers[i].hostname.get(),
+				                                                  WLTOKEN_CLIENTLEADERREG_GETLEADER,
+				                                                  TaskPriority::CoordinationReply));
+			} else {
+				leaderServers.push_back(retryBrokenPromise(coord.clientLeaderServers[i].getLeader,
+				                                           GetLeaderRequest(coord.clusterKey, UID()),
+				                                           TaskPriority::CoordinationReply));
+			}
+		}
 
 		state std::vector<Future<ProtocolInfoReply>> coordProtocols;
 		coordProtocols.reserve(coord.clientLeaderServers.size());
 		for (int i = 0; i < coord.clientLeaderServers.size(); i++) {
-			RequestStream<ProtocolInfoRequest> requestStream{ Endpoint::wellKnown(
-				{ coord.clientLeaderServers[i].getLeader.getEndpoint().addresses }, WLTOKEN_PROTOCOL_INFO) };
-			coordProtocols.push_back(retryBrokenPromise(requestStream, ProtocolInfoRequest{}));
+			if (coord.clientLeaderServers[i].hostname.present()) {
+				coordProtocols.push_back(retryGetReplyFromHostname(
+				    ProtocolInfoRequest{}, coord.clientLeaderServers[i].hostname.get(), WLTOKEN_PROTOCOL_INFO));
+			} else {
+				RequestStream<ProtocolInfoRequest> requestStream{ Endpoint::wellKnown(
+					{ coord.clientLeaderServers[i].getLeader.getEndpoint().addresses }, WLTOKEN_PROTOCOL_INFO) };
+				coordProtocols.push_back(retryBrokenPromise(requestStream, ProtocolInfoRequest{}));
+			}
 		}
 
 		wait(smartQuorum(leaderServers, leaderServers.size() / 2 + 1, 1.5) &&
@@ -337,8 +349,12 @@ ACTOR Future<Optional<StatusObject>> clientCoordinatorsStatusFetcher(Reference<I
 		int coordinatorsUnavailable = 0;
 		for (int i = 0; i < leaderServers.size(); i++) {
 			StatusObject coordStatus;
-			coordStatus["address"] =
-			    coord.clientLeaderServers[i].getLeader.getEndpoint().getPrimaryAddress().toString();
+			if (coord.clientLeaderServers[i].hostname.present()) {
+				coordStatus["address"] = coord.clientLeaderServers[i].hostname.get().toString();
+			} else {
+				coordStatus["address"] =
+				    coord.clientLeaderServers[i].getLeader.getEndpoint().getPrimaryAddress().toString();
+			}
 
 			if (leaderServers[i].isReady()) {
 				coordStatus["reachable"] = true;
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 6344e312692..38d4b73a0d4 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -72,6 +72,20 @@ Future<REPLY_TYPE(Req)> retryBrokenPromise(RequestStream<Req> to, Req request, T
 	}
 }
 
+ACTOR template <class Req>
+Future<Void> tryInitializeRequestStream(RequestStream<Req>* stream, Hostname hostname, WellKnownEndpoints token) {
+	Optional<NetworkAddress> address = wait(hostname.resolve());
+	if (!address.present()) {
+		return Void();
+	}
+	if (stream == nullptr) {
+		stream = new RequestStream<Req>(Endpoint::wellKnown({ address.get() }, token));
+	} else {
+		*stream = RequestStream<Req>(Endpoint::wellKnown({ address.get() }, token));
+	}
+	return Void();
+}
+
 ACTOR template <class Req>
 Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(Req request, Hostname hostname, WellKnownEndpoints token) {
 	// A wrapper of tryGetReply(request), except that the request is sent to an address resolved from a hostname.
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index a5872647ece..57bb2ae31e7 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -1110,10 +1110,10 @@ ACTOR Future<Void> registerWorker(RegisterWorkerRequest req,
 	newPriorityInfo.processClassFitness = newProcessClass.machineClassFitness(ProcessClass::ClusterController);
 
 	bool isCoordinator =
-	    (std::find(coordinatorAddresses.begin(), coordinatorAddresses.end(), req.wi.address()) !=
+	    (std::find(coordinatorAddresses.begin(), coordinatorAddresses.end(), w.address()) !=
 	     coordinatorAddresses.end()) ||
-	    (req.wi.secondaryAddress().present() &&
-	     std::find(coordinatorAddresses.begin(), coordinatorAddresses.end(), req.wi.secondaryAddress().get()) !=
+	    (w.secondaryAddress().present() &&
+	     std::find(coordinatorAddresses.begin(), coordinatorAddresses.end(), w.secondaryAddress().get()) !=
 	         coordinatorAddresses.end());
 
 	for (auto it : req.incompatiblePeers) {
@@ -2480,12 +2480,11 @@ ACTOR Future<Void> workerHealthMonitor(ClusterControllerData* self) {
 	}
 }
 
-ACTOR Future<Void> clusterControllerCore(Reference<IClusterConnectionRecord> connRecord,
-                                         ClusterControllerFullInterface interf,
+ACTOR Future<Void> clusterControllerCore(ClusterControllerFullInterface interf,
                                          Future<Void> leaderFail,
+                                         ServerCoordinators coordinators,
                                          LocalityData locality,
                                          ConfigDBType configDBType) {
-	state ServerCoordinators coordinators(connRecord);
 	state ClusterControllerData self(interf, locality, coordinators);
 	state ConfigBroadcaster configBroadcaster(coordinators, configDBType);
 	state Future<Void> coordinationPingDelay = delay(SERVER_KNOBS->WORKER_COORDINATION_PING_DELAY);
@@ -2620,7 +2619,7 @@ ACTOR Future<Void> replaceInterface(ClusterControllerFullInterface interf) {
 	}
 }
 
-ACTOR Future<Void> clusterController(Reference<IClusterConnectionRecord> connRecord,
+ACTOR Future<Void> clusterController(ServerCoordinators coordinators,
                                      Reference<AsyncVar<Optional<ClusterControllerFullInterface>>> currentCC,
                                      bool hasConnected,
                                      Reference<AsyncVar<ClusterControllerPriorityInfo>> asyncPriorityInfo,
@@ -2631,10 +2630,9 @@ ACTOR Future<Void> clusterController(Reference<IClusterConnectionRecord> connRec
 		state bool inRole = false;
 		cci.initEndpoints();
 		try {
-			wait(connRecord->resolveHostnames());
 			// Register as a possible leader; wait to be elected
 			state Future<Void> leaderFail =
-			    tryBecomeLeader(connRecord, cci, currentCC, hasConnected, asyncPriorityInfo);
+			    tryBecomeLeader(coordinators, cci, currentCC, hasConnected, asyncPriorityInfo);
 			state Future<Void> shouldReplace = replaceInterface(cci);
 
 			while (!currentCC->get().present() || currentCC->get().get() != cci) {
@@ -2653,7 +2651,7 @@ ACTOR Future<Void> clusterController(Reference<IClusterConnectionRecord> connRec
 				startRole(Role::CLUSTER_CONTROLLER, cci.id(), UID());
 				inRole = true;
 
-				wait(clusterControllerCore(connRecord, cci, leaderFail, locality, configDBType));
+				wait(clusterControllerCore(cci, leaderFail, coordinators, locality, configDBType));
 			}
 		} catch (Error& e) {
 			if (inRole)
@@ -2682,7 +2680,8 @@ ACTOR Future<Void> clusterController(Reference<IClusterConnectionRecord> connRec
 	state bool hasConnected = false;
 	loop {
 		try {
-			wait(clusterController(connRecord, currentCC, hasConnected, asyncPriorityInfo, locality, configDBType));
+			ServerCoordinators coordinators(connRecord);
+			wait(clusterController(coordinators, currentCC, hasConnected, asyncPriorityInfo, locality, configDBType));
 			hasConnected = true;
 		} catch (Error& e) {
 			if (e.code() != error_code_coordinators_changed)
diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
index 0c1da6f60f1..c1b8474bf5c 100644
--- a/fdbserver/ClusterRecovery.actor.cpp
+++ b/fdbserver/ClusterRecovery.actor.cpp
@@ -536,8 +536,7 @@ ACTOR Future<Void> changeCoordinators(Reference<ClusterRecoveryData> self) {
 		}
 
 		try {
-			state ClusterConnectionString conn(changeCoordinatorsRequest.newConnectionString.toString());
-			wait(conn.resolveHostnames());
+			ClusterConnectionString conn(changeCoordinatorsRequest.newConnectionString.toString());
 			wait(self->cstate.move(conn));
 		} catch (Error& e) {
 			if (e.code() != error_code_actor_cancelled)
diff --git a/fdbserver/CoordinatedState.actor.cpp b/fdbserver/CoordinatedState.actor.cpp
index 7a2c5e028ce..72e75bf3be1 100644
--- a/fdbserver/CoordinatedState.actor.cpp
+++ b/fdbserver/CoordinatedState.actor.cpp
@@ -26,21 +26,29 @@
 #include "fdbserver/LeaderElection.h"
 #include "flow/actorcompiler.h" // has to be last include
 
-ACTOR Future<GenerationRegReadReply> waitAndSendRead(RequestStream<GenerationRegReadRequest> to,
-                                                     GenerationRegReadRequest req) {
+ACTOR Future<GenerationRegReadReply> waitAndSendRead(GenerationRegInterface stateServer, GenerationRegReadRequest req) {
 	if (SERVER_KNOBS->BUGGIFY_ALL_COORDINATION || BUGGIFY)
 		wait(delay(SERVER_KNOBS->BUGGIFIED_EVENTUAL_CONSISTENCY * deterministicRandom()->random01()));
-	state GenerationRegReadReply reply = wait(retryBrokenPromise(to, req));
+	state GenerationRegReadReply reply;
+	if (stateServer.hostname.present()) {
+		wait(store(reply, retryGetReplyFromHostname(req, stateServer.hostname.get(), WLTOKEN_GENERATIONREG_READ)));
+	} else {
+		wait(store(reply, retryBrokenPromise(stateServer.read, req)));
+	}
 	if (SERVER_KNOBS->BUGGIFY_ALL_COORDINATION || BUGGIFY)
 		wait(delay(SERVER_KNOBS->BUGGIFIED_EVENTUAL_CONSISTENCY * deterministicRandom()->random01()));
 	return reply;
 }
 
-ACTOR Future<UniqueGeneration> waitAndSendWrite(RequestStream<GenerationRegWriteRequest> to,
-                                                GenerationRegWriteRequest req) {
+ACTOR Future<UniqueGeneration> waitAndSendWrite(GenerationRegInterface stateServer, GenerationRegWriteRequest req) {
 	if (SERVER_KNOBS->BUGGIFY_ALL_COORDINATION || BUGGIFY)
 		wait(delay(SERVER_KNOBS->BUGGIFIED_EVENTUAL_CONSISTENCY * deterministicRandom()->random01()));
-	state UniqueGeneration reply = wait(retryBrokenPromise(to, req));
+	state UniqueGeneration reply;
+	if (stateServer.hostname.present()) {
+		wait(store(reply, retryGetReplyFromHostname(req, stateServer.hostname.get(), WLTOKEN_GENERATIONREG_WRITE)));
+	} else {
+		wait(store(reply, retryBrokenPromise(stateServer.write, req)));
+	}
 	if (SERVER_KNOBS->BUGGIFY_ALL_COORDINATION || BUGGIFY)
 		wait(delay(SERVER_KNOBS->BUGGIFIED_EVENTUAL_CONSISTENCY * deterministicRandom()->random01()));
 	return reply;
@@ -152,7 +160,7 @@ struct CoordinatedStateImpl {
 		state std::vector<Future<GenerationRegReadReply>> rep_reply;
 		for (int i = 0; i < replicas.size(); i++) {
 			Future<GenerationRegReadReply> reply =
-			    waitAndSendRead(replicas[i].read, GenerationRegReadRequest(req.key, req.gen));
+			    waitAndSendRead(replicas[i], GenerationRegReadRequest(req.key, req.gen));
 			rep_empty_reply.push_back(nonemptyToNever(reply));
 			rep_reply.push_back(emptyToNever(reply));
 			self->ac.add(success(reply));
@@ -192,8 +200,7 @@ struct CoordinatedStateImpl {
 		state std::vector<GenerationRegInterface>& replicas = self->coordinators.stateServers;
 		state std::vector<Future<UniqueGeneration>> wrep_reply;
 		for (int i = 0; i < replicas.size(); i++) {
-			Future<UniqueGeneration> reply =
-			    waitAndSendWrite(replicas[i].write, GenerationRegWriteRequest(req.kv, req.gen));
+			Future<UniqueGeneration> reply = waitAndSendWrite(replicas[i], GenerationRegWriteRequest(req.kv, req.gen));
 			wrep_reply.push_back(reply);
 			self->ac.add(success(reply));
 		}
diff --git a/fdbserver/Coordination.actor.cpp b/fdbserver/Coordination.actor.cpp
index 53086e55162..a3746c4f5ec 100644
--- a/fdbserver/Coordination.actor.cpp
+++ b/fdbserver/Coordination.actor.cpp
@@ -98,12 +98,16 @@ LeaderElectionRegInterface::LeaderElectionRegInterface(INetwork* local) : Client
 }
 
 ServerCoordinators::ServerCoordinators(Reference<IClusterConnectionRecord> ccr) : ClientCoordinators(ccr) {
-	ASSERT(ccr->connectionStringStatus() == ClusterConnectionString::RESOLVED);
 	ClusterConnectionString cs = ccr->getConnectionString();
-	for (auto s = cs.coordinators().begin(); s != cs.coordinators().end(); ++s) {
-		leaderElectionServers.emplace_back(*s);
-		stateServers.emplace_back(*s);
-		configServers.emplace_back(*s);
+	for (auto h : cs.hostnames) {
+		leaderElectionServers.emplace_back(h);
+		stateServers.emplace_back(h);
+		configServers.emplace_back(h);
+	}
+	for (auto s : cs.coordinators()) {
+		leaderElectionServers.emplace_back(s);
+		stateServers.emplace_back(s);
+		configServers.emplace_back(s);
 	}
 }
 
@@ -208,10 +212,8 @@ ACTOR Future<Void> openDatabase(ClientData* db,
                                 int* clientCount,
                                 Reference<AsyncVar<bool>> hasConnectedClients,
                                 OpenDatabaseCoordRequest req,
-                                Future<Void> checkStuck,
-                                Reference<AsyncVar<Void>> coordinatorsChanged) {
+                                Future<Void> checkStuck) {
 	state ErrorOr<CachedSerialization<ClientDBInfo>> replyContents;
-	state Future<Void> coordinatorsChangedOnChange = coordinatorsChanged->onChange();
 	state Future<Void> clientInfoOnChange = db->clientInfo->onChange();
 
 	++(*clientCount);
@@ -233,11 +235,6 @@ ACTOR Future<Void> openDatabase(ClientData* db,
 				clientInfoOnChange = db->clientInfo->onChange();
 				replyContents = db->clientInfo->get();
 			}
-			when(wait(coordinatorsChangedOnChange)) {
-				coordinatorsChangedOnChange = coordinatorsChanged->onChange();
-				replyContents = coordinators_changed();
-				break;
-			}
 			when(wait(delayJittered(SERVER_KNOBS->CLIENT_REGISTER_INTERVAL))) {
 				if (db->clientInfo->get().read().id.isValid()) {
 					replyContents = db->clientInfo->get();
@@ -268,10 +265,7 @@ ACTOR Future<Void> openDatabase(ClientData* db,
 ACTOR Future<Void> remoteMonitorLeader(int* clientCount,
                                        Reference<AsyncVar<bool>> hasConnectedClients,
                                        Reference<AsyncVar<Optional<LeaderInfo>>> currentElectedLeader,
-                                       ElectionResultRequest req,
-                                       Reference<AsyncVar<Void>> coordinatorsChanged) {
-	state bool coordinatorsChangeDetected = false;
-	state Future<Void> coordinatorsChangedOnChange = coordinatorsChanged->onChange();
+                                       ElectionResultRequest req) {
 	state Future<Void> currentElectedLeaderOnChange = currentElectedLeader->onChange();
 	++(*clientCount);
 	hasConnectedClients->set(true);
@@ -281,20 +275,11 @@ ACTOR Future<Void> remoteMonitorLeader(int* clientCount,
 			when(wait(yieldedFuture(currentElectedLeaderOnChange))) {
 				currentElectedLeaderOnChange = currentElectedLeader->onChange();
 			}
-			when(wait(coordinatorsChangedOnChange)) {
-				coordinatorsChangedOnChange = coordinatorsChanged->onChange();
-				coordinatorsChangeDetected = true;
-				break;
-			}
 			when(wait(delayJittered(SERVER_KNOBS->CLIENT_REGISTER_INTERVAL))) { break; }
 		}
 	}
 
-	if (coordinatorsChangeDetected) {
-		req.reply.sendError(coordinators_changed());
-	} else {
-		req.reply.send(currentElectedLeader->get());
-	}
+	req.reply.send(currentElectedLeader->get());
 
 	if (--(*clientCount) == 0) {
 		hasConnectedClients->set(false);
@@ -325,8 +310,6 @@ ACTOR Future<Void> leaderRegister(LeaderElectionRegInterface interf, Key key) {
 	state Reference<AsyncVar<Optional<LeaderInfo>>> currentElectedLeader =
 	    makeReference<AsyncVar<Optional<LeaderInfo>>>();
 	state LivenessChecker canConnectToLeader(SERVER_KNOBS->COORDINATOR_LEADER_CONNECTION_TIMEOUT);
-	state Reference<AsyncVar<Void>> coordinatorsChanged = makeReference<AsyncVar<Void>>();
-	state Future<Void> coordinatorsChangedOnChange = coordinatorsChanged->onChange();
 	state Future<Void> hasConnectedClientsOnChange = hasConnectedClients->onChange();
 
 	loop choose {
@@ -338,14 +321,10 @@ ACTOR Future<Void> leaderRegister(LeaderElectionRegInterface interf, Key key) {
 			} else {
 				if (!leaderMon.isValid()) {
 					leaderMon = monitorLeaderAndGetClientInfo(
-					    req.clusterKey, req.coordinators, &clientData, currentElectedLeader, coordinatorsChanged);
+					    req.clusterKey, req.hostnames, req.coordinators, &clientData, currentElectedLeader);
 				}
-				actors.add(openDatabase(&clientData,
-				                        &clientCount,
-				                        hasConnectedClients,
-				                        req,
-				                        canConnectToLeader.checkStuck(),
-				                        coordinatorsChanged));
+				actors.add(
+				    openDatabase(&clientData, &clientCount, hasConnectedClients, req, canConnectToLeader.checkStuck()));
 			}
 		}
 		when(ElectionResultRequest req = waitNext(interf.electionResult.getFuture())) {
@@ -355,10 +334,9 @@ ACTOR Future<Void> leaderRegister(LeaderElectionRegInterface interf, Key key) {
 			} else {
 				if (!leaderMon.isValid()) {
 					leaderMon = monitorLeaderAndGetClientInfo(
-					    req.key, req.coordinators, &clientData, currentElectedLeader, coordinatorsChanged);
+					    req.key, req.hostnames, req.coordinators, &clientData, currentElectedLeader);
 				}
-				actors.add(remoteMonitorLeader(
-				    &clientCount, hasConnectedClients, currentElectedLeader, req, coordinatorsChanged));
+				actors.add(remoteMonitorLeader(&clientCount, hasConnectedClients, currentElectedLeader, req));
 			}
 		}
 		when(GetLeaderRequest req = waitNext(interf.getLeader.getFuture())) {
@@ -499,10 +477,6 @@ ACTOR Future<Void> leaderRegister(LeaderElectionRegInterface interf, Key key) {
 			}
 		}
 		when(wait(actors.getResult())) {}
-		when(wait(coordinatorsChangedOnChange)) {
-			leaderMon = Future<Void>();
-			coordinatorsChangedOnChange = coordinatorsChanged->onChange();
-		}
 	}
 }
 
diff --git a/fdbserver/CoordinationInterface.h b/fdbserver/CoordinationInterface.h
index b966678cc6a..2c8c037afa5 100644
--- a/fdbserver/CoordinationInterface.h
+++ b/fdbserver/CoordinationInterface.h
@@ -153,17 +153,21 @@ struct CandidacyRequest {
 struct ElectionResultRequest {
 	constexpr static FileIdentifier file_identifier = 11815465;
 	Key key;
+	std::vector<Hostname> hostnames;
 	std::vector<NetworkAddress> coordinators;
 	UID knownLeader;
 	ReplyPromise<Optional<LeaderInfo>> reply;
 
 	ElectionResultRequest() = default;
-	ElectionResultRequest(Key key, std::vector<NetworkAddress> coordinators, UID knownLeader)
-	  : key(key), coordinators(std::move(coordinators)), knownLeader(knownLeader) {}
+	ElectionResultRequest(Key key,
+	                      std::vector<Hostname> hostnames,
+	                      std::vector<NetworkAddress> coordinators,
+	                      UID knownLeader)
+	  : key(key), hostnames(std::move(hostnames)), coordinators(std::move(coordinators)), knownLeader(knownLeader) {}
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, key, coordinators, knownLeader, reply);
+		serializer(ar, key, hostnames, coordinators, knownLeader, reply);
 	}
 };
 
diff --git a/fdbserver/LeaderElection.actor.cpp b/fdbserver/LeaderElection.actor.cpp
index 272e07c1ec3..3c23827e710 100644
--- a/fdbserver/LeaderElection.actor.cpp
+++ b/fdbserver/LeaderElection.actor.cpp
@@ -27,44 +27,29 @@
 
 // Keep trying to become a leader by submitting itself to all coordinators.
 // Monitor the health of all coordinators at the same time.
-// Note: for coordinators whose NetworkAddress is parsed out of a hostname, a connection failure will cause this actor
-// to throw `coordinators_changed()` error
 ACTOR Future<Void> submitCandidacy(Key key,
                                    LeaderElectionRegInterface coord,
                                    LeaderInfo myInfo,
                                    UID prevChangeID,
                                    AsyncTrigger* nomineeChange,
-                                   Optional<LeaderInfo>* nominee,
-                                   Optional<Hostname> hostname = Optional<Hostname>()) {
+                                   Optional<LeaderInfo>* nominee) {
 	loop {
 		state Optional<LeaderInfo> li;
-
-		if (coord.candidacy.getEndpoint().getPrimaryAddress().fromHostname) {
-			state ErrorOr<Optional<LeaderInfo>> rep = wait(coord.candidacy.tryGetReply(
-			    CandidacyRequest(key, myInfo, nominee->present() ? nominee->get().changeID : UID(), prevChangeID),
-			    TaskPriority::CoordinationReply));
-			if (rep.isError()) {
-				// Connecting to nominee failed, most likely due to connection failed.
-				TraceEvent("SubmitCandadicyError")
-				    .error(rep.getError())
-				    .detail("Hostname", hostname.present() ? hostname.get().toString() : "UnknownHostname")
-				    .detail("OldAddr", coord.candidacy.getEndpoint().getPrimaryAddress().toString());
-				if (rep.getError().code() == error_code_request_maybe_delivered) {
-					// Delay to prevent tight resolving loop due to outdated DNS cache
-					wait(delay(FLOW_KNOBS->HOSTNAME_RECONNECT_INIT_INTERVAL));
-					throw coordinators_changed();
-				} else {
-					throw rep.getError();
-				}
-			} else if (rep.present()) {
-				li = rep.get();
-			}
+		if (coord.hostname.present()) {
+			wait(store(
+			    li,
+			    retryGetReplyFromHostname(
+			        CandidacyRequest(key, myInfo, nominee->present() ? nominee->get().changeID : UID(), prevChangeID),
+			        coord.hostname.get(),
+			        WLTOKEN_LEADERELECTIONREG_CANDIDACY,
+			        TaskPriority::CoordinationReply)));
 		} else {
-			Optional<LeaderInfo> tmp = wait(retryBrokenPromise(
-			    coord.candidacy,
-			    CandidacyRequest(key, myInfo, nominee->present() ? nominee->get().changeID : UID(), prevChangeID),
-			    TaskPriority::CoordinationReply));
-			li = tmp;
+			wait(store(
+			    li,
+			    retryBrokenPromise(
+			        coord.candidacy,
+			        CandidacyRequest(key, myInfo, nominee->present() ? nominee->get().changeID : UID(), prevChangeID),
+			        TaskPriority::CoordinationReply)));
 		}
 
 		wait(Future<Void>(Void())); // Make sure we weren't cancelled
@@ -104,20 +89,26 @@ Future<Void> buggifyDelayedAsyncVar(Reference<AsyncVar<T>>& var) {
 ACTOR Future<Void> changeLeaderCoordinators(ServerCoordinators coordinators, Value forwardingInfo) {
 	std::vector<Future<Void>> forwardRequests;
 	forwardRequests.reserve(coordinators.leaderElectionServers.size());
-	for (int i = 0; i < coordinators.leaderElectionServers.size(); i++)
-		forwardRequests.push_back(retryBrokenPromise(coordinators.leaderElectionServers[i].forward,
-		                                             ForwardRequest(coordinators.clusterKey, forwardingInfo)));
+	for (int i = 0; i < coordinators.leaderElectionServers.size(); i++) {
+		if (coordinators.leaderElectionServers[i].hostname.present()) {
+			forwardRequests.push_back(retryGetReplyFromHostname(ForwardRequest(coordinators.clusterKey, forwardingInfo),
+			                                                    coordinators.leaderElectionServers[i].hostname.get(),
+			                                                    WLTOKEN_LEADERELECTIONREG_FORWARD));
+		} else {
+			forwardRequests.push_back(retryBrokenPromise(coordinators.leaderElectionServers[i].forward,
+			                                             ForwardRequest(coordinators.clusterKey, forwardingInfo)));
+		}
+	}
 	int quorum_size = forwardRequests.size() / 2 + 1;
 	wait(quorum(forwardRequests, quorum_size));
 	return Void();
 }
 
-ACTOR Future<Void> tryBecomeLeaderInternal(Reference<IClusterConnectionRecord> connRecord,
+ACTOR Future<Void> tryBecomeLeaderInternal(ServerCoordinators coordinators,
                                            Value proposedSerializedInterface,
                                            Reference<AsyncVar<Value>> outSerializedLeader,
                                            bool hasConnected,
                                            Reference<AsyncVar<ClusterControllerPriorityInfo>> asyncPriorityInfo) {
-	state ServerCoordinators coordinators(connRecord);
 	state AsyncTrigger nomineeChange;
 	state std::vector<Optional<LeaderInfo>> nominees;
 	state LeaderInfo myInfo;
@@ -134,6 +125,8 @@ ACTOR Future<Void> tryBecomeLeaderInternal(Reference<IClusterConnectionRecord> c
 		wait(delay(SERVER_KNOBS->WAIT_FOR_GOOD_RECRUITMENT_DELAY));
 	}
 
+	nominees.resize(coordinators.leaderElectionServers.size());
+
 	myInfo.serializedInfo = proposedSerializedInterface;
 	outSerializedLeader->set(Value());
 
@@ -141,9 +134,6 @@ ACTOR Future<Void> tryBecomeLeaderInternal(Reference<IClusterConnectionRecord> c
 	    (SERVER_KNOBS->BUGGIFY_ALL_COORDINATION || BUGGIFY) ? buggifyDelayedAsyncVar(outSerializedLeader) : Void();
 
 	while (!iAmLeader) {
-		wait(connRecord->resolveHostnames());
-		coordinators = ServerCoordinators(connRecord);
-		nominees.resize(coordinators.leaderElectionServers.size());
 		state Future<Void> badCandidateTimeout;
 
 		myInfo.changeID = deterministicRandom()->randomUniqueID();
@@ -153,19 +143,12 @@ ACTOR Future<Void> tryBecomeLeaderInternal(Reference<IClusterConnectionRecord> c
 		std::vector<Future<Void>> cand;
 		cand.reserve(coordinators.leaderElectionServers.size());
 		for (int i = 0; i < coordinators.leaderElectionServers.size(); i++) {
-			Optional<Hostname> hostname;
-			auto r = connRecord->getConnectionString().networkAddressToHostname.find(
-			    coordinators.leaderElectionServers[i].candidacy.getEndpoint().getPrimaryAddress());
-			if (r != connRecord->getConnectionString().networkAddressToHostname.end()) {
-				hostname = r->second;
-			}
 			cand.push_back(submitCandidacy(coordinators.clusterKey,
 			                               coordinators.leaderElectionServers[i],
 			                               myInfo,
 			                               prevChangeID,
 			                               &nomineeChange,
-			                               &nominees[i],
-			                               hostname));
+			                               &nominees[i]));
 		}
 		candidacies = waitForAll(cand);
 
@@ -220,24 +203,15 @@ ACTOR Future<Void> tryBecomeLeaderInternal(Reference<IClusterConnectionRecord> c
 			} else
 				badCandidateTimeout = Future<Void>();
 
-			try {
-				choose {
-					when(wait(nomineeChange.onTrigger())) {}
-					when(wait(badCandidateTimeout.isValid() ? badCandidateTimeout : Never())) {
-						TEST(true); // Bad candidate timeout
-						TraceEvent("LeaderBadCandidateTimeout", myInfo.changeID).log();
-						break;
-					}
-					when(wait(candidacies)) { ASSERT(false); }
-					when(wait(asyncPriorityInfo->onChange())) { break; }
-				}
-			} catch (Error& e) {
-				if (e.code() == error_code_coordinators_changed) {
-					connRecord->getConnectionString().resetToUnresolved();
+			choose {
+				when(wait(nomineeChange.onTrigger())) {}
+				when(wait(badCandidateTimeout.isValid() ? badCandidateTimeout : Never())) {
+					TEST(true); // Bad candidate timeout
+					TraceEvent("LeaderBadCandidateTimeout", myInfo.changeID).log();
 					break;
-				} else {
-					throw e;
 				}
+				when(wait(candidacies)) { ASSERT(false); }
+				when(wait(asyncPriorityInfo->onChange())) { break; }
 			}
 		}
 
@@ -258,10 +232,17 @@ ACTOR Future<Void> tryBecomeLeaderInternal(Reference<IClusterConnectionRecord> c
 		state std::vector<Future<Void>> true_heartbeats;
 		state std::vector<Future<Void>> false_heartbeats;
 		for (int i = 0; i < coordinators.leaderElectionServers.size(); i++) {
-			Future<LeaderHeartbeatReply> hb =
-			    retryBrokenPromise(coordinators.leaderElectionServers[i].leaderHeartbeat,
-			                       LeaderHeartbeatRequest(coordinators.clusterKey, myInfo, prevChangeID),
-			                       TaskPriority::CoordinationReply);
+			Future<LeaderHeartbeatReply> hb;
+			if (coordinators.leaderElectionServers[i].hostname.present()) {
+				hb = retryGetReplyFromHostname(LeaderHeartbeatRequest(coordinators.clusterKey, myInfo, prevChangeID),
+				                               coordinators.leaderElectionServers[i].hostname.get(),
+				                               WLTOKEN_LEADERELECTIONREG_LEADERHEARTBEAT,
+				                               TaskPriority::CoordinationReply);
+			} else {
+				hb = retryBrokenPromise(coordinators.leaderElectionServers[i].leaderHeartbeat,
+				                        LeaderHeartbeatRequest(coordinators.clusterKey, myInfo, prevChangeID),
+				                        TaskPriority::CoordinationReply);
+			}
 			true_heartbeats.push_back(onEqual(hb, LeaderHeartbeatReply{ true }));
 			false_heartbeats.push_back(onEqual(hb, LeaderHeartbeatReply{ false }));
 		}
diff --git a/fdbserver/LeaderElection.h b/fdbserver/LeaderElection.h
index 9639116ec55..ad5d959ce56 100644
--- a/fdbserver/LeaderElection.h
+++ b/fdbserver/LeaderElection.h
@@ -37,7 +37,7 @@ class ServerCoordinators;
 // eventually be set.  If the return value is cancelled, the candidacy or leadership of the proposedInterface
 // will eventually end.
 template <class LeaderInterface>
-Future<Void> tryBecomeLeader(Reference<IClusterConnectionRecord> const& connRecord,
+Future<Void> tryBecomeLeader(ServerCoordinators const& coordinators,
                              LeaderInterface const& proposedInterface,
                              Reference<AsyncVar<Optional<LeaderInterface>>> const& outKnownLeader,
                              bool hasConnected,
@@ -50,20 +50,20 @@ Future<Void> changeLeaderCoordinators(ServerCoordinators const& coordinators, Va
 #pragma region Implementation
 #endif // __INTEL_COMPILER
 
-Future<Void> tryBecomeLeaderInternal(Reference<IClusterConnectionRecord> const& connRecord,
+Future<Void> tryBecomeLeaderInternal(ServerCoordinators const& coordinators,
                                      Value const& proposedSerializedInterface,
                                      Reference<AsyncVar<Value>> const& outSerializedLeader,
                                      bool const& hasConnected,
                                      Reference<AsyncVar<ClusterControllerPriorityInfo>> const& asyncPriorityInfo);
 
 template <class LeaderInterface>
-Future<Void> tryBecomeLeader(Reference<IClusterConnectionRecord> const& connRecord,
+Future<Void> tryBecomeLeader(ServerCoordinators const& coordinators,
                              LeaderInterface const& proposedInterface,
                              Reference<AsyncVar<Optional<LeaderInterface>>> const& outKnownLeader,
                              bool hasConnected,
                              Reference<AsyncVar<ClusterControllerPriorityInfo>> const& asyncPriorityInfo) {
 	auto serializedInfo = makeReference<AsyncVar<Value>>();
-	Future<Void> m = tryBecomeLeaderInternal(connRecord,
+	Future<Void> m = tryBecomeLeaderInternal(coordinators,
 	                                         ObjectWriter::toValue(proposedInterface, IncludeVersion()),
 	                                         serializedInfo,
 	                                         hasConnected,
diff --git a/fdbserver/PaxosConfigConsumer.actor.cpp b/fdbserver/PaxosConfigConsumer.actor.cpp
index 934efccfa3d..aee3b83bbe6 100644
--- a/fdbserver/PaxosConfigConsumer.actor.cpp
+++ b/fdbserver/PaxosConfigConsumer.actor.cpp
@@ -99,8 +99,17 @@ class GetCommittedVersionQuorum {
 
 			// Now roll node forward to match the largest committed version of
 			// the replies.
-			state Reference<ConfigFollowerInfo> quorumCfi(new ConfigFollowerInfo(self->replies[target]));
 			try {
+				state std::vector<ConfigFollowerInterface> interfs = self->replies[target];
+				std::vector<Future<Void>> fs;
+				for (ConfigFollowerInterface& interf : interfs) {
+					if (interf.hostname.present()) {
+						fs.push_back(tryInitializeRequestStream(
+						    &interf.getChanges, interf.hostname.get(), WLTOKEN_CONFIGFOLLOWER_GETCHANGES));
+					}
+				}
+				wait(waitForAll(fs));
+				state Reference<ConfigFollowerInfo> quorumCfi(new ConfigFollowerInfo(interfs));
 				state Version lastSeenVersion = std::max(
 				    rollback.present() ? rollback.get() : nodeVersion.lastCommitted, self->largestCompactedResponse);
 				ConfigFollowerGetChangesReply reply =
@@ -108,9 +117,21 @@ class GetCommittedVersionQuorum {
 				                                       &ConfigFollowerInterface::getChanges,
 				                                       ConfigFollowerGetChangesRequest{ lastSeenVersion, target }),
 				                      SERVER_KNOBS->GET_COMMITTED_VERSION_TIMEOUT));
-				wait(timeoutError(cfi.rollforward.getReply(ConfigFollowerRollforwardRequest{
-				                      rollback, nodeVersion.lastCommitted, target, reply.changes, reply.annotations }),
-				                  SERVER_KNOBS->GET_COMMITTED_VERSION_TIMEOUT));
+
+				if (cfi.hostname.present()) {
+					wait(timeoutError(
+					    retryGetReplyFromHostname(
+					        ConfigFollowerRollforwardRequest{
+					            rollback, nodeVersion.lastCommitted, target, reply.changes, reply.annotations },
+					        cfi.hostname.get(),
+					        WLTOKEN_CONFIGFOLLOWER_ROLLFORWARD),
+					    SERVER_KNOBS->GET_COMMITTED_VERSION_TIMEOUT));
+				} else {
+					wait(timeoutError(
+					    cfi.rollforward.getReply(ConfigFollowerRollforwardRequest{
+					        rollback, nodeVersion.lastCommitted, target, reply.changes, reply.annotations }),
+					    SERVER_KNOBS->GET_COMMITTED_VERSION_TIMEOUT));
+				}
 			} catch (Error& e) {
 				if (e.code() == error_code_transaction_too_old) {
 					// Seeing this trace is not necessarily a problem. There
@@ -129,9 +150,18 @@ class GetCommittedVersionQuorum {
 
 	ACTOR static Future<Void> getCommittedVersionActor(GetCommittedVersionQuorum* self, ConfigFollowerInterface cfi) {
 		try {
-			ConfigFollowerGetCommittedVersionReply reply =
-			    wait(timeoutError(cfi.getCommittedVersion.getReply(ConfigFollowerGetCommittedVersionRequest{}),
-			                      SERVER_KNOBS->GET_COMMITTED_VERSION_TIMEOUT));
+			state ConfigFollowerGetCommittedVersionReply reply;
+			if (cfi.hostname.present()) {
+				wait(timeoutError(store(reply,
+				                        retryGetReplyFromHostname(ConfigFollowerGetCommittedVersionRequest{},
+				                                                  cfi.hostname.get(),
+				                                                  WLTOKEN_CONFIGFOLLOWER_GETCOMMITTEDVERSION)),
+				                  SERVER_KNOBS->GET_COMMITTED_VERSION_TIMEOUT));
+			} else {
+				wait(timeoutError(
+				    store(reply, cfi.getCommittedVersion.getReply(ConfigFollowerGetCommittedVersionRequest{})),
+				    SERVER_KNOBS->GET_COMMITTED_VERSION_TIMEOUT));
+			}
 
 			++self->totalRepliesReceived;
 			self->largestCompactedResponse = std::max(self->largestCompactedResponse, reply.lastCompacted);
@@ -279,7 +309,15 @@ class PaxosConfigConsumerImpl {
 			std::vector<Future<Void>> compactionRequests;
 			compactionRequests.reserve(compactionRequests.size());
 			for (const auto& cfi : self->cfis) {
-				compactionRequests.push_back(cfi.compact.getReply(ConfigFollowerCompactRequest{ compactionVersion }));
+				if (cfi.hostname.present()) {
+					compactionRequests.push_back(
+					    retryGetReplyFromHostname(ConfigFollowerCompactRequest{ compactionVersion },
+					                              cfi.hostname.get(),
+					                              WLTOKEN_CONFIGFOLLOWER_COMPACT));
+				} else {
+					compactionRequests.push_back(
+					    cfi.compact.getReply(ConfigFollowerCompactRequest{ compactionVersion }));
+				}
 			}
 			try {
 				wait(timeoutError(waitForAll(compactionRequests), 1.0));
@@ -294,8 +332,18 @@ class PaxosConfigConsumerImpl {
 			self->resetCommittedVersionQuorum(); // TODO: This seems to fix a segfault, investigate more
 			try {
 				state Version committedVersion = wait(getCommittedVersion(self));
-				state Reference<ConfigFollowerInfo> configNodes(
-				    new ConfigFollowerInfo(self->getCommittedVersionQuorum.getReadReplicas()));
+				state std::vector<ConfigFollowerInterface> readReplicas =
+				    self->getCommittedVersionQuorum.getReadReplicas();
+				std::vector<Future<Void>> fs;
+				for (ConfigFollowerInterface& readReplica : readReplicas) {
+					if (readReplica.hostname.present()) {
+						fs.push_back(tryInitializeRequestStream(&readReplica.getSnapshotAndChanges,
+						                                        readReplica.hostname.get(),
+						                                        WLTOKEN_CONFIGFOLLOWER_GETSNAPSHOTANDCHANGES));
+					}
+				}
+				wait(waitForAll(fs));
+				state Reference<ConfigFollowerInfo> configNodes(new ConfigFollowerInfo(readReplicas));
 				ConfigFollowerGetSnapshotAndChangesReply reply =
 				    wait(timeoutError(basicLoadBalance(configNodes,
 				                                       &ConfigFollowerInterface::getSnapshotAndChanges,
@@ -349,8 +397,18 @@ class PaxosConfigConsumerImpl {
 				// returned would be 1.
 				if (committedVersion > self->lastSeenVersion) {
 					ASSERT(self->getCommittedVersionQuorum.getReadReplicas().size() >= self->cfis.size() / 2 + 1);
-					state Reference<ConfigFollowerInfo> configNodes(
-					    new ConfigFollowerInfo(self->getCommittedVersionQuorum.getReadReplicas()));
+					state std::vector<ConfigFollowerInterface> readReplicas =
+					    self->getCommittedVersionQuorum.getReadReplicas();
+					std::vector<Future<Void>> fs;
+					for (ConfigFollowerInterface& readReplica : readReplicas) {
+						if (readReplica.hostname.present()) {
+							fs.push_back(tryInitializeRequestStream(&readReplica.getChanges,
+							                                        readReplica.hostname.get(),
+							                                        WLTOKEN_CONFIGFOLLOWER_GETCHANGES));
+						}
+					}
+					wait(waitForAll(fs));
+					state Reference<ConfigFollowerInfo> configNodes(new ConfigFollowerInfo(readReplicas));
 					ConfigFollowerGetChangesReply reply = wait(timeoutError(
 					    basicLoadBalance(configNodes,
 					                     &ConfigFollowerInterface::getChanges,
diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index b69d7930ee9..014e091b79c 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -161,9 +161,8 @@ ACTOR Future<std::vector<WorkerInterface>> getCoordWorkers(Database cx,
 	if (!coordinators.present()) {
 		throw operation_failed();
 	}
-	state ClusterConnectionString ccs(coordinators.get().toString());
-	wait(ccs.resolveHostnames());
-	std::vector<NetworkAddress> coordinatorsAddr = ccs.coordinators();
+	ClusterConnectionString ccs(coordinators.get().toString());
+	std::vector<NetworkAddress> coordinatorsAddr = wait(ccs.tryResolveHostnames());
 	std::set<NetworkAddress> coordinatorsAddrSet;
 	for (const auto& addr : coordinatorsAddr) {
 		TraceEvent(SevDebug, "CoordinatorAddress").detail("Addr", addr);
diff --git a/fdbserver/SimpleConfigConsumer.actor.cpp b/fdbserver/SimpleConfigConsumer.actor.cpp
index a2cbfba9db7..ddad99c80de 100644
--- a/fdbserver/SimpleConfigConsumer.actor.cpp
+++ b/fdbserver/SimpleConfigConsumer.actor.cpp
@@ -44,15 +44,29 @@ class SimpleConfigConsumerImpl {
 		loop {
 			state Version compactionVersion = self->lastSeenVersion;
 			wait(delayJittered(self->compactionInterval.get()));
-			wait(self->cfi.compact.getReply(ConfigFollowerCompactRequest{ compactionVersion }));
+			if (self->cfi.hostname.present()) {
+				wait(retryGetReplyFromHostname(ConfigFollowerCompactRequest{ compactionVersion },
+				                               self->cfi.hostname.get(),
+				                               WLTOKEN_CONFIGFOLLOWER_COMPACT));
+			} else {
+				wait(self->cfi.compact.getReply(ConfigFollowerCompactRequest{ compactionVersion }));
+			}
 			++self->compactRequest;
 			broadcaster->compact(compactionVersion);
 		}
 	}
 
 	ACTOR static Future<Version> getCommittedVersion(SimpleConfigConsumerImpl* self) {
-		ConfigFollowerGetCommittedVersionReply committedVersionReply =
-		    wait(self->cfi.getCommittedVersion.getReply(ConfigFollowerGetCommittedVersionRequest{}));
+		state ConfigFollowerGetCommittedVersionReply committedVersionReply;
+		if (self->cfi.hostname.present()) {
+			wait(store(committedVersionReply,
+			           retryGetReplyFromHostname(ConfigFollowerGetCommittedVersionRequest{},
+			                                     self->cfi.hostname.get(),
+			                                     WLTOKEN_CONFIGFOLLOWER_GETCOMMITTEDVERSION)));
+		} else {
+			wait(store(committedVersionReply,
+			           self->cfi.getCommittedVersion.getReply(ConfigFollowerGetCommittedVersionRequest{})));
+		}
 		return committedVersionReply.lastCommitted;
 	}
 
@@ -63,8 +77,18 @@ class SimpleConfigConsumerImpl {
 				state Version committedVersion = wait(getCommittedVersion(self));
 				ASSERT_GE(committedVersion, self->lastSeenVersion);
 				if (committedVersion > self->lastSeenVersion) {
-					ConfigFollowerGetChangesReply reply = wait(self->cfi.getChanges.getReply(
-					    ConfigFollowerGetChangesRequest{ self->lastSeenVersion, committedVersion }));
+					state ConfigFollowerGetChangesReply reply;
+					if (self->cfi.hostname.present()) {
+						wait(store(reply,
+						           retryGetReplyFromHostname(
+						               ConfigFollowerGetChangesRequest{ self->lastSeenVersion, committedVersion },
+						               self->cfi.hostname.get(),
+						               WLTOKEN_CONFIGFOLLOWER_GETCHANGES)));
+					} else {
+						wait(store(reply,
+						           self->cfi.getChanges.getReply(
+						               ConfigFollowerGetChangesRequest{ self->lastSeenVersion, committedVersion })));
+					}
 					++self->successfulChangeRequest;
 					for (const auto& versionedMutation : reply.changes) {
 						TraceEvent te(SevDebug, "ConsumerFetchedMutation", self->id);
@@ -96,8 +120,17 @@ class SimpleConfigConsumerImpl {
 
 	ACTOR static Future<Void> getSnapshotAndChanges(SimpleConfigConsumerImpl* self, ConfigBroadcaster* broadcaster) {
 		state Version committedVersion = wait(getCommittedVersion(self));
-		ConfigFollowerGetSnapshotAndChangesReply reply = wait(
-		    self->cfi.getSnapshotAndChanges.getReply(ConfigFollowerGetSnapshotAndChangesRequest{ committedVersion }));
+		state ConfigFollowerGetSnapshotAndChangesReply reply;
+		if (self->cfi.hostname.present()) {
+			wait(store(reply,
+			           retryGetReplyFromHostname(ConfigFollowerGetSnapshotAndChangesRequest{ committedVersion },
+			                                     self->cfi.hostname.get(),
+			                                     WLTOKEN_CONFIGFOLLOWER_GETSNAPSHOTANDCHANGES)));
+		} else {
+			wait(store(reply,
+			           self->cfi.getSnapshotAndChanges.getReply(
+			               ConfigFollowerGetSnapshotAndChangesRequest{ committedVersion })));
+		}
 		++self->snapshotRequest;
 		TraceEvent(SevDebug, "ConfigConsumerGotSnapshotAndChanges", self->id)
 		    .detail("SnapshotVersion", reply.snapshotVersion)
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index 0d9f2836ad1..f209ab51d6b 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -1962,8 +1962,8 @@ void setupSimulatedSystem(std::vector<Future<Void>>* systemActors,
 	TEST(useIPv6); // Use IPv6
 	TEST(!useIPv6); // Use IPv4
 
-	// TODO(renxuan): Use hostname 25% of the time, unless it is disabled
-	bool useHostname = false; // !testConfig.disableHostname && deterministicRandom()->random01() < 0.25;
+	// Use hostname 25% of the time, unless it is disabled
+	bool useHostname = !testConfig.disableHostname && deterministicRandom()->random01() < 0.25;
 	TEST(useHostname); // Use hostname
 	TEST(!useHostname); // Use IP address
 	NetworkAddressFromHostname fromHostname =
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index aea2e2c362c..5eccecb2f2b 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -830,7 +830,8 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 		}
 	}
 
-	for (auto& coordinator : coordinators.ccr->getConnectionString().coordinators()) {
+	std::vector<NetworkAddress> addressVec = wait(coordinators.ccr->getConnectionString().tryResolveHostnames());
+	for (const auto& coordinator : addressVec) {
 		roles.addCoordinatorRole(coordinator);
 	}
 
@@ -1653,8 +1654,7 @@ static JsonBuilderObject configurationFetcher(Optional<DatabaseConfiguration> co
 			}
 			statusObj["excluded_servers"] = excludedServersArr;
 		}
-		std::vector<ClientLeaderRegInterface> coordinatorLeaderServers = coordinators.clientLeaderServers;
-		int count = coordinatorLeaderServers.size();
+		int count = coordinators.clientLeaderServers.size();
 		statusObj["coordinators_count"] = count;
 	} catch (Error&) {
 		incomplete_reasons->insert("Could not retrieve all configuration status information.");
@@ -2469,7 +2469,8 @@ static JsonBuilderArray tlogFetcher(int* logFaultTolerance,
 
 static JsonBuilderObject faultToleranceStatusFetcher(DatabaseConfiguration configuration,
                                                      ServerCoordinators coordinators,
-                                                     std::vector<WorkerDetails>& workers,
+                                                     const std::vector<NetworkAddress>& coordinatorAddresses,
+                                                     const std::vector<WorkerDetails>& workers,
                                                      int extraTlogEligibleZones,
                                                      int minStorageReplicasRemaining,
                                                      int oldLogFaultTolerance,
@@ -2485,11 +2486,11 @@ static JsonBuilderObject faultToleranceStatusFetcher(DatabaseConfiguration confi
 	int maxCoordinatorFailures = (coordinators.clientLeaderServers.size() - 1) / 2;
 
 	std::map<NetworkAddress, StringRef> workerZones;
-	for (auto& worker : workers) {
+	for (const auto& worker : workers) {
 		workerZones[worker.interf.address()] = worker.interf.locality.zoneId().orDefault(LiteralStringRef(""));
 	}
 	std::map<StringRef, int> coordinatorZoneCounts;
-	for (auto& coordinator : coordinators.ccr->getConnectionString().coordinators()) {
+	for (const auto& coordinator : coordinatorAddresses) {
 		auto zone = workerZones[coordinator];
 		coordinatorZoneCounts[zone] += 1;
 	}
@@ -3020,6 +3021,9 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			state std::vector<JsonBuilderObject> workerStatuses = wait(getAll(futures2));
 			wait(success(primaryDCFO));
 
+			std::vector<NetworkAddress> coordinatorAddresses =
+			    wait(coordinators.ccr->getConnectionString().tryResolveHostnames());
+
 			int logFaultTolerance = 100;
 			if (db->get().recoveryState >= RecoveryState::ACCEPTING_COMMITS) {
 				statusObj["logs"] = tlogFetcher(&logFaultTolerance, db, address_workers);
@@ -3029,6 +3033,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			statusObj["fault_tolerance"] =
 			    faultToleranceStatusFetcher(configuration.get(),
 			                                coordinators,
+			                                coordinatorAddresses,
 			                                workers,
 			                                extraTlogEligibleZones,
 			                                minStorageReplicasRemaining,
diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp
index aa40c6abbb1..2bcfca7347e 100644
--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@@ -854,9 +854,9 @@ std::pair<NetworkAddressList, NetworkAddressList> buildNetworkAddresses(
 	NetworkAddressList publicNetworkAddresses;
 	NetworkAddressList listenNetworkAddresses;
 
-	connectionRecord.resolveHostnamesBlocking();
-	auto& coordinators = connectionRecord.getConnectionString().coordinators();
-	ASSERT(coordinators.size() > 0);
+	std::vector<Hostname>& hostnames = connectionRecord.getConnectionString().hostnames;
+	const std::vector<NetworkAddress>& coords = connectionRecord.getConnectionString().coordinators();
+	ASSERT(hostnames.size() + coords.size() > 0);
 
 	for (int ii = 0; ii < publicAddressStrs.size(); ++ii) {
 		const std::string& publicAddressStr = publicAddressStrs[ii];
@@ -925,13 +925,26 @@ std::pair<NetworkAddressList, NetworkAddressList> buildNetworkAddresses(
 			listenNetworkAddresses.secondaryAddress = currentListenAddress;
 		}
 
-		bool hasSameCoord = std::all_of(coordinators.begin(), coordinators.end(), [&](const NetworkAddress& address) {
+		bool matchCoordinatorsTls = std::all_of(coords.begin(), coords.end(), [&](const NetworkAddress& address) {
 			if (address.ip == currentPublicAddress.ip && address.port == currentPublicAddress.port) {
 				return address.isTLS() == currentPublicAddress.isTLS();
 			}
 			return true;
 		});
-		if (!hasSameCoord) {
+		// If true, further check hostnames.
+		if (matchCoordinatorsTls) {
+			matchCoordinatorsTls = std::all_of(hostnames.begin(), hostnames.end(), [&](Hostname& hostname) {
+				Optional<NetworkAddress> resolvedAddress = hostname.resolveBlocking();
+				if (resolvedAddress.present()) {
+					NetworkAddress address = resolvedAddress.get();
+					if (address.ip == currentPublicAddress.ip && address.port == currentPublicAddress.port) {
+						return address.isTLS() == currentPublicAddress.isTLS();
+					}
+				}
+				return true;
+			});
+		}
+		if (!matchCoordinatorsTls) {
 			fprintf(stderr,
 			        "ERROR: TLS state of public address %s does not match in coordinator list.\n",
 			        publicAddressStr.c_str());
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index f6ae3912e03..df39331fa44 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -2669,21 +2669,40 @@ ACTOR Future<MonitorLeaderInfo> monitorLeaderWithDelayedCandidacyImplOneGenerati
     Reference<IClusterConnectionRecord> connRecord,
     Reference<AsyncVar<Value>> result,
     MonitorLeaderInfo info) {
-	state ClusterConnectionString ccf = info.intermediateConnRecord->getConnectionString();
-	state std::vector<NetworkAddress> addrs = ccf.coordinators();
+	ClusterConnectionString cs = info.intermediateConnRecord->getConnectionString();
+	state int coordinatorsSize = cs.hostnames.size() + cs.coordinators().size();
 	state ElectionResultRequest request;
 	state int index = 0;
 	state int successIndex = 0;
-	request.key = ccf.clusterKey();
-	request.coordinators = ccf.coordinators();
+	state std::vector<LeaderElectionRegInterface> leaderElectionServers;
 
-	deterministicRandom()->randomShuffle(addrs);
+	leaderElectionServers.reserve(coordinatorsSize);
+	for (const auto& h : cs.hostnames) {
+		leaderElectionServers.push_back(LeaderElectionRegInterface(h));
+	}
+	for (const auto& c : cs.coordinators()) {
+		leaderElectionServers.push_back(LeaderElectionRegInterface(c));
+	}
+	deterministicRandom()->randomShuffle(leaderElectionServers);
+
+	request.key = cs.clusterKey();
+	request.hostnames = cs.hostnames;
+	request.coordinators = cs.coordinators();
 
 	loop {
-		LeaderElectionRegInterface interf(addrs[index]);
+		LeaderElectionRegInterface interf = leaderElectionServers[index];
+		bool usingHostname = interf.hostname.present();
 		request.reply = ReplyPromise<Optional<LeaderInfo>>();
 
-		ErrorOr<Optional<LeaderInfo>> leader = wait(interf.electionResult.tryGetReply(request));
+		state ErrorOr<Optional<LeaderInfo>> leader;
+		if (usingHostname) {
+			wait(store(
+			    leader,
+			    tryGetReplyFromHostname(request, interf.hostname.get(), WLTOKEN_LEADERELECTIONREG_ELECTIONRESULT)));
+		} else {
+			wait(store(leader, interf.electionResult.tryGetReply(request)));
+		}
+
 		if (leader.present()) {
 			if (leader.get().present()) {
 				if (leader.get().get().forward) {
@@ -2719,14 +2738,9 @@ ACTOR Future<MonitorLeaderInfo> monitorLeaderWithDelayedCandidacyImplOneGenerati
 			}
 			successIndex = index;
 		} else {
-			if (leader.isError() && leader.getError().code() == error_code_coordinators_changed) {
-				info.intermediateConnRecord->getConnectionString().resetToUnresolved();
-				throw coordinators_changed();
-			}
-			index = (index + 1) % addrs.size();
+			index = (index + 1) % coordinatorsSize;
 			if (index == successIndex) {
 				wait(delay(CLIENT_KNOBS->COORDINATOR_RECONNECTION_DELAY));
-				throw coordinators_changed();
 			}
 		}
 	}
@@ -2734,22 +2748,11 @@ ACTOR Future<MonitorLeaderInfo> monitorLeaderWithDelayedCandidacyImplOneGenerati
 
 ACTOR Future<Void> monitorLeaderWithDelayedCandidacyImplInternal(Reference<IClusterConnectionRecord> connRecord,
                                                                  Reference<AsyncVar<Value>> outSerializedLeaderInfo) {
-	wait(connRecord->resolveHostnames());
 	state MonitorLeaderInfo info(connRecord);
 	loop {
-		try {
-			wait(info.intermediateConnRecord->resolveHostnames());
-			MonitorLeaderInfo _info =
-			    wait(monitorLeaderWithDelayedCandidacyImplOneGeneration(connRecord, outSerializedLeaderInfo, info));
-			info = _info;
-		} catch (Error& e) {
-			if (e.code() == error_code_coordinators_changed) {
-				TraceEvent("MonitorLeaderWithDelayedCandidacyCoordinatorsChanged").suppressFor(1.0);
-				info.intermediateConnRecord->getConnectionString().resetToUnresolved();
-			} else {
-				throw e;
-			}
-		}
+		MonitorLeaderInfo _info =
+		    wait(monitorLeaderWithDelayedCandidacyImplOneGeneration(connRecord, outSerializedLeaderInfo, info));
+		info = _info;
 	}
 }
 
@@ -2883,6 +2886,7 @@ ACTOR Future<Void> fdbd(Reference<IClusterConnectionRecord> connRecord,
 	actors.push_back(serveProcess());
 
 	try {
+		ServerCoordinators coordinators(connRecord);
 		if (g_network->isSimulated()) {
 			whitelistBinPaths = ",, random_path,  /bin/snap_create.sh,,";
 		}
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 16d39a7f1e6..fd352ab2996 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -2096,7 +2096,8 @@ struct ConsistencyCheckWorkload : TestWorkload {
 					return false;
 				}
 
-				state ClusterConnectionString old(currentKey.get().toString());
+				ClusterConnectionString old(currentKey.get().toString());
+				state std::vector<NetworkAddress> oldCoordinators = wait(old.tryResolveHostnames());
 
 				std::vector<ProcessData> workers = wait(::getWorkers(&tr));
 
@@ -2106,7 +2107,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				}
 
 				std::set<Optional<Standalone<StringRef>>> checkDuplicates;
-				for (const auto& addr : old.coordinators()) {
+				for (const auto& addr : oldCoordinators) {
 					auto findResult = addr_locality.find(addr);
 					if (findResult != addr_locality.end()) {
 						if (checkDuplicates.count(findResult->second.zoneId())) {
diff --git a/fdbserver/workloads/RemoveServersSafely.actor.cpp b/fdbserver/workloads/RemoveServersSafely.actor.cpp
index d2550394d1d..6be4a58ceea 100644
--- a/fdbserver/workloads/RemoveServersSafely.actor.cpp
+++ b/fdbserver/workloads/RemoveServersSafely.actor.cpp
@@ -541,7 +541,12 @@ struct RemoveServersSafelyWorkload : TestWorkload {
 		state AddressExclusion coordExcl;
 		// Exclude a coordinator under buggify, but only if fault tolerance is > 0 and kill set is non-empty already
 		if (BUGGIFY && toKill.size()) {
-			std::vector<NetworkAddress> coordinators = wait(getCoordinators(cx));
+			Optional<ClusterConnectionString> csOptional = wait(getConnectionString(cx));
+			state std::vector<NetworkAddress> coordinators;
+			if (csOptional.present()) {
+				ClusterConnectionString cs = csOptional.get();
+				wait(store(coordinators, cs.tryResolveHostnames()));
+			}
 			if (coordinators.size() > 2) {
 				auto randomCoordinator = deterministicRandom()->randomChoice(coordinators);
 				coordExcl = AddressExclusion(randomCoordinator.ip, randomCoordinator.port);
diff --git a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
index 03ddb4e6150..82397daeace 100644
--- a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
+++ b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
@@ -957,9 +957,9 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 				boost::split(
 				    process_addresses, coordinator_processes_key.get().toString(), [](char c) { return c == ','; });
 				ASSERT(process_addresses.size() == cs.coordinators().size() + cs.hostnames.size());
-				wait(cs.resolveHostnames());
 				// compare the coordinator process network addresses one by one
-				for (const auto& network_address : cs.coordinators()) {
+				std::vector<NetworkAddress> coordinators = wait(cs.tryResolveHostnames());
+				for (const auto& network_address : coordinators) {
 					ASSERT(std::find(process_addresses.begin(), process_addresses.end(), network_address.toString()) !=
 					       process_addresses.end());
 				}
@@ -1077,19 +1077,20 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 					tx->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
 					Optional<Value> res = wait(tx->get(coordinatorsKey));
 					ASSERT(res.present()); // Otherwise, database is in a bad state
-					state ClusterConnectionString csNew(res.get().toString());
-					wait(csNew.resolveHostnames());
-					ASSERT(csNew.coordinators().size() == old_coordinators_processes.size() + 1);
+					ClusterConnectionString csNew(res.get().toString());
+					// verify the cluster decription
+					ASSERT(new_cluster_description == csNew.clusterKeyName().toString());
+					ASSERT(csNew.hostnames.size() + csNew.coordinators().size() ==
+					       old_coordinators_processes.size() + 1);
+					std::vector<NetworkAddress> newCoordinators = wait(csNew.tryResolveHostnames());
 					// verify the coordinators' addresses
-					for (const auto& network_address : csNew.coordinators()) {
+					for (const auto& network_address : newCoordinators) {
 						std::string address_str = network_address.toString();
 						ASSERT(std::find(old_coordinators_processes.begin(),
 						                 old_coordinators_processes.end(),
 						                 address_str) != old_coordinators_processes.end() ||
 						       new_coordinator_process == address_str);
 					}
-					// verify the cluster decription
-					ASSERT(new_cluster_description == csNew.clusterKeyName().toString());
 					tx->reset();
 				} catch (Error& e) {
 					wait(tx->onError(e));

From a33a688de233aadac452b049056146203c9ed5ff Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openwaygroup.com>
Date: Fri, 29 Apr 2022 15:34:42 +0300
Subject: [PATCH 361/740] Removed unneeded type casting

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 006e354d47f..4b14be81811 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -194,7 +194,7 @@ rocksdb::ExportImportFilesMetaData getMetaData(const CheckpointMetaData& checkpo
 		liveFileMetaData.being_compacted = fileMetaData.being_compacted;
 		liveFileMetaData.num_entries = fileMetaData.num_entries;
 		liveFileMetaData.num_deletions = fileMetaData.num_deletions;
-		liveFileMetaData.temperature = static_cast<rocksdb::Temperature>(fileMetaData.temperature);
+		liveFileMetaData.temperature = fileMetaData.temperature;
 		liveFileMetaData.oldest_blob_file_number = fileMetaData.oldest_blob_file_number;
 		liveFileMetaData.oldest_ancester_time = fileMetaData.oldest_ancester_time;
 		liveFileMetaData.file_creation_time = fileMetaData.file_creation_time;

From 74ff6f58480bc2d4776b7d70f2a5de85bdae6b92 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openwaygroup.com>
Date: Fri, 29 Apr 2022 23:03:19 +0300
Subject: [PATCH 362/740] Try to fix build on hosts with GCC 7.5.0

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index b2f7fae3092..38fa2a30986 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -340,7 +340,7 @@ else()
     -fvisibility=hidden
     -Wreturn-type
     -fPIC)
-  if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86" AND CMAKE_COMPILER_IS_GNUCC AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER '7.0')
+ if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86" AND CMAKE_COMPILER_IS_GNUCC AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL '8')
     add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wclass-memaccess>)
   endif()
   if (GPERFTOOLS_FOUND AND GCC)

From 3b8d27ffe41cfe378e0b82eb8d747aeb5b0dabc1 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openwaygroup.com>
Date: Fri, 29 Apr 2022 23:55:53 +0300
Subject: [PATCH 363/740] Try to fix build on hosts with GCC 7.5.0

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 38fa2a30986..6829b2b3e5c 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -340,7 +340,7 @@ else()
     -fvisibility=hidden
     -Wreturn-type
     -fPIC)
- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86" AND CMAKE_COMPILER_IS_GNUCC AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL '8')
+  if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86" AND CMAKE_COMPILER_IS_GNUCC AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL '8.0.0')
     add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wclass-memaccess>)
   endif()
   if (GPERFTOOLS_FOUND AND GCC)

From ce2b034513887c1b761fa7a06463c4e6c03fc69c Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openwaygroup.com>
Date: Sat, 30 Apr 2022 00:07:47 +0300
Subject: [PATCH 364/740] Try to fix build

---
 cmake/ConfigureCompiler.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 6829b2b3e5c..a7e0a8697df 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -340,9 +340,9 @@ else()
     -fvisibility=hidden
     -Wreturn-type
     -fPIC)
-  if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86" AND CMAKE_COMPILER_IS_GNUCC AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL '8.0.0')
-    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wclass-memaccess>)
-  endif()
+  #if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86" AND CMAKE_COMPILER_IS_GNUCC AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL '8.0.0')
+  #  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wclass-memaccess>)
+  #endif()
   if (GPERFTOOLS_FOUND AND GCC)
     add_compile_options(
       -fno-builtin-malloc

From 6e55a050be98bdc06c08a3b8abcac16712ae9d07 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Wed, 27 Apr 2022 16:53:30 -0700
Subject: [PATCH 365/740] fix: when more tlogs are absent than the replication
 factor we would access invalid memory

---
 fdbserver/TagPartitionedLogSystem.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp
index 3ccef6192e4..a4822a7ef58 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.cpp
+++ b/fdbserver/TagPartitionedLogSystem.actor.cpp
@@ -1908,7 +1908,7 @@ Optional<std::tuple<Version, Version, std::vector<TLogLockResult>>> TagPartition
 		int absent = logSet->logServers.size() - results.size();
 		int safe_range_begin = logSet->tLogWriteAntiQuorum;
 		int new_safe_range_begin = std::min(logSet->tLogWriteAntiQuorum, (int)(results.size() - 1));
-		int safe_range_end = logSet->tLogReplicationFactor - absent;
+		int safe_range_end = std::max(logSet->tLogReplicationFactor - absent, 1);
 
 		if (!lastEnd.present() || ((safe_range_end > 0) && (safe_range_end - 1 < results.size()) &&
 		                           results[safe_range_end - 1].end < lastEnd.get())) {

From 16cceab39a6f8771dff0918d92e9baa81c9291ed Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openwaygroup.com>
Date: Sat, 30 Apr 2022 20:24:20 +0300
Subject: [PATCH 366/740] Try to fix build in github

---
 flow/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index 5cd37810b5f..6f02c3f9815 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -181,6 +181,10 @@ else()
   target_link_libraries(flow PUBLIC boost_target)
   target_link_libraries(flow_sampling PUBLIC boost_target)
 endif()
+if(USE_JEMALLOC)
+  target_link_libraries(flow PUBLIC jemalloc)
+  target_link_libraries(flow_sampling PUBLIC jemalloc)
+endif()
 if(USE_VALGRIND)
   target_link_libraries(flow PUBLIC Valgrind)
   target_link_libraries(flow_sampling PUBLIC Valgrind)

From 3a69b62c148143a393099966b705153d9df926b5 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Thu, 28 Apr 2022 17:04:50 -0700
Subject: [PATCH 367/740] Bug fix: Killing a machine process would not wait for
 AsyncFileNonDurable close operations to finish, causing a later reopen of the
 same file in a new process to hang forever.  Renamed
 AsyncFileNonDurable::deleteFile to closeFile for clarity.  Renamed Machine
 deletingFiles to deletingOrClosingFiles for clarity.

---
 fdbrpc/AsyncFileNonDurable.actor.h   | 9 ++++++---
 fdbrpc/sim2.actor.cpp                | 2 +-
 fdbrpc/simulator.h                   | 2 +-
 fdbserver/SimulatedCluster.actor.cpp | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index 6396f16e50f..3f884585d10 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -276,7 +276,7 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 		if (delref_no_destroy()) {
 			if (filesBeingDeleted.count(filename) == 0) {
 				//TraceEvent("AsyncFileNonDurable_StartDelete", id).detail("Filename", filename);
-				Future<Void> deleteFuture = deleteFile(this);
+				Future<Void> deleteFuture = closeFile(this);
 				if (!deleteFuture.isReady())
 					filesBeingDeleted[filename] = deleteFuture;
 			}
@@ -824,11 +824,13 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 	}
 
 	// Finishes all outstanding actors on an AsyncFileNonDurable and then deletes it
-	ACTOR Future<Void> deleteFile(AsyncFileNonDurable* self) {
+	ACTOR Future<Void> closeFile(AsyncFileNonDurable* self) {
 		state ISimulator::ProcessInfo* currentProcess = g_simulator.getCurrentProcess();
 		state TaskPriority currentTaskID = g_network->getCurrentTask();
 		state std::string filename = self->filename;
 
+		g_simulator.getMachineByNetworkAddress(self->openedAddress)->deletingOrClosingFiles.insert(self->getFilename());
+
 		wait(g_simulator.onMachine(currentProcess));
 		try {
 			// Make sure all writes have gone through.
@@ -853,7 +855,8 @@ class AsyncFileNonDurable final : public IAsyncFile, public ReferenceCounted<Asy
 
 			// Remove this file from the filesBeingDeleted map so that new files can be created with this filename
 			g_simulator.getMachineByNetworkAddress(self->openedAddress)->closingFiles.erase(self->getFilename());
-			g_simulator.getMachineByNetworkAddress(self->openedAddress)->deletingFiles.erase(self->getFilename());
+			g_simulator.getMachineByNetworkAddress(self->openedAddress)
+			    ->deletingOrClosingFiles.erase(self->getFilename());
 			AsyncFileNonDurable::filesBeingDeleted.erase(self->filename);
 			//TraceEvent("AsyncFileNonDurable_FinishDelete", self->id).detail("Filename", self->filename);
 
diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index 64817a5214e..009cc4b1179 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -1146,7 +1146,7 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 		// for the existence of a non-durably deleted file BEFORE a reboot will show that it apparently doesn't exist.
 		if (g_simulator.getCurrentProcess()->machine->openFiles.count(filename)) {
 			g_simulator.getCurrentProcess()->machine->openFiles.erase(filename);
-			g_simulator.getCurrentProcess()->machine->deletingFiles.insert(filename);
+			g_simulator.getCurrentProcess()->machine->deletingOrClosingFiles.insert(filename);
 		}
 		if (mustBeDurable || deterministicRandom()->random01() < 0.5) {
 			state ISimulator::ProcessInfo* currentProcess = g_simulator.getCurrentProcess();
diff --git a/fdbrpc/simulator.h b/fdbrpc/simulator.h
index 8f23db0400c..62a8f7c6792 100644
--- a/fdbrpc/simulator.h
+++ b/fdbrpc/simulator.h
@@ -202,7 +202,7 @@ class ISimulator : public INetwork {
 		// A map from filename to file handle for all open files on a machine
 		std::map<std::string, UnsafeWeakFutureReference<IAsyncFile>> openFiles;
 
-		std::set<std::string> deletingFiles;
+		std::set<std::string> deletingOrClosingFiles;
 		std::set<std::string> closingFiles;
 		Optional<Standalone<StringRef>> machineId;
 
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index f209ab51d6b..558ee88442f 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -893,7 +893,7 @@ ACTOR Future<Void> simulatedMachine(ClusterConnectionString connStr,
 				ASSERT(it.second.get().canGet());
 			}
 
-			for (auto it : g_simulator.getMachineById(localities.machineId())->deletingFiles) {
+			for (auto it : g_simulator.getMachineById(localities.machineId())->deletingOrClosingFiles) {
 				filenames.insert(it);
 				closingStr += it + ", ";
 			}

From 39d9ce0e2c43f062be3d310cbec3c6bd6eeb8d95 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Mon, 25 Apr 2022 16:10:14 -0500
Subject: [PATCH 368/740] Fixing change feed deleted from multiple sources race

---
 fdbserver/storageserver.actor.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index d7f34445827..6ca5438e74f 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -5183,7 +5183,11 @@ ACTOR Future<Version> fetchChangeFeed(StorageServer* data,
 			++data->counters.kvSystemClearRanges;
 
 			changeFeedInfo->destroy(cleanupVersion);
-			data->changeFeedCleanupDurable[changeFeedInfo->id] = cleanupVersion;
+
+			if (data->uidChangeFeed.count(changeFeedInfo->id)) {
+				// only register range for cleanup if it has not been already cleaned up
+				data->changeFeedCleanupDurable[changeFeedInfo->id] = cleanupVersion;
+			}
 
 			for (auto& it : data->changeFeedRemovals) {
 				it.second.send(changeFeedInfo->id);

From e816957bcf319e5c776c32f0d7aefacf049f8d7d Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Wed, 27 Apr 2022 15:03:35 -0500
Subject: [PATCH 369/740] Don't do huge tail latencies for network requests
 when speed up simulation is set

---
 fdbrpc/sim2.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index 009cc4b1179..fc62d046f1b 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -171,7 +171,7 @@ struct SimClogging {
 	double halfLatency() const {
 		double a = deterministicRandom()->random01();
 		const double pFast = 0.999;
-		if (a <= pFast) {
+		if (a <= pFast || g_simulator.speedUpSimulation) {
 			a = a / pFast;
 			return 0.5 * (FLOW_KNOBS->MIN_NETWORK_LATENCY * (1 - a) +
 			              FLOW_KNOBS->FAST_NETWORK_LATENCY / pFast * a); // 0.5ms average

From 786950d4059c41d35a26357ed5b207c9f9e06025 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Thu, 28 Apr 2022 15:06:21 -0500
Subject: [PATCH 370/740] Add delay between quickly re-recruiting the same
 singleton process, to avoid recruit thrashing when there are temporarily
 multiple cluster controllers

---
 fdbclient/ServerKnobs.cpp             |  1 +
 fdbclient/ServerKnobs.h               |  2 +
 fdbserver/ClusterController.actor.cpp | 92 +++++++++++++++++----------
 3 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 8b60369eeb4..39ac24c3d27 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -541,6 +541,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( CC_ENABLE_ENTIRE_SATELLITE_MONITORING,               false );
 	init( CC_SATELLITE_DEGRADATION_MIN_COMPLAINER,                 3 );
 	init( CC_SATELLITE_DEGRADATION_MIN_BAD_SERVER,                 3 );
+	init( CC_THROTTLE_SINGLETON_RERECRUIT_INTERVAL,              0.5 );
 
 	init( INCOMPATIBLE_PEERS_LOGGING_INTERVAL,                   600 ); if( randomize && BUGGIFY ) INCOMPATIBLE_PEERS_LOGGING_INTERVAL = 60.0;
 	init( EXPECTED_MASTER_FITNESS,            ProcessClass::UnsetFit );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 5eec2ef57a6..cde3eb28d10 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -480,6 +480,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	                                             // be determined as degraded worker.
 	int CC_SATELLITE_DEGRADATION_MIN_BAD_SERVER; // The minimum amount of degraded server in satellite DC to be
 	                                             // determined as degraded satellite.
+	double CC_THROTTLE_SINGLETON_RERECRUIT_INTERVAL; // The interval to prevent re-recruiting the same singleton if a
+	                                                 // recruiting fight between two cluster controllers occurs.
 
 	// Knobs used to select the best policy (via monte carlo)
 	int POLICY_RATING_TESTS; // number of tests per policy (in order to compare)
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 57bb2ae31e7..911d1e68649 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -1933,8 +1933,24 @@ ACTOR Future<Void> handleForcedRecoveries(ClusterControllerData* self, ClusterCo
 	}
 }
 
-ACTOR Future<Void> startDataDistributor(ClusterControllerData* self) {
-	wait(delay(0.0)); // If master fails at the same time, give it a chance to clear master PID.
+struct SingletonRecruitThrottler {
+	double lastRecruitStart;
+
+	SingletonRecruitThrottler() : lastRecruitStart(-1) {}
+
+	double newRecruitment() {
+		double n = now();
+		double waitTime =
+		    std::max(0.0, (lastRecruitStart + SERVER_KNOBS->CC_THROTTLE_SINGLETON_RERECRUIT_INTERVAL - n));
+		lastRecruitStart = n;
+		return waitTime;
+	}
+};
+
+ACTOR Future<Void> startDataDistributor(ClusterControllerData* self, double waitTime) {
+	// If master fails at the same time, give it a chance to clear master PID.
+	// Also wait to avoid too many consecutive recruits in a small time window.
+	wait(delay(waitTime));
 
 	TraceEvent("CCStartDataDistributor", self->id).log();
 	loop {
@@ -2003,6 +2019,7 @@ ACTOR Future<Void> startDataDistributor(ClusterControllerData* self) {
 }
 
 ACTOR Future<Void> monitorDataDistributor(ClusterControllerData* self) {
+	state SingletonRecruitThrottler recruitThrottler;
 	while (self->db.serverInfo->get().recoveryState < RecoveryState::ACCEPTING_COMMITS) {
 		wait(self->db.serverInfo->onChange());
 	}
@@ -2019,13 +2036,15 @@ ACTOR Future<Void> monitorDataDistributor(ClusterControllerData* self) {
 				when(wait(self->recruitDistributor.onChange())) {}
 			}
 		} else {
-			wait(startDataDistributor(self));
+			wait(startDataDistributor(self, recruitThrottler.newRecruitment()));
 		}
 	}
 }
 
-ACTOR Future<Void> startRatekeeper(ClusterControllerData* self) {
-	wait(delay(0.0)); // If master fails at the same time, give it a chance to clear master PID.
+ACTOR Future<Void> startRatekeeper(ClusterControllerData* self, double waitTime) {
+	// If master fails at the same time, give it a chance to clear master PID.
+	// Also wait to avoid too many consecutive recruits in a small time window.
+	wait(delay(waitTime));
 
 	TraceEvent("CCStartRatekeeper", self->id).log();
 	loop {
@@ -2091,6 +2110,7 @@ ACTOR Future<Void> startRatekeeper(ClusterControllerData* self) {
 }
 
 ACTOR Future<Void> monitorRatekeeper(ClusterControllerData* self) {
+	state SingletonRecruitThrottler recruitThrottler;
 	while (self->db.serverInfo->get().recoveryState < RecoveryState::ACCEPTING_COMMITS) {
 		wait(self->db.serverInfo->onChange());
 	}
@@ -2107,34 +2127,15 @@ ACTOR Future<Void> monitorRatekeeper(ClusterControllerData* self) {
 				when(wait(self->recruitRatekeeper.onChange())) {}
 			}
 		} else {
-			wait(startRatekeeper(self));
+			wait(startRatekeeper(self, recruitThrottler.newRecruitment()));
 		}
 	}
 }
 
-// Acquires the BM lock by getting the next epoch no.
-ACTOR Future<int64_t> getNextBMEpoch(ClusterControllerData* self) {
-	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(self->cx);
-
-	loop {
-		tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-		tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
-		try {
-			Optional<Value> oldEpoch = wait(tr->get(blobManagerEpochKey));
-			state int64_t newEpoch = oldEpoch.present() ? decodeBlobManagerEpochValue(oldEpoch.get()) + 1 : 1;
-			tr->set(blobManagerEpochKey, blobManagerEpochValueFor(newEpoch));
-
-			wait(tr->commit());
-			TraceEvent(SevDebug, "CCNextBlobManagerEpoch", self->id).detail("Epoch", newEpoch);
-			return newEpoch;
-		} catch (Error& e) {
-			wait(tr->onError(e));
-		}
-	}
-}
-
-ACTOR Future<Void> startEncryptKeyProxy(ClusterControllerData* self) {
-	wait(delay(0.0)); // If master fails at the same time, give it a chance to clear master PID.
+ACTOR Future<Void> startEncryptKeyProxy(ClusterControllerData* self, double waitTime) {
+	// If master fails at the same time, give it a chance to clear master PID.
+	// Also wait to avoid too many consecutive recruits in a small time window.
+	wait(delay(waitTime));
 
 	TraceEvent("CCEKP_Start", self->id).log();
 	loop {
@@ -2207,6 +2208,7 @@ ACTOR Future<Void> startEncryptKeyProxy(ClusterControllerData* self) {
 }
 
 ACTOR Future<Void> monitorEncryptKeyProxy(ClusterControllerData* self) {
+	state SingletonRecruitThrottler recruitThrottler;
 	loop {
 		if (self->db.serverInfo->get().encryptKeyProxy.present() && !self->recruitEncryptKeyProxy.get()) {
 			choose {
@@ -2218,13 +2220,36 @@ ACTOR Future<Void> monitorEncryptKeyProxy(ClusterControllerData* self) {
 				when(wait(self->recruitEncryptKeyProxy.onChange())) {}
 			}
 		} else {
-			wait(startEncryptKeyProxy(self));
+			wait(startEncryptKeyProxy(self, recruitThrottler.newRecruitment()));
+		}
+	}
+}
+
+// Acquires the BM lock by getting the next epoch no.
+ACTOR Future<int64_t> getNextBMEpoch(ClusterControllerData* self) {
+	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(self->cx);
+
+	loop {
+		tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+		tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+		try {
+			Optional<Value> oldEpoch = wait(tr->get(blobManagerEpochKey));
+			state int64_t newEpoch = oldEpoch.present() ? decodeBlobManagerEpochValue(oldEpoch.get()) + 1 : 1;
+			tr->set(blobManagerEpochKey, blobManagerEpochValueFor(newEpoch));
+
+			wait(tr->commit());
+			TraceEvent(SevDebug, "CCNextBlobManagerEpoch", self->id).detail("Epoch", newEpoch);
+			return newEpoch;
+		} catch (Error& e) {
+			wait(tr->onError(e));
 		}
 	}
 }
 
-ACTOR Future<Void> startBlobManager(ClusterControllerData* self) {
-	wait(delay(0.0)); // If master fails at the same time, give it a chance to clear master PID.
+ACTOR Future<Void> startBlobManager(ClusterControllerData* self, double waitTime) {
+	// If master fails at the same time, give it a chance to clear master PID.
+	// Also wait to avoid too many consecutive recruits in a small time window.
+	wait(delay(waitTime));
 
 	TraceEvent("CCStartBlobManager", self->id).log();
 	loop {
@@ -2321,6 +2346,7 @@ ACTOR Future<Void> watchBlobGranulesConfigKey(ClusterControllerData* self) {
 }
 
 ACTOR Future<Void> monitorBlobManager(ClusterControllerData* self) {
+	state SingletonRecruitThrottler recruitThrottler;
 	while (self->db.serverInfo->get().recoveryState < RecoveryState::ACCEPTING_COMMITS) {
 		wait(self->db.serverInfo->onChange());
 	}
@@ -2351,7 +2377,7 @@ ACTOR Future<Void> monitorBlobManager(ClusterControllerData* self) {
 			}
 		} else if (self->db.blobGranulesEnabled.get()) {
 			// if there is no blob manager present but blob granules are now enabled, recruit a BM
-			wait(startBlobManager(self));
+			wait(startBlobManager(self, recruitThrottler.newRecruitment()));
 		} else {
 			// if there is no blob manager present and blob granules are disabled, wait for a config change
 			wait(self->db.blobGranulesEnabled.onChange());

From d5dfcba89b0b354b56c3e9dab28b32356c98ce74 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 29 Apr 2022 14:56:43 -0700
Subject: [PATCH 371/740] fix: prevent a storage server from attempting to read
 the cluster id from itself due to a stale cache entry

---
 fdbserver/storageserver.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 6ca5438e74f..0deb72c3fab 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -7752,6 +7752,7 @@ ACTOR Future<UID> getClusterId(StorageServer* self) {
 	state ReadYourWritesTransaction tr(self->cx);
 	loop {
 		try {
+			self->cx->invalidateCache(Key(), systemKeys);
 			tr.setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 			tr.setOption(FDBTransactionOptions::LOCK_AWARE);
 			Optional<Value> clusterId = wait(tr.get(clusterIdKey));

From 930674abc4e3ff5e9ca922ce2d322c853eedf172 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Fri, 29 Apr 2022 12:40:41 -0700
Subject: [PATCH 372/740] Mark a team as unhealthy when it is removed

---
 fdbserver/DDTeamCollection.actor.cpp | 1 +
 fdbserver/DataDistribution.actor.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdbserver/DDTeamCollection.actor.cpp b/fdbserver/DDTeamCollection.actor.cpp
index 1ed1fa7b401..83b113d77fa 100644
--- a/fdbserver/DDTeamCollection.actor.cpp
+++ b/fdbserver/DDTeamCollection.actor.cpp
@@ -4758,6 +4758,7 @@ bool DDTeamCollection::removeTeam(Reference<TCTeamInfo> team) {
 
 	ASSERT_WE_THINK(foundInMachineTeam);
 	team->tracker.cancel();
+	team->setHealthy(false);
 	if (g_network->isSimulated()) {
 		// Update server team information for consistency check in simulation
 		traceTeamCollectionInfo();
diff --git a/fdbserver/DataDistribution.actor.h b/fdbserver/DataDistribution.actor.h
index a977dc051ae..e2428c961b3 100644
--- a/fdbserver/DataDistribution.actor.h
+++ b/fdbserver/DataDistribution.actor.h
@@ -65,7 +65,7 @@ struct IDataDistributionTeam {
 
 	std::string getDesc() const {
 		const auto& servers = getLastKnownServerInterfaces();
-		std::string s = format("TeamID:%s", getTeamID().c_str());
+		std::string s = format("TeamID %s; ", getTeamID().c_str());
 		s += format("Size %d; ", servers.size());
 		for (int i = 0; i < servers.size(); i++) {
 			if (i)

From 65876db478af3609ccb46dacbd89e6443bcb4d30 Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Mon, 2 May 2022 15:49:24 -0700
Subject: [PATCH 373/740] Fix excludedServer overwritten bug and change some
 trace event field (cherry-pick to release-7.1) (#6984)

* update release note

* fix doc compilation

* fix metadata status type

* fix excludedServer overwritten bug; change some trace event field

Co-authored-by: Jingyu Zhou <jingyuzhou@gmail.com>
---
 fdbserver/DDTeamCollection.actor.cpp | 45 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/fdbserver/DDTeamCollection.actor.cpp b/fdbserver/DDTeamCollection.actor.cpp
index 83b113d77fa..d573f5c910f 100644
--- a/fdbserver/DDTeamCollection.actor.cpp
+++ b/fdbserver/DDTeamCollection.actor.cpp
@@ -713,18 +713,19 @@ class DDTeamCollectionImpl {
 				bool recheck = !healthy && (lastReady != self->initialFailureReactionDelay.isReady() ||
 				                            (lastZeroHealthy && !self->zeroHealthyTeams->get()) || containsFailed);
 
-				// TraceEvent("TeamHealthChangeDetected", self->distributorId)
-				//     .detail("Team", team->getDesc())
-				//     .detail("ServersLeft", serversLeft)
-				//     .detail("LastServersLeft", lastServersLeft)
-				//     .detail("AnyUndesired", anyUndesired)
-				//     .detail("LastAnyUndesired", lastAnyUndesired)
-				//     .detail("AnyWrongConfiguration", anyWrongConfiguration)
-				//     .detail("LastWrongConfiguration", lastWrongConfiguration)
-				//     .detail("Recheck", recheck)
-				//     .detail("BadTeam", badTeam)
-				//     .detail("LastZeroHealthy", lastZeroHealthy)
-				//     .detail("ZeroHealthyTeam", self->zeroHealthyTeams->get());
+				//TraceEvent("TeamHealthChangeDetected", self->distributorId)
+				//    .detail("Team", team->getDesc())
+				//    .detail("ServersLeft", serversLeft)
+				//    .detail("LastServersLeft", lastServersLeft)
+				//    .detail("AnyUndesired", anyUndesired)
+				//    .detail("LastAnyUndesired", lastAnyUndesired)
+				//    .detail("AnyWrongConfiguration", anyWrongConfiguration)
+				//    .detail("LastWrongConfiguration", lastWrongConfiguration)
+				//    .detail("ContainsWigglingServer", anyWigglingServer)
+				//    .detail("Recheck", recheck)
+				//    .detail("BadTeam", badTeam)
+				//    .detail("LastZeroHealthy", lastZeroHealthy)
+				//    .detail("ZeroHealthyTeam", self->zeroHealthyTeams->get());
 
 				lastReady = self->initialFailureReactionDelay.isReady();
 				lastZeroHealthy = self->zeroHealthyTeams->get();
@@ -1098,9 +1099,8 @@ class DDTeamCollectionImpl {
 				if (worstStatus == DDTeamCollection::Status::WIGGLING && invalidWiggleServer(worstAddr, self, server)) {
 					TraceEvent(SevInfo, "InvalidWiggleServer", self->distributorId)
 					    .detail("Address", worstAddr.toString())
-					    .detail("ProcessId", server->getLastKnownInterface().locality.processId())
-					    .detail("WigglingId", self->wigglingId.present());
-					self->excludedServers.set(worstAddr, DDTeamCollection::Status::NONE);
+					    .detail("ServerId", server->getId())
+					    .detail("WigglingId", self->wigglingId.present() ? self->wigglingId.get().toString() : "");
 					worstStatus = DDTeamCollection::Status::NONE;
 				}
 				otherChanges.push_back(self->excludedServers.onChange(worstAddr));
@@ -1122,10 +1122,9 @@ class DDTeamCollectionImpl {
 					if (testStatus == DDTeamCollection::Status::WIGGLING &&
 					    invalidWiggleServer(testAddr, self, server)) {
 						TraceEvent(SevInfo, "InvalidWiggleServer", self->distributorId)
-						    .detail("Address", testAddr.toString())
-						    .detail("ProcessId", server->getLastKnownInterface().locality.processId())
-						    .detail("ValidWigglingId", self->wigglingId.present());
-						self->excludedServers.set(testAddr, DDTeamCollection::Status::NONE);
+						    .detail("Address", worstAddr.toString())
+						    .detail("ServerId", server->getId())
+						    .detail("WigglingId", self->wigglingId.present() ? self->wigglingId.get().toString() : "");
 						testStatus = DDTeamCollection::Status::NONE;
 					}
 
@@ -2047,7 +2046,7 @@ class DDTeamCollectionImpl {
 					           "PerpetualStorageWigglePause",
 					           self->distributorId)
 					    .detail("Primary", self->primary)
-					    .detail("ProcessId", id)
+					    .detail("ServerId", id)
 					    .detail("BestTeamKeepStuckCount", self->bestTeamKeepStuckCount)
 					    .detail("ExtraHealthyTeamCount", extraTeamCount)
 					    .detail("HealthyTeamCount", self->healthyTeamCount);
@@ -2060,7 +2059,7 @@ class DDTeamCollectionImpl {
 							moveFinishFuture = fv;
 							TraceEvent("PerpetualStorageWiggleStart", self->distributorId)
 							    .detail("Primary", self->primary)
-							    .detail("ProcessId", id)
+							    .detail("ServerId", id)
 							    .detail("ExtraHealthyTeamCount", extraTeamCount)
 							    .detail("HealthyTeamCount", self->healthyTeamCount);
 						}
@@ -2086,7 +2085,7 @@ class DDTeamCollectionImpl {
 					self->includeStorageServersForWiggle();
 					TraceEvent("PerpetualStorageWiggleFinish", self->distributorId)
 					    .detail("Primary", self->primary)
-					    .detail("ProcessId", self->wigglingId.get());
+					    .detail("ServerId", self->wigglingId.get());
 
 					wait(self->eraseStorageWiggleMap(&metadataMap, self->wigglingId.get()) &&
 					     self->storageWiggler->finishWiggle());
@@ -2107,7 +2106,7 @@ class DDTeamCollectionImpl {
 			self->includeStorageServersForWiggle();
 			TraceEvent("PerpetualStorageWiggleExitingPause", self->distributorId)
 			    .detail("Primary", self->primary)
-			    .detail("ProcessId", self->wigglingId.get());
+			    .detail("ServerId", self->wigglingId.get());
 			self->wigglingId.reset();
 		}
 

From 1a1507e41c512be7e7d8cbfc618c000d9328a5e5 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Tue, 26 Apr 2022 11:48:46 -0700
Subject: [PATCH 374/740] Increase lower bound for snapshot restart tests to
 7.1.0

---
 tests/CMakeLists.txt                          | 20 +++++++++----------
 .../SnapCycleRestart-1.txt                    |  0
 .../SnapCycleRestart-2.txt                    |  0
 .../SnapIncrementalRestore-1.txt              |  0
 .../SnapIncrementalRestore-2.txt              |  0
 .../SnapTestAttrition-1.txt                   |  0
 .../SnapTestAttrition-2.txt                   |  0
 .../SnapTestRestart-1.txt                     |  0
 .../SnapTestRestart-2.txt                     |  0
 .../SnapTestSimpleRestart-1.txt               |  0
 .../SnapTestSimpleRestart-2.txt               |  0
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapCycleRestart-1.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapCycleRestart-2.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapIncrementalRestore-1.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapIncrementalRestore-2.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapTestAttrition-1.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapTestAttrition-2.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapTestRestart-1.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapTestRestart-2.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapTestSimpleRestart-1.txt (100%)
 rename tests/restarting/{from_7.0.0 => from_7.1.0}/SnapTestSimpleRestart-2.txt (100%)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 44f0cf4d4e8..ce5b714a3eb 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -218,8 +218,8 @@ if(WITH_PYTHON)
   add_fdb_test(TEST_FILES rare/StatusBuilderPerf.toml)
   add_fdb_test(TEST_FILES rare/TLogVersionMessagesOverheadFactor.toml)
   add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/SnapIncrementalRestore-1.txt
-               restarting/from_7.0.0/SnapIncrementalRestore-2.txt)
+    TEST_FILES restarting/from_7.1.0/SnapIncrementalRestore-1.txt
+               restarting/from_7.1.0/SnapIncrementalRestore-2.txt)
   add_fdb_test(
     TEST_FILES restarting/from_7.1.0/ConfigureTestRestart-1.toml
                restarting/from_7.1.0/ConfigureTestRestart-2.toml)
@@ -254,17 +254,17 @@ if(WITH_PYTHON)
     TEST_FILES restarting/to_7.0.0/CycleTestRestart-1.txt
                restarting/to_7.0.0/CycleTestRestart-2.txt)
   add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/SnapTestAttrition-1.txt
-               restarting/from_7.0.0/SnapTestAttrition-2.txt)
+    TEST_FILES restarting/from_7.1.0/SnapTestAttrition-1.txt
+               restarting/from_7.1.0/SnapTestAttrition-2.txt)
   add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/SnapTestSimpleRestart-1.txt
-               restarting/from_7.0.0/SnapTestSimpleRestart-2.txt)
+    TEST_FILES restarting/from_7.1.0/SnapTestSimpleRestart-1.txt
+               restarting/from_7.1.0/SnapTestSimpleRestart-2.txt)
   add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/SnapTestRestart-1.txt
-               restarting/from_7.0.0/SnapTestRestart-2.txt)
+    TEST_FILES restarting/from_7.1.0/SnapTestRestart-1.txt
+               restarting/from_7.1.0/SnapTestRestart-2.txt)
   add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/SnapCycleRestart-1.txt
-               restarting/from_7.0.0/SnapCycleRestart-2.txt)
+    TEST_FILES restarting/from_7.1.0/SnapCycleRestart-1.txt
+               restarting/from_7.1.0/SnapCycleRestart-2.txt)
   add_fdb_test(
     TEST_FILES restarting/to_7.1.0/ConfigureStorageMigrationTestRestart-1.toml
                restarting/to_7.1.0/ConfigureStorageMigrationTestRestart-2.toml)
diff --git a/tests/restarting/from_7.0.0/SnapCycleRestart-1.txt b/tests/restarting/from_7.1.0/SnapCycleRestart-1.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapCycleRestart-1.txt
rename to tests/restarting/from_7.1.0/SnapCycleRestart-1.txt
diff --git a/tests/restarting/from_7.0.0/SnapCycleRestart-2.txt b/tests/restarting/from_7.1.0/SnapCycleRestart-2.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapCycleRestart-2.txt
rename to tests/restarting/from_7.1.0/SnapCycleRestart-2.txt
diff --git a/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.txt b/tests/restarting/from_7.1.0/SnapIncrementalRestore-1.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapIncrementalRestore-1.txt
rename to tests/restarting/from_7.1.0/SnapIncrementalRestore-1.txt
diff --git a/tests/restarting/from_7.0.0/SnapIncrementalRestore-2.txt b/tests/restarting/from_7.1.0/SnapIncrementalRestore-2.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapIncrementalRestore-2.txt
rename to tests/restarting/from_7.1.0/SnapIncrementalRestore-2.txt
diff --git a/tests/restarting/from_7.0.0/SnapTestAttrition-1.txt b/tests/restarting/from_7.1.0/SnapTestAttrition-1.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapTestAttrition-1.txt
rename to tests/restarting/from_7.1.0/SnapTestAttrition-1.txt
diff --git a/tests/restarting/from_7.0.0/SnapTestAttrition-2.txt b/tests/restarting/from_7.1.0/SnapTestAttrition-2.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapTestAttrition-2.txt
rename to tests/restarting/from_7.1.0/SnapTestAttrition-2.txt
diff --git a/tests/restarting/from_7.0.0/SnapTestRestart-1.txt b/tests/restarting/from_7.1.0/SnapTestRestart-1.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapTestRestart-1.txt
rename to tests/restarting/from_7.1.0/SnapTestRestart-1.txt
diff --git a/tests/restarting/from_7.0.0/SnapTestRestart-2.txt b/tests/restarting/from_7.1.0/SnapTestRestart-2.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapTestRestart-2.txt
rename to tests/restarting/from_7.1.0/SnapTestRestart-2.txt
diff --git a/tests/restarting/from_7.0.0/SnapTestSimpleRestart-1.txt b/tests/restarting/from_7.1.0/SnapTestSimpleRestart-1.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapTestSimpleRestart-1.txt
rename to tests/restarting/from_7.1.0/SnapTestSimpleRestart-1.txt
diff --git a/tests/restarting/from_7.0.0/SnapTestSimpleRestart-2.txt b/tests/restarting/from_7.1.0/SnapTestSimpleRestart-2.txt
similarity index 100%
rename from tests/restarting/from_7.0.0/SnapTestSimpleRestart-2.txt
rename to tests/restarting/from_7.1.0/SnapTestSimpleRestart-2.txt

From 5bfe0ad62ab46c80a34a88b48831c95789c33a5e Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openwaygroup.com>
Date: Tue, 3 May 2022 15:13:53 +0300
Subject: [PATCH 375/740] CI rules merged with ow-fork-6.3 branch

---
 .github/workflows/build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5e7d2667035..ec6bd9c2246 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,7 +98,12 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}/bld
       shell: bash
-      run: ninja -j 1
+      run: ninja -j 2
+
+    - name: Tests
+      working-directory: ${{github.workspace}}/bld
+      shell: bash
+      run: ctest -V
 
     - name: Build rpms
       working-directory: ${{github.workspace}}/bld

From a3fdd05977e6c3c8bd0f278b103ad13c26a8ff9d Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openwaygroup.com>
Date: Tue, 3 May 2022 20:13:07 +0300
Subject: [PATCH 376/740] Try to fix build in github

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ec6bd9c2246..2da2eba328d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,7 +98,7 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}/bld
       shell: bash
-      run: ninja -j 2
+      run: ninja -j 1
 
     - name: Tests
       working-directory: ${{github.workspace}}/bld

From 6acdfff4f2a50eb7075408d52081c15613e5d807 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 20 Apr 2022 21:00:31 -0700
Subject: [PATCH 377/740] Fix orphaned storage server due to force recovery

The force recovery can roll back the transaction that adds a storage server.
However, the storage server may now at version B > A, the recovery version.
As a result, its peek to buddy TLog won't return TLogPeekReply::popped to
trigger its exit, and instead getting a higher version C > B back. To the
storage server, this means the message is empty, thus not removing itself and
keeps peeking.

The fix is to instead of using recovery version as the popped version for the
SS, we use the recovery transaction version, which is the first transaction
after the recovery. Force recovery bumps this version to a much higher version
than the SS's version. So the TLog would set TLogPeekReply::popped to trigger
the storage server exit.
---
 fdbserver/TLogServer.actor.cpp    | 15 ++++++++++-----
 fdbserver/storageserver.actor.cpp |  4 +++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 749f63949ab..f5b0773f30f 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -567,6 +567,7 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	TLogData* tLogData;
 	Promise<Void> recoveryComplete, committingQueue;
 	Version unrecoveredBefore, recoveredAt;
+	Version recoveryTxnVersion;
 
 	struct PeekTrackerData {
 		std::map<int, Promise<std::pair<Version, bool>>>
@@ -646,10 +647,11 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	    blockingPeekTimeouts("BlockingPeekTimeouts", cc), emptyPeeks("EmptyPeeks", cc),
 	    nonEmptyPeeks("NonEmptyPeeks", cc), logId(interf.id()), protocolVersion(protocolVersion),
 	    newPersistentDataVersion(invalidVersion), tLogData(tLogData), unrecoveredBefore(1), recoveredAt(1),
-	    logSystem(new AsyncVar<Reference<ILogSystem>>()), remoteTag(remoteTag), isPrimary(isPrimary),
-	    logRouterTags(logRouterTags), logRouterPoppedVersion(0), logRouterPopToVersion(0), locality(tagLocalityInvalid),
-	    recruitmentID(recruitmentID), logSpillType(logSpillType), allTags(tags.begin(), tags.end()),
-	    terminated(tLogData->terminated.getFuture()), execOpCommitInProgress(false), txsTags(txsTags) {
+	    recoveryTxnVersion(1), logSystem(new AsyncVar<Reference<ILogSystem>>()), remoteTag(remoteTag),
+	    isPrimary(isPrimary), logRouterTags(logRouterTags), logRouterPoppedVersion(0), logRouterPopToVersion(0),
+	    locality(tagLocalityInvalid), recruitmentID(recruitmentID), logSpillType(logSpillType),
+	    allTags(tags.begin(), tags.end()), terminated(tLogData->terminated.getFuture()), execOpCommitInProgress(false),
+	    txsTags(txsTags) {
 		startRole(Role::TRANSACTION_LOG,
 		          interf.id(),
 		          tLogData->workerID,
@@ -1565,7 +1567,7 @@ Version poppedVersion(Reference<LogData> self, Tag tag) {
 		if (tag == txsTag || tag.locality == tagLocalityTxs) {
 			return 0;
 		}
-		return self->recoveredAt + 1;
+		return self->recoveryTxnVersion;
 	}
 	return tagData->popped;
 }
@@ -2221,6 +2223,9 @@ ACTOR Future<Void> tLogCommit(TLogData* self,
 		g_traceBatch.addEvent("CommitDebug", tlogDebugID.get().first(), "TLog.tLogCommit.BeforeWaitForVersion");
 	}
 
+	if (req.prevVersion == logData->recoveredAt) {
+		logData->recoveryTxnVersion = req.version;
+	}
 	logData->minKnownCommittedVersion = std::max(logData->minKnownCommittedVersion, req.minKnownCommittedVersion);
 
 	wait(logData->version.whenAtLeast(req.prevVersion));
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 0deb72c3fab..5a68c3f391e 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -6798,7 +6798,9 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 		}
 		data->tlogCursorReadsLatencyHistogram->sampleSeconds(now() - beforeTLogCursorReads);
 		if (cursor->popped() > 0) {
-			TraceEvent("StorageServerWorkerRemoved", data->thisServerID).detail("Reason", "PeekPoppedTLogData");
+			TraceEvent("StorageServerWorkerRemoved", data->thisServerID)
+			    .detail("Reason", "PeekPoppedTLogData")
+			    .detail("Version", cursor->popped());
 			throw worker_removed();
 		}
 

From 23c6a942213d2ea24f076533631852b51153bb8f Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 27 Apr 2022 20:46:02 -0700
Subject: [PATCH 378/740] Fix tlog peek to disallow return empty message
 between recoveredAt and recovery txn version

This contract today is not explicitly set and can cause storage server to fail
with assertion "rollbackVersion >= data->storageVersion()". This is because if
such an empty version is returned, SS may advance its storage version to a
value larger than the rollback version set in the recovery transaction.

The fix is to block peek reply until recovery transaction has been received.
---
 fdbserver/LogRouter.actor.cpp           |  7 +++-
 fdbserver/LogSystemPeekCursor.actor.cpp |  1 +
 fdbserver/TLogServer.actor.cpp          | 54 ++++++++++++++++++++-----
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp
index 8684fa5263d..6e13e35abfb 100644
--- a/fdbserver/LogRouter.actor.cpp
+++ b/fdbserver/LogRouter.actor.cpp
@@ -603,7 +603,12 @@ Future<Void> logRouterPeekMessages(PromiseType replyPromise,
 	}
 
 	replyPromise.send(reply);
-	//TraceEvent("LogRouterPeek4", self->dbgid);
+	DisabledTraceEvent("LogRouterPeek4", self->dbgid)
+	    .detail("Tag", reqTag.toString())
+	    .detail("ReqBegin", reqBegin)
+	    .detail("End", reply.end)
+	    .detail("MessageSize", reply.messages.size())
+	    .detail("PoppedVersion", self->poppedVersion);
 	return Void();
 }
 
diff --git a/fdbserver/LogSystemPeekCursor.actor.cpp b/fdbserver/LogSystemPeekCursor.actor.cpp
index 3f604e12a64..a17556e61cd 100644
--- a/fdbserver/LogSystemPeekCursor.actor.cpp
+++ b/fdbserver/LogSystemPeekCursor.actor.cpp
@@ -58,6 +58,7 @@ ILogSystem::ServerPeekCursor::ServerPeekCursor(Reference<AsyncVar<OptionalInterf
 	this->results.minKnownCommittedVersion = 0;
 	DisabledTraceEvent(SevDebug, "SPC_Starting", randomID)
 	    .detail("Tag", tag.toString())
+	    .detail("UsePeekStream", usePeekStream)
 	    .detail("Begin", begin)
 	    .detail("End", end);
 }
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index f5b0773f30f..0295f961661 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -371,6 +371,7 @@ struct TLogData : NonCopyable {
 	std::vector<TagsAndMessage> tempTagMessages;
 
 	Reference<Histogram> commitLatencyDist;
+	Promise<Void> recoveryTxnReceived;
 
 	TLogData(UID dbgid,
 	         UID workerID,
@@ -1745,12 +1746,25 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 		return Void();
 	}
 
-	//TraceEvent("TLogPeekMessages0", self->dbgid).detail("ReqBeginEpoch", reqBegin.epoch).detail("ReqBeginSeq", reqBegin.sequence).detail("Epoch", self->epoch()).detail("PersistentDataSeq", self->persistentDataSequence).detail("Tag1", reqTag1).detail("Tag2", reqTag2);
+	DisabledTraceEvent("TLogPeekMessages0", self->dbgid)
+	    .detail("LogId", logData->logId)
+	    .detail("ReqBegin", reqBegin)
+	    .detail("Version", logData->version.get())
+	    .detail("RecoveredAt", logData->recoveredAt)
+	    .detail("Tag", reqTag.toString());
 	// Wait until we have something to return that the caller doesn't already have
 	if (logData->version.get() < reqBegin) {
 		wait(logData->version.whenAtLeast(reqBegin));
 		wait(delay(SERVER_KNOBS->TLOG_PEEK_DELAY, g_network->getCurrentTask()));
 	}
+	if (!logData->stopped && reqBegin >= logData->recoveredAt &&
+	    (reqTag.locality != tagLocalityTxs || reqTag == txsTag)) {
+		// Make sure the peek reply has the recovery txn for the current TLog.
+		// Older generation TLog has been stopped and doesn't wait here.
+		// Similarly during recovery, reading transaction state store
+		// doesn't wait here.
+		wait(self->recoveryTxnReceived.getFuture());
+	}
 
 	if (logData->locality != tagLocalitySatellite && reqTag.locality == tagLocalityLogRouter) {
 		wait(self->concurrentLogRouterReads.take());
@@ -1790,6 +1804,11 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 		poppedVer = poppedVersion(logData, reqTag);
 	}
 
+	DisabledTraceEvent("TLogPeekMessages1", self->dbgid)
+	    .detail("LogId", logData->logId)
+	    .detail("ReqBegin", reqBegin)
+	    .detail("Tag", reqTag.toString())
+	    .detail("PoppedVer", poppedVer);
 	if (poppedVer > reqBegin) {
 		TLogPeekReply rep;
 		rep.maxKnownVersion = logData->version.get();
@@ -1834,7 +1853,9 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 		onlySpilled = false;
 
 		// grab messages from disk
-		//TraceEvent("TLogPeekMessages", self->dbgid).detail("ReqBeginEpoch", reqBegin.epoch).detail("ReqBeginSeq", reqBegin.sequence).detail("Epoch", self->epoch()).detail("PersistentDataSeq", self->persistentDataSequence).detail("Tag1", reqTag1).detail("Tag2", reqTag2);
+		DisabledTraceEvent("TLogPeekMessages2", self->dbgid)
+		    .detail("ReqBegin", reqBegin)
+		    .detail("Tag", reqTag.toString());
 		if (reqBegin <= logData->persistentDataDurableVersion) {
 			// Just in case the durable version changes while we are waiting for the read, we grab this data from
 			// memory. We may or may not actually send it depending on whether we get enough data from disk. SOMEDAY:
@@ -1995,13 +2016,12 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 	reply.end = endVersion;
 	reply.onlySpilled = onlySpilled;
 
-	// TraceEvent("TlogPeek", self->dbgid)
-	//    .detail("LogId", logData->logId)
-	//    .detail("Tag", req.tag.toString())
-	//    .detail("BeginVer", req.begin)
-	//    .detail("EndVer", reply.end)
-	//    .detail("MsgBytes", reply.messages.expectedSize())
-	//    .detail("ForAddress", req.reply.getEndpoint().getPrimaryAddress());
+	DisabledTraceEvent("TlogPeekMessages4", self->dbgid)
+	    .detail("LogId", logData->logId)
+	    .detail("Tag", reqTag.toString())
+	    .detail("ReqBegin", reqBegin)
+	    .detail("EndVer", reply.end)
+	    .detail("MsgBytes", reply.messages.expectedSize());
 
 	if (reqSequence.present()) {
 		auto& trackerData = logData->peekTracker[peekId];
@@ -2279,6 +2299,14 @@ ACTOR Future<Void> tLogCommit(TLogData* self,
 		}
 		// Notifies the commitQueue actor to commit persistentQueue, and also unblocks tLogPeekMessages actors
 		logData->version.set(req.version);
+		if (self->recoveryTxnReceived.canBeSet() && (req.prevVersion == 0 || req.prevVersion == logData->recoveredAt)) {
+			TraceEvent("TLogInfo", self->dbgid)
+			    .detail("Log", logData->logId)
+			    .detail("Prev", req.prevVersion)
+			    .detail("RecoveredAt", logData->recoveredAt)
+			    .detail("RecoveryTxnVersion", req.version);
+			self->recoveryTxnReceived.send(Void());
+		}
 		if (SERVER_KNOBS->ENABLE_VERSION_VECTOR_TLOG_UNICAST) {
 			self->unknownCommittedVersions.push_front(std::make_tuple(req.version, req.tLogCount));
 			while (!self->unknownCommittedVersions.empty() &&
@@ -2782,6 +2810,7 @@ ACTOR Future<Void> pullAsyncData(TLogData* self,
 
 		state Version ver = 0;
 		state std::vector<TagsAndMessage> messages;
+		state bool pullingRecoveryData = endVersion.present() && endVersion.get() == logData->recoveredAt;
 		loop {
 			state bool foundMessage = r->hasMessage();
 			if (!foundMessage || r->version().version != ver) {
@@ -2819,6 +2848,13 @@ ACTOR Future<Void> pullAsyncData(TLogData* self,
 					// Notifies the commitQueue actor to commit persistentQueue, and also unblocks tLogPeekMessages
 					// actors
 					logData->version.set(ver);
+					if (!pullingRecoveryData && ver > logData->recoveredAt && self->recoveryTxnReceived.canBeSet()) {
+						TraceEvent("TLogInfo", self->dbgid)
+						    .detail("Log", logData->logId)
+						    .detail("RecoveredAt", logData->recoveredAt)
+						    .detail("RecoveryTxnVersion", ver);
+						self->recoveryTxnReceived.send(Void());
+					}
 					wait(yield(TaskPriority::TLogCommit));
 				}
 				lastVer = ver;

From 45955be2935191dcfbad70f7672aeb521d3fa82e Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 29 Apr 2022 09:43:29 -0700
Subject: [PATCH 379/740] Move recoveryTxnReceived to be per LogData

This is because a shared TLog can have a first generation TLog which is already
setting the promise, thus later generations won't wait for the recovery version.
For the current generation, all peeks need to wait, while for older generations,
there is no need to wait (by checking if they are stopped).
---
 fdbserver/TLogServer.actor.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 0295f961661..50e9edafdd3 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -371,7 +371,6 @@ struct TLogData : NonCopyable {
 	std::vector<TagsAndMessage> tempTagMessages;
 
 	Reference<Histogram> commitLatencyDist;
-	Promise<Void> recoveryTxnReceived;
 
 	TLogData(UID dbgid,
 	         UID workerID,
@@ -569,6 +568,7 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	Promise<Void> recoveryComplete, committingQueue;
 	Version unrecoveredBefore, recoveredAt;
 	Version recoveryTxnVersion;
+	Promise<Void> recoveryTxnReceived;
 
 	struct PeekTrackerData {
 		std::map<int, Promise<std::pair<Version, bool>>>
@@ -1748,22 +1748,21 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 
 	DisabledTraceEvent("TLogPeekMessages0", self->dbgid)
 	    .detail("LogId", logData->logId)
+	    .detail("Tag", reqTag.toString())
 	    .detail("ReqBegin", reqBegin)
 	    .detail("Version", logData->version.get())
-	    .detail("RecoveredAt", logData->recoveredAt)
-	    .detail("Tag", reqTag.toString());
+	    .detail("RecoveredAt", logData->recoveredAt);
 	// Wait until we have something to return that the caller doesn't already have
 	if (logData->version.get() < reqBegin) {
 		wait(logData->version.whenAtLeast(reqBegin));
 		wait(delay(SERVER_KNOBS->TLOG_PEEK_DELAY, g_network->getCurrentTask()));
 	}
-	if (!logData->stopped && reqBegin >= logData->recoveredAt &&
-	    (reqTag.locality != tagLocalityTxs || reqTag == txsTag)) {
+	if (!logData->stopped && reqTag.locality != tagLocalityTxs && reqTag != txsTag) {
 		// Make sure the peek reply has the recovery txn for the current TLog.
 		// Older generation TLog has been stopped and doesn't wait here.
 		// Similarly during recovery, reading transaction state store
 		// doesn't wait here.
-		wait(self->recoveryTxnReceived.getFuture());
+		wait(logData->recoveryTxnReceived.getFuture());
 	}
 
 	if (logData->locality != tagLocalitySatellite && reqTag.locality == tagLocalityLogRouter) {
@@ -1806,8 +1805,8 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 
 	DisabledTraceEvent("TLogPeekMessages1", self->dbgid)
 	    .detail("LogId", logData->logId)
-	    .detail("ReqBegin", reqBegin)
 	    .detail("Tag", reqTag.toString())
+	    .detail("ReqBegin", reqBegin)
 	    .detail("PoppedVer", poppedVer);
 	if (poppedVer > reqBegin) {
 		TLogPeekReply rep;
@@ -2016,7 +2015,7 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 	reply.end = endVersion;
 	reply.onlySpilled = onlySpilled;
 
-	DisabledTraceEvent("TlogPeekMessages4", self->dbgid)
+	DisabledTraceEvent("TLogPeekMessages4", self->dbgid)
 	    .detail("LogId", logData->logId)
 	    .detail("Tag", reqTag.toString())
 	    .detail("ReqBegin", reqBegin)
@@ -2299,13 +2298,14 @@ ACTOR Future<Void> tLogCommit(TLogData* self,
 		}
 		// Notifies the commitQueue actor to commit persistentQueue, and also unblocks tLogPeekMessages actors
 		logData->version.set(req.version);
-		if (self->recoveryTxnReceived.canBeSet() && (req.prevVersion == 0 || req.prevVersion == logData->recoveredAt)) {
+		if (logData->recoveryTxnReceived.canBeSet() &&
+		    (req.prevVersion == 0 || req.prevVersion == logData->recoveredAt)) {
 			TraceEvent("TLogInfo", self->dbgid)
 			    .detail("Log", logData->logId)
 			    .detail("Prev", req.prevVersion)
 			    .detail("RecoveredAt", logData->recoveredAt)
 			    .detail("RecoveryTxnVersion", req.version);
-			self->recoveryTxnReceived.send(Void());
+			logData->recoveryTxnReceived.send(Void());
 		}
 		if (SERVER_KNOBS->ENABLE_VERSION_VECTOR_TLOG_UNICAST) {
 			self->unknownCommittedVersions.push_front(std::make_tuple(req.version, req.tLogCount));
@@ -2848,12 +2848,12 @@ ACTOR Future<Void> pullAsyncData(TLogData* self,
 					// Notifies the commitQueue actor to commit persistentQueue, and also unblocks tLogPeekMessages
 					// actors
 					logData->version.set(ver);
-					if (!pullingRecoveryData && ver > logData->recoveredAt && self->recoveryTxnReceived.canBeSet()) {
+					if (logData->recoveryTxnReceived.canBeSet() && !pullingRecoveryData && ver > logData->recoveredAt) {
 						TraceEvent("TLogInfo", self->dbgid)
 						    .detail("Log", logData->logId)
 						    .detail("RecoveredAt", logData->recoveredAt)
 						    .detail("RecoveryTxnVersion", ver);
-						self->recoveryTxnReceived.send(Void());
+						logData->recoveryTxnReceived.send(Void());
 					}
 					wait(yield(TaskPriority::TLogCommit));
 				}

From 1cfb1045b99f207bf1b12e73229529db1c6eee54 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 29 Apr 2022 14:45:48 -0700
Subject: [PATCH 380/740] For initial commit, poppedVersion needs to be at
 least 2

To get rid of the previous unsuccessful recovery's recruited seed
storage servers.
---
 fdbserver/TLogServer.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 50e9edafdd3..4f6c9f17e75 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -1568,7 +1568,7 @@ Version poppedVersion(Reference<LogData> self, Tag tag) {
 		if (tag == txsTag || tag.locality == tagLocalityTxs) {
 			return 0;
 		}
-		return self->recoveryTxnVersion;
+		return std::max(self->recoveredAt + 1, self->recoveryTxnVersion);
 	}
 	return tagData->popped;
 }

From 38eab0830816d93cbc05720aa48c3af17df3615b Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Mon, 2 May 2022 19:26:44 -0700
Subject: [PATCH 381/740] Bug fix:  Redwood shutdown would wait for pending IO
 success so if any of them failed the shutdown would never complete.

---
 fdbserver/VersionedBTree.actor.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp
index 9b4b177c2cf..6eb2ac09726 100644
--- a/fdbserver/VersionedBTree.actor.cpp
+++ b/fdbserver/VersionedBTree.actor.cpp
@@ -2108,7 +2108,9 @@ class DWALPager final : public IPager2 {
 			return !reading() && !writing();
 		}
 
-		Future<Void> onEvictable() const { return ready(readFuture) && writeFuture; }
+		// Entry is evictable when its write and read futures are ready, even if they are
+		// errors, so any buffers they hold are no longer needed by the underlying file actors
+		Future<Void> onEvictable() const { return ready(readFuture) && ready(writeFuture); }
 	};
 	typedef ObjectCache<LogicalPageID, PageCacheEntry> PageCacheT;
 
@@ -3761,7 +3763,9 @@ class DWALPager final : public IPager2 {
 		// Must wait for pending operations to complete, canceling them can cause a crash because the underlying
 		// operations may be uncancellable and depend on memory from calling scope's page reference
 		debug_printf("DWALPager(%s) shutdown wait for operations\n", self->filename.c_str());
-		wait(waitForAll(self->operations));
+
+		// Pending ops must be all ready, errors are okay
+		wait(waitForAllReady(self->operations));
 		self->operations.clear();
 
 		debug_printf("DWALPager(%s) shutdown destroy page cache\n", self->filename.c_str());

From 49efb9b302657b022de664d51ea9ca5d9e02fd4b Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 29 Apr 2022 13:24:00 -0500
Subject: [PATCH 382/740] Allow TSS failures in consistency check when fault
 injection is enabled

---
 fdbserver/workloads/ConsistencyCheck.actor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index fd352ab2996..35952cc7c61 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -1625,8 +1625,10 @@ struct ConsistencyCheckWorkload : TestWorkload {
 
 							break;
 						} else if (estimatedBytes[j] < 0 &&
-						           (g_network->isSimulated() || !storageServerInterfaces[j].isTss())) {
-							self->testFailure("Could not get storage metrics from server");
+						           ((g_network->isSimulated() &&
+						             g_simulator.tssMode <= ISimulator::TSSMode::EnabledNormal) ||
+						            !storageServerInterfaces[j].isTss())) {
+							// Ignore a non-responding TSS outside of simulation, or if tss fault injection is enabled
 							hasValidEstimate = false;
 							break;
 						}

From 3c8b24e02918cbdba7530e0b63d8526b18316212 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Wed, 4 May 2022 10:06:14 -0400
Subject: [PATCH 383/740] Merge pull request #7057 from sbodagala/main

Address GRV cache and version vector incompatibility
---
 fdbclient/DatabaseContext.h   |  1 -
 fdbclient/NativeAPI.actor.cpp | 37 +++++++++++++++++------------------
 flow/error_definitions.h      |  1 -
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index 8bd76bc65bb..e5662b9b9c4 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -524,7 +524,6 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	Counter transactionsExpensiveClearCostEstCount;
 	Counter transactionGrvFullBatches;
 	Counter transactionGrvTimedOutBatches;
-	Counter transactionsStaleVersionVectors;
 
 	ContinuousSample<double> latencies, readLatencies, commitLatencies, GRVLatencies, mutationsPerCommit,
 	    bytesPerCommit, bgLatencies, bgGranulesPerRequest;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 6f6f8ec9e38..1d10fecc13c 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -235,11 +235,14 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 	}
 
 	if (ssVersionVectorCache.getMaxVersion() != invalidVersion && readVersion > ssVersionVectorCache.getMaxVersion()) {
-		TraceEvent(SevDebug, "GetLatestCommitVersions")
-		    .detail("ReadVersion", readVersion)
-		    .detail("VersionVector", ssVersionVectorCache.toString());
-		ssVersionVectorCache.clear();
-		throw stale_version_vector(); // TODO: investigate why
+		if (!CLIENT_KNOBS->FORCE_GRV_CACHE_OFF && !info->options.skipGrvCache && info->options.useGrvCache) {
+			return;
+		} else {
+			TraceEvent(SevError, "GetLatestCommitVersions")
+			    .detail("ReadVersion", readVersion)
+			    .detail("VersionVector", ssVersionVectorCache.toString());
+			ASSERT(false);
+		}
 	}
 
 	std::map<Version, std::set<Tag>> versionMap; // order the versions to be returned
@@ -1436,13 +1439,13 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
     transactionsProcessBehind("ProcessBehind", cc), transactionsThrottled("Throttled", cc),
     transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc),
     transactionGrvFullBatches("NumGrvFullBatches", cc), transactionGrvTimedOutBatches("NumGrvTimedOutBatches", cc),
-    transactionsStaleVersionVectors("NumStaleVersionVectors", cc), latencies(1000), readLatencies(1000),
-    commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000), bgLatencies(1000),
-    bgGranulesPerRequest(1000), outstandingWatches(0), sharedStatePtr(nullptr), lastGrvTime(0.0), cachedReadVersion(0),
-    lastRkBatchThrottleTime(0.0), lastRkDefaultThrottleTime(0.0), lastProxyRequestTime(0.0),
-    transactionTracingSample(false), taskID(taskID), clientInfo(clientInfo), clientInfoMonitor(clientInfoMonitor),
-    coordinator(coordinator), apiVersion(apiVersion), mvCacheInsertLocation(0), healthMetricsLastUpdated(0),
-    detailedHealthMetricsLastUpdated(0), smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
+    latencies(1000), readLatencies(1000), commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000),
+    bytesPerCommit(1000), bgLatencies(1000), bgGranulesPerRequest(1000), outstandingWatches(0), sharedStatePtr(nullptr),
+    lastGrvTime(0.0), cachedReadVersion(0), lastRkBatchThrottleTime(0.0), lastRkDefaultThrottleTime(0.0),
+    lastProxyRequestTime(0.0), transactionTracingSample(false), taskID(taskID), clientInfo(clientInfo),
+    clientInfoMonitor(clientInfoMonitor), coordinator(coordinator), apiVersion(apiVersion), mvCacheInsertLocation(0),
+    healthMetricsLastUpdated(0), detailedHealthMetricsLastUpdated(0),
+    smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
     specialKeySpace(std::make_unique<SpecialKeySpace>(specialKeys.begin, specialKeys.end, /* test */ false)),
     connectToDatabaseEventCacheHolder(format("ConnectToDatabase/%s", dbId.toString().c_str())) {
 	dbId = deterministicRandom()->randomUniqueID();
@@ -1709,9 +1712,8 @@ DatabaseContext::DatabaseContext(const Error& err)
     transactionsProcessBehind("ProcessBehind", cc), transactionsThrottled("Throttled", cc),
     transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc),
     transactionGrvFullBatches("NumGrvFullBatches", cc), transactionGrvTimedOutBatches("NumGrvTimedOutBatches", cc),
-    transactionsStaleVersionVectors("NumStaleVersionVectors", cc), latencies(1000), readLatencies(1000),
-    commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000), bgLatencies(1000),
-    bgGranulesPerRequest(1000), transactionTracingSample(false),
+    latencies(1000), readLatencies(1000), commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000),
+    bytesPerCommit(1000), bgLatencies(1000), bgGranulesPerRequest(1000), transactionTracingSample(false),
     smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
     connectToDatabaseEventCacheHolder(format("ConnectToDatabase/%s", dbId.toString().c_str())) {}
 
@@ -7073,14 +7075,11 @@ Future<Void> Transaction::onError(Error const& e) {
 		reset();
 		return delay(backoff, trState->taskID);
 	}
-	if (e.code() == error_code_transaction_too_old || e.code() == error_code_future_version ||
-	    e.code() == error_code_stale_version_vector) {
+	if (e.code() == error_code_transaction_too_old || e.code() == error_code_future_version) {
 		if (e.code() == error_code_transaction_too_old)
 			++trState->cx->transactionsTooOld;
 		else if (e.code() == error_code_future_version)
 			++trState->cx->transactionsFutureVersions;
-		else if (e.code() == error_code_stale_version_vector)
-			++trState->cx->transactionsStaleVersionVectors;
 
 		double maxBackoff = trState->options.maxBackoff;
 		reset();
diff --git a/flow/error_definitions.h b/flow/error_definitions.h
index 1a054ce43e2..0301d889e87 100755
--- a/flow/error_definitions.h
+++ b/flow/error_definitions.h
@@ -95,7 +95,6 @@ ERROR( page_encoding_not_supported, 1071, "Page encoding type is not supported o
 ERROR( page_decoding_failed, 1072, "Page content decoding failed" )
 ERROR( unexpected_encoding_type, 1073, "Page content decoding failed" )
 ERROR( encryption_key_not_found, 1074, "Encryption key not found" )
-ERROR( stale_version_vector, 1075, "Client version vector is stale" )
 
 ERROR( broken_promise, 1100, "Broken promise" )
 ERROR( operation_cancelled, 1101, "Asynchronous operation cancelled" )

From 6a59c453cef7d81d37b42e21dfedc6508c7252c6 Mon Sep 17 00:00:00 2001
From: hao fu <hfu5@apple.com>
Date: Mon, 2 May 2022 11:57:10 -0700
Subject: [PATCH 384/740] implement equals and hashCode in MappedKeyValue

---
 .../apple/foundationdb/MappedKeyValue.java    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java b/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
index 71bad2caa98..7a0bcf6e4a8 100644
--- a/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
+++ b/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
@@ -84,6 +84,27 @@ static byte[] takeBytes(Offset offset, byte[] bytes, int[] lengths) {
 		return b;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null)
+			return false;
+		if (obj == this)
+			return true;
+		if (!(obj instanceof MappedKeyValue))
+			return false;
+
+		MappedKeyValue rhs = (MappedKeyValue) obj;
+		return Arrays.equals(rangeBegin, rhs.rangeBegin)
+				&& Arrays.equals(rangeEnd, rhs.rangeEnd)
+				&& Objects.equals(rangeResult, rhs.rangeResult);
+	}
+
+	@Override
+	public int hashCode() {
+		int hashForResult = rangeResult == null ? 0 : rangeResult.hashCode();
+		return 17 + (29 * hashForResult + 37 * Arrays.hashCode(rangeBegin) + Arrays.hashCode(rangeEnd));
+	}
+
 	@Override
 	public String toString() {
 		final StringBuilder sb = new StringBuilder("MappedKeyValue{");

From d9513b4104a6fd7760d8893453735d6349b889aa Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 2 May 2022 13:49:42 -0700
Subject: [PATCH 385/740] Cherry pick #6993 to release-7.1

---
 fdbclient/RYWIterator.cpp | 21 +++++++++++++++++++++
 fdbclient/WriteMap.h      |  8 +++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/fdbclient/RYWIterator.cpp b/fdbclient/RYWIterator.cpp
index 3e7e18c1e8e..35ffb32cb06 100644
--- a/fdbclient/RYWIterator.cpp
+++ b/fdbclient/RYWIterator.cpp
@@ -430,6 +430,27 @@ TEST_CASE("/fdbclient/WriteMap/emptiness") {
 	return Void();
 }
 
+TEST_CASE("/fdbclient/WriteMap/VersionstampedvalueAfterSet") {
+	Arena arena = Arena();
+	SnapshotCache cache(&arena);
+	WriteMap writes = WriteMap(&arena);
+
+	ASSERT(writes.empty());
+	writes.mutate("apple"_sr, MutationRef::SetValue, "red"_sr, true);
+	writes.mutate("apple"_sr, MutationRef::SetVersionstampedValue, metadataVersionRequiredValue, true);
+
+	RYWIterator it(&cache, &writes);
+	it.bypassUnreadableProtection();
+	it.skip("apple"_sr);
+	ASSERT(it.is_unreadable());
+	ASSERT(it.is_kv());
+	const KeyValueRef* kv = it.kv(arena);
+	ASSERT(kv->key == "apple"_sr);
+	ASSERT(kv->value == metadataVersionRequiredValue);
+
+	return Void();
+}
+
 TEST_CASE("/fdbclient/WriteMap/clear") {
 	Arena arena = Arena();
 	WriteMap writes = WriteMap(&arena);
diff --git a/fdbclient/WriteMap.h b/fdbclient/WriteMap.h
index 05793313f0c..33fb6aee373 100644
--- a/fdbclient/WriteMap.h
+++ b/fdbclient/WriteMap.h
@@ -231,7 +231,8 @@ class WriteMap {
 				                                is_unreadable));
 			}
 		} else {
-			if (!it.is_unreadable() && operation == MutationRef::SetValue) {
+			if (!it.is_unreadable() &&
+			    (operation == MutationRef::SetValue || operation == MutationRef::SetVersionstampedValue)) {
 				it.tree.clear();
 				PTreeImpl::remove(writes, ver, key);
 				PTreeImpl::insert(writes,
@@ -523,9 +524,10 @@ class WriteMap {
 	static RYWMutation coalesce(RYWMutation existingEntry, RYWMutation newEntry, Arena& arena) {
 		ASSERT(newEntry.value.present());
 
-		if (newEntry.type == MutationRef::SetValue)
+		if (newEntry.type == MutationRef::SetValue || newEntry.type == MutationRef::SetVersionstampedValue) {
+			// independent mutations
 			return newEntry;
-		else if (newEntry.type == MutationRef::AddValue) {
+		} else if (newEntry.type == MutationRef::AddValue) {
 			switch (existingEntry.type) {
 			case MutationRef::SetValue:
 				return RYWMutation(doLittleEndianAdd(existingEntry.value, newEntry.value.get(), arena),

From d107f02a4dbc22ccb2ff01c9174f93cf081033d3 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Mon, 2 May 2022 16:36:27 -0700
Subject: [PATCH 386/740] Update RYWIterator test to match #6993

There's a test which checks behavior against a reference implementation,
and so the reference implementation needs to be updated as well.
---
 fdbclient/RYWIterator.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdbclient/RYWIterator.cpp b/fdbclient/RYWIterator.cpp
index 35ffb32cb06..949f164485f 100644
--- a/fdbclient/RYWIterator.cpp
+++ b/fdbclient/RYWIterator.cpp
@@ -676,7 +676,10 @@ TEST_CASE("/fdbclient/WriteMap/random") {
 			KeyRef key = RandomTestImpl::getRandomKey(arena);
 			ValueRef value = RandomTestImpl::getRandomValue(arena);
 			writes.mutate(key, MutationRef::SetVersionstampedValue, value, addConflict);
-			setMap[key].push(RYWMutation(value, MutationRef::SetVersionstampedValue));
+			if (unreadableMap[key])
+				setMap[key].push(RYWMutation(value, MutationRef::SetVersionstampedValue));
+			else
+				setMap[key] = OperationStack(RYWMutation(value, MutationRef::SetVersionstampedValue));
 			if (addConflict)
 				conflictMap.insert(key, true);
 			clearMap.insert(key, false);

From 73c1830f4176d85ca72003db115332a3e7601633 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Tue, 26 Apr 2022 16:07:59 -0700
Subject: [PATCH 387/740] Consider tenant prefix sizes when doing key size
 limit checks

---
 fdbclient/ClientKnobs.cpp                     |   2 +
 fdbclient/ClientKnobs.h                       |   1 +
 fdbclient/FDBTypes.cpp                        |  15 ++-
 fdbclient/GenericManagementAPI.actor.h        |  11 ++
 fdbclient/NativeAPI.actor.cpp                 | 105 +++++++++---------
 fdbclient/NativeAPI.actor.h                   |  14 +++
 fdbclient/ReadYourWrites.actor.cpp            |  89 +++++++--------
 fdbclient/Tenant.h                            |   2 +
 .../workloads/FuzzApiCorrectness.actor.cpp    |  57 +++++-----
 fdbserver/workloads/WriteDuringRead.actor.cpp |  65 +++--------
 10 files changed, 173 insertions(+), 188 deletions(-)

diff --git a/fdbclient/ClientKnobs.cpp b/fdbclient/ClientKnobs.cpp
index 5464e63185b..7f7f58a8bc2 100644
--- a/fdbclient/ClientKnobs.cpp
+++ b/fdbclient/ClientKnobs.cpp
@@ -21,6 +21,7 @@
 #include "fdbclient/Knobs.h"
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/SystemData.h"
+#include "fdbclient/Tenant.h"
 #include "flow/UnitTest.h"
 
 #define init(...) KNOB_FN(__VA_ARGS__, INIT_ATOMIC_KNOB, INIT_KNOB)(__VA_ARGS__)
@@ -82,6 +83,7 @@ void ClientKnobs::initialize(Randomize randomize) {
 	init( CHANGE_FEED_CACHE_SIZE,               100000 ); if( randomize && BUGGIFY ) CHANGE_FEED_CACHE_SIZE = 1;
 	init( CHANGE_FEED_POP_TIMEOUT,                 5.0 );
 	init( CHANGE_FEED_STREAM_MIN_BYTES,            1e4 ); if( randomize && BUGGIFY ) CHANGE_FEED_STREAM_MIN_BYTES = 1;
+	init( TENANT_PREFIX_SIZE_LIMIT,                 28 ); ASSERT(TENANT_PREFIX_SIZE_LIMIT >= TenantMapEntry::ROOT_PREFIX_SIZE); // includes 8-byte ID and optional tenant subspace
 
 	init( MAX_BATCH_SIZE,                         1000 ); if( randomize && BUGGIFY ) MAX_BATCH_SIZE = 1;
 	init( GRV_BATCH_TIMEOUT,                     0.005 ); if( randomize && BUGGIFY ) GRV_BATCH_TIMEOUT = 0.1;
diff --git a/fdbclient/ClientKnobs.h b/fdbclient/ClientKnobs.h
index 3378fd01e52..ca3dd1494ee 100644
--- a/fdbclient/ClientKnobs.h
+++ b/fdbclient/ClientKnobs.h
@@ -81,6 +81,7 @@ class ClientKnobs : public KnobsImpl<ClientKnobs> {
 	int64_t CHANGE_FEED_CACHE_SIZE;
 	double CHANGE_FEED_POP_TIMEOUT;
 	int64_t CHANGE_FEED_STREAM_MIN_BYTES;
+	int64_t TENANT_PREFIX_SIZE_LIMIT;
 
 	int MAX_BATCH_SIZE;
 	double GRV_BATCH_TIMEOUT;
diff --git a/fdbclient/FDBTypes.cpp b/fdbclient/FDBTypes.cpp
index 85b90313e52..ff268075bd8 100644
--- a/fdbclient/FDBTypes.cpp
+++ b/fdbclient/FDBTypes.cpp
@@ -20,6 +20,7 @@
 
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/Knobs.h"
+#include "fdbclient/NativeAPI.actor.h"
 
 KeyRef keyBetween(const KeyRangeRef& keys) {
 	int pos = 0; // will be the position of the first difference between keys.begin and keys.end
@@ -40,16 +41,14 @@ KeyRef keyBetween(const KeyRangeRef& keys) {
 }
 
 void KeySelectorRef::setKey(KeyRef const& key) {
-	// There are no keys in the database with size greater than KEY_SIZE_LIMIT, so if this key selector has a key
+	// There are no keys in the database with size greater than the max key size, so if this key selector has a key
 	// which is large, then we can translate it to an equivalent key selector with a smaller key
-	if (key.size() >
-	    (key.startsWith(LiteralStringRef("\xff")) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		this->key = key.substr(0,
-		                       (key.startsWith(LiteralStringRef("\xff")) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-		                                                                 : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		                           1);
-	else
+	int64_t maxKeySize = getMaxKeySize(key);
+	if (key.size() > maxKeySize) {
+		this->key = key.substr(0, maxKeySize + 1);
+	} else {
 		this->key = key;
+	}
 }
 
 void KeySelectorRef::setKeyUnlimited(KeyRef const& key) {
diff --git a/fdbclient/GenericManagementAPI.actor.h b/fdbclient/GenericManagementAPI.actor.h
index 43b103e3138..193c751e5dc 100644
--- a/fdbclient/GenericManagementAPI.actor.h
+++ b/fdbclient/GenericManagementAPI.actor.h
@@ -735,6 +735,17 @@ Future<Optional<TenantMapEntry>> createTenantTransaction(Transaction tr, TenantN
 	state Optional<Value> lastIdVal = wait(safeThreadFutureToFuture(lastIdFuture));
 	Optional<Value> tenantDataPrefix = wait(safeThreadFutureToFuture(tenantDataPrefixFuture));
 
+	if (tenantDataPrefix.present() &&
+	    tenantDataPrefix.get().size() + TenantMapEntry::ROOT_PREFIX_SIZE > CLIENT_KNOBS->TENANT_PREFIX_SIZE_LIMIT) {
+		TraceEvent(SevWarnAlways, "TenantPrefixTooLarge")
+		    .detail("TenantSubspace", tenantDataPrefix.get())
+		    .detail("TenantSubspaceLength", tenantDataPrefix.get().size())
+			.detail("RootPrefixLength", TenantMapEntry::ROOT_PREFIX_SIZE)
+		    .detail("MaxTenantPrefixSize", CLIENT_KNOBS->TENANT_PREFIX_SIZE_LIMIT);
+
+		throw client_invalid_operation();
+	}
+
 	state TenantMapEntry newTenant(lastIdVal.present() ? TenantMapEntry::prefixToId(lastIdVal.get()) + 1 : 0,
 	                               tenantDataPrefix.present() ? (KeyRef)tenantDataPrefix.get() : ""_sr);
 
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 1d10fecc13c..b0070ac0a8e 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -5097,10 +5097,10 @@ Future<Optional<Value>> Transaction::get(const Key& key, Snapshot snapshot) {
 	++trState->cx->transactionGetValueRequests;
 	// ASSERT (key < allKeys.end);
 
-	// There are no keys in the database with size greater than KEY_SIZE_LIMIT
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	// There are no keys in the database with size greater than the max key size
+	if (key.size() > getMaxReadKeySize(key)) {
 		return Optional<Value>();
+	}
 
 	auto ver = getReadVersion();
 
@@ -5481,23 +5481,19 @@ Future<Void> Transaction::getRangeStream(const PromiseStream<RangeResult>& resul
 void Transaction::addReadConflictRange(KeyRangeRef const& keys) {
 	ASSERT(!keys.empty());
 
-	// There aren't any keys in the database with size larger than KEY_SIZE_LIMIT, so if range contains large keys
+	// There aren't any keys in the database with size larger than the max key size, so if range contains large keys
 	// we can translate it to an equivalent one with smaller keys
 	KeyRef begin = keys.begin;
 	KeyRef end = keys.end;
 
-	if (begin.size() >
-	    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		begin = begin.substr(
-		    0,
-		    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
-	if (end.size() >
-	    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		end = end.substr(
-		    0,
-		    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
+	int64_t beginMaxSize = getMaxReadKeySize(begin);
+	int64_t endMaxSize = getMaxReadKeySize(end);
+	if (begin.size() > beginMaxSize) {
+		begin = begin.substr(0, beginMaxSize + 1);
+	}
+	if (end.size() > endMaxSize) {
+		end = end.substr(0, endMaxSize + 1);
+	}
 
 	KeyRangeRef r = KeyRangeRef(begin, end);
 
@@ -5519,8 +5515,7 @@ void Transaction::makeSelfConflicting() {
 
 void Transaction::set(const KeyRef& key, const ValueRef& value, AddConflictRange addConflictRange) {
 	++trState->cx->transactionSetMutations;
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	if (key.size() > getMaxWriteKeySize(key, trState->options.rawAccess))
 		throw key_too_large();
 	if (value.size() > CLIENT_KNOBS->VALUE_SIZE_LIMIT)
 		throw value_too_large();
@@ -5541,8 +5536,7 @@ void Transaction::atomicOp(const KeyRef& key,
                            MutationRef::Type operationType,
                            AddConflictRange addConflictRange) {
 	++trState->cx->transactionAtomicMutations;
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	if (key.size() > getMaxWriteKeySize(key, trState->options.rawAccess))
 		throw key_too_large();
 	if (operand.size() > CLIENT_KNOBS->VALUE_SIZE_LIMIT)
 		throw value_too_large();
@@ -5575,20 +5569,16 @@ void Transaction::clear(const KeyRangeRef& range, AddConflictRange addConflictRa
 	KeyRef begin = range.begin;
 	KeyRef end = range.end;
 
-	// There aren't any keys in the database with size larger than KEY_SIZE_LIMIT, so if range contains large keys
+	// There aren't any keys in the database with size larger than the max key size, so if range contains large keys
 	// we can translate it to an equivalent one with smaller keys
-	if (begin.size() >
-	    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		begin = begin.substr(
-		    0,
-		    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
-	if (end.size() >
-	    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		end = end.substr(
-		    0,
-		    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
+	int64_t beginMaxSize = getMaxClearKeySize(begin);
+	int64_t endMaxSize = getMaxClearKeySize(end);
+	if (begin.size() > beginMaxSize) {
+		begin = begin.substr(0, beginMaxSize + 1);
+	}
+	if (end.size() > endMaxSize) {
+		end = end.substr(0, endMaxSize + 1);
+	}
 
 	auto r = KeyRangeRef(req.arena, KeyRangeRef(begin, end));
 	if (r.empty())
@@ -5601,10 +5591,10 @@ void Transaction::clear(const KeyRangeRef& range, AddConflictRange addConflictRa
 }
 void Transaction::clear(const KeyRef& key, AddConflictRange addConflictRange) {
 	++trState->cx->transactionClearMutations;
-	// There aren't any keys in the database with size larger than KEY_SIZE_LIMIT
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	// There aren't any keys in the database with size larger than the max key size
+	if (key.size() > getMaxClearKeySize(key)) {
 		return;
+	}
 
 	auto& req = tr;
 	auto& t = req.transaction;
@@ -5623,24 +5613,19 @@ void Transaction::addWriteConflictRange(const KeyRangeRef& keys) {
 	auto& req = tr;
 	auto& t = req.transaction;
 
-	// There aren't any keys in the database with size larger than KEY_SIZE_LIMIT, so if range contains large keys
+	// There aren't any keys in the database with size larger than the max key size, so if range contains large keys
 	// we can translate it to an equivalent one with smaller keys
 	KeyRef begin = keys.begin;
 	KeyRef end = keys.end;
 
-	if (begin.size() >
-	    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		begin = begin.substr(
-		    0,
-		    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
-	if (end.size() >
-	    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		end = end.substr(
-		    0,
-		    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
-
+	int64_t beginMaxSize = getMaxKeySize(begin);
+	int64_t endMaxSize = getMaxKeySize(end);
+	if (begin.size() > beginMaxSize) {
+		begin = begin.substr(0, beginMaxSize + 1);
+	}
+	if (end.size() > endMaxSize) {
+		end = end.substr(0, endMaxSize + 1);
+	}
 	KeyRangeRef r = KeyRangeRef(begin, end);
 
 	if (r.empty()) {
@@ -9408,4 +9393,22 @@ ACTOR Future<Void> waitPurgeGranulesCompleteActor(Reference<DatabaseContext> db,
 
 Future<Void> DatabaseContext::waitPurgeGranulesComplete(Key purgeKey) {
 	return waitPurgeGranulesCompleteActor(Reference<DatabaseContext>::addRef(this), purgeKey);
-}
\ No newline at end of file
+}
+
+int64_t getMaxKeySize(KeyRef const& key) {
+	return getMaxWriteKeySize(key, true);
+}
+
+int64_t getMaxReadKeySize(KeyRef const& key) {
+	return getMaxKeySize(key);
+}
+
+int64_t getMaxWriteKeySize(KeyRef const& key, bool hasRawAccess) {
+	int64_t tenantSize = hasRawAccess ? CLIENT_KNOBS->TENANT_PREFIX_SIZE_LIMIT : 0;
+	return key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
+	                                        : CLIENT_KNOBS->KEY_SIZE_LIMIT + tenantSize;
+}
+
+int64_t getMaxClearKeySize(KeyRef const& key) {
+	return getMaxKeySize(key);
+}
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 456af4c7465..988e64aaf18 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -539,5 +539,19 @@ ACTOR Future<std::vector<std::pair<UID, StorageWiggleValue>>> readStorageWiggleV
                                                                                       bool primary,
                                                                                       bool use_system_priority);
 
+// Returns the maximum legal size of a key. This size will be determined by the prefix of the passed in key
+// (system keys have a larger maximum size). This should be used for generic max key size requests.
+int64_t getMaxKeySize(KeyRef const& key);
+
+// Returns the maximum legal size of a key that can be read. Keys larger than this will be assumed not to exist.
+int64_t getMaxReadKeySize(KeyRef const& key);
+
+// Returns the maximum legal size of a key that can be written. If using raw access, writes to normal keys will
+// be allowed to be slighly larger to accommodate the prefix.
+int64_t getMaxWriteKeySize(KeyRef const& key, bool hasRawAccess);
+
+// Returns the maximum legal size of a key that can be cleared. Keys larger than this will be assumed not to exist.
+int64_t getMaxClearKeySize(KeyRef const& key);
+
 #include "flow/unactorcompiler.h"
 #endif
diff --git a/fdbclient/ReadYourWrites.actor.cpp b/fdbclient/ReadYourWrites.actor.cpp
index a16034963bf..c651adad32a 100644
--- a/fdbclient/ReadYourWrites.actor.cpp
+++ b/fdbclient/ReadYourWrites.actor.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "fdbclient/ReadYourWrites.h"
+#include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/Atomic.h"
 #include "fdbclient/DatabaseContext.h"
 #include "fdbclient/SpecialKeySpace.actor.h"
@@ -1578,10 +1579,10 @@ Future<Optional<Value>> ReadYourWritesTransaction::get(const Key& key, Snapshot
 	if (key >= getMaxReadKey() && key != metadataVersionKey)
 		return key_outside_legal_range();
 
-	// There are no keys in the database with size greater than KEY_SIZE_LIMIT
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	// There are no keys in the database with size greater than the max key size
+	if (key.size() > getMaxReadKeySize(key)) {
 		return Optional<Value>();
+	}
 
 	Future<Optional<Value>> result = RYWImpl::readWithConflictRange(this, RYWImpl::GetValueReq(key), snapshot);
 	reading.add(success(result));
@@ -1822,23 +1823,19 @@ void ReadYourWritesTransaction::addReadConflictRange(KeyRangeRef const& keys) {
 		}
 	}
 
-	// There aren't any keys in the database with size larger than KEY_SIZE_LIMIT, so if range contains large keys
+	// There aren't any keys in the database with size larger than max key size, so if range contains large keys
 	// we can translate it to an equivalent one with smaller keys
 	KeyRef begin = keys.begin;
 	KeyRef end = keys.end;
 
-	if (begin.size() >
-	    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		begin = begin.substr(
-		    0,
-		    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
-	if (end.size() >
-	    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		end = end.substr(
-		    0,
-		    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
+	int64_t beginMaxSize = getMaxReadKeySize(begin);
+	int64_t endMaxSize = getMaxReadKeySize(end);
+	if (begin.size() > beginMaxSize) {
+		begin = begin.substr(0, beginMaxSize + 1);
+	}
+	if (end.size() > endMaxSize) {
+		end = end.substr(0, endMaxSize + 1);
+	}
 
 	KeyRangeRef r = KeyRangeRef(begin, end);
 
@@ -2111,9 +2108,9 @@ void ReadYourWritesTransaction::atomicOp(const KeyRef& key, const ValueRef& oper
 	if (!isValidMutationType(operationType) || !isAtomicOp((MutationRef::Type)operationType))
 		throw invalid_mutation_type();
 
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	if (key.size() > getMaxWriteKeySize(key, getTransactionState()->options.rawAccess)) {
 		throw key_too_large();
+	}
 	if (operand.size() > CLIENT_KNOBS->VALUE_SIZE_LIMIT)
 		throw value_too_large();
 
@@ -2218,9 +2215,9 @@ void ReadYourWritesTransaction::set(const KeyRef& key, const ValueRef& value) {
 	}
 
 	// TODO: check transaction size here
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	if (key.size() > getMaxWriteKeySize(key, getTransactionState()->options.rawAccess)) {
 		throw key_too_large();
+	}
 	if (value.size() > CLIENT_KNOBS->VALUE_SIZE_LIMIT)
 		throw value_too_large();
 
@@ -2254,23 +2251,19 @@ void ReadYourWritesTransaction::clear(const KeyRangeRef& range) {
 		return tr.clear(range, addWriteConflict);
 	}
 
-	// There aren't any keys in the database with size larger than KEY_SIZE_LIMIT, so if range contains large keys
+	// There aren't any keys in the database with size larger than the max key size, so if range contains large keys
 	// we can translate it to an equivalent one with smaller keys
 	KeyRef begin = range.begin;
 	KeyRef end = range.end;
 
-	if (begin.size() >
-	    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		begin = begin.substr(
-		    0,
-		    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
-	if (end.size() >
-	    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		end = end.substr(
-		    0,
-		    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
+	int64_t beginMaxSize = getMaxClearKeySize(begin);
+	int64_t endMaxSize = getMaxClearKeySize(end);
+	if (begin.size() > beginMaxSize) {
+		begin = begin.substr(0, beginMaxSize + 1);
+	}
+	if (end.size() > endMaxSize) {
+		end = end.substr(0, endMaxSize + 1);
+	}
 
 	KeyRangeRef r = KeyRangeRef(begin, end);
 
@@ -2300,9 +2293,9 @@ void ReadYourWritesTransaction::clear(const KeyRef& key) {
 	if (key >= getMaxWriteKey())
 		throw key_outside_legal_range();
 
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	if (key.size() > getMaxClearKeySize(key)) {
 		return;
+	}
 
 	if (options.readYourWritesDisabled) {
 		return tr.clear(key, addWriteConflict);
@@ -2332,9 +2325,9 @@ Future<Void> ReadYourWritesTransaction::watch(const Key& key) {
 	if (key >= allKeys.end || (key >= getMaxReadKey() && key != metadataVersionKey && tr.apiVersionAtLeast(300)))
 		return key_outside_legal_range();
 
-	if (key.size() >
-	    (key.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+	if (key.size() > getMaxWriteKeySize(key, getTransactionState()->options.rawAccess)) {
 		return key_too_large();
+	}
 
 	return RYWImpl::watch(this, key);
 }
@@ -2350,23 +2343,19 @@ void ReadYourWritesTransaction::addWriteConflictRange(KeyRangeRef const& keys) {
 		}
 	}
 
-	// There aren't any keys in the database with size larger than KEY_SIZE_LIMIT, so if range contains large keys
+	// There aren't any keys in the database with size larger than the max key size, so if range contains large keys
 	// we can translate it to an equivalent one with smaller keys
 	KeyRef begin = keys.begin;
 	KeyRef end = keys.end;
 
-	if (begin.size() >
-	    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		begin = begin.substr(
-		    0,
-		    (begin.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
-	if (end.size() >
-	    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT))
-		end = end.substr(
-		    0,
-		    (end.startsWith(systemKeys.begin) ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-		        1);
+	int64_t beginMaxSize = getMaxKeySize(begin);
+	int64_t endMaxSize = getMaxKeySize(end);
+	if (begin.size() > beginMaxSize) {
+		begin = begin.substr(0, beginMaxSize + 1);
+	}
+	if (end.size() > endMaxSize) {
+		end = end.substr(0, endMaxSize + 1);
+	}
 
 	KeyRangeRef r = KeyRangeRef(begin, end);
 
diff --git a/fdbclient/Tenant.h b/fdbclient/Tenant.h
index 221ae451bb2..f7e69e6d440 100644
--- a/fdbclient/Tenant.h
+++ b/fdbclient/Tenant.h
@@ -48,6 +48,8 @@ struct TenantMapEntry {
 	int64_t id;
 	Key prefix;
 
+	constexpr static int ROOT_PREFIX_SIZE = sizeof(id);
+
 private:
 	void initPrefix(KeyRef subspace) {
 		ASSERT(id >= 0);
diff --git a/fdbserver/workloads/FuzzApiCorrectness.actor.cpp b/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
index 7f3e5d41e1b..bd2abff7c3f 100644
--- a/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
+++ b/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
@@ -329,9 +329,7 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
 								for (int j = i; j < end; j++) {
 									if (deterministicRandom()->random01() < self->initialKeyDensity) {
 										Key key = self->getKeyForIndex(tenantNum, j);
-										if (key.size() <= (key.startsWith(systemKeys.begin)
-										                       ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-										                       : CLIENT_KNOBS->KEY_SIZE_LIMIT)) {
+										if (key.size() <= getMaxWriteKeySize(key, false)) {
 											Value value = self->getRandomValue();
 											value = value.substr(
 											    0, std::min<int>(value.size(), CLIENT_KNOBS->VALUE_SIZE_LIMIT));
@@ -1091,24 +1089,22 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
 				pos = littleEndian32(*(int32_t*)&value.end()[-4]);
 			}
 
-			contract = {
-				std::make_pair(error_code_key_too_large,
-				               ExceptionContract::requiredIf(key.size() > (key.startsWith(systemKeys.begin)
-				                                                               ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-				                                                               : CLIENT_KNOBS->KEY_SIZE_LIMIT))),
-				std::make_pair(error_code_value_too_large,
-				               ExceptionContract::requiredIf(value.size() > CLIENT_KNOBS->VALUE_SIZE_LIMIT)),
-				std::make_pair(
-				    error_code_invalid_mutation_type,
-				    ExceptionContract::requiredIf(!isValidMutationType(op) || !isAtomicOp((MutationRef::Type)op))),
-				std::make_pair(error_code_key_outside_legal_range,
-				               ExceptionContract::requiredIf((key >= workload->getMaxKey(tr)))),
-				std::make_pair(
-				    error_code_client_invalid_operation,
-				    ExceptionContract::requiredIf(
-				        (op == MutationRef::SetVersionstampedKey && (pos < 0 || pos + 10 > key.size() - 4)) ||
-				        (op == MutationRef::SetVersionstampedValue && (pos < 0 || pos + 10 > value.size() - 4))))
-			};
+			contract = { std::make_pair(error_code_key_too_large,
+				                        key.size() > getMaxWriteKeySize(key, true)    ? ExceptionContract::Always
+				                        : key.size() > getMaxWriteKeySize(key, false) ? ExceptionContract::Possible
+				                                                                      : ExceptionContract::Never),
+				         std::make_pair(error_code_value_too_large,
+				                        ExceptionContract::requiredIf(value.size() > CLIENT_KNOBS->VALUE_SIZE_LIMIT)),
+				         std::make_pair(error_code_invalid_mutation_type,
+				                        ExceptionContract::requiredIf(!isValidMutationType(op) ||
+				                                                      !isAtomicOp((MutationRef::Type)op))),
+				         std::make_pair(error_code_key_outside_legal_range,
+				                        ExceptionContract::requiredIf((key >= workload->getMaxKey(tr)))),
+				         std::make_pair(error_code_client_invalid_operation,
+				                        ExceptionContract::requiredIf((op == MutationRef::SetVersionstampedKey &&
+				                                                       (pos < 0 || pos + 10 > key.size() - 4)) ||
+				                                                      (op == MutationRef::SetVersionstampedValue &&
+				                                                       (pos < 0 || pos + 10 > value.size() - 4)))) };
 		}
 
 		void callback(Reference<ITransaction> tr) override { tr->atomicOp(key, value, (FDBMutationTypes::Option)op); }
@@ -1131,11 +1127,10 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
 				key = makeKey();
 			}
 			value = makeValue();
-			contract = { std::make_pair(
-				             error_code_key_too_large,
-				             ExceptionContract::requiredIf(key.size() > (key.startsWith(systemKeys.begin)
-				                                                             ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-				                                                             : CLIENT_KNOBS->KEY_SIZE_LIMIT))),
+			contract = { std::make_pair(error_code_key_too_large,
+				                        key.size() > getMaxWriteKeySize(key, true)    ? ExceptionContract::Always
+				                        : key.size() > getMaxWriteKeySize(key, false) ? ExceptionContract::Possible
+				                                                                      : ExceptionContract::Never),
 				         std::make_pair(error_code_value_too_large,
 				                        ExceptionContract::requiredIf(value.size() > CLIENT_KNOBS->VALUE_SIZE_LIMIT)),
 				         std::make_pair(error_code_key_outside_legal_range,
@@ -1268,11 +1263,11 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
 		TestWatch(unsigned int id, FuzzApiCorrectnessWorkload* workload, Reference<ITransaction> tr)
 		  : BaseTest(id, workload, "TestWatch") {
 			key = makeKey();
-			contract = { std::make_pair(
-				             error_code_key_too_large,
-				             ExceptionContract::requiredIf(key.size() > (key.startsWith(systemKeys.begin)
-				                                                             ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-				                                                             : CLIENT_KNOBS->KEY_SIZE_LIMIT))),
+			printf("Watching: %d %s\n", key.size(), printable(key.substr(0, std::min(key.size(), 20))).c_str());
+			contract = { std::make_pair(error_code_key_too_large,
+				                        key.size() > getMaxWriteKeySize(key, true)    ? ExceptionContract::Always
+				                        : key.size() > getMaxWriteKeySize(key, false) ? ExceptionContract::Possible
+				                                                                      : ExceptionContract::Never),
 				         std::make_pair(error_code_watches_disabled, ExceptionContract::Possible),
 				         std::make_pair(error_code_key_outside_legal_range,
 				                        ExceptionContract::requiredIf((key >= workload->getMaxKey(tr)))),
diff --git a/fdbserver/workloads/WriteDuringRead.actor.cpp b/fdbserver/workloads/WriteDuringRead.actor.cpp
index 8516f5f3ed4..668f14552a1 100644
--- a/fdbserver/workloads/WriteDuringRead.actor.cpp
+++ b/fdbserver/workloads/WriteDuringRead.actor.cpp
@@ -642,9 +642,7 @@ struct WriteDuringReadWorkload : TestWorkload {
 						for (int j = i; j < end; j++) {
 							if (deterministicRandom()->random01() < self->initialKeyDensity) {
 								Key key = self->getKeyForIndex(j);
-								if (key.size() <= (key.startsWith(systemKeys.begin)
-								                       ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-								                       : CLIENT_KNOBS->KEY_SIZE_LIMIT)) {
+								if (key.size() <= getMaxWriteKeySize(key, false)) {
 									Value value = self->getRandomValue();
 									value =
 									    value.substr(0, std::min<int>(value.size(), CLIENT_KNOBS->VALUE_SIZE_LIMIT));
@@ -887,18 +885,10 @@ struct WriteDuringReadWorkload : TestWorkload {
 								tr.clear(range);
 								if (!noConflict) {
 									KeyRangeRef conflict(
-									    range.begin.substr(0,
-									                       std::min<int>(range.begin.size(),
-									                                     (range.begin.startsWith(systemKeys.begin)
-									                                          ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-									                                          : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-									                                         1)),
-									    range.end.substr(0,
-									                     std::min<int>(range.end.size(),
-									                                   (range.end.startsWith(systemKeys.begin)
-									                                        ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-									                                        : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-									                                       1)));
+									    range.begin.substr(
+									        0, std::min<int>(range.begin.size(), getMaxClearKeySize(range.begin) + 1)),
+									    range.end.substr(
+									        0, std::min<int>(range.end.size(), getMaxClearKeySize(range.end) + 1)));
 									self->addedConflicts.insert(conflict, true);
 								}
 								self->memoryDatabase.erase(self->memoryDatabase.lower_bound(range.begin),
@@ -911,9 +901,7 @@ struct WriteDuringReadWorkload : TestWorkload {
 								if (noConflict)
 									tr.setOption(FDBTransactionOptions::NEXT_WRITE_NO_WRITE_CONFLICT_RANGE);
 								tr.clear(key);
-								if (!noConflict && key.size() <= (key.startsWith(systemKeys.begin)
-								                                      ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-								                                      : CLIENT_KNOBS->KEY_SIZE_LIMIT)) {
+								if (!noConflict && key.size() <= getMaxClearKeySize(key)) {
 									self->addedConflicts.insert(key, true);
 								}
 								self->memoryDatabase.erase(key);
@@ -925,18 +913,9 @@ struct WriteDuringReadWorkload : TestWorkload {
 								//TraceEvent("WDRAddWriteConflict").detail("Range", range);
 								tr.addWriteConflictRange(range);
 								KeyRangeRef conflict(
-								    range.begin.substr(0,
-								                       std::min<int>(range.begin.size(),
-								                                     (range.begin.startsWith(systemKeys.begin)
-								                                          ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-								                                          : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-								                                         1)),
-								    range.end.substr(0,
-								                     std::min<int>(range.end.size(),
-								                                   (range.end.startsWith(systemKeys.begin)
-								                                        ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-								                                        : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-								                                       1)));
+								    range.begin.substr(
+								        0, std::min<int>(range.begin.size(), getMaxKeySize(range.begin) + 1)),
+								    range.end.substr(0, std::min<int>(range.end.size(), getMaxKeySize(range.end) + 1)));
 								self->addedConflicts.insert(conflict, true);
 							} else if (operationType == 8 && !disableDelay) {
 								double maxTime = 6.0;
@@ -980,18 +959,10 @@ struct WriteDuringReadWorkload : TestWorkload {
 									tr.atomicOp(versionStampKey, value, MutationRef::SetVersionstampedKey);
 									tr.clear(range);
 									KeyRangeRef conflict(
-									    range.begin.substr(0,
-									                       std::min<int>(range.begin.size(),
-									                                     (range.begin.startsWith(systemKeys.begin)
-									                                          ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-									                                          : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-									                                         1)),
-									    range.end.substr(0,
-									                     std::min<int>(range.end.size(),
-									                                   (range.end.startsWith(systemKeys.begin)
-									                                        ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-									                                        : CLIENT_KNOBS->KEY_SIZE_LIMIT) +
-									                                       1)));
+									    range.begin.substr(
+									        0, std::min<int>(range.begin.size(), getMaxClearKeySize(range.begin) + 1)),
+									    range.end.substr(
+									        0, std::min<int>(range.end.size(), getMaxClearKeySize(range.end) + 1)));
 									self->addedConflicts.insert(conflict, true);
 									self->memoryDatabase.erase(self->memoryDatabase.lower_bound(range.begin),
 									                           self->memoryDatabase.lower_bound(range.end));
@@ -1032,10 +1003,9 @@ struct WriteDuringReadWorkload : TestWorkload {
 										tr.setOption(FDBTransactionOptions::NEXT_WRITE_NO_WRITE_CONFLICT_RANGE);
 									tr.atomicOp(key, value, opType);
 									//TraceEvent("WDRAtomicOpSuccess").detail("Key", key).detail("Value", value.size());
-									if (!noConflict && key.size() <= (key.startsWith(systemKeys.begin)
-									                                      ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-									                                      : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+									if (!noConflict && key.size() <= getMaxWriteKeySize(key, false)) {
 										self->addedConflicts.insert(key, true);
+									}
 									Optional<Value> existing = self->memoryGet(&self->memoryDatabase, key);
 									self->memoryDatabase[key] =
 									    self->applyAtomicOp(existing.present() ? Optional<StringRef>(existing.get())
@@ -1052,10 +1022,9 @@ struct WriteDuringReadWorkload : TestWorkload {
 								if (noConflict)
 									tr.setOption(FDBTransactionOptions::NEXT_WRITE_NO_WRITE_CONFLICT_RANGE);
 								tr.set(key, value);
-								if (!noConflict && key.size() <= (key.startsWith(systemKeys.begin)
-								                                      ? CLIENT_KNOBS->SYSTEM_KEY_SIZE_LIMIT
-								                                      : CLIENT_KNOBS->KEY_SIZE_LIMIT))
+								if (!noConflict && key.size() <= getMaxWriteKeySize(key, false)) {
 									self->addedConflicts.insert(key, true);
+								}
 								//TraceEvent("WDRSetSuccess").detail("Key", key).detail("Value", value.size());
 								self->memoryDatabase[key] = value;
 							}

From b26e3d499f89b0a523fdab9e10adcdb5da939360 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Tue, 26 Apr 2022 19:38:26 -0700
Subject: [PATCH 388/740] Fix formatting

---
 fdbclient/GenericManagementAPI.actor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/GenericManagementAPI.actor.h b/fdbclient/GenericManagementAPI.actor.h
index 193c751e5dc..8ea27b33cf4 100644
--- a/fdbclient/GenericManagementAPI.actor.h
+++ b/fdbclient/GenericManagementAPI.actor.h
@@ -740,7 +740,7 @@ Future<Optional<TenantMapEntry>> createTenantTransaction(Transaction tr, TenantN
 		TraceEvent(SevWarnAlways, "TenantPrefixTooLarge")
 		    .detail("TenantSubspace", tenantDataPrefix.get())
 		    .detail("TenantSubspaceLength", tenantDataPrefix.get().size())
-			.detail("RootPrefixLength", TenantMapEntry::ROOT_PREFIX_SIZE)
+		    .detail("RootPrefixLength", TenantMapEntry::ROOT_PREFIX_SIZE)
 		    .detail("MaxTenantPrefixSize", CLIENT_KNOBS->TENANT_PREFIX_SIZE_LIMIT);
 
 		throw client_invalid_operation();

From f58801f26f82be92e39b5d12fdb7aa0e66c1655f Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Wed, 20 Apr 2022 18:45:20 -0500
Subject: [PATCH 389/740] Decreasing MIN_SHARD_BYTES knob

---
 fdbclient/ClientKnobs.cpp | 2 +-
 fdbclient/ServerKnobs.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ClientKnobs.cpp b/fdbclient/ClientKnobs.cpp
index 7f7f58a8bc2..7427078d5b5 100644
--- a/fdbclient/ClientKnobs.cpp
+++ b/fdbclient/ClientKnobs.cpp
@@ -71,7 +71,7 @@ void ClientKnobs::initialize(Randomize randomize) {
 	init( RESOURCE_CONSTRAINED_MAX_BACKOFF,       30.0 );
 	init( PROXY_COMMIT_OVERHEAD_BYTES,              23 ); //The size of serializing 7 tags (3 primary, 3 remote, 1 log router) + 2 for the tag length
 	init( SHARD_STAT_SMOOTH_AMOUNT,                5.0 );
-	init( INIT_MID_SHARD_BYTES,               50000000 ); if( randomize && BUGGIFY ) INIT_MID_SHARD_BYTES = 40000; else if(randomize && BUGGIFY_WITH_PROB(0.75)) INIT_MID_SHARD_BYTES = 200000; // The same value as SERVER_KNOBS->MIN_SHARD_BYTES
+	init( INIT_MID_SHARD_BYTES,               10000000 ); if( randomize && BUGGIFY ) INIT_MID_SHARD_BYTES = 40000; else if(randomize && BUGGIFY_WITH_PROB(0.75)) INIT_MID_SHARD_BYTES = 200000; // The same value as SERVER_KNOBS->MIN_SHARD_BYTES
 
 	init( TRANSACTION_SIZE_LIMIT,                  1e7 );
 	init( KEY_SIZE_LIMIT,                          1e4 );
diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 39ac24c3d27..e1ba2514d7e 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -161,7 +161,8 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( DATA_DISTRIBUTION_FAILURE_REACTION_TIME,              60.0 ); if( randomize && BUGGIFY ) DATA_DISTRIBUTION_FAILURE_REACTION_TIME = 1.0;
 	bool buggifySmallShards = randomize && BUGGIFY;
 	bool simulationMediumShards = !buggifySmallShards && isSimulated && randomize && !BUGGIFY; // prefer smaller shards in simulation
-	init( MIN_SHARD_BYTES,                                  50000000 ); if( buggifySmallShards ) MIN_SHARD_BYTES = 40000; if (simulationMediumShards) MIN_SHARD_BYTES = 200000; //FIXME: data distribution tracker (specifically StorageMetrics) relies on this number being larger than the maximum size of a key value pair
+	// FIXME: increase this even more eventually
+	init( MIN_SHARD_BYTES,                                  10000000 ); if( buggifySmallShards ) MIN_SHARD_BYTES = 40000; if (simulationMediumShards) MIN_SHARD_BYTES = 200000; //FIXME: data distribution tracker (specifically StorageMetrics) relies on this number being larger than the maximum size of a key value pair
 	init( SHARD_BYTES_RATIO,                                       4 );
 	init( SHARD_BYTES_PER_SQRT_BYTES,                             45 ); if( buggifySmallShards ) SHARD_BYTES_PER_SQRT_BYTES = 0;//Approximately 10000 bytes per shard
 	init( MAX_SHARD_BYTES,                                 500000000 );

From 79c7ced360e1ff36d1a66d1ad44aca3e4efeb91e Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 4 May 2022 21:19:52 -0700
Subject: [PATCH 390/740] Avoid creating LogPushData when
 PROXY_USE_RESOLVER_PRIVATE_MUTATIONS is off

To save CPU cost, especially for creating LogSystemConfig.
---
 fdbserver/Resolver.actor.cpp | 38 ++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/fdbserver/Resolver.actor.cpp b/fdbserver/Resolver.actor.cpp
index d24a0401b59..72ea6f5fc45 100644
--- a/fdbserver/Resolver.actor.cpp
+++ b/fdbserver/Resolver.actor.cpp
@@ -18,6 +18,8 @@
  * limitations under the License.
  */
 
+#include <memory>
+
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/Notified.h"
 #include "fdbclient/StorageServerInterface.h"
@@ -310,20 +312,22 @@ ACTOR Future<Void> resolveBatch(Reference<Resolver> self, ResolveTransactionBatc
 		auto& stateTransactions = stateTransactionsPair.second;
 		int64_t stateMutations = 0;
 		int64_t stateBytes = 0;
-		LogPushData toCommit(self->logSystem); // For accumulating private mutations
-		ResolverData resolverData(self->dbgid,
-		                          self->logSystem,
-		                          self->txnStateStore,
-		                          &self->keyInfo,
-		                          &toCommit,
-		                          self->forceRecovery,
-		                          req.version + 1,
-		                          &self->storageCache,
-		                          &self->tssMapping);
+		std::unique_ptr<LogPushData> toCommit(nullptr); // For accumulating private mutations
+		std::unique_ptr<ResolverData> resolverData(nullptr);
 		bool isLocked = false;
 		if (SERVER_KNOBS->PROXY_USE_RESOLVER_PRIVATE_MUTATIONS) {
 			auto lockedKey = self->txnStateStore->readValue(databaseLockedKey).get();
 			isLocked = lockedKey.present() && lockedKey.get().size();
+			toCommit.reset(new LogPushData(self->logSystem));
+			resolverData.reset(new ResolverData(self->dbgid,
+			                                    self->logSystem,
+			                                    self->txnStateStore,
+			                                    &self->keyInfo,
+			                                    toCommit.get(),
+			                                    self->forceRecovery,
+			                                    req.version + 1,
+			                                    &self->storageCache,
+			                                    &self->tssMapping));
 		}
 		for (int t : req.txnStateTransactions) {
 			stateMutations += req.transactions[t].mutations.size();
@@ -343,7 +347,7 @@ ACTOR Future<Void> resolveBatch(Reference<Resolver> self, ResolveTransactionBatc
 				SpanID spanContext =
 				    req.transactions[t].spanContext.present() ? req.transactions[t].spanContext.get() : SpanID();
 
-				applyMetadataMutations(spanContext, resolverData, req.transactions[t].mutations);
+				applyMetadataMutations(spanContext, *resolverData, req.transactions[t].mutations);
 			}
 			TEST(self->forceRecovery); // Resolver detects forced recovery
 		}
@@ -361,20 +365,20 @@ ACTOR Future<Void> resolveBatch(Reference<Resolver> self, ResolveTransactionBatc
 
 		// If shardChanged at or before this commit version, the proxy may have computed
 		// the wrong set of groups. Then we need to broadcast to all groups below.
-		stateTransactionsPair.first = toCommit.isShardChanged();
+		stateTransactionsPair.first = toCommit && toCommit->isShardChanged();
 		bool shardChanged = self->recentStateTransactionsInfo.applyStateTxnsToBatchReply(
-		    &reply, firstUnseenVersion, req.version, toCommit.isShardChanged());
+		    &reply, firstUnseenVersion, req.version, toCommit && toCommit->isShardChanged());
 
 		// Adds private mutation messages to the reply message.
 		if (SERVER_KNOBS->PROXY_USE_RESOLVER_PRIVATE_MUTATIONS) {
-			auto privateMutations = toCommit.getAllMessages();
+			auto privateMutations = toCommit->getAllMessages();
 			for (const auto& mutations : privateMutations) {
 				reply.privateMutations.push_back(reply.arena, mutations);
 				reply.arena.dependsOn(mutations.arena());
 			}
 			// merge mutation tags with sent client tags
-			toCommit.saveTags(reply.writtenTags);
-			reply.privateMutationCount = toCommit.getMutationCount();
+			toCommit->saveTags(reply.writtenTags);
+			reply.privateMutationCount = toCommit->getMutationCount();
 		}
 
 		//TraceEvent("ResolveBatch", self->dbgid).detail("PrevVersion", req.prevVersion).detail("Version", req.version).detail("StateTransactionVersions", self->recentStateTransactionsInfo.size()).detail("StateBytes", stateBytes).detail("FirstVersion", self->recentStateTransactionsInfo.empty() ? -1 : self->recentStateTransactionsInfo.firstVersion()).detail("StateMutationsIn", req.txnStateTransactions.size()).detail("StateMutationsOut", reply.stateMutations.size()).detail("From", proxyAddress);
@@ -418,7 +422,7 @@ ACTOR Future<Void> resolveBatch(Reference<Resolver> self, ResolveTransactionBatc
 						writtenTLogs.insert(i);
 					}
 				} else {
-					toCommit.getLocations(reply.writtenTags, writtenTLogs);
+					toCommit->getLocations(reply.writtenTags, writtenTLogs);
 				}
 				if (self->tpcvVector[0] == invalidVersion) {
 					std::fill(self->tpcvVector.begin(), self->tpcvVector.end(), req.prevVersion);

From 9cae8810506ac765259e40080c77237a52c524d8 Mon Sep 17 00:00:00 2001
From: Aaron Molitor <ammolitor@users.noreply.github.com>
Date: Thu, 5 May 2022 16:43:26 -0500
Subject: [PATCH 391/740] Update Badge URL in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e40bf6ae23e..08e3af5c587 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <img alt="FoundationDB logo" src="documentation/FDB_logo.png?raw=true" width="400">
 
-![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiZ1FhRlNwU0JXeHVpZkt0a0k0QlNJK3BEUkplTGVRYnk3azBoT1FOazBQbGlIeDgrYmRJZVhuSUI4RTd3RWJWcjVMT3ZPTzV0NXlCTWpPTGlPVlMzckJJPSIsIml2UGFyYW1ldGVyU3BlYyI6IlB0TWVCM0VYdU5PQWtMUFYiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
+![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVjVzb1RQNUZTaGxGNm9iUnk4OUZ1d09GdTMzZnVOT1YzaUU1RU1xR2o2TENRWFZjb3ZrTHJEcngrZVdnNE40bXJJVDErOGVwendIL3lFWFY3Y3oxQmdjPSIsIml2UGFyYW1ldGVyU3BlYyI6IlJUbWhnaUlJVXRORUNJTjQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=release-7.1)
 
 FoundationDB is a distributed database designed to handle large volumes of structured data across clusters of commodity servers. It organizes data as an ordered key-value store and employs ACID transactions for all operations. It is especially well-suited for read/write workloads but also has excellent performance for write-intensive workloads. Users interact with the database using API language binding.
 

From 98808e26024ad3cff363138579df33a58cc9830c Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Wed, 4 May 2022 13:37:05 -0700
Subject: [PATCH 392/740] Clean up constructMappedKey method (#7062)

* Clean up constructMappedKey method

* fix comments and bugs

* Fix search index

* Fix bug, if escaped is true after first round, it would skip the second round
---
 fdbserver/storageserver.actor.cpp | 115 +++++++++++++++---------------
 1 file changed, 59 insertions(+), 56 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 5a68c3f391e..985504ac941 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3467,6 +3467,56 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 	}
 };
 
+void unpackKeyTuple(Tuple** referenceTuple, Optional<Tuple>& keyTuple, KeyValueRef* keyValue) {
+	if (!keyTuple.present()) {
+		// May throw exception if the key is not parsable as a tuple.
+		try {
+			keyTuple = Tuple::unpack(keyValue->key);
+		} catch (Error& e) {
+			TraceEvent("KeyNotTuple").error(e).detail("Key", keyValue->key.printable());
+			throw key_not_tuple();
+		}
+	}
+	*referenceTuple = &keyTuple.get();
+}
+
+void unpackValueTuple(Tuple** referenceTuple, Optional<Tuple>& valueTuple, KeyValueRef* keyValue) {
+	if (!valueTuple.present()) {
+		// May throw exception if the value is not parsable as a tuple.
+		try {
+			valueTuple = Tuple::unpack(keyValue->value);
+		} catch (Error& e) {
+			TraceEvent("ValueNotTuple").error(e).detail("Value", keyValue->value.printable());
+			throw value_not_tuple();
+		}
+	}
+	*referenceTuple = &valueTuple.get();
+}
+
+bool unescapeLiterals(std::string& s, std::string before, std::string after) {
+	bool escaped = false;
+	size_t p = 0;
+	while (true) {
+		size_t found = s.find(before, p);
+		if (found == std::string::npos) {
+			break;
+		}
+		s.replace(found, before.length(), after);
+		p = found + after.length();
+		escaped = true;
+	}
+	return escaped;
+}
+
+bool singleKeyOrValue(const std::string& s, size_t sz) {
+	// format would be {K[??]} or {V[??]}
+	return sz > 5 && s[0] == '{' && (s[1] == 'K' || s[1] == 'V') && s[2] == '[' && s[sz - 2] == ']' && s[sz - 1] == '}';
+}
+
+bool rangeQuery(const std::string& s) {
+	return s == "{...}";
+}
+
 Key constructMappedKey(KeyValueRef* keyValue, Tuple& mappedKeyFormatTuple, bool& isRangeQuery) {
 	// Lazily parse key and/or value to tuple because they may not need to be a tuple if not used.
 	Optional<Tuple> keyTuple;
@@ -3478,78 +3528,31 @@ Key constructMappedKey(KeyValueRef* keyValue, Tuple& mappedKeyFormatTuple, bool&
 		if (type == Tuple::BYTES || type == Tuple::UTF8) {
 			std::string s = mappedKeyFormatTuple.getString(i).toString();
 			auto sz = s.size();
-
-			// Handle escape.
-			bool escaped = false;
-			size_t p = 0;
-			while (true) {
-				size_t found = s.find("{{", p);
-				if (found == std::string::npos) {
-					break;
-				}
-				s.replace(found, 2, "{");
-				p += 1;
-				escaped = true;
-			}
-			p = 0;
-			while (true) {
-				size_t found = s.find("}}", p);
-				if (found == std::string::npos) {
-					break;
-				}
-				s.replace(found, 2, "}");
-				p += 1;
-				escaped = true;
-			}
+			bool escaped = unescapeLiterals(s, "{{", "{");
+			escaped = unescapeLiterals(s, "}}", "}") || escaped;
 			if (escaped) {
-				// If the element uses escape, cope the escaped version.
 				mappedKeyTuple.append(s);
-			}
-			// {K[??]} or {V[??]}
-			else if (sz > 5 && s[0] == '{' && (s[1] == 'K' || s[1] == 'V') && s[2] == '[' && s[sz - 2] == ']' &&
-			         s[sz - 1] == '}') {
+			} else if (singleKeyOrValue(s, sz)) {
 				int idx;
+				Tuple* referenceTuple;
 				try {
 					idx = std::stoi(s.substr(3, sz - 5));
 				} catch (std::exception& e) {
 					throw mapper_bad_index();
 				}
-				Tuple* referenceTuple;
 				if (s[1] == 'K') {
-					// Use keyTuple as reference.
-					if (!keyTuple.present()) {
-						// May throw exception if the key is not parsable as a tuple.
-						try {
-							keyTuple = Tuple::unpack(keyValue->key);
-						} catch (Error& e) {
-							TraceEvent("KeyNotTuple").error(e).detail("Key", keyValue->key.printable());
-							throw key_not_tuple();
-						}
-					}
-					referenceTuple = &keyTuple.get();
+					unpackKeyTuple(&referenceTuple, keyTuple, keyValue);
 				} else if (s[1] == 'V') {
-					// Use valueTuple as reference.
-					if (!valueTuple.present()) {
-						// May throw exception if the value is not parsable as a tuple.
-						try {
-							valueTuple = Tuple::unpack(keyValue->value);
-						} catch (Error& e) {
-							TraceEvent("ValueNotTuple").error(e).detail("Value", keyValue->value.printable());
-							throw value_not_tuple();
-						}
-					}
-					referenceTuple = &valueTuple.get();
+					unpackValueTuple(&referenceTuple, valueTuple, keyValue);
 				} else {
 					ASSERT(false);
 					throw internal_error();
 				}
-
 				if (idx < 0 || idx >= referenceTuple->size()) {
 					throw mapper_bad_index();
 				}
 				mappedKeyTuple.append(referenceTuple->subTuple(idx, idx + 1));
-			} else if (s == "{...}") {
-				// Range query.
+			} else if (rangeQuery(s)) {
 				if (i != mappedKeyFormatTuple.size() - 1) {
 					// It must be the last element of the mapper tuple
 					throw mapper_bad_range_decriptor();
@@ -3558,11 +3561,11 @@ Key constructMappedKey(KeyValueRef* keyValue, Tuple& mappedKeyFormatTuple, bool&
 				isRangeQuery = true;
 				// Do not add it to the mapped key.
 			} else {
-				// If the element is a string but neither escaped nor descriptors, just copy it.
+				// If the element is a string but neither escaped nor descriptors, add to result.
 				mappedKeyTuple.append(mappedKeyFormatTuple.subTuple(i, i + 1));
 			}
 		} else {
-			// If the element not a string, just copy it.
+			// If the element not a string, add to result.
 			mappedKeyTuple.append(mappedKeyFormatTuple.subTuple(i, i + 1));
 		}
 	}

From 6e018087bd66c9574997751cc4802bf2e1acf86f Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Thu, 5 May 2022 12:52:54 -0700
Subject: [PATCH 393/740] re-use same arena when construct mapped key (#7066)

* re-use same arena when construct mapped key

ConstructMappedKey seems to be a hotspot, try eliminate unnecessary
operations by
* re-using the same Tuple
* preprocess the formatTuple to get a list of Tuples and strings

* throw  mapper_bad_range_decriptor when range query is not the last element
---
 fdbclient/Tuple.h                 |   5 +
 fdbserver/storageserver.actor.cpp | 176 +++++++++++++++++++++---------
 2 files changed, 127 insertions(+), 54 deletions(-)

diff --git a/fdbclient/Tuple.h b/fdbclient/Tuple.h
index 5c357af7123..2ff31bf9904 100644
--- a/fdbclient/Tuple.h
+++ b/fdbclient/Tuple.h
@@ -56,6 +56,11 @@ struct Tuple {
 
 	// this is number of elements, not length of data
 	size_t size() const { return offsets.size(); }
+	void reserve(size_t cap) { offsets.reserve(cap); }
+	void clear() {
+		data.clear();
+		offsets.clear();
+	}
 
 	ElementType getType(size_t index) const;
 	Standalone<StringRef> getString(size_t index) const;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 985504ac941..65cf14e4c44 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3517,12 +3517,17 @@ bool rangeQuery(const std::string& s) {
 	return s == "{...}";
 }
 
-Key constructMappedKey(KeyValueRef* keyValue, Tuple& mappedKeyFormatTuple, bool& isRangeQuery) {
-	// Lazily parse key and/or value to tuple because they may not need to be a tuple if not used.
-	Optional<Tuple> keyTuple;
-	Optional<Tuple> valueTuple;
+// create a vector of Optional<Tuple>
+// in case of a singleKeyOrValue, insert an empty Tuple to vector as placeholder
+// in case of a rangeQuery, insert Optional.empty as placeholder
+// in other cases, insert the correct Tuple to be used.
+void preprocessMappedKey(Tuple& mappedKeyFormatTuple,
+                         std::vector<Optional<Tuple>>& vt,
+                         std::vector<std::string>& strings,
+                         bool& isRangeQuery) {
+	vt.reserve(mappedKeyFormatTuple.size());
+	strings.reserve(mappedKeyFormatTuple.size());
 
-	Tuple mappedKeyTuple;
 	for (int i = 0; i < mappedKeyFormatTuple.size(); i++) {
 		Tuple::ElementType type = mappedKeyFormatTuple.getType(i);
 		if (type == Tuple::BYTES || type == Tuple::UTF8) {
@@ -3530,43 +3535,71 @@ Key constructMappedKey(KeyValueRef* keyValue, Tuple& mappedKeyFormatTuple, bool&
 			auto sz = s.size();
 			bool escaped = unescapeLiterals(s, "{{", "{");
 			escaped = unescapeLiterals(s, "}}", "}") || escaped;
+			strings.push_back(s);
 			if (escaped) {
-				mappedKeyTuple.append(s);
+				Tuple escapedTuple;
+				escapedTuple.append(s);
+				vt.push_back(Optional<Tuple>(escapedTuple));
 			} else if (singleKeyOrValue(s, sz)) {
-				int idx;
-				Tuple* referenceTuple;
-				try {
-					idx = std::stoi(s.substr(3, sz - 5));
-				} catch (std::exception& e) {
-					throw mapper_bad_index();
-				}
-				if (s[1] == 'K') {
-					unpackKeyTuple(&referenceTuple, keyTuple, keyValue);
-				} else if (s[1] == 'V') {
-					unpackValueTuple(&referenceTuple, valueTuple, keyValue);
-				} else {
-					ASSERT(false);
-					throw internal_error();
-				}
-				if (idx < 0 || idx >= referenceTuple->size()) {
-					throw mapper_bad_index();
-				}
-				mappedKeyTuple.append(referenceTuple->subTuple(idx, idx + 1));
+				// when it is SingleKeyOrValue, insert an empty Tuple to vector as placeholder
+				vt.push_back(Optional<Tuple>(Tuple()));
 			} else if (rangeQuery(s)) {
 				if (i != mappedKeyFormatTuple.size() - 1) {
 					// It must be the last element of the mapper tuple
 					throw mapper_bad_range_decriptor();
 				}
-				// Every record will try to set it. It's ugly, but not wrong.
+				// when it is rangeQuery, insert Optional.empty as placeholder
+				vt.push_back(Optional<Tuple>());
 				isRangeQuery = true;
-				// Do not add it to the mapped key.
 			} else {
-				// If the element is a string but neither escaped nor descriptors, add to result.
-				mappedKeyTuple.append(mappedKeyFormatTuple.subTuple(i, i + 1));
+				vt.push_back(Optional<Tuple>(mappedKeyFormatTuple.subTuple(i, i + 1)));
 			}
 		} else {
-			// If the element not a string, add to result.
-			mappedKeyTuple.append(mappedKeyFormatTuple.subTuple(i, i + 1));
+			vt.push_back(Optional<Tuple>(mappedKeyFormatTuple.subTuple(i, i + 1)));
+		}
+	}
+}
+
+Key constructMappedKey(KeyValueRef* keyValue,
+                       std::vector<Optional<Tuple>>& vec,
+                       Tuple& mappedKeyTuple,
+                       std::vector<std::string>& strings) {
+	// Lazily parse key and/or value to tuple because they may not need to be a tuple if not used.
+	Optional<Tuple> keyTuple;
+	Optional<Tuple> valueTuple;
+	mappedKeyTuple.clear();
+	mappedKeyTuple.reserve(vec.size());
+
+	for (int i = 0; i < vec.size(); i++) {
+		if (!vec[i].present()) {
+			// rangeQuery
+			continue;
+		}
+		if (vec[i].get().size()) {
+			mappedKeyTuple.append(vec[i].get());
+		} else {
+			// singleKeyOrValue is true
+			std::string s = strings[i];
+			auto sz = s.size();
+			int idx;
+			Tuple* referenceTuple;
+			try {
+				idx = std::stoi(s.substr(3, sz - 5));
+			} catch (std::exception& e) {
+				throw mapper_bad_index();
+			}
+			if (s[1] == 'K') {
+				unpackKeyTuple(&referenceTuple, keyTuple, keyValue);
+			} else if (s[1] == 'V') {
+				unpackValueTuple(&referenceTuple, valueTuple, keyValue);
+			} else {
+				ASSERT(false);
+				throw internal_error();
+			}
+			if (idx < 0 || idx >= referenceTuple->size()) {
+				throw mapper_bad_index();
+			}
+			mappedKeyTuple.append(referenceTuple->subTuple(idx, idx + 1));
 		}
 	}
 
@@ -3578,15 +3611,20 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 	Value value = Tuple().append("value-0"_sr).append("value-1"_sr).append("value-2"_sr).getDataAsStandalone();
 	state KeyValueRef kvr(key, value);
 	{
-		Tuple mapperTuple = Tuple()
-		                        .append("normal"_sr)
-		                        .append("{{escaped}}"_sr)
-		                        .append("{K[2]}"_sr)
-		                        .append("{V[0]}"_sr)
-		                        .append("{...}"_sr);
-
+		Tuple mappedKeyFormatTuple = Tuple()
+		                                 .append("normal"_sr)
+		                                 .append("{{escaped}}"_sr)
+		                                 .append("{K[2]}"_sr)
+		                                 .append("{V[0]}"_sr)
+		                                 .append("{...}"_sr);
+
+		Tuple mappedKeyTuple;
+		std::vector<Optional<Tuple>> vt;
+		std::vector<std::string> strings;
 		bool isRangeQuery = false;
-		Key mappedKey = constructMappedKey(&kvr, mapperTuple, isRangeQuery);
+		preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
 
 		Key expectedMappedKey = Tuple()
 		                            .append("normal"_sr)
@@ -3598,11 +3636,16 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		ASSERT(mappedKey.compare(expectedMappedKey) == 0);
 		ASSERT(isRangeQuery == true);
 	}
+
 	{
-		Tuple mapperTuple = Tuple().append("{{{{}}"_sr).append("}}"_sr);
+		Tuple mappedKeyFormatTuple = Tuple().append("{{{{}}"_sr).append("}}"_sr);
 
+		Tuple mappedKeyTuple;
+		std::vector<Optional<Tuple>> vt;
+		std::vector<std::string> strings;
 		bool isRangeQuery = false;
-		Key mappedKey = constructMappedKey(&kvr, mapperTuple, isRangeQuery);
+		preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
 
 		Key expectedMappedKey = Tuple().append("{{}"_sr).append("}"_sr).getDataAsStandalone();
 		//		std::cout << printable(mappedKey) << " == " << printable(expectedMappedKey) << std::endl;
@@ -3610,10 +3653,14 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		ASSERT(isRangeQuery == false);
 	}
 	{
-		Tuple mapperTuple = Tuple().append("{{{{}}"_sr).append("}}"_sr);
+		Tuple mappedKeyFormatTuple = Tuple().append("{{{{}}"_sr).append("}}"_sr);
 
+		Tuple mappedKeyTuple;
+		std::vector<Optional<Tuple>> vt;
+		std::vector<std::string> strings;
 		bool isRangeQuery = false;
-		Key mappedKey = constructMappedKey(&kvr, mapperTuple, isRangeQuery);
+		preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
 
 		Key expectedMappedKey = Tuple().append("{{}"_sr).append("}"_sr).getDataAsStandalone();
 		//		std::cout << printable(mappedKey) << " == " << printable(expectedMappedKey) << std::endl;
@@ -3621,11 +3668,16 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		ASSERT(isRangeQuery == false);
 	}
 	{
-		Tuple mapperTuple = Tuple().append("{K[100]}"_sr);
-		bool isRangeQuery = false;
+		Tuple mappedKeyFormatTuple = Tuple().append("{K[100]}"_sr);
 		state bool throwException = false;
 		try {
-			Key mappedKey = constructMappedKey(&kvr, mapperTuple, isRangeQuery);
+			Tuple mappedKeyTuple;
+			std::vector<Optional<Tuple>> vt;
+			std::vector<std::string> strings;
+			bool isRangeQuery = false;
+			preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_index);
 			throwException = true;
@@ -3633,11 +3685,16 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		ASSERT(throwException);
 	}
 	{
-		Tuple mapperTuple = Tuple().append("{...}"_sr).append("last-element"_sr);
-		bool isRangeQuery = false;
+		Tuple mappedKeyFormatTuple = Tuple().append("{...}"_sr).append("last-element"_sr);
 		state bool throwException2 = false;
 		try {
-			Key mappedKey = constructMappedKey(&kvr, mapperTuple, isRangeQuery);
+			Tuple mappedKeyTuple;
+			std::vector<Optional<Tuple>> vt;
+			std::vector<std::string> strings;
+			bool isRangeQuery = false;
+			preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_range_decriptor);
 			throwException2 = true;
@@ -3645,11 +3702,16 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		ASSERT(throwException2);
 	}
 	{
-		Tuple mapperTuple = Tuple().append("{K[not-a-number]}"_sr);
-		bool isRangeQuery = false;
+		Tuple mappedKeyFormatTuple = Tuple().append("{K[not-a-number]}"_sr);
 		state bool throwException3 = false;
 		try {
-			Key mappedKey = constructMappedKey(&kvr, mapperTuple, isRangeQuery);
+			Tuple mappedKeyTuple;
+			std::vector<Optional<Tuple>> vt;
+			std::vector<std::string> strings;
+			bool isRangeQuery = false;
+			preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_index);
 			throwException3 = true;
@@ -3674,6 +3736,8 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	result.data.reserve(result.arena, input.data.size());
 
 	state Tuple mappedKeyFormatTuple;
+	state Tuple mappedKeyTuple;
+
 	try {
 		mappedKeyFormatTuple = Tuple::unpack(mapper);
 	} catch (Error& e) {
@@ -3681,13 +3745,17 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 		throw mapper_not_tuple();
 	}
 	state KeyValueRef* it = input.data.begin();
+	state std::vector<Optional<Tuple>> vt;
+	state std::vector<std::string> strings;
+	state bool isRangeQuery = false;
+	preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+
 	for (; it != input.data.end(); it++) {
 		state MappedKeyValueRef kvm;
 		kvm.key = it->key;
 		kvm.value = it->value;
 
-		state bool isRangeQuery = false;
-		state Key mappedKey = constructMappedKey(it, mappedKeyFormatTuple, isRangeQuery);
+		state Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, strings);
 		// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
 		result.arena.dependsOn(mappedKey.arena());
 

From 0d606175f3d4772bc0ee3f3babe03c1ab5bd70e3 Mon Sep 17 00:00:00 2001
From: hao fu <hfu5@apple.com>
Date: Thu, 5 May 2022 20:42:32 -0700
Subject: [PATCH 394/740] Eliminate vector string during mapped key processing

There was OOM if we pre-process all the strings.
---
 fdbserver/storageserver.actor.cpp | 46 ++++++++++++-------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 65cf14e4c44..9b23ecab3cb 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3521,12 +3521,8 @@ bool rangeQuery(const std::string& s) {
 // in case of a singleKeyOrValue, insert an empty Tuple to vector as placeholder
 // in case of a rangeQuery, insert Optional.empty as placeholder
 // in other cases, insert the correct Tuple to be used.
-void preprocessMappedKey(Tuple& mappedKeyFormatTuple,
-                         std::vector<Optional<Tuple>>& vt,
-                         std::vector<std::string>& strings,
-                         bool& isRangeQuery) {
+void preprocessMappedKey(Tuple& mappedKeyFormatTuple, std::vector<Optional<Tuple>>& vt, bool& isRangeQuery) {
 	vt.reserve(mappedKeyFormatTuple.size());
-	strings.reserve(mappedKeyFormatTuple.size());
 
 	for (int i = 0; i < mappedKeyFormatTuple.size(); i++) {
 		Tuple::ElementType type = mappedKeyFormatTuple.getType(i);
@@ -3535,7 +3531,6 @@ void preprocessMappedKey(Tuple& mappedKeyFormatTuple,
 			auto sz = s.size();
 			bool escaped = unescapeLiterals(s, "{{", "{");
 			escaped = unescapeLiterals(s, "}}", "}") || escaped;
-			strings.push_back(s);
 			if (escaped) {
 				Tuple escapedTuple;
 				escapedTuple.append(s);
@@ -3563,7 +3558,7 @@ void preprocessMappedKey(Tuple& mappedKeyFormatTuple,
 Key constructMappedKey(KeyValueRef* keyValue,
                        std::vector<Optional<Tuple>>& vec,
                        Tuple& mappedKeyTuple,
-                       std::vector<std::string>& strings) {
+                       Tuple& mappedKeyFormatTuple) {
 	// Lazily parse key and/or value to tuple because they may not need to be a tuple if not used.
 	Optional<Tuple> keyTuple;
 	Optional<Tuple> valueTuple;
@@ -3579,7 +3574,7 @@ Key constructMappedKey(KeyValueRef* keyValue,
 			mappedKeyTuple.append(vec[i].get());
 		} else {
 			// singleKeyOrValue is true
-			std::string s = strings[i];
+			std::string s = mappedKeyFormatTuple.getString(i).toString();
 			auto sz = s.size();
 			int idx;
 			Tuple* referenceTuple;
@@ -3620,11 +3615,10 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 
 		Tuple mappedKeyTuple;
 		std::vector<Optional<Tuple>> vt;
-		std::vector<std::string> strings;
 		bool isRangeQuery = false;
-		preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+		preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
 
 		Key expectedMappedKey = Tuple()
 		                            .append("normal"_sr)
@@ -3642,10 +3636,9 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 
 		Tuple mappedKeyTuple;
 		std::vector<Optional<Tuple>> vt;
-		std::vector<std::string> strings;
 		bool isRangeQuery = false;
-		preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
-		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
+		preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
 
 		Key expectedMappedKey = Tuple().append("{{}"_sr).append("}"_sr).getDataAsStandalone();
 		//		std::cout << printable(mappedKey) << " == " << printable(expectedMappedKey) << std::endl;
@@ -3657,10 +3650,9 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 
 		Tuple mappedKeyTuple;
 		std::vector<Optional<Tuple>> vt;
-		std::vector<std::string> strings;
 		bool isRangeQuery = false;
-		preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
-		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
+		preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
 
 		Key expectedMappedKey = Tuple().append("{{}"_sr).append("}"_sr).getDataAsStandalone();
 		//		std::cout << printable(mappedKey) << " == " << printable(expectedMappedKey) << std::endl;
@@ -3673,11 +3665,10 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		try {
 			Tuple mappedKeyTuple;
 			std::vector<Optional<Tuple>> vt;
-			std::vector<std::string> strings;
 			bool isRangeQuery = false;
-			preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+			preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_index);
 			throwException = true;
@@ -3690,11 +3681,10 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		try {
 			Tuple mappedKeyTuple;
 			std::vector<Optional<Tuple>> vt;
-			std::vector<std::string> strings;
 			bool isRangeQuery = false;
-			preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+			preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_range_decriptor);
 			throwException2 = true;
@@ -3707,11 +3697,10 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		try {
 			Tuple mappedKeyTuple;
 			std::vector<Optional<Tuple>> vt;
-			std::vector<std::string> strings;
 			bool isRangeQuery = false;
-			preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+			preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, strings);
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_index);
 			throwException3 = true;
@@ -3746,16 +3735,15 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	}
 	state KeyValueRef* it = input.data.begin();
 	state std::vector<Optional<Tuple>> vt;
-	state std::vector<std::string> strings;
 	state bool isRangeQuery = false;
-	preprocessMappedKey(mappedKeyFormatTuple, vt, strings, isRangeQuery);
+	preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
 	for (; it != input.data.end(); it++) {
 		state MappedKeyValueRef kvm;
 		kvm.key = it->key;
 		kvm.value = it->value;
 
-		state Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, strings);
+		state Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
 		// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
 		result.arena.dependsOn(mappedKey.arena());
 

From ed7d323698d0f2e528e2d1ca15bb99c6e2b0a1c7 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 5 May 2022 09:52:20 -0700
Subject: [PATCH 395/740] Optimize LogPushData to avoid constructing
 LogSystemConfig

Which seems to be a CPU hot spot in our testing.
---
 fdbserver/CommitProxyServer.actor.cpp | 16 ++++++----------
 fdbserver/LogSystem.cpp               |  9 +++++++++
 fdbserver/LogSystem.h                 | 15 +++------------
 fdbserver/ProxyCommitData.actor.h     |  1 +
 fdbserver/Resolver.actor.cpp          |  4 +++-
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 8272cb3c075..0c372cfdb79 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -621,16 +621,11 @@ std::set<Tag> CommitBatchContext::getWrittenTagsPreResolution() {
 CommitBatchContext::CommitBatchContext(ProxyCommitData* const pProxyCommitData_,
                                        const std::vector<CommitTransactionRequest>* trs_,
                                        const int currentBatchMemBytesCount)
-  :
-
-    pProxyCommitData(pProxyCommitData_), trs(std::move(*const_cast<std::vector<CommitTransactionRequest>*>(trs_))),
-    currentBatchMemBytesCount(currentBatchMemBytesCount),
-
-    startTime(g_network->now()),
-
-    localBatchNumber(++pProxyCommitData->localCommitBatchesStarted), toCommit(pProxyCommitData->logSystem),
-
-    span("MP:commitBatch"_loc), committed(trs.size()) {
+  : pProxyCommitData(pProxyCommitData_), trs(std::move(*const_cast<std::vector<CommitTransactionRequest>*>(trs_))),
+    currentBatchMemBytesCount(currentBatchMemBytesCount), startTime(g_network->now()),
+    localBatchNumber(++pProxyCommitData->localCommitBatchesStarted),
+    toCommit(pProxyCommitData->logSystem, pProxyCommitData->localTLogs), span("MP:commitBatch"_loc),
+    committed(trs.size()) {
 
 	evaluateBatchSize();
 
@@ -2332,6 +2327,7 @@ ACTOR Future<Void> commitProxyServerCore(CommitProxyInterface proxy,
 	//TraceEvent("ProxyInit3", proxy.id());
 
 	commitData.resolvers = commitData.db->get().resolvers;
+	commitData.localTLogs = commitData.db->get().logSystemConfig.numLogs();
 	ASSERT(commitData.resolvers.size() != 0);
 	for (int i = 0; i < commitData.resolvers.size(); ++i) {
 		commitData.stats.resolverDist.push_back(
diff --git a/fdbserver/LogSystem.cpp b/fdbserver/LogSystem.cpp
index 1e1189facbd..b5b1419bf1c 100644
--- a/fdbserver/LogSystem.cpp
+++ b/fdbserver/LogSystem.cpp
@@ -269,6 +269,15 @@ void LogSet::getPushLocations(VectorRef<Tag> tags, std::vector<int>& locations,
 	//	.detail("Included", alsoServers.size()).detail("Duration", timer() - t);
 }
 
+LogPushData::LogPushData(Reference<ILogSystem> logSystem, int tlogCount) : logSystem(logSystem), subsequence(1) {
+	ASSERT(tlogCount > 0);
+	messagesWriter.reserve(tlogCount);
+	for (int i = 0; i < tlogCount; i++) {
+		messagesWriter.emplace_back(AssumeVersion(g_network->protocolVersion()));
+	}
+	messagesWritten = std::vector<bool>(tlogCount, false);
+}
+
 void LogPushData::addTxsTag() {
 	if (logSystem->getTLogVersion() >= TLogVersion::V4) {
 		next_message_tags.push_back(logSystem->getRandomTxsTag());
diff --git a/fdbserver/LogSystem.h b/fdbserver/LogSystem.h
index e8453184e44..a8c7a6397dc 100644
--- a/fdbserver/LogSystem.h
+++ b/fdbserver/LogSystem.h
@@ -651,14 +651,14 @@ struct ILogSystem {
 	// Returns an ILogSystem representing a new epoch immediately following this one.  The new epoch is only provisional
 	// until the caller updates the coordinated DBCoreState
 
-	virtual LogSystemConfig getLogSystemConfig() const = 0;
 	// Returns the physical configuration of this LogSystem, that could be used to construct an equivalent LogSystem
 	// using fromLogSystemConfig()
+	virtual LogSystemConfig getLogSystemConfig() const = 0;
 
 	virtual Standalone<StringRef> getLogsValue() const = 0;
 
-	virtual Future<Void> onLogSystemConfigChange() = 0;
 	// Returns when the log system configuration has changed due to a tlog rejoin.
+	virtual Future<Void> onLogSystemConfigChange() = 0;
 
 	virtual void getPushLocations(VectorRef<Tag> tags,
 	                              std::vector<int>& locations,
@@ -740,16 +740,7 @@ struct LogPushData : NonCopyable {
 	// Log subsequences have to start at 1 (the MergedPeekCursor relies on this to make sure we never have !hasMessage()
 	// in the middle of data for a version
 
-	explicit LogPushData(Reference<ILogSystem> logSystem) : logSystem(logSystem), subsequence(1) {
-		for (auto& log : logSystem->getLogSystemConfig().tLogs) {
-			if (log.isLocal) {
-				for (int i = 0; i < log.tLogs.size(); i++) {
-					messagesWriter.push_back(BinaryWriter(AssumeVersion(g_network->protocolVersion())));
-				}
-			}
-		}
-		messagesWritten = std::vector<bool>(messagesWriter.size(), false);
-	}
+	explicit LogPushData(Reference<ILogSystem> logSystem, int tlogCount);
 
 	void addTxsTag();
 
diff --git a/fdbserver/ProxyCommitData.actor.h b/fdbserver/ProxyCommitData.actor.h
index 309df78bfe8..71bde56a951 100644
--- a/fdbserver/ProxyCommitData.actor.h
+++ b/fdbserver/ProxyCommitData.actor.h
@@ -225,6 +225,7 @@ struct ProxyCommitData {
 	double lastResolverReset;
 
 	std::map<TenantName, TenantMapEntry> tenantMap;
+	int localTLogs = -1;
 
 	// The tag related to a storage server rarely change, so we keep a vector of tags for each key range to be slightly
 	// more CPU efficient. When a tag related to a storage server does change, we empty out all of these vectors to
diff --git a/fdbserver/Resolver.actor.cpp b/fdbserver/Resolver.actor.cpp
index 72ea6f5fc45..044287c9ef2 100644
--- a/fdbserver/Resolver.actor.cpp
+++ b/fdbserver/Resolver.actor.cpp
@@ -138,6 +138,7 @@ struct Resolver : ReferenceCounted<Resolver> {
 	LogSystemDiskQueueAdapter* logAdapter = nullptr;
 	Reference<ILogSystem> logSystem;
 	IKeyValueStore* txnStateStore = nullptr;
+	int localTLogs = -1;
 
 	std::map<UID, Reference<StorageInfo>> storageCache;
 	KeyRangeMap<ServerCacheInfo> keyInfo; // keyrange -> all storage servers in all DCs for the keyrange
@@ -318,7 +319,7 @@ ACTOR Future<Void> resolveBatch(Reference<Resolver> self, ResolveTransactionBatc
 		if (SERVER_KNOBS->PROXY_USE_RESOLVER_PRIVATE_MUTATIONS) {
 			auto lockedKey = self->txnStateStore->readValue(databaseLockedKey).get();
 			isLocked = lockedKey.present() && lockedKey.get().size();
-			toCommit.reset(new LogPushData(self->logSystem));
+			toCommit.reset(new LogPushData(self->logSystem, self->localTLogs));
 			resolverData.reset(new ResolverData(self->dbgid,
 			                                    self->logSystem,
 			                                    self->txnStateStore,
@@ -647,6 +648,7 @@ ACTOR Future<Void> resolverCore(ResolverInterface resolver,
 
 	// Initialize txnStateStore
 	self->logSystem = ILogSystem::fromServerDBInfo(resolver.id(), db->get(), false, addActor);
+	self->localTLogs = db->get().logSystemConfig.numLogs();
 	state PromiseStream<Future<Void>> addActor;
 	state Future<Void> onError =
 	    transformError(actorCollection(addActor.getFuture()), broken_promise(), resolver_failed());

From 467d79f42f22e218b19dace1149a17d222408ee0 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 6 May 2022 11:19:37 -0700
Subject: [PATCH 396/740] Rename variable names

---
 fdbserver/CommitProxyServer.actor.cpp | 4 ++--
 fdbserver/ProxyCommitData.actor.h     | 2 +-
 fdbserver/Resolver.actor.cpp          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 0c372cfdb79..ef28a3b0b6d 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -624,7 +624,7 @@ CommitBatchContext::CommitBatchContext(ProxyCommitData* const pProxyCommitData_,
   : pProxyCommitData(pProxyCommitData_), trs(std::move(*const_cast<std::vector<CommitTransactionRequest>*>(trs_))),
     currentBatchMemBytesCount(currentBatchMemBytesCount), startTime(g_network->now()),
     localBatchNumber(++pProxyCommitData->localCommitBatchesStarted),
-    toCommit(pProxyCommitData->logSystem, pProxyCommitData->localTLogs), span("MP:commitBatch"_loc),
+    toCommit(pProxyCommitData->logSystem, pProxyCommitData->localTLogCount), span("MP:commitBatch"_loc),
     committed(trs.size()) {
 
 	evaluateBatchSize();
@@ -2327,7 +2327,7 @@ ACTOR Future<Void> commitProxyServerCore(CommitProxyInterface proxy,
 	//TraceEvent("ProxyInit3", proxy.id());
 
 	commitData.resolvers = commitData.db->get().resolvers;
-	commitData.localTLogs = commitData.db->get().logSystemConfig.numLogs();
+	commitData.localTLogCount = commitData.db->get().logSystemConfig.numLogs();
 	ASSERT(commitData.resolvers.size() != 0);
 	for (int i = 0; i < commitData.resolvers.size(); ++i) {
 		commitData.stats.resolverDist.push_back(
diff --git a/fdbserver/ProxyCommitData.actor.h b/fdbserver/ProxyCommitData.actor.h
index 71bde56a951..f198e7c5895 100644
--- a/fdbserver/ProxyCommitData.actor.h
+++ b/fdbserver/ProxyCommitData.actor.h
@@ -225,7 +225,7 @@ struct ProxyCommitData {
 	double lastResolverReset;
 
 	std::map<TenantName, TenantMapEntry> tenantMap;
-	int localTLogs = -1;
+	int localTLogCount = -1;
 
 	// The tag related to a storage server rarely change, so we keep a vector of tags for each key range to be slightly
 	// more CPU efficient. When a tag related to a storage server does change, we empty out all of these vectors to
diff --git a/fdbserver/Resolver.actor.cpp b/fdbserver/Resolver.actor.cpp
index 044287c9ef2..87a4e5244c6 100644
--- a/fdbserver/Resolver.actor.cpp
+++ b/fdbserver/Resolver.actor.cpp
@@ -138,7 +138,7 @@ struct Resolver : ReferenceCounted<Resolver> {
 	LogSystemDiskQueueAdapter* logAdapter = nullptr;
 	Reference<ILogSystem> logSystem;
 	IKeyValueStore* txnStateStore = nullptr;
-	int localTLogs = -1;
+	int localTLogCount = -1;
 
 	std::map<UID, Reference<StorageInfo>> storageCache;
 	KeyRangeMap<ServerCacheInfo> keyInfo; // keyrange -> all storage servers in all DCs for the keyrange
@@ -319,7 +319,7 @@ ACTOR Future<Void> resolveBatch(Reference<Resolver> self, ResolveTransactionBatc
 		if (SERVER_KNOBS->PROXY_USE_RESOLVER_PRIVATE_MUTATIONS) {
 			auto lockedKey = self->txnStateStore->readValue(databaseLockedKey).get();
 			isLocked = lockedKey.present() && lockedKey.get().size();
-			toCommit.reset(new LogPushData(self->logSystem, self->localTLogs));
+			toCommit.reset(new LogPushData(self->logSystem, self->localTLogCount));
 			resolverData.reset(new ResolverData(self->dbgid,
 			                                    self->logSystem,
 			                                    self->txnStateStore,
@@ -648,7 +648,7 @@ ACTOR Future<Void> resolverCore(ResolverInterface resolver,
 
 	// Initialize txnStateStore
 	self->logSystem = ILogSystem::fromServerDBInfo(resolver.id(), db->get(), false, addActor);
-	self->localTLogs = db->get().logSystemConfig.numLogs();
+	self->localTLogCount = db->get().logSystemConfig.numLogs();
 	state PromiseStream<Future<Void>> addActor;
 	state Future<Void> onError =
 	    transformError(actorCollection(addActor.getFuture()), broken_promise(), resolver_failed());

From 16bfa7929774dc820b4b25c7c8af2c211668a8fe Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Fri, 6 May 2022 12:24:25 -0700
Subject: [PATCH 397/740] Fix compatibility issue.

New added field should be the last in serializer.
---
 fdbclient/CoordinationInterface.h | 4 ++--
 fdbserver/CoordinationInterface.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbclient/CoordinationInterface.h b/fdbclient/CoordinationInterface.h
index 38c654b3e66..4bfb4f75120 100644
--- a/fdbclient/CoordinationInterface.h
+++ b/fdbclient/CoordinationInterface.h
@@ -251,9 +251,9 @@ struct OpenDatabaseCoordRequest {
 		           traceLogGroup,
 		           knownClientInfoID,
 		           clusterKey,
-		           hostnames,
 		           coordinators,
-		           reply);
+		           reply,
+		           hostnames);
 	}
 };
 
diff --git a/fdbserver/CoordinationInterface.h b/fdbserver/CoordinationInterface.h
index 2c8c037afa5..0589f5cde2b 100644
--- a/fdbserver/CoordinationInterface.h
+++ b/fdbserver/CoordinationInterface.h
@@ -167,7 +167,7 @@ struct ElectionResultRequest {
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, key, hostnames, coordinators, knownLeader, reply);
+		serializer(ar, key, coordinators, knownLeader, reply, hostnames);
 	}
 };
 

From f4ccb3d70195325ffea3ef643af99835b7466a71 Mon Sep 17 00:00:00 2001
From: Vishesh Yadav <vishesh_yadav@apple.com>
Date: Tue, 3 May 2022 17:14:38 -0700
Subject: [PATCH 398/740] Create GlobalConfig object for each database instance

Currently, GlobalConfig is a singleton that means for each process there is only
one GlobalConfig object. This is bug from clients perspective as a client can
keep connections to several databases. This patch tracks GlobalConfig for each
database using an unordered_map in flowGlobals.

We discovered this bug while testing multi-version client, where the client got
stuck. This was lucky, as normally it'd just write down config to the wrong
database.
---
 fdbcli/ProfileCommand.actor.cpp     | 11 +++++++----
 fdbcli/fdbcli.actor.cpp             |  4 ++--
 fdbcli/fdbcli.actor.h               |  5 ++++-
 fdbclient/GlobalConfig.actor.cpp    | 14 ++++++++++----
 fdbclient/GlobalConfig.actor.h      | 22 +++++++++++++++++----
 fdbclient/NativeAPI.actor.cpp       | 30 +++++++++++++++--------------
 fdbclient/NativeAPI.actor.h         |  1 +
 fdbclient/SpecialKeySpace.actor.cpp |  4 ++--
 fdbclient/SpecialKeySpace.actor.h   |  6 +++++-
 fdbserver/worker.actor.cpp          | 12 ++++++------
 10 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/fdbcli/ProfileCommand.actor.cpp b/fdbcli/ProfileCommand.actor.cpp
index 43d3d7a966f..3c5710e53f8 100644
--- a/fdbcli/ProfileCommand.actor.cpp
+++ b/fdbcli/ProfileCommand.actor.cpp
@@ -35,7 +35,10 @@
 
 namespace fdb_cli {
 
-ACTOR Future<bool> profileCommandActor(Reference<ITransaction> tr, std::vector<StringRef> tokens, bool intrans) {
+ACTOR Future<bool> profileCommandActor(Database db,
+                                       Reference<ITransaction> tr,
+                                       std::vector<StringRef> tokens,
+                                       bool intrans) {
 	state bool result = true;
 	if (tokens.size() == 1) {
 		printUsage(tokens[0]);
@@ -45,7 +48,7 @@ ACTOR Future<bool> profileCommandActor(Reference<ITransaction> tr, std::vector<S
 			fprintf(stderr, "ERROR: Usage: profile client <get|set>\n");
 			return false;
 		}
-		wait(GlobalConfig::globalConfig().onInitialized());
+		wait(GlobalConfig::globalConfig(db).onInitialized());
 		if (tokencmp(tokens[2], "get")) {
 			if (tokens.size() != 3) {
 				fprintf(stderr, "ERROR: Addtional arguments to `get` are not supported.\n");
@@ -53,12 +56,12 @@ ACTOR Future<bool> profileCommandActor(Reference<ITransaction> tr, std::vector<S
 			}
 			std::string sampleRateStr = "default";
 			std::string sizeLimitStr = "default";
-			const double sampleRateDbl = GlobalConfig::globalConfig().get<double>(
+			const double sampleRateDbl = GlobalConfig::globalConfig(db).get<double>(
 			    fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
 			if (!std::isinf(sampleRateDbl)) {
 				sampleRateStr = std::to_string(sampleRateDbl);
 			}
-			const int64_t sizeLimit = GlobalConfig::globalConfig().get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
+			const int64_t sizeLimit = GlobalConfig::globalConfig(db).get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
 			if (sizeLimit != -1) {
 				sizeLimitStr = boost::lexical_cast<std::string>(sizeLimit);
 			}
diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 66f695b386c..00369a7b5df 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -856,7 +856,7 @@ void fdbcliCompCmd(std::string const& text, std::vector<std::string>& lc) {
 	int count = tokens.size();
 
 	// for(int i = 0; i < count; i++) {
-	// 	printf("Token (%d): `%s'\n", i, tokens[i].toString().c_str());
+	//	printf("Token (%d): `%s'\n", i, tokens[i].toString().c_str());
 	// }
 
 	std::string ntext = "";
@@ -1698,7 +1698,7 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 
 				if (tokencmp(tokens[0], "profile")) {
 					getTransaction(db, managementTenant, tr, options, intrans);
-					bool _result = wait(makeInterruptable(profileCommandActor(tr, tokens, intrans)));
+					bool _result = wait(makeInterruptable(profileCommandActor(localDb, tr, tokens, intrans)));
 					if (!_result)
 						is_error = true;
 					continue;
diff --git a/fdbcli/fdbcli.actor.h b/fdbcli/fdbcli.actor.h
index 71fe2d4e4a0..c0a180af012 100644
--- a/fdbcli/fdbcli.actor.h
+++ b/fdbcli/fdbcli.actor.h
@@ -189,7 +189,10 @@ ACTOR Future<bool> clearHealthyZone(Reference<IDatabase> db,
                                     bool clearSSFailureZoneString = false);
 ACTOR Future<bool> maintenanceCommandActor(Reference<IDatabase> db, std::vector<StringRef> tokens);
 // profile command
-ACTOR Future<bool> profileCommandActor(Reference<ITransaction> tr, std::vector<StringRef> tokens, bool intrans);
+ACTOR Future<bool> profileCommandActor(Database db,
+                                       Reference<ITransaction> tr,
+                                       std::vector<StringRef> tokens,
+                                       bool intrans);
 // setclass command
 ACTOR Future<bool> setClassCommandActor(Reference<IDatabase> db, std::vector<StringRef> tokens);
 // snapshot command
diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index 4a2e4aec562..de5963d31ac 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -39,10 +39,16 @@ const KeyRef samplingWindow = LiteralStringRef("visibility/sampling/window");
 
 GlobalConfig::GlobalConfig(Database& cx) : cx(cx), lastUpdate(0) {}
 
-GlobalConfig& GlobalConfig::globalConfig() {
-	void* res = g_network->global(INetwork::enGlobalConfig);
-	ASSERT(res);
-	return *reinterpret_cast<GlobalConfig*>(res);
+GlobalConfig& GlobalConfig::globalConfig(const Database& cx) {
+	return GlobalConfig::globalConfig(cx->dbId);
+}
+
+GlobalConfig& GlobalConfig::globalConfig(UID dbid) {
+	ConfigMap* config_map = reinterpret_cast<ConfigMap*>(g_network->global(INetwork::enGlobalConfig));
+	auto res = config_map->find(dbid);
+	ASSERT(res != config_map->end());
+	ASSERT(res->second);
+	return *reinterpret_cast<GlobalConfig*>(res->second);
 }
 
 Key GlobalConfig::prefixedKey(KeyRef key) {
diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index 91a78921cd7..833a68f7080 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -33,6 +33,7 @@
 #include <unordered_map>
 
 #include "fdbclient/CommitProxyInterface.h"
+#include "fdbclient/DatabaseContext.h"
 #include "fdbclient/GlobalConfig.h"
 #include "fdbclient/ReadYourWrites.h"
 
@@ -65,6 +66,8 @@ struct ConfigValue : ReferenceCounted<ConfigValue> {
 };
 
 class GlobalConfig : NonCopyable {
+	typedef std::unordered_map<UID, GlobalConfig*> ConfigMap;
+
 public:
 	// Creates a GlobalConfig singleton, accessed by calling
 	// GlobalConfig::globalConfig(). This function requires a database object
@@ -77,23 +80,34 @@ class GlobalConfig : NonCopyable {
 	// database.
 	template <class T>
 	static void create(Database& cx, Reference<AsyncVar<T> const> db, const ClientDBInfo* dbInfo) {
-		if (g_network->global(INetwork::enGlobalConfig) == nullptr) {
+		auto config_map =
+		    reinterpret_cast<ConfigMap*>(g_network->global(INetwork::enGlobalConfig));
+		if (config_map == nullptr) {
+			auto m = new ConfigMap();
+			g_network->setGlobal(INetwork::enGlobalConfig, m);
+			config_map = m;
+		}
+
+		auto it = config_map->find(cx.dbId());
+		if (it == config_map->end()) {
 			auto config = new GlobalConfig{ cx };
-			g_network->setGlobal(INetwork::enGlobalConfig, config);
+			config_map->emplace(cx.dbId(), config);
 			config->_updater = updater(config, dbInfo);
 			// Bind changes in `db` to the `dbInfoChanged` AsyncTrigger.
 			// TODO: Change AsyncTrigger to a Reference
 			forward(db, std::addressof(config->dbInfoChanged));
 		} else {
-			GlobalConfig* config = reinterpret_cast<GlobalConfig*>(g_network->global(INetwork::enGlobalConfig));
+			GlobalConfig* config = it->second;
 			config->cx = cx;
+			config->_updater = updater(config, dbInfo);
 		}
 	}
 
 	// Returns a reference to the global GlobalConfig object. Clients should
 	// call this function whenever they need to read a value out of the global
 	// configuration.
-	static GlobalConfig& globalConfig();
+	static GlobalConfig& globalConfig(const Database& cx);
+	static GlobalConfig& globalConfig(UID dbid);
 
 	// Use this function to turn a global configuration key defined above into
 	// the full path needed to set the value in the database.
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index b0070ac0a8e..195a482a2ca 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -808,12 +808,12 @@ ACTOR static Future<Void> clientStatusUpdateActor(DatabaseContext* cx) {
 				}
 			}
 			cx->clientStatusUpdater.outStatusQ.clear();
-			wait(GlobalConfig::globalConfig().onInitialized());
-			double sampleRate = GlobalConfig::globalConfig().get<double>(fdbClientInfoTxnSampleRate,
-			                                                             std::numeric_limits<double>::infinity());
+			wait(GlobalConfig::globalConfig(cx->dbId).onInitialized());
+			double sampleRate = GlobalConfig::globalConfig(cx->dbId).get<double>(
+			    fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
 			double clientSamplingProbability =
 			    std::isinf(sampleRate) ? CLIENT_KNOBS->CSI_SAMPLING_PROBABILITY : sampleRate;
-			int64_t sizeLimit = GlobalConfig::globalConfig().get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
+			int64_t sizeLimit = GlobalConfig::globalConfig(cx->dbId).get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
 			int64_t clientTxnInfoSizeLimit = sizeLimit == -1 ? CLIENT_KNOBS->CSI_SIZE_LIMIT : sizeLimit;
 			if (!trChunksQ.empty() && deterministicRandom()->random01() < clientSamplingProbability)
 				wait(delExcessClntTxnEntriesActor(&tr, clientTxnInfoSizeLimit));
@@ -1546,7 +1546,7 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
 		registerSpecialKeySpaceModule(
 		    SpecialKeySpace::MODULE::GLOBALCONFIG,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
-		    std::make_unique<GlobalConfigImpl>(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG)));
+		    std::make_unique<GlobalConfigImpl>(dbId, SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG)));
 		registerSpecialKeySpaceModule(
 		    SpecialKeySpace::MODULE::TRACING,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
@@ -1929,13 +1929,13 @@ Future<Void> DatabaseContext::onProxiesChanged() const {
 }
 
 bool DatabaseContext::sampleReadTags() const {
-	double sampleRate = GlobalConfig::globalConfig().get(transactionTagSampleRate, CLIENT_KNOBS->READ_TAG_SAMPLE_RATE);
+	double sampleRate = GlobalConfig::globalConfig(dbId).get(transactionTagSampleRate, CLIENT_KNOBS->READ_TAG_SAMPLE_RATE);
 	return sampleRate > 0 && deterministicRandom()->random01() <= sampleRate;
 }
 
 bool DatabaseContext::sampleOnCost(uint64_t cost) const {
 	double sampleCost =
-	    GlobalConfig::globalConfig().get<double>(transactionTagSampleCost, CLIENT_KNOBS->COMMIT_SAMPLE_COST);
+	    GlobalConfig::globalConfig(dbId).get<double>(transactionTagSampleCost, CLIENT_KNOBS->COMMIT_SAMPLE_COST);
 	if (sampleCost <= 0)
 		return false;
 	return deterministicRandom()->random01() <= (double)cost / sampleCost;
@@ -2213,8 +2213,8 @@ Database Database::createDatabase(Reference<IClusterConnectionRecord> connRecord
 	auto database = Database(db);
 	GlobalConfig::create(
 	    database, Reference<AsyncVar<ClientDBInfo> const>(clientInfo), std::addressof(clientInfo->get()));
-	GlobalConfig::globalConfig().trigger(samplingFrequency, samplingProfilerUpdateFrequency);
-	GlobalConfig::globalConfig().trigger(samplingWindow, samplingProfilerUpdateWindow);
+	GlobalConfig::globalConfig(database).trigger(samplingFrequency, samplingProfilerUpdateFrequency);
+	GlobalConfig::globalConfig(database).trigger(samplingWindow, samplingProfilerUpdateWindow);
 
 	TraceEvent("ConnectToDatabase", database->dbId)
 	    .detail("Version", FDB_VT_VERSION)
@@ -2237,6 +2237,8 @@ Database Database::createDatabase(std::string connFileName,
 	return Database::createDatabase(rccr, apiVersion, internal, clientLocality);
 }
 
+UID Database::dbId() const { return db->dbId; };
+
 Reference<WatchMetadata> DatabaseContext::getWatchMetadata(int64_t tenantId, KeyRef key) const {
 	const auto it = watchMap.find(std::make_pair(tenantId, key));
 	if (it == watchMap.end())
@@ -7223,10 +7225,10 @@ ACTOR Future<Standalone<VectorRef<ReadHotRangeWithMetrics>>> getReadHotRanges(Da
 			// condition. Should we abort and wait for the newly split shards to be hot again?
 			state int nLocs = locations.size();
 			// if (nLocs > 1) {
-			// 	TraceEvent("RHDDebug")
-			// 	    .detail("NumSSIs", nLocs)
-			// 	    .detail("KeysBegin", keys.begin.printable().c_str())
-			// 	    .detail("KeysEnd", keys.end.printable().c_str());
+			//	TraceEvent("RHDDebug")
+			//	    .detail("NumSSIs", nLocs)
+			//	    .detail("KeysBegin", keys.begin.printable().c_str())
+			//	    .detail("KeysEnd", keys.end.printable().c_str());
 			// }
 			state std::vector<Future<ReadHotSubRangeReply>> fReplies(nLocs);
 			KeyRef partBegin, partEnd;
@@ -7938,7 +7940,7 @@ void Transaction::checkDeferredError() const {
 
 Reference<TransactionLogInfo> Transaction::createTrLogInfoProbabilistically(const Database& cx) {
 	if (!cx->isError()) {
-		double clientSamplingProbability = GlobalConfig::globalConfig().get<double>(
+		double clientSamplingProbability = GlobalConfig::globalConfig(cx).get<double>(
 		    fdbClientInfoTxnSampleRate, CLIENT_KNOBS->CSI_SAMPLING_PROBABILITY);
 		if (((networkOptions.logClientInfo.present() && networkOptions.logClientInfo.get()) || BUGGIFY) &&
 		    deterministicRandom()->random01() < clientSamplingProbability &&
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 988e64aaf18..44e9b6b7b08 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -111,6 +111,7 @@ class Database {
 	inline DatabaseContext* extractPtr() { return db.extractPtr(); }
 	DatabaseContext* operator->() const { return db.getPtr(); }
 	Reference<DatabaseContext> getReference() const { return db; }
+	UID dbId() const;
 
 	const UniqueOrderedOptionList<FDBTransactionOptions>& getTransactionDefaults() const;
 
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 6be5c903c74..b941f007a9c 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -1452,7 +1452,7 @@ Future<Optional<std::string>> ConsistencyCheckImpl::commit(ReadYourWritesTransac
 	return Optional<std::string>();
 }
 
-GlobalConfigImpl::GlobalConfigImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
+GlobalConfigImpl::GlobalConfigImpl(UID dbId, KeyRangeRef kr) : dbId(dbId), SpecialKeyRangeRWImpl(kr) {}
 
 // Returns key-value pairs for each value stored in the global configuration
 // framework within the range specified. The special-key-space getrange
@@ -1463,7 +1463,7 @@ Future<RangeResult> GlobalConfigImpl::getRange(ReadYourWritesTransaction* ryw,
                                                GetRangeLimits limitsHint) const {
 	RangeResult result;
 
-	auto& globalConfig = GlobalConfig::globalConfig();
+	auto& globalConfig = GlobalConfig::globalConfig(dbId);
 	KeyRangeRef modified =
 	    KeyRangeRef(kr.begin.removePrefix(getKeyRange().begin), kr.end.removePrefix(getKeyRange().begin));
 	std::map<KeyRef, Reference<ConfigValue>> values = globalConfig.get(modified);
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index b60ee67472f..a0e414bb5a1 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -29,6 +29,7 @@
 #include "flow/flow.h"
 #include "flow/Arena.h"
 #include "fdbclient/FDBTypes.h"
+#include "fdbclient/GlobalConfig.actor.h"
 #include "fdbclient/KeyRangeMap.h"
 #include "fdbclient/ReadYourWrites.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
@@ -426,7 +427,7 @@ class ConsistencyCheckImpl : public SpecialKeyRangeRWImpl {
 
 class GlobalConfigImpl : public SpecialKeyRangeRWImpl {
 public:
-	explicit GlobalConfigImpl(KeyRangeRef kr);
+	explicit GlobalConfigImpl(UID dbId, KeyRangeRef kr);
 	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
 	                             KeyRangeRef kr,
 	                             GetRangeLimits limitsHint) const override;
@@ -434,6 +435,9 @@ class GlobalConfigImpl : public SpecialKeyRangeRWImpl {
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 	void clear(ReadYourWritesTransaction* ryw, const KeyRangeRef& range) override;
 	void clear(ReadYourWritesTransaction* ryw, const KeyRef& key) override;
+
+private:
+	UID dbId;
 };
 
 class TracingOptionsImpl : public SpecialKeyRangeRWImpl {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index df39331fa44..92beda2f36b 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -160,8 +160,8 @@ Database openDBOnServer(Reference<AsyncVar<ServerDBInfo> const> const& db,
 	                                  taskID,
 	                                  lockAware);
 	GlobalConfig::create(cx, db, std::addressof(db->get().client));
-	GlobalConfig::globalConfig().trigger(samplingFrequency, samplingProfilerUpdateFrequency);
-	GlobalConfig::globalConfig().trigger(samplingWindow, samplingProfilerUpdateWindow);
+	GlobalConfig::globalConfig(cx).trigger(samplingFrequency, samplingProfilerUpdateFrequency);
+	GlobalConfig::globalConfig(cx).trigger(samplingWindow, samplingProfilerUpdateWindow);
 	return cx;
 }
 
@@ -1588,16 +1588,16 @@ ACTOR Future<Void> workerServer(Reference<IClusterConnectionRecord> connRecord,
 				state Database db =
 				    Database::createDatabase(metricsConnFile, Database::API_VERSION_LATEST, IsInternal::True, locality);
 				metricsLogger = runMetrics(db, KeyRef(metricsPrefix));
+				GlobalConfig::globalConfig(db).trigger(samplingFrequency, samplingProfilerUpdateFrequency);
 			} catch (Error& e) {
 				TraceEvent(SevWarnAlways, "TDMetricsBadClusterFile").error(e).detail("ConnFile", metricsConnFile);
 			}
 		} else {
 			auto lockAware = metricsPrefix.size() && metricsPrefix[0] == '\xff' ? LockAware::True : LockAware::False;
-			metricsLogger =
-			    runMetrics(openDBOnServer(dbInfo, TaskPriority::DefaultEndpoint, lockAware), KeyRef(metricsPrefix));
+			auto database = openDBOnServer(dbInfo, TaskPriority::DefaultEndpoint, lockAware);
+			metricsLogger = runMetrics(database, KeyRef(metricsPrefix));
+			GlobalConfig::globalConfig(database).trigger(samplingFrequency, samplingProfilerUpdateFrequency);
 		}
-
-		GlobalConfig::globalConfig().trigger(samplingFrequency, samplingProfilerUpdateFrequency);
 	}
 
 	errorForwarders.add(resetAfter(degraded,

From 703c26b8a793aa5ba3fbdee3494690dedaf176a2 Mon Sep 17 00:00:00 2001
From: Vishesh Yadav <vishesh_yadav@apple.com>
Date: Wed, 4 May 2022 16:36:04 -0700
Subject: [PATCH 399/740] Move GlobalConfig to DatabaseContext

---
 fdbcli/ProfileCommand.actor.cpp     |  6 ++--
 fdbclient/DatabaseContext.h         |  3 ++
 fdbclient/GlobalConfig.actor.cpp    | 14 +--------
 fdbclient/GlobalConfig.actor.h      | 46 ++++++++---------------------
 fdbclient/NativeAPI.actor.cpp       | 25 ++++++++--------
 fdbclient/SpecialKeySpace.actor.cpp |  7 ++---
 fdbclient/SpecialKeySpace.actor.h   |  5 ++--
 fdbserver/worker.actor.cpp          | 10 +++----
 flow/genericactors.actor.h          |  2 +-
 9 files changed, 44 insertions(+), 74 deletions(-)

diff --git a/fdbcli/ProfileCommand.actor.cpp b/fdbcli/ProfileCommand.actor.cpp
index 3c5710e53f8..0f48ce877b4 100644
--- a/fdbcli/ProfileCommand.actor.cpp
+++ b/fdbcli/ProfileCommand.actor.cpp
@@ -48,7 +48,7 @@ ACTOR Future<bool> profileCommandActor(Database db,
 			fprintf(stderr, "ERROR: Usage: profile client <get|set>\n");
 			return false;
 		}
-		wait(GlobalConfig::globalConfig(db).onInitialized());
+		wait(db->globalConfig->onInitialized());
 		if (tokencmp(tokens[2], "get")) {
 			if (tokens.size() != 3) {
 				fprintf(stderr, "ERROR: Addtional arguments to `get` are not supported.\n");
@@ -56,12 +56,12 @@ ACTOR Future<bool> profileCommandActor(Database db,
 			}
 			std::string sampleRateStr = "default";
 			std::string sizeLimitStr = "default";
-			const double sampleRateDbl = GlobalConfig::globalConfig(db).get<double>(
+			const double sampleRateDbl = db->globalConfig->get<double>(
 			    fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
 			if (!std::isinf(sampleRateDbl)) {
 				sampleRateStr = std::to_string(sampleRateDbl);
 			}
-			const int64_t sizeLimit = GlobalConfig::globalConfig(db).get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
+			const int64_t sizeLimit = db->globalConfig->get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
 			if (sizeLimit != -1) {
 				sizeLimitStr = boost::lexical_cast<std::string>(sizeLimit);
 			}
diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index e5662b9b9c4..df3904d23eb 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -222,6 +222,8 @@ struct KeyRangeLocationInfo {
 	  : tenantEntry(tenantEntry), range(range), locations(locations) {}
 };
 
+class GlobalConfig;
+
 class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAllocated<DatabaseContext>, NonCopyable {
 public:
 	static DatabaseContext* allocateOnForeignThread() {
@@ -626,6 +628,7 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	using TransactionT = ReadYourWritesTransaction;
 	Reference<TransactionT> createTransaction();
 
+	std::unique_ptr<GlobalConfig> globalConfig;
 	EventCacheHolder connectToDatabaseEventCacheHolder;
 
 private:
diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index de5963d31ac..93b43de0d4f 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -37,19 +37,7 @@ const KeyRef transactionTagSampleCost = LiteralStringRef("config/transaction_tag
 const KeyRef samplingFrequency = LiteralStringRef("visibility/sampling/frequency");
 const KeyRef samplingWindow = LiteralStringRef("visibility/sampling/window");
 
-GlobalConfig::GlobalConfig(Database& cx) : cx(cx), lastUpdate(0) {}
-
-GlobalConfig& GlobalConfig::globalConfig(const Database& cx) {
-	return GlobalConfig::globalConfig(cx->dbId);
-}
-
-GlobalConfig& GlobalConfig::globalConfig(UID dbid) {
-	ConfigMap* config_map = reinterpret_cast<ConfigMap*>(g_network->global(INetwork::enGlobalConfig));
-	auto res = config_map->find(dbid);
-	ASSERT(res != config_map->end());
-	ASSERT(res->second);
-	return *reinterpret_cast<GlobalConfig*>(res->second);
-}
+GlobalConfig::GlobalConfig(const Database& cx) : cx(cx), lastUpdate(0) {}
 
 Key GlobalConfig::prefixedKey(KeyRef key) {
 	return key.withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG).begin);
diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index 833a68f7080..a1617b9d264 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include <memory>
 #if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_GLOBALCONFIG_ACTOR_G_H)
 #define FDBCLIENT_GLOBALCONFIG_ACTOR_G_H
 #include "fdbclient/GlobalConfig.actor.g.h"
@@ -69,46 +70,24 @@ class GlobalConfig : NonCopyable {
 	typedef std::unordered_map<UID, GlobalConfig*> ConfigMap;
 
 public:
-	// Creates a GlobalConfig singleton, accessed by calling
-	// GlobalConfig::globalConfig(). This function requires a database object
-	// to allow global configuration to run transactions on the database, and
-	// an AsyncVar object to watch for changes on. The ClientDBInfo pointer
+	// Requires a database object to allow global configuration to run
+	// transactions on the database.
+	explicit GlobalConfig(const Database& cx);
+
+	// Requires an AsyncVar object to watch for changes on. The ClientDBInfo pointer
 	// should point to a ClientDBInfo object which will contain the updated
 	// global configuration history when the given AsyncVar changes. This
 	// function should be called whenever the database object changes, in order
 	// to allow global configuration to run transactions on the latest
 	// database.
 	template <class T>
-	static void create(Database& cx, Reference<AsyncVar<T> const> db, const ClientDBInfo* dbInfo) {
-		auto config_map =
-		    reinterpret_cast<ConfigMap*>(g_network->global(INetwork::enGlobalConfig));
-		if (config_map == nullptr) {
-			auto m = new ConfigMap();
-			g_network->setGlobal(INetwork::enGlobalConfig, m);
-			config_map = m;
-		}
-
-		auto it = config_map->find(cx.dbId());
-		if (it == config_map->end()) {
-			auto config = new GlobalConfig{ cx };
-			config_map->emplace(cx.dbId(), config);
-			config->_updater = updater(config, dbInfo);
-			// Bind changes in `db` to the `dbInfoChanged` AsyncTrigger.
-			// TODO: Change AsyncTrigger to a Reference
-			forward(db, std::addressof(config->dbInfoChanged));
-		} else {
-			GlobalConfig* config = it->second;
-			config->cx = cx;
-			config->_updater = updater(config, dbInfo);
-		}
+	void init(Reference<AsyncVar<T> const> db, const ClientDBInfo* dbInfo) {
+		_updater = updater(this, dbInfo);
+		// Bind changes in `db` to the `dbInfoChanged` AsyncTrigger.
+		// TODO: Change AsyncTrigger to a Reference
+		_forward = forward(db, std::addressof(dbInfoChanged));
 	}
 
-	// Returns a reference to the global GlobalConfig object. Clients should
-	// call this function whenever they need to read a value out of the global
-	// configuration.
-	static GlobalConfig& globalConfig(const Database& cx);
-	static GlobalConfig& globalConfig(UID dbid);
-
 	// Use this function to turn a global configuration key defined above into
 	// the full path needed to set the value in the database.
 	//
@@ -164,8 +143,6 @@ class GlobalConfig : NonCopyable {
 	void trigger(KeyRef key, std::function<void(std::optional<std::any>)> fn);
 
 private:
-	GlobalConfig(Database& cx);
-
 	// The functions below only affect the local copy of the global
 	// configuration keyspace! To insert or remove values across all nodes you
 	// must use a transaction (see the note above).
@@ -187,6 +164,7 @@ class GlobalConfig : NonCopyable {
 
 	Database cx;
 	AsyncTrigger dbInfoChanged;
+	Future<Void> _forward;
 	Future<Void> _updater;
 	Promise<Void> initialized;
 	AsyncTrigger configChanged;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 195a482a2ca..5e5020f49f6 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -22,6 +22,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <memory>
 #include <regex>
 #include <unordered_set>
 #include <tuple>
@@ -808,12 +809,12 @@ ACTOR static Future<Void> clientStatusUpdateActor(DatabaseContext* cx) {
 				}
 			}
 			cx->clientStatusUpdater.outStatusQ.clear();
-			wait(GlobalConfig::globalConfig(cx->dbId).onInitialized());
-			double sampleRate = GlobalConfig::globalConfig(cx->dbId).get<double>(
+			wait(cx->globalConfig->onInitialized());
+			double sampleRate = cx->globalConfig->get<double>(
 			    fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
 			double clientSamplingProbability =
 			    std::isinf(sampleRate) ? CLIENT_KNOBS->CSI_SAMPLING_PROBABILITY : sampleRate;
-			int64_t sizeLimit = GlobalConfig::globalConfig(cx->dbId).get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
+			int64_t sizeLimit = cx->globalConfig->get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
 			int64_t clientTxnInfoSizeLimit = sizeLimit == -1 ? CLIENT_KNOBS->CSI_SIZE_LIMIT : sizeLimit;
 			if (!trChunksQ.empty() && deterministicRandom()->random01() < clientSamplingProbability)
 				wait(delExcessClntTxnEntriesActor(&tr, clientTxnInfoSizeLimit));
@@ -1473,6 +1474,7 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
 	cacheListMonitor = monitorCacheList(this);
 
 	smoothMidShardSize.reset(CLIENT_KNOBS->INIT_MID_SHARD_BYTES);
+	globalConfig = std::make_unique<GlobalConfig>(Database(this));
 
 	if (apiVersionAtLeast(710)) {
 		registerSpecialKeySpaceModule(
@@ -1546,7 +1548,8 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
 		registerSpecialKeySpaceModule(
 		    SpecialKeySpace::MODULE::GLOBALCONFIG,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
-		    std::make_unique<GlobalConfigImpl>(dbId, SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG)));
+		    std::make_unique<GlobalConfigImpl>(globalConfig.get(),
+		                                       SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG)));
 		registerSpecialKeySpaceModule(
 		    SpecialKeySpace::MODULE::TRACING,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
@@ -1929,13 +1932,12 @@ Future<Void> DatabaseContext::onProxiesChanged() const {
 }
 
 bool DatabaseContext::sampleReadTags() const {
-	double sampleRate = GlobalConfig::globalConfig(dbId).get(transactionTagSampleRate, CLIENT_KNOBS->READ_TAG_SAMPLE_RATE);
+	double sampleRate = globalConfig->get(transactionTagSampleRate, CLIENT_KNOBS->READ_TAG_SAMPLE_RATE);
 	return sampleRate > 0 && deterministicRandom()->random01() <= sampleRate;
 }
 
 bool DatabaseContext::sampleOnCost(uint64_t cost) const {
-	double sampleCost =
-	    GlobalConfig::globalConfig(dbId).get<double>(transactionTagSampleCost, CLIENT_KNOBS->COMMIT_SAMPLE_COST);
+	double sampleCost = globalConfig->get<double>(transactionTagSampleCost, CLIENT_KNOBS->COMMIT_SAMPLE_COST);
 	if (sampleCost <= 0)
 		return false;
 	return deterministicRandom()->random01() <= (double)cost / sampleCost;
@@ -2211,10 +2213,9 @@ Database Database::createDatabase(Reference<IClusterConnectionRecord> connRecord
 	}
 
 	auto database = Database(db);
-	GlobalConfig::create(
-	    database, Reference<AsyncVar<ClientDBInfo> const>(clientInfo), std::addressof(clientInfo->get()));
-	GlobalConfig::globalConfig(database).trigger(samplingFrequency, samplingProfilerUpdateFrequency);
-	GlobalConfig::globalConfig(database).trigger(samplingWindow, samplingProfilerUpdateWindow);
+	database->globalConfig->init(Reference<AsyncVar<ClientDBInfo> const>(clientInfo), std::addressof(clientInfo->get()));
+	database->globalConfig->trigger(samplingFrequency, samplingProfilerUpdateFrequency);
+	database->globalConfig->trigger(samplingWindow, samplingProfilerUpdateWindow);
 
 	TraceEvent("ConnectToDatabase", database->dbId)
 	    .detail("Version", FDB_VT_VERSION)
@@ -7940,7 +7941,7 @@ void Transaction::checkDeferredError() const {
 
 Reference<TransactionLogInfo> Transaction::createTrLogInfoProbabilistically(const Database& cx) {
 	if (!cx->isError()) {
-		double clientSamplingProbability = GlobalConfig::globalConfig(cx).get<double>(
+		double clientSamplingProbability = cx->globalConfig->get<double>(
 		    fdbClientInfoTxnSampleRate, CLIENT_KNOBS->CSI_SAMPLING_PROBABILITY);
 		if (((networkOptions.logClientInfo.present() && networkOptions.logClientInfo.get()) || BUGGIFY) &&
 		    deterministicRandom()->random01() < clientSamplingProbability &&
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index b941f007a9c..f745e1d2c73 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -1452,7 +1452,8 @@ Future<Optional<std::string>> ConsistencyCheckImpl::commit(ReadYourWritesTransac
 	return Optional<std::string>();
 }
 
-GlobalConfigImpl::GlobalConfigImpl(UID dbId, KeyRangeRef kr) : dbId(dbId), SpecialKeyRangeRWImpl(kr) {}
+GlobalConfigImpl::GlobalConfigImpl(GlobalConfig* config, KeyRangeRef kr)
+  : globalConfig(config), SpecialKeyRangeRWImpl(kr) {}
 
 // Returns key-value pairs for each value stored in the global configuration
 // framework within the range specified. The special-key-space getrange
@@ -1462,11 +1463,9 @@ Future<RangeResult> GlobalConfigImpl::getRange(ReadYourWritesTransaction* ryw,
                                                KeyRangeRef kr,
                                                GetRangeLimits limitsHint) const {
 	RangeResult result;
-
-	auto& globalConfig = GlobalConfig::globalConfig(dbId);
 	KeyRangeRef modified =
 	    KeyRangeRef(kr.begin.removePrefix(getKeyRange().begin), kr.end.removePrefix(getKeyRange().begin));
-	std::map<KeyRef, Reference<ConfigValue>> values = globalConfig.get(modified);
+	std::map<KeyRef, Reference<ConfigValue>> values = globalConfig->get(modified);
 	for (const auto& [key, config] : values) {
 		Key prefixedKey = key.withPrefix(getKeyRange().begin);
 		if (config.isValid() && config->value.has_value()) {
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index a0e414bb5a1..e188853460c 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -425,9 +425,10 @@ class ConsistencyCheckImpl : public SpecialKeyRangeRWImpl {
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
 
+class GlobalConfig;
 class GlobalConfigImpl : public SpecialKeyRangeRWImpl {
 public:
-	explicit GlobalConfigImpl(UID dbId, KeyRangeRef kr);
+	explicit GlobalConfigImpl(GlobalConfig* config, KeyRangeRef kr);
 	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
 	                             KeyRangeRef kr,
 	                             GetRangeLimits limitsHint) const override;
@@ -437,7 +438,7 @@ class GlobalConfigImpl : public SpecialKeyRangeRWImpl {
 	void clear(ReadYourWritesTransaction* ryw, const KeyRef& key) override;
 
 private:
-	UID dbId;
+	GlobalConfig* globalConfig;
 };
 
 class TracingOptionsImpl : public SpecialKeyRangeRWImpl {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 92beda2f36b..191a7b5ec27 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -159,9 +159,9 @@ Database openDBOnServer(Reference<AsyncVar<ServerDBInfo> const> const& db,
 	                                  enableLocalityLoadBalance,
 	                                  taskID,
 	                                  lockAware);
-	GlobalConfig::create(cx, db, std::addressof(db->get().client));
-	GlobalConfig::globalConfig(cx).trigger(samplingFrequency, samplingProfilerUpdateFrequency);
-	GlobalConfig::globalConfig(cx).trigger(samplingWindow, samplingProfilerUpdateWindow);
+	cx->globalConfig->init(db, std::addressof(db->get().client));
+	cx->globalConfig->trigger(samplingFrequency, samplingProfilerUpdateFrequency);
+	cx->globalConfig->trigger(samplingWindow, samplingProfilerUpdateWindow);
 	return cx;
 }
 
@@ -1588,7 +1588,7 @@ ACTOR Future<Void> workerServer(Reference<IClusterConnectionRecord> connRecord,
 				state Database db =
 				    Database::createDatabase(metricsConnFile, Database::API_VERSION_LATEST, IsInternal::True, locality);
 				metricsLogger = runMetrics(db, KeyRef(metricsPrefix));
-				GlobalConfig::globalConfig(db).trigger(samplingFrequency, samplingProfilerUpdateFrequency);
+				db->globalConfig->trigger(samplingFrequency, samplingProfilerUpdateFrequency);
 			} catch (Error& e) {
 				TraceEvent(SevWarnAlways, "TDMetricsBadClusterFile").error(e).detail("ConnFile", metricsConnFile);
 			}
@@ -1596,7 +1596,7 @@ ACTOR Future<Void> workerServer(Reference<IClusterConnectionRecord> connRecord,
 			auto lockAware = metricsPrefix.size() && metricsPrefix[0] == '\xff' ? LockAware::True : LockAware::False;
 			auto database = openDBOnServer(dbInfo, TaskPriority::DefaultEndpoint, lockAware);
 			metricsLogger = runMetrics(database, KeyRef(metricsPrefix));
-			GlobalConfig::globalConfig(database).trigger(samplingFrequency, samplingProfilerUpdateFrequency);
+			database->globalConfig->trigger(samplingFrequency, samplingProfilerUpdateFrequency);
 		}
 	}
 
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 2c7dde58233..434ddcd18c0 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -704,7 +704,7 @@ class AsyncTrigger : NonCopyable {
 // Binds an AsyncTrigger object to an AsyncVar, so when the AsyncVar changes
 // the AsyncTrigger is triggered.
 ACTOR template <class T>
-void forward(Reference<AsyncVar<T> const> from, AsyncTrigger* to) {
+Future<Void> forward(Reference<AsyncVar<T> const> from, AsyncTrigger* to) {
 	loop {
 		wait(from->onChange());
 		to->trigger();

From 2e48bfbe28446a033a22f38d677268602b043010 Mon Sep 17 00:00:00 2001
From: Vishesh Yadav <vishesh_yadav@apple.com>
Date: Wed, 4 May 2022 17:32:04 -0700
Subject: [PATCH 400/740] clang-format changes

---
 fdbcli/ProfileCommand.actor.cpp |  4 ++--
 fdbclient/GlobalConfig.actor.h  |  1 -
 fdbclient/NativeAPI.actor.cpp   | 15 +++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/fdbcli/ProfileCommand.actor.cpp b/fdbcli/ProfileCommand.actor.cpp
index 0f48ce877b4..d7f66ce080e 100644
--- a/fdbcli/ProfileCommand.actor.cpp
+++ b/fdbcli/ProfileCommand.actor.cpp
@@ -56,8 +56,8 @@ ACTOR Future<bool> profileCommandActor(Database db,
 			}
 			std::string sampleRateStr = "default";
 			std::string sizeLimitStr = "default";
-			const double sampleRateDbl = db->globalConfig->get<double>(
-			    fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
+			const double sampleRateDbl =
+			    db->globalConfig->get<double>(fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
 			if (!std::isinf(sampleRateDbl)) {
 				sampleRateStr = std::to_string(sampleRateDbl);
 			}
diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index a1617b9d264..1558635f526 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include <memory>
 #if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_GLOBALCONFIG_ACTOR_G_H)
 #define FDBCLIENT_GLOBALCONFIG_ACTOR_G_H
 #include "fdbclient/GlobalConfig.actor.g.h"
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 5e5020f49f6..e19bf72d53e 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -810,8 +810,8 @@ ACTOR static Future<Void> clientStatusUpdateActor(DatabaseContext* cx) {
 			}
 			cx->clientStatusUpdater.outStatusQ.clear();
 			wait(cx->globalConfig->onInitialized());
-			double sampleRate = cx->globalConfig->get<double>(
-			    fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
+			double sampleRate =
+			    cx->globalConfig->get<double>(fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
 			double clientSamplingProbability =
 			    std::isinf(sampleRate) ? CLIENT_KNOBS->CSI_SAMPLING_PROBABILITY : sampleRate;
 			int64_t sizeLimit = cx->globalConfig->get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
@@ -2213,7 +2213,8 @@ Database Database::createDatabase(Reference<IClusterConnectionRecord> connRecord
 	}
 
 	auto database = Database(db);
-	database->globalConfig->init(Reference<AsyncVar<ClientDBInfo> const>(clientInfo), std::addressof(clientInfo->get()));
+	database->globalConfig->init(Reference<AsyncVar<ClientDBInfo> const>(clientInfo),
+	                             std::addressof(clientInfo->get()));
 	database->globalConfig->trigger(samplingFrequency, samplingProfilerUpdateFrequency);
 	database->globalConfig->trigger(samplingWindow, samplingProfilerUpdateWindow);
 
@@ -2238,7 +2239,9 @@ Database Database::createDatabase(std::string connFileName,
 	return Database::createDatabase(rccr, apiVersion, internal, clientLocality);
 }
 
-UID Database::dbId() const { return db->dbId; };
+UID Database::dbId() const {
+	return db->dbId;
+};
 
 Reference<WatchMetadata> DatabaseContext::getWatchMetadata(int64_t tenantId, KeyRef key) const {
 	const auto it = watchMap.find(std::make_pair(tenantId, key));
@@ -7941,8 +7944,8 @@ void Transaction::checkDeferredError() const {
 
 Reference<TransactionLogInfo> Transaction::createTrLogInfoProbabilistically(const Database& cx) {
 	if (!cx->isError()) {
-		double clientSamplingProbability = cx->globalConfig->get<double>(
-		    fdbClientInfoTxnSampleRate, CLIENT_KNOBS->CSI_SAMPLING_PROBABILITY);
+		double clientSamplingProbability =
+		    cx->globalConfig->get<double>(fdbClientInfoTxnSampleRate, CLIENT_KNOBS->CSI_SAMPLING_PROBABILITY);
 		if (((networkOptions.logClientInfo.present() && networkOptions.logClientInfo.get()) || BUGGIFY) &&
 		    deterministicRandom()->random01() < clientSamplingProbability &&
 		    (!g_network->isSimulated() || !g_simulator.speedUpSimulation)) {

From 3068b1e60bb17cb2d49682372f187fda05e34268 Mon Sep 17 00:00:00 2001
From: Vishesh Yadav <vishesh_yadav@apple.com>
Date: Fri, 6 May 2022 11:29:17 -0700
Subject: [PATCH 401/740] Address review comments

---
 fdbclient/GlobalConfig.actor.h      | 2 --
 fdbclient/NativeAPI.actor.cpp       | 7 +------
 fdbclient/NativeAPI.actor.h         | 1 -
 fdbclient/SpecialKeySpace.actor.cpp | 5 ++---
 fdbclient/SpecialKeySpace.actor.h   | 5 +----
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index 1558635f526..5e430a30375 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -66,8 +66,6 @@ struct ConfigValue : ReferenceCounted<ConfigValue> {
 };
 
 class GlobalConfig : NonCopyable {
-	typedef std::unordered_map<UID, GlobalConfig*> ConfigMap;
-
 public:
 	// Requires a database object to allow global configuration to run
 	// transactions on the database.
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index e19bf72d53e..f01d2cecac5 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1548,8 +1548,7 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
 		registerSpecialKeySpaceModule(
 		    SpecialKeySpace::MODULE::GLOBALCONFIG,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
-		    std::make_unique<GlobalConfigImpl>(globalConfig.get(),
-		                                       SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG)));
+		    std::make_unique<GlobalConfigImpl>(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG)));
 		registerSpecialKeySpaceModule(
 		    SpecialKeySpace::MODULE::TRACING,
 		    SpecialKeySpace::IMPLTYPE::READWRITE,
@@ -2239,10 +2238,6 @@ Database Database::createDatabase(std::string connFileName,
 	return Database::createDatabase(rccr, apiVersion, internal, clientLocality);
 }
 
-UID Database::dbId() const {
-	return db->dbId;
-};
-
 Reference<WatchMetadata> DatabaseContext::getWatchMetadata(int64_t tenantId, KeyRef key) const {
 	const auto it = watchMap.find(std::make_pair(tenantId, key));
 	if (it == watchMap.end())
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 44e9b6b7b08..988e64aaf18 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -111,7 +111,6 @@ class Database {
 	inline DatabaseContext* extractPtr() { return db.extractPtr(); }
 	DatabaseContext* operator->() const { return db.getPtr(); }
 	Reference<DatabaseContext> getReference() const { return db; }
-	UID dbId() const;
 
 	const UniqueOrderedOptionList<FDBTransactionOptions>& getTransactionDefaults() const;
 
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index f745e1d2c73..0db0a30f761 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -1452,8 +1452,7 @@ Future<Optional<std::string>> ConsistencyCheckImpl::commit(ReadYourWritesTransac
 	return Optional<std::string>();
 }
 
-GlobalConfigImpl::GlobalConfigImpl(GlobalConfig* config, KeyRangeRef kr)
-  : globalConfig(config), SpecialKeyRangeRWImpl(kr) {}
+GlobalConfigImpl::GlobalConfigImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
 
 // Returns key-value pairs for each value stored in the global configuration
 // framework within the range specified. The special-key-space getrange
@@ -1465,7 +1464,7 @@ Future<RangeResult> GlobalConfigImpl::getRange(ReadYourWritesTransaction* ryw,
 	RangeResult result;
 	KeyRangeRef modified =
 	    KeyRangeRef(kr.begin.removePrefix(getKeyRange().begin), kr.end.removePrefix(getKeyRange().begin));
-	std::map<KeyRef, Reference<ConfigValue>> values = globalConfig->get(modified);
+	std::map<KeyRef, Reference<ConfigValue>> values = ryw->getDatabase()->globalConfig->get(modified);
 	for (const auto& [key, config] : values) {
 		Key prefixedKey = key.withPrefix(getKeyRange().begin);
 		if (config.isValid() && config->value.has_value()) {
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index e188853460c..836567ecf4a 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -428,7 +428,7 @@ class ConsistencyCheckImpl : public SpecialKeyRangeRWImpl {
 class GlobalConfig;
 class GlobalConfigImpl : public SpecialKeyRangeRWImpl {
 public:
-	explicit GlobalConfigImpl(GlobalConfig* config, KeyRangeRef kr);
+	explicit GlobalConfigImpl(KeyRangeRef kr);
 	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
 	                             KeyRangeRef kr,
 	                             GetRangeLimits limitsHint) const override;
@@ -436,9 +436,6 @@ class GlobalConfigImpl : public SpecialKeyRangeRWImpl {
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 	void clear(ReadYourWritesTransaction* ryw, const KeyRangeRef& range) override;
 	void clear(ReadYourWritesTransaction* ryw, const KeyRef& key) override;
-
-private:
-	GlobalConfig* globalConfig;
 };
 
 class TracingOptionsImpl : public SpecialKeyRangeRWImpl {

From 63390ff7a07fca14c296456e1a9de1d78b54fa95 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Fri, 29 Apr 2022 13:10:05 +0100
Subject: [PATCH 402/740] Add sidecar method to check if a file is present

---
 packaging/docker/sidecar.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packaging/docker/sidecar.py b/packaging/docker/sidecar.py
index 666cb82816f..6fb80b48808 100755
--- a/packaging/docker/sidecar.py
+++ b/packaging/docker/sidecar.py
@@ -518,10 +518,16 @@ def do_GET(self):
                 return
             if self.path.startswith("/check_hash/"):
                 try:
-                    self.send_text(check_hash(self.path[12:]), add_newline=False)
+                    self.send_text(check_hash(os.path.basename(self.path)), add_newline=False)
                 except FileNotFoundError:
                     self.send_error(404, "Path not found")
                     self.end_headers()
+            if self.path.startswith("/is_present/"):
+                if is_present(os.path.basename(self.path))):
+                    self.send_text("OK")
+                else:
+                    self.send_error(404, "Path not found")
+                    self.end_headers()
             elif self.path == "/ready":
                 self.send_text(ready())
             elif self.path == "/substitutions":
@@ -599,6 +605,10 @@ def check_hash(filename):
         return m.hexdigest()
 
 
+def is_present(filename):
+    return os.path.exists(os.path.join(Config.shared().output_dir, filename))
+
+
 def copy_files():
     config = Config.shared()
     if config.require_not_empty:

From 1392d00ddd475299531a6caca329c1d1786fc4f7 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Fri, 6 May 2022 10:01:03 +0100
Subject: [PATCH 403/740] Correct sidecar script

---
 packaging/docker/sidecar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/docker/sidecar.py b/packaging/docker/sidecar.py
index 6fb80b48808..342d9dc3059 100755
--- a/packaging/docker/sidecar.py
+++ b/packaging/docker/sidecar.py
@@ -523,7 +523,7 @@ def do_GET(self):
                     self.send_error(404, "Path not found")
                     self.end_headers()
             if self.path.startswith("/is_present/"):
-                if is_present(os.path.basename(self.path))):
+                if is_present(os.path.basename(self.path)):
                     self.send_text("OK")
                 else:
                     self.send_error(404, "Path not found")

From a1250ec0348d7aa4b44aa69944b0ba1a3156fbf6 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Fri, 6 May 2022 10:01:22 +0100
Subject: [PATCH 404/740] Format sidecar script

---
 packaging/docker/sidecar.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packaging/docker/sidecar.py b/packaging/docker/sidecar.py
index 342d9dc3059..39c4685bc7f 100755
--- a/packaging/docker/sidecar.py
+++ b/packaging/docker/sidecar.py
@@ -518,7 +518,9 @@ def do_GET(self):
                 return
             if self.path.startswith("/check_hash/"):
                 try:
-                    self.send_text(check_hash(os.path.basename(self.path)), add_newline=False)
+                    self.send_text(
+                        check_hash(os.path.basename(self.path)), add_newline=False
+                    )
                 except FileNotFoundError:
                     self.send_error(404, "Path not found")
                     self.end_headers()

From d9621ba9f410d9aee78e2e995ca5078db847b71f Mon Sep 17 00:00:00 2001
From: hao fu <hfu5@apple.com>
Date: Thu, 5 May 2022 13:44:10 -0700
Subject: [PATCH 405/740] add appendRaw and subTupleRawString for Tuple

---
 fdbclient/Tuple.cpp               | 16 ++++++++++++++++
 fdbclient/Tuple.h                 |  3 ++-
 fdbserver/storageserver.actor.cpp | 10 +++++++---
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/fdbclient/Tuple.cpp b/fdbclient/Tuple.cpp
index ec74abaeac8..77716b94ee7 100644
--- a/fdbclient/Tuple.cpp
+++ b/fdbclient/Tuple.cpp
@@ -121,6 +121,13 @@ Tuple& Tuple::append(StringRef const& str, bool utf8) {
 	return *this;
 }
 
+Tuple& Tuple::appendRaw(StringRef const& str) {
+	offsets.push_back(data.size());
+
+	data.append(data.arena(), str.begin(), str.size());
+	return *this;
+}
+
 Tuple& Tuple::append(int64_t value) {
 	uint64_t swap = value;
 	bool neg = false;
@@ -383,3 +390,12 @@ Tuple Tuple::subTuple(size_t start, size_t end) const {
 	size_t endPos = end < offsets.size() ? offsets[end] : data.size();
 	return Tuple(StringRef(data.begin() + offsets[start], endPos - offsets[start]));
 }
+
+StringRef Tuple::subTupleRawString(size_t index) const {
+	if (index >= offsets.size()) {
+		return StringRef();
+	}
+	size_t end = index + 1;
+	size_t endPos = end < offsets.size() ? offsets[end] : data.size();
+	return StringRef(data.begin() + offsets[index], endPos - offsets[index]);
+}
diff --git a/fdbclient/Tuple.h b/fdbclient/Tuple.h
index 2ff31bf9904..6201bfdfcf1 100644
--- a/fdbclient/Tuple.h
+++ b/fdbclient/Tuple.h
@@ -36,6 +36,7 @@ struct Tuple {
 	static Tuple unpack(StringRef const& str, bool exclude_incomplete = false);
 
 	Tuple& append(Tuple const& tuple);
+	Tuple& appendRaw(StringRef const& str);
 	Tuple& append(StringRef const& str, bool utf8 = false);
 	Tuple& append(int64_t);
 	// There are some ambiguous append calls in fdbclient, so to make it easier
@@ -61,7 +62,7 @@ struct Tuple {
 		data.clear();
 		offsets.clear();
 	}
-
+	StringRef subTupleRawString(size_t index) const;
 	ElementType getType(size_t index) const;
 	Standalone<StringRef> getString(size_t index) const;
 	int64_t getInt(size_t index, bool allow_incomplete = false) const;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 9b23ecab3cb..3d06691b122 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3547,10 +3547,14 @@ void preprocessMappedKey(Tuple& mappedKeyFormatTuple, std::vector<Optional<Tuple
 				vt.push_back(Optional<Tuple>());
 				isRangeQuery = true;
 			} else {
-				vt.push_back(Optional<Tuple>(mappedKeyFormatTuple.subTuple(i, i + 1)));
+				Tuple t;
+				t.appendRaw(mappedKeyFormatTuple.subTupleRawString(i));
+				vt.push_back(Optional<Tuple>(t));
 			}
 		} else {
-			vt.push_back(Optional<Tuple>(mappedKeyFormatTuple.subTuple(i, i + 1)));
+			Tuple t;
+			t.appendRaw(mappedKeyFormatTuple.subTupleRawString(i));
+			vt.push_back(Optional<Tuple>(t));
 		}
 	}
 }
@@ -3594,7 +3598,7 @@ Key constructMappedKey(KeyValueRef* keyValue,
 			if (idx < 0 || idx >= referenceTuple->size()) {
 				throw mapper_bad_index();
 			}
-			mappedKeyTuple.append(referenceTuple->subTuple(idx, idx + 1));
+			mappedKeyTuple.appendRaw(referenceTuple->subTupleRawString(idx));
 		}
 	}
 

From cb750b1859ab68993ee2c2991c9e85fc125eca2b Mon Sep 17 00:00:00 2001
From: hao fu <hfu5@apple.com>
Date: Fri, 6 May 2022 13:12:00 -0700
Subject: [PATCH 406/740] Fix comments

---
 fdbclient/Tuple.h                 |  3 +++
 fdbserver/storageserver.actor.cpp | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/fdbclient/Tuple.h b/fdbclient/Tuple.h
index 6201bfdfcf1..9db4d7ba4cf 100644
--- a/fdbclient/Tuple.h
+++ b/fdbclient/Tuple.h
@@ -36,6 +36,8 @@ struct Tuple {
 	static Tuple unpack(StringRef const& str, bool exclude_incomplete = false);
 
 	Tuple& append(Tuple const& tuple);
+
+	// the str needs to be a Tuple encoded string.
 	Tuple& appendRaw(StringRef const& str);
 	Tuple& append(StringRef const& str, bool utf8 = false);
 	Tuple& append(int64_t);
@@ -62,6 +64,7 @@ struct Tuple {
 		data.clear();
 		offsets.clear();
 	}
+	// Return a Tuple encoded raw string.
 	StringRef subTupleRawString(size_t index) const;
 	ElementType getType(size_t index) const;
 	Standalone<StringRef> getString(size_t index) const;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 3d06691b122..c33abf94e9d 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3534,27 +3534,27 @@ void preprocessMappedKey(Tuple& mappedKeyFormatTuple, std::vector<Optional<Tuple
 			if (escaped) {
 				Tuple escapedTuple;
 				escapedTuple.append(s);
-				vt.push_back(Optional<Tuple>(escapedTuple));
+				vt.emplace_back(escapedTuple);
 			} else if (singleKeyOrValue(s, sz)) {
 				// when it is SingleKeyOrValue, insert an empty Tuple to vector as placeholder
-				vt.push_back(Optional<Tuple>(Tuple()));
+				vt.emplace_back(Tuple());
 			} else if (rangeQuery(s)) {
 				if (i != mappedKeyFormatTuple.size() - 1) {
 					// It must be the last element of the mapper tuple
 					throw mapper_bad_range_decriptor();
 				}
 				// when it is rangeQuery, insert Optional.empty as placeholder
-				vt.push_back(Optional<Tuple>());
+				vt.emplace_back(Optional<Tuple>());
 				isRangeQuery = true;
 			} else {
 				Tuple t;
 				t.appendRaw(mappedKeyFormatTuple.subTupleRawString(i));
-				vt.push_back(Optional<Tuple>(t));
+				vt.emplace_back(t);
 			}
 		} else {
 			Tuple t;
 			t.appendRaw(mappedKeyFormatTuple.subTupleRawString(i));
-			vt.push_back(Optional<Tuple>(t));
+			vt.emplace_back(t);
 		}
 	}
 }

From f26e0607b2984729f1d81065e84545f6bf22d7fc Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Fri, 29 Apr 2022 11:09:39 -0500
Subject: [PATCH 407/740] Fix for WriteDuringRead workload key sizes with
 useSystemKeys=true but writing to normal key space

---
 fdbserver/workloads/WriteDuringRead.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbserver/workloads/WriteDuringRead.actor.cpp b/fdbserver/workloads/WriteDuringRead.actor.cpp
index 668f14552a1..f598c5f3f02 100644
--- a/fdbserver/workloads/WriteDuringRead.actor.cpp
+++ b/fdbserver/workloads/WriteDuringRead.actor.cpp
@@ -1003,7 +1003,7 @@ struct WriteDuringReadWorkload : TestWorkload {
 										tr.setOption(FDBTransactionOptions::NEXT_WRITE_NO_WRITE_CONFLICT_RANGE);
 									tr.atomicOp(key, value, opType);
 									//TraceEvent("WDRAtomicOpSuccess").detail("Key", key).detail("Value", value.size());
-									if (!noConflict && key.size() <= getMaxWriteKeySize(key, false)) {
+									if (!noConflict && key.size() <= getMaxWriteKeySize(key, self->useSystemKeys)) {
 										self->addedConflicts.insert(key, true);
 									}
 									Optional<Value> existing = self->memoryGet(&self->memoryDatabase, key);
@@ -1022,7 +1022,7 @@ struct WriteDuringReadWorkload : TestWorkload {
 								if (noConflict)
 									tr.setOption(FDBTransactionOptions::NEXT_WRITE_NO_WRITE_CONFLICT_RANGE);
 								tr.set(key, value);
-								if (!noConflict && key.size() <= getMaxWriteKeySize(key, false)) {
+								if (!noConflict && key.size() <= getMaxWriteKeySize(key, self->useSystemKeys)) {
 									self->addedConflicts.insert(key, true);
 								}
 								//TraceEvent("WDRSetSuccess").detail("Key", key).detail("Value", value.size());

From b197710956e53697b6898a59d691893622ffbde5 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Sat, 7 May 2022 09:26:00 +0100
Subject: [PATCH 408/740] Make use of relpath instead of basepath

---
 packaging/docker/sidecar.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/docker/sidecar.py b/packaging/docker/sidecar.py
index 39c4685bc7f..a9c618c129c 100755
--- a/packaging/docker/sidecar.py
+++ b/packaging/docker/sidecar.py
@@ -519,13 +519,13 @@ def do_GET(self):
             if self.path.startswith("/check_hash/"):
                 try:
                     self.send_text(
-                        check_hash(os.path.basename(self.path)), add_newline=False
+                        check_hash(os.path.relpath(self.path, "/check_hash")), add_newline=False
                     )
                 except FileNotFoundError:
                     self.send_error(404, "Path not found")
                     self.end_headers()
             if self.path.startswith("/is_present/"):
-                if is_present(os.path.basename(self.path)):
+                if is_present(os.path.relpath(self.path, "/is_present")):
                     self.send_text("OK")
                 else:
                     self.send_error(404, "Path not found")

From 671977ed4880c5f60060fb61133c6eaa90e0ff80 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 9 May 2022 05:45:12 +0000
Subject: [PATCH 409/740] update version after 7.1.4 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2155d182ae3..3fc82e6a399 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.4
+  VERSION 7.1.5
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 9d7c7386b23b6f6dea34c5afe03ed2b32c28d954 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Fri, 6 May 2022 18:40:10 -0400
Subject: [PATCH 410/740] Merge pull request #7092 from sbodagala/main

---
 fdbclient/NativeAPI.actor.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index f01d2cecac5..9e973709d45 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -4369,11 +4369,10 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
 					TEST(true); // !GetKeyValuesFamilyReply.more and modifiedSelectors in getRange
 
 					if (!rep.data.size()) {
-						// VERSION_VECTOR change version to readVersion in getRangeFallback
 						RangeResultFamily result = wait(
 						    getRangeFallback<GetKeyValuesFamilyRequest, GetKeyValuesFamilyReply, RangeResultFamily>(
 						        trState,
-						        version,
+						        readVersion,
 						        originalBegin,
 						        originalEnd,
 						        mapper,

From a11b832aa4499235871830b51276526e4b07b1b4 Mon Sep 17 00:00:00 2001
From: Russell Sears <russell_sears@apple.com>
Date: Mon, 18 Apr 2022 13:32:04 -0700
Subject: [PATCH 411/740] Improve YCSB image logging; remove logic to support
 partial restarts (#6830)

---
 packaging/docker/run_ycsb.sh | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/packaging/docker/run_ycsb.sh b/packaging/docker/run_ycsb.sh
index 0f7896201f7..deb065a7288 100755
--- a/packaging/docker/run_ycsb.sh
+++ b/packaging/docker/run_ycsb.sh
@@ -1,23 +1,16 @@
 #!/usr/bin/env bash
-set -Eeuo pipefail
+set -Eeuxo pipefail
 
 namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
 POD_NUM=$(echo $POD_NAME | cut -d - -f3)
 KEY="ycsb_load_${POD_NUM}_of_${NUM_PODS}_complete"
 CLI=$(ls /var/dynamic-conf/bin/*/fdbcli | head -n1)
-if [ ${MODE} != "load" ]; then
-    echo "WAITING FOR ALL PODS TO COME UP"
-    while [[ $(kubectl get pods -n ${namespace} -l name=ycsb,run=${RUN_ID} --field-selector=status.phase=Running | grep -cv NAME) -lt ${NUM_PODS} ]]; do
-        sleep 0.1
-    done
-    echo "ALL PODS ARE UP"
-else
-    if ${CLI} --exec "get ${KEY}" | grep is ;
-    then
-        # load already completed
-        exit 0
-    fi
-fi;
+
+echo "WAITING FOR ALL PODS TO COME UP"
+while [[ $(kubectl get pods -n ${namespace} -l name=ycsb,run=${RUN_ID} --field-selector=status.phase=Running | grep -cv NAME) -lt ${NUM_PODS} ]]; do
+    sleep 1
+done
+echo "ALL PODS ARE UP"
 
 echo "RUNNING YCSB"
 ./bin/ycsb.sh ${MODE} foundationdb -s -P workloads/${WORKLOAD} ${YCSB_ARGS}
@@ -27,7 +20,3 @@ echo "COPYING HISTOGRAMS TO S3"
 aws s3 sync --sse aws:kms --exclude "*" --include "histogram.*" /tmp s3://${BUCKET}/ycsb_histograms/${namespace}/${POD_NAME}
 echo "COPYING HISTOGRAMS TO S3 FINISHED"
 
-if [ ${MODE} == "load" ]; then
-    ${CLI} --exec "writemode on; set ${KEY} 1"
-    echo "WROTE LOAD COMPLETION KEY"
-fi

From 4b683be1bc4750419399cdd0b01c2cb8e65bd666 Mon Sep 17 00:00:00 2001
From: Neethu Haneesha Bingi <nbingi@apple.com>
Date: Thu, 5 May 2022 16:28:54 -0400
Subject: [PATCH 412/740] Adding rocksdb throttling counters to trace event.

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 44 ++++++++++++++----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 7e657ee7c89..9c08a29c00c 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -331,6 +331,15 @@ rocksdb::ReadOptions getReadOptions() {
 	return options;
 }
 
+struct Counters {
+	CounterCollection cc;
+	Counter immediateThrottle;
+	Counter failedToAcquire;
+
+	Counters()
+	  : cc("RocksDBThrottle"), immediateThrottle("ImmediateThrottle", cc), failedToAcquire("FailedToAcquire", cc) {}
+};
+
 struct ReadIterator {
 	CF& cf;
 	uint64_t index; // incrementing counter to uniquely identify read iterator.
@@ -729,7 +738,8 @@ ACTOR Future<Void> flowLockLogger(const FlowLock* readLock, const FlowLock* fetc
 ACTOR Future<Void> rocksDBMetricLogger(std::shared_ptr<rocksdb::Statistics> statistics,
                                        std::shared_ptr<PerfContextMetrics> perfContextMetrics,
                                        rocksdb::DB* db,
-                                       std::shared_ptr<ReadIteratorPool> readIterPool) {
+                                       std::shared_ptr<ReadIteratorPool> readIterPool,
+                                       Counters* counters) {
 	state std::vector<std::tuple<const char*, uint32_t, uint64_t>> tickerStats = {
 		{ "StallMicros", rocksdb::STALL_MICROS, 0 },
 		{ "BytesRead", rocksdb::BYTES_READ, 0 },
@@ -768,7 +778,6 @@ ACTOR Future<Void> rocksDBMetricLogger(std::shared_ptr<rocksdb::Statistics> stat
 
 	};
 	state std::vector<std::pair<const char*, std::string>> propertyStats = {
-		{ "NumCompactionsRunning", rocksdb::DB::Properties::kNumRunningCompactions },
 		{ "NumImmutableMemtables", rocksdb::DB::Properties::kNumImmutableMemTable },
 		{ "NumImmutableMemtablesFlushed", rocksdb::DB::Properties::kNumImmutableMemTableFlushed },
 		{ "IsMemtableFlushPending", rocksdb::DB::Properties::kMemTableFlushPending },
@@ -828,6 +837,8 @@ ACTOR Future<Void> rocksDBMetricLogger(std::shared_ptr<rocksdb::Statistics> stat
 		e.detail("NumTimesReadIteratorsReused", stat - readIteratorPoolStats["NumTimesReadIteratorsReused"]);
 		readIteratorPoolStats["NumTimesReadIteratorsReused"] = stat;
 
+		counters->cc.logToTraceEvent(e);
+
 		if (SERVER_KNOBS->ROCKSDB_PERFCONTEXT_ENABLE) {
 			perfContextMetrics->log(true);
 		}
@@ -903,13 +914,15 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			const FlowLock* readLock;
 			const FlowLock* fetchLock;
 			std::shared_ptr<RocksDBErrorListener> errorListener;
+			Counters& counters;
 			OpenAction(std::string path,
 			           Optional<Future<Void>>& metrics,
 			           const FlowLock* readLock,
 			           const FlowLock* fetchLock,
-			           std::shared_ptr<RocksDBErrorListener> errorListener)
+			           std::shared_ptr<RocksDBErrorListener> errorListener,
+			           Counters& counters)
 			  : path(std::move(path)), metrics(metrics), readLock(readLock), fetchLock(fetchLock),
-			    errorListener(errorListener) {}
+			    errorListener(errorListener), counters(counters) {}
 
 			double getTimeEstimate() const override { return SERVER_KNOBS->COMMIT_TIME_ESTIMATE; }
 		};
@@ -969,12 +982,14 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				// The current thread and main thread are same when the code runs in simulation.
 				// blockUntilReady() is getting the thread into deadlock state, so directly calling
 				// the metricsLogger.
-				a.metrics = rocksDBMetricLogger(options.statistics, perfContextMetrics, db, readIterPool) &&
-				            flowLockLogger(a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
+				a.metrics =
+				    rocksDBMetricLogger(options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
+				    flowLockLogger(a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
 			} else {
 				onMainThread([&] {
-					a.metrics = rocksDBMetricLogger(options.statistics, perfContextMetrics, db, readIterPool) &&
-					            flowLockLogger(a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
+					a.metrics =
+					    rocksDBMetricLogger(options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
+					    flowLockLogger(a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
 					return Future<bool>(true);
 				}).blockUntilReady();
 			}
@@ -1612,16 +1627,6 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	int numFetchWaiters;
 	std::shared_ptr<ReadIteratorPool> readIterPool;
 	std::vector<Future<Void>> actors;
-
-	struct Counters {
-		CounterCollection cc;
-		Counter immediateThrottle;
-		Counter failedToAcquire;
-
-		Counters()
-		  : cc("RocksDBThrottle"), immediateThrottle("ImmediateThrottle", cc), failedToAcquire("failedToAcquire", cc) {}
-	};
-
 	Counters counters;
 
 	explicit RocksDBKeyValueStore(const std::string& path, UID id)
@@ -1775,7 +1780,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		if (openFuture.isValid()) {
 			return openFuture;
 		}
-		auto a = std::make_unique<Writer::OpenAction>(path, metrics, &readSemaphore, &fetchSemaphore, errorListener);
+		auto a = std::make_unique<Writer::OpenAction>(
+		    path, metrics, &readSemaphore, &fetchSemaphore, errorListener, counters);
 		openFuture = a->done.getFuture();
 		writeThread->post(a.release());
 		return openFuture;

From bd56d0782a47edc0e5e2c4c4b783cba975a9eb4b Mon Sep 17 00:00:00 2001
From: Xiaoxi Wang <xiaoxi.wang@snowflake.com>
Date: Tue, 10 May 2022 13:52:46 -0700
Subject: [PATCH 413/740] catch special_keys_api_failure()

---
 fdbserver/workloads/FuzzApiCorrectness.actor.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fdbserver/workloads/FuzzApiCorrectness.actor.cpp b/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
index bd2abff7c3f..bec0240257a 100644
--- a/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
+++ b/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
@@ -901,6 +901,7 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
 			Key autoCoordinatorSpecialKey =
 			    LiteralStringRef("auto_coordinators")
 			        .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin);
+			KeyRangeRef actorLineageRange = SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::ACTORLINEAGE);
 			// Read this particular special key may throw timed_out
 			Key statusJsonSpecialKey = LiteralStringRef("\xff\xff/status/json");
 
@@ -920,8 +921,9 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
 				    error_code_timed_out,
 				    ExceptionContract::possibleIf(key1 <= statusJsonSpecialKey && statusJsonSpecialKey < key2)),
 				std::make_pair(error_code_special_keys_api_failure,
-				               ExceptionContract::possibleIf(key1 <= autoCoordinatorSpecialKey &&
-				                                             autoCoordinatorSpecialKey < key2)),
+				               ExceptionContract::possibleIf(
+				                   (key1 <= autoCoordinatorSpecialKey && autoCoordinatorSpecialKey < key2) ||
+				                   actorLineageRange.intersects(KeyRangeRef(key1, key2)))),
 				std::make_pair(error_code_accessed_unreadable, ExceptionContract::Possible),
 				std::make_pair(error_code_tenant_not_found,
 				               ExceptionContract::possibleIf(!workload->canUseTenant(tr->getTenant()))),
@@ -956,6 +958,7 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
 			Key autoCoordinatorSpecialKey =
 			    LiteralStringRef("auto_coordinators")
 			        .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin);
+			KeyRangeRef actorLineageRange = SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::ACTORLINEAGE);
 			Key statusJsonSpecialKey = LiteralStringRef("\xff\xff/status/json");
 
 			contract = {
@@ -975,8 +978,9 @@ struct FuzzApiCorrectnessWorkload : TestWorkload {
 				    error_code_timed_out,
 				    ExceptionContract::possibleIf(key1 <= statusJsonSpecialKey && statusJsonSpecialKey < key2)),
 				std::make_pair(error_code_special_keys_api_failure,
-				               ExceptionContract::possibleIf((key1 <= autoCoordinatorSpecialKey) &&
-				                                             (autoCoordinatorSpecialKey < key2))),
+				               ExceptionContract::possibleIf(
+				                   (key1 <= autoCoordinatorSpecialKey && autoCoordinatorSpecialKey < key2) ||
+				                   actorLineageRange.intersects(KeyRangeRef(key1, key2)))),
 				std::make_pair(error_code_accessed_unreadable, ExceptionContract::Possible),
 				std::make_pair(error_code_tenant_not_found,
 				               ExceptionContract::possibleIf(!workload->canUseTenant(tr->getTenant()))),

From 47726806ac79d76c910c64223eea0fb21208fc89 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 30 Mar 2022 11:59:20 -0700
Subject: [PATCH 414/740] Add test for turning off version vector feature

---
 tests/CMakeLists.txt                          |  3 ++
 .../VersionVectorDisableRestart-1.toml        | 42 +++++++++++++++++++
 .../VersionVectorDisableRestart-2.toml        | 37 ++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
 create mode 100644 tests/restarting/from_7.1.0/VersionVectorDisableRestart-2.toml

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ce5b714a3eb..2c64e255116 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -271,6 +271,9 @@ if(WITH_PYTHON)
   add_fdb_test(
     TEST_FILES restarting/from_7.1.0/ConfigureStorageMigrationTestRestart-1.toml
                restarting/from_7.1.0/ConfigureStorageMigrationTestRestart-2.toml)
+  add_fdb_test(
+    TEST_FILES restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
+               restarting/from_7.1.0/VersionVectorDisableRestart-2.toml)
 
 
   add_fdb_test(TEST_FILES slow/ApiCorrectness.toml)
diff --git a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
new file mode 100644
index 00000000000..170b596af25
--- /dev/null
+++ b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
@@ -0,0 +1,42 @@
+[[knobs]]
+enable_version_vector = true
+enable_version_vector_tlog_unicast = true
+
+[[test]]
+testTitle='VersionVectorDowngrade'
+clearAfterTest=false
+
+    [[test.workload]]
+    testName='Cycle'
+    transactionsPerSecond=500.0
+    nodeCount=2500
+    testDuration=10.0
+    expectedRate=0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Rollback'
+    meanDelay=10.0
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Attrition'
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Attrition'
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='SaveAndKill'
+    restartInfoLocation='simfdb/restartInfo.ini'
+    testDuration=10.0
diff --git a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-2.toml b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-2.toml
new file mode 100644
index 00000000000..b294aa39782
--- /dev/null
+++ b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-2.toml
@@ -0,0 +1,37 @@
+[[knobs]]
+enable_version_vector = false
+enable_version_vector_tlog_unicast = false
+
+[[test]]
+testTitle='VersionVectorDowngrade'
+runSetup=false
+
+    [[test.workload]]
+    testName='Cycle'
+    transactionsPerSecond=2500.0
+    nodeCount=2500
+    testDuration=10.0
+    expectedRate=0
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Rollback'
+    meanDelay=10.0
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Attrition'
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Attrition'
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0

From 4d76f2e8241b3b8eb6c209069c934073426bb3b6 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 4 Apr 2022 20:47:43 -0700
Subject: [PATCH 415/740] Use 3 cycles in VV disable tests

---
 .../VersionVectorDisableRestart-1.toml        | 25 ++++++++++++++++---
 .../VersionVectorDisableRestart-2.toml        | 23 ++++++++++++++---
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
index 170b596af25..c20a7312fbe 100644
--- a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
+++ b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
@@ -8,10 +8,27 @@ clearAfterTest=false
 
     [[test.workload]]
     testName='Cycle'
-    transactionsPerSecond=500.0
-    nodeCount=2500
-    testDuration=10.0
+    transactionsPerSecond=2500.0
+    nodeCount=1000
+    testDuration=30.0
     expectedRate=0
+    keyPrefix = 'cycle'
+
+    [[test.workload]]
+    testName = 'Cycle'
+    nodeCount = 1000
+    transactionsPerSecond = 2500.0
+    testDuration = 30.0
+    expectedRate = 0
+    keyPrefix = '!'
+
+    [[test.workload]]
+    testName = 'Cycle'
+    nodeCount = 1000
+    transactionsPerSecond = 2500.0
+    testDuration = 30.0
+    expectedRate = 0
+    keyPrefix = 'ZZZ'
 
     [[test.workload]]
     testName='RandomClogging'
@@ -39,4 +56,4 @@ clearAfterTest=false
     [[test.workload]]
     testName='SaveAndKill'
     restartInfoLocation='simfdb/restartInfo.ini'
-    testDuration=10.0
+    testDuration=60.0
diff --git a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-2.toml b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-2.toml
index b294aa39782..5c178993a37 100644
--- a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-2.toml
+++ b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-2.toml
@@ -9,9 +9,26 @@ runSetup=false
     [[test.workload]]
     testName='Cycle'
     transactionsPerSecond=2500.0
-    nodeCount=2500
-    testDuration=10.0
+    nodeCount=1000
+    testDuration=30.0
     expectedRate=0
+    keyPrefix = 'cycle'
+
+    [[test.workload]]
+    testName = 'Cycle'
+    nodeCount = 1000
+    transactionsPerSecond = 2500.0
+    testDuration = 30.0
+    expectedRate = 0
+    keyPrefix = '!'
+
+    [[test.workload]]
+    testName = 'Cycle'
+    nodeCount = 1000
+    transactionsPerSecond = 2500.0
+    testDuration = 30.0
+    expectedRate = 0
+    keyPrefix = 'ZZZ'
 
     [[test.workload]]
     testName='RandomClogging'
@@ -34,4 +51,4 @@ runSetup=false
     machinesToKill=10
     machinesToLeave=3
     reboot=true
-    testDuration=10.0
+    testDuration=60.0

From 7812dd8dfe603cb76aa5741114fc0edcf4589c38 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 4 Apr 2022 20:51:51 -0700
Subject: [PATCH 416/740] Add VV upgrade tests

No VV to VV upgrade tests.
---
 tests/CMakeLists.txt                          |  3 +
 .../VersionVectorEnableRestart-1.toml         | 59 +++++++++++++++++++
 .../VersionVectorEnableRestart-2.toml         | 54 +++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
 create mode 100644 tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2c64e255116..3dc6d17595b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -274,6 +274,9 @@ if(WITH_PYTHON)
   add_fdb_test(
     TEST_FILES restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
                restarting/from_7.1.0/VersionVectorDisableRestart-2.toml)
+  add_fdb_test(
+    TEST_FILES restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
+               restarting/from_7.1.0/VersionVectorEnableRestart-2.toml)
 
 
   add_fdb_test(TEST_FILES slow/ApiCorrectness.toml)
diff --git a/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
new file mode 100644
index 00000000000..05b9d7a7100
--- /dev/null
+++ b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
@@ -0,0 +1,59 @@
+[[knobs]]
+enable_version_vector = false
+enable_version_vector_tlog_unicast = false
+
+[[test]]
+testTitle='VersionVectorUpgrade'
+clearAfterTest=false
+
+    [[test.workload]]
+    testName='Cycle'
+    transactionsPerSecond=2500.0
+    nodeCount=1000
+    testDuration=30.0
+    expectedRate=0
+    keyPrefix = 'cycle'
+
+    [[test.workload]]
+    testName = 'Cycle'
+    nodeCount = 1000
+    transactionsPerSecond = 2500.0
+    testDuration = 30.0
+    expectedRate = 0
+    keyPrefix = '!'
+
+    [[test.workload]]
+    testName = 'Cycle'
+    nodeCount = 1000
+    transactionsPerSecond = 2500.0
+    testDuration = 30.0
+    expectedRate = 0
+    keyPrefix = 'ZZZ'
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Rollback'
+    meanDelay=10.0
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Attrition'
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Attrition'
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='SaveAndKill'
+    restartInfoLocation='simfdb/restartInfo.ini'
+    testDuration=60.0
diff --git a/tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml
new file mode 100644
index 00000000000..1aa8537f0b2
--- /dev/null
+++ b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml
@@ -0,0 +1,54 @@
+[[knobs]]
+enable_version_vector = true
+enable_version_vector_tlog_unicast = true
+
+[[test]]
+testTitle='VersionVectorUpgrade'
+runSetup=false
+
+    [[test.workload]]
+    testName='Cycle'
+    transactionsPerSecond=2500.0
+    nodeCount=1000
+    testDuration=30.0
+    expectedRate=0
+    keyPrefix = 'cycle'
+
+    [[test.workload]]
+    testName = 'Cycle'
+    nodeCount = 1000
+    transactionsPerSecond = 2500.0
+    testDuration = 30.0
+    expectedRate = 0
+    keyPrefix = '!'
+
+    [[test.workload]]
+    testName = 'Cycle'
+    nodeCount = 1000
+    transactionsPerSecond = 2500.0
+    testDuration = 30.0
+    expectedRate = 0
+    keyPrefix = 'ZZZ'
+
+    [[test.workload]]
+    testName='RandomClogging'
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Rollback'
+    meanDelay=10.0
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Attrition'
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=10.0
+
+    [[test.workload]]
+    testName='Attrition'
+    machinesToKill=10
+    machinesToLeave=3
+    reboot=true
+    testDuration=60.0

From 535394a680f5ad75c53cae9dd35f6f778e65988b Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 4 Apr 2022 21:02:25 -0700
Subject: [PATCH 417/740] Enable proxy_use_resolver_private_mutations for VV
 restarting tests

---
 tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml | 1 +
 tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
index c20a7312fbe..0e143bfe222 100644
--- a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
+++ b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
@@ -1,6 +1,7 @@
 [[knobs]]
 enable_version_vector = true
 enable_version_vector_tlog_unicast = true
+proxy_use_resolver_private_mutations = true
 
 [[test]]
 testTitle='VersionVectorDowngrade'
diff --git a/tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml
index 1aa8537f0b2..c1b4bc1e3ef 100644
--- a/tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml
+++ b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-2.toml
@@ -1,6 +1,7 @@
 [[knobs]]
 enable_version_vector = true
 enable_version_vector_tlog_unicast = true
+proxy_use_resolver_private_mutations = true
 
 [[test]]
 testTitle='VersionVectorUpgrade'

From 98551950714e3c7add2511926886e61e45f9e805 Mon Sep 17 00:00:00 2001
From: hao fu <hfu5@apple.com>
Date: Fri, 6 May 2022 17:04:56 -0700
Subject: [PATCH 418/740] Reduce workload in CycleMultiClientIntegrationTest

By default we have 3 clusters, each have 5 threads running the same
workload, this PR reduces workload from 2k write txn to 200 because
2k txn takes too long to execute and 200 is enough for correcetness.
---
 .../apple/foundationdb/CycleMultiClientIntegrationTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bindings/java/src/integration/com/apple/foundationdb/CycleMultiClientIntegrationTest.java b/bindings/java/src/integration/com/apple/foundationdb/CycleMultiClientIntegrationTest.java
index 36df0182a80..60217b3c488 100644
--- a/bindings/java/src/integration/com/apple/foundationdb/CycleMultiClientIntegrationTest.java
+++ b/bindings/java/src/integration/com/apple/foundationdb/CycleMultiClientIntegrationTest.java
@@ -43,8 +43,8 @@ public class CycleMultiClientIntegrationTest {
     public static final MultiClientHelper clientHelper = new MultiClientHelper();
 
     // more write txn than validate txn, as parent thread waits only for validate txn.
-    private static final int writeTxnCnt = 2000;
-    private static final int validateTxnCnt = 1000;
+    private static final int writeTxnCnt = 200;
+    private static final int validateTxnCnt = 100;
     private static final int threadPerDB = 5;
 
     private static final int cycleLength = 4;

From 9974e494cef884022c166f8d626741edc48c7556 Mon Sep 17 00:00:00 2001
From: Markus Pilman <markus.pilman@snowflake.com>
Date: Wed, 11 May 2022 11:41:30 -0700
Subject: [PATCH 419/740] Cherry-pick #6896 (#6957)

Co-authored-by: Jingyu Zhou <jingyuzhou@gmail.com>
---
 fdbclient/NativeAPI.actor.cpp       | 20 ++++++++---------
 fdbserver/workloads/Cycle.actor.cpp |  2 +-
 flow/Knobs.cpp                      |  1 +
 flow/Knobs.h                        |  1 +
 flow/Trace.cpp                      | 34 +++++++++++++++++++----------
 5 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 9e973709d45..b56c17d7afd 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -269,11 +269,11 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 void updateCachedReadVersionShared(double t, Version v, DatabaseSharedState* p) {
 	MutexHolder mutex(p->mutexLock);
 	if (v >= p->grvCacheSpace.cachedReadVersion) {
-		TraceEvent(SevDebug, "CacheReadVersionUpdate")
-		    .detail("Version", v)
-		    .detail("CurTime", t)
-		    .detail("LastVersion", p->grvCacheSpace.cachedReadVersion)
-		    .detail("LastTime", p->grvCacheSpace.lastGrvTime);
+		//TraceEvent(SevDebug, "CacheReadVersionUpdate")
+		//    .detail("Version", v)
+		//    .detail("CurTime", t)
+		//    .detail("LastVersion", p->grvCacheSpace.cachedReadVersion)
+		//    .detail("LastTime", p->grvCacheSpace.lastGrvTime);
 		p->grvCacheSpace.cachedReadVersion = v;
 		if (t > p->grvCacheSpace.lastGrvTime) {
 			p->grvCacheSpace.lastGrvTime = t;
@@ -286,11 +286,11 @@ void DatabaseContext::updateCachedReadVersion(double t, Version v) {
 		return updateCachedReadVersionShared(t, v, sharedStatePtr);
 	}
 	if (v >= cachedReadVersion) {
-		TraceEvent(SevDebug, "CachedReadVersionUpdate")
-		    .detail("Version", v)
-		    .detail("GrvStartTime", t)
-		    .detail("LastVersion", cachedReadVersion)
-		    .detail("LastTime", lastGrvTime);
+		//TraceEvent(SevDebug, "CachedReadVersionUpdate")
+		//    .detail("Version", v)
+		//    .detail("GrvStartTime", t)
+		//    .detail("LastVersion", cachedReadVersion)
+		//    .detail("LastTime", lastGrvTime);
 		cachedReadVersion = v;
 		// Since the time is based on the start of the request, it's possible that we
 		// get a newer version with an older time.
diff --git a/fdbserver/workloads/Cycle.actor.cpp b/fdbserver/workloads/Cycle.actor.cpp
index 4e17e82a88c..1863eaf30a9 100644
--- a/fdbserver/workloads/Cycle.actor.cpp
+++ b/fdbserver/workloads/Cycle.actor.cpp
@@ -106,7 +106,7 @@ struct CycleWorkload : TestWorkload {
 				state Transaction tr(cx);
 				if (deterministicRandom()->random01() >= self->traceParentProbability) {
 					state Span span("CycleClient"_loc);
-					TraceEvent("CycleTracingTransaction", span.context).log();
+					//TraceEvent("CycleTracingTransaction", span.context).log();
 					tr.setOption(FDBTransactionOptions::SPAN_PARENT,
 					             BinaryWriter::toValue(span.context, Unversioned()));
 				}
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index f78427002e3..4af76ac6ed2 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -217,6 +217,7 @@ void FlowKnobs::initialize(Randomize randomize, IsSimulated isSimulated) {
 	init( MAX_TRACE_EVENT_LENGTH,                             4000 ); // If the value of this is changed, the corresponding default in Trace.cpp should be changed as well
 	init( ALLOCATION_TRACING_ENABLED,                         true );
 	init( SIM_SPEEDUP_AFTER_SECONDS,                           450 );
+	init( MAX_TRACE_LINES,                               1'000'000 );
 	init( CODE_COV_TRACE_EVENT_SEVERITY,                        10 ); // Code coverage TraceEvent severity level
 
 	//TDMetrics
diff --git a/flow/Knobs.h b/flow/Knobs.h
index ae34659939a..8aca2204547 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -271,6 +271,7 @@ class FlowKnobs : public KnobsImpl<FlowKnobs> {
 	double MAX_BUGGIFIED_DELAY;
 	int SIM_CONNECT_ERROR_MODE;
 	double SIM_SPEEDUP_AFTER_SECONDS;
+	int MAX_TRACE_LINES;
 
 	// Tracefiles
 	int ZERO_LENGTH_FILE_PAD;
diff --git a/flow/Trace.cpp b/flow/Trace.cpp
index 86d572d4fe2..390e5941129 100644
--- a/flow/Trace.cpp
+++ b/flow/Trace.cpp
@@ -53,6 +53,8 @@
 // 2. To avoid a historically documented but unknown crash that occurs when logging allocations
 //    during an open trace event
 thread_local int g_allocation_tracing_disabled = 1;
+unsigned tracedLines = 0;
+thread_local int failedLineOverflow = 0;
 
 ITraceLogIssuesReporter::~ITraceLogIssuesReporter() {}
 
@@ -394,17 +396,22 @@ struct TraceLog {
 		eventBuffer.push_back(fields);
 		bufferLength += fields.sizeBytes();
 
-		// If we have queued up a large number of events in simulation, then throw an error. This makes it easier to
-		// diagnose cases where we get stuck in a loop logging trace events that eventually runs out of memory.
-		// Without this we would never see any trace events from that loop, and it would be more difficult to identify
-		// where the process is actually stuck.
-		if (g_network && g_network->isSimulated() && bufferLength > 1e8) {
-			fprintf(stderr, "Trace log buffer overflow\n");
-			fprintf(stderr, "Last event: %s\n", fields.toString().c_str());
-			// Setting this to 0 avoids a recurse from the assertion trace event and also prevents a situation where
-			// we roll the trace log only to log the single assertion event when using --crash.
-			bufferLength = 0;
-			ASSERT(false);
+		if (g_network && g_network->isSimulated()) {
+			// Throw an error if we have queued up a large number of events in simulation. This makes it easier to
+			// diagnose cases where we get stuck in a loop logging trace events that eventually runs out of memory.
+			// Without this we would never see any trace events from that loop, and it would be more difficult to
+			// identify where the process is actually stuck.
+			if (bufferLength > 1e8) {
+				fprintf(stderr, "Trace log buffer overflow\n");
+				fprintf(stderr, "Last event: %s\n", fields.toString().c_str());
+				// Setting this to 0 avoids a recurse from the assertion trace event and also prevents a situation where
+				// we roll the trace log only to log the single assertion event when using --crash.
+				bufferLength = 0;
+				ASSERT(false);
+			}
+			if (++tracedLines > FLOW_KNOBS->MAX_TRACE_LINES && failedLineOverflow == 0) {
+				failedLineOverflow = 1; // we only want to do this once
+			}
 		}
 
 		if (trackError) {
@@ -1265,6 +1272,11 @@ void BaseTraceEvent::log() {
 
 BaseTraceEvent::~BaseTraceEvent() {
 	log();
+	if (failedLineOverflow == 1) {
+		failedLineOverflow = 2;
+		TraceEvent(SevError, "TracedTooManyLines").log();
+		crashAndDie();
+	}
 }
 
 thread_local bool BaseTraceEvent::networkThread = false;

From af4335af16d9ebbbc1ffcf676889daf6da3d25d1 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Wed, 11 May 2022 18:41:11 -0700
Subject: [PATCH 420/740] Remove HostnameStatus and resolve trigger.

They are no longer needed since we have coordinators DNS cache; and they are introducing complex crashes.
---
 fdbclient/MonitorLeader.actor.cpp |   8 +-
 fdbrpc/genericactors.actor.h      |   4 -
 flow/Hostname.actor.cpp           | 118 +++++++++---------------------
 flow/Hostname.h                   |  17 +----
 4 files changed, 41 insertions(+), 106 deletions(-)

diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index 7f76fcfdb25..0182bc15347 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -270,6 +270,9 @@ TEST_CASE("/fdbclient/MonitorLeader/ConnectionString/hostname") {
 
 ACTOR Future<std::vector<NetworkAddress>> tryResolveHostnamesImpl(ClusterConnectionString* self) {
 	state std::set<NetworkAddress> allCoordinatorsSet;
+	for (const auto& coord : self->coords) {
+		allCoordinatorsSet.insert(coord);
+	}
 	std::vector<Future<Void>> fs;
 	for (auto& hostname : self->hostnames) {
 		fs.push_back(map(hostname.resolve(), [&](Optional<NetworkAddress> const& addr) -> Void {
@@ -280,9 +283,6 @@ ACTOR Future<std::vector<NetworkAddress>> tryResolveHostnamesImpl(ClusterConnect
 		}));
 	}
 	wait(waitForAll(fs));
-	for (const auto& coord : self->coords) {
-		allCoordinatorsSet.insert(coord);
-	}
 	std::vector<NetworkAddress> allCoordinators(allCoordinatorsSet.begin(), allCoordinatorsSet.end());
 	std::sort(allCoordinators.begin(), allCoordinators.end());
 	return allCoordinators;
@@ -300,7 +300,7 @@ TEST_CASE("/fdbclient/MonitorLeader/PartialResolve") {
 
 	INetworkConnections::net()->addMockTCPEndpoint(hn, port, { address });
 
-	state ClusterConnectionString cs(connectionString);
+	ClusterConnectionString cs(connectionString);
 	state std::vector<NetworkAddress> allCoordinators = wait(cs.tryResolveHostnames());
 	ASSERT(allCoordinators.size() == 1 &&
 	       std::find(allCoordinators.begin(), allCoordinators.end(), address) != allCoordinators.end());
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 38d4b73a0d4..ab52b52c615 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -101,7 +101,6 @@ Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(Req request, Hostname h
 		resetReply(request);
 		if (reply.getError().code() == error_code_request_maybe_delivered) {
 			// Connection failure.
-			hostname.resetToUnresolved();
 			INetworkConnections::net()->removeCachedDNS(hostname.host, hostname.service);
 		}
 	}
@@ -126,7 +125,6 @@ Future<ErrorOr<REPLY_TYPE(Req)>> tryGetReplyFromHostname(Req request,
 		resetReply(request);
 		if (reply.getError().code() == error_code_request_maybe_delivered) {
 			// Connection failure.
-			hostname.resetToUnresolved();
 			INetworkConnections::net()->removeCachedDNS(hostname.host, hostname.service);
 		}
 	}
@@ -149,7 +147,6 @@ Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(Req request, Hostname hostname
 				// Connection failure.
 				wait(delay(reconnetInterval));
 				reconnetInterval = std::min(2 * reconnetInterval, FLOW_KNOBS->HOSTNAME_RECONNECT_MAX_INTERVAL);
-				hostname.resetToUnresolved();
 				INetworkConnections::net()->removeCachedDNS(hostname.host, hostname.service);
 			} else {
 				throw reply.getError();
@@ -179,7 +176,6 @@ Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(Req request,
 				// Connection failure.
 				wait(delay(reconnetInterval));
 				reconnetInterval = std::min(2 * reconnetInterval, FLOW_KNOBS->HOSTNAME_RECONNECT_MAX_INTERVAL);
-				hostname.resetToUnresolved();
 				INetworkConnections::net()->removeCachedDNS(hostname.host, hostname.service);
 			} else {
 				throw reply.getError();
diff --git a/flow/Hostname.actor.cpp b/flow/Hostname.actor.cpp
index ab89280a44f..110061e5c98 100644
--- a/flow/Hostname.actor.cpp
+++ b/flow/Hostname.actor.cpp
@@ -39,47 +39,19 @@ Hostname Hostname::parse(const std::string& s) {
 	return Hostname(f.substr(0, colonPos), f.substr(colonPos + 1), isTLS);
 }
 
-void Hostname::resetToUnresolved() {
-	if (status == Hostname::RESOLVED) {
-		status = UNRESOLVED;
-		resolvedAddress = Optional<NetworkAddress>();
-	}
-}
-
 ACTOR Future<Optional<NetworkAddress>> resolveImpl(Hostname* self) {
-	loop {
-		if (self->status == Hostname::UNRESOLVED) {
-			self->status = Hostname::RESOLVING;
-			try {
-				std::vector<NetworkAddress> addresses =
-				    wait(INetworkConnections::net()->resolveTCPEndpointWithDNSCache(self->host, self->service));
-				NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
-				address.flags = 0; // Reset the parsed address to public
-				address.fromHostname = NetworkAddressFromHostname::True;
-				if (self->isTLS) {
-					address.flags |= NetworkAddress::FLAG_TLS;
-				}
-				self->resolvedAddress = address;
-				self->status = Hostname::RESOLVED;
-				self->resolveFinish.trigger();
-				return self->resolvedAddress.get();
-			} catch (...) {
-				self->status = Hostname::UNRESOLVED;
-				self->resolveFinish.trigger();
-				self->resolvedAddress = Optional<NetworkAddress>();
-				return Optional<NetworkAddress>();
-			}
-		} else if (self->status == Hostname::RESOLVING) {
-			wait(self->resolveFinish.onTrigger());
-			if (self->status == Hostname::RESOLVED) {
-				return self->resolvedAddress.get();
-			}
-			// Otherwise, this means other threads failed on resolve, so here we go back to the loop and try to resolve
-			// again.
-		} else {
-			// status is RESOLVED, nothing to do.
-			return self->resolvedAddress.get();
+	try {
+		std::vector<NetworkAddress> addresses =
+		    wait(INetworkConnections::net()->resolveTCPEndpointWithDNSCache(self->host, self->service));
+		NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		address.flags = 0; // Reset the parsed address to public
+		address.fromHostname = NetworkAddressFromHostname::True;
+		if (self->isTLS) {
+			address.flags |= NetworkAddress::FLAG_TLS;
 		}
+		return address;
+	} catch (...) {
+		return Optional<NetworkAddress>();
 	}
 }
 
@@ -109,24 +81,19 @@ Future<NetworkAddress> Hostname::resolveWithRetry() {
 }
 
 Optional<NetworkAddress> Hostname::resolveBlocking() {
-	if (status != RESOLVED) {
-		try {
-			std::vector<NetworkAddress> addresses =
-			    INetworkConnections::net()->resolveTCPEndpointBlockingWithDNSCache(host, service);
-			NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
-			address.flags = 0; // Reset the parsed address to public
-			address.fromHostname = NetworkAddressFromHostname::True;
-			if (isTLS) {
-				address.flags |= NetworkAddress::FLAG_TLS;
-			}
-			resolvedAddress = address;
-			status = RESOLVED;
-		} catch (...) {
-			status = UNRESOLVED;
-			resolvedAddress = Optional<NetworkAddress>();
+	try {
+		std::vector<NetworkAddress> addresses =
+		    INetworkConnections::net()->resolveTCPEndpointBlockingWithDNSCache(host, service);
+		NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		address.flags = 0; // Reset the parsed address to public
+		address.fromHostname = NetworkAddressFromHostname::True;
+		if (isTLS) {
+			address.flags |= NetworkAddress::FLAG_TLS;
 		}
+		return address;
+	} catch (...) {
+		return Optional<NetworkAddress>();
 	}
-	return resolvedAddress;
 }
 
 TEST_CASE("/flow/Hostname/hostname") {
@@ -179,49 +146,36 @@ TEST_CASE("/flow/Hostname/hostname") {
 	ASSERT(!Hostname::isHostname(hn12s));
 	ASSERT(!Hostname::isHostname(hn13s));
 
-	ASSERT(hn1.status == Hostname::UNRESOLVED && !hn1.resolvedAddress.present());
-	ASSERT(hn2.status == Hostname::UNRESOLVED && !hn2.resolvedAddress.present());
-	ASSERT(hn3.status == Hostname::UNRESOLVED && !hn3.resolvedAddress.present());
-	ASSERT(hn4.status == Hostname::UNRESOLVED && !hn4.resolvedAddress.present());
+	state Optional<NetworkAddress> optionalAddress = wait(hn2.resolve());
+	ASSERT(!optionalAddress.present());
 
-	state Optional<NetworkAddress> emptyAddress = wait(hn2.resolve());
-	ASSERT(hn2.status == Hostname::UNRESOLVED && !hn2.resolvedAddress.present() && !emptyAddress.present());
+	optionalAddress = hn2.resolveBlocking();
+	ASSERT(!optionalAddress.present());
 
+	state NetworkAddress address;
 	try {
-		NetworkAddress _ = wait(timeoutError(hn2.resolveWithRetry(), 1));
+		wait(timeoutError(store(address, hn2.resolveWithRetry()), 1));
 	} catch (Error& e) {
 		ASSERT(e.code() == error_code_timed_out);
 	}
-	ASSERT(hn2.status == Hostname::UNRESOLVED && !hn2.resolvedAddress.present());
-
-	emptyAddress = hn2.resolveBlocking();
-	ASSERT(hn2.status == Hostname::UNRESOLVED && !hn2.resolvedAddress.present() && !emptyAddress.present());
+	ASSERT(address == NetworkAddress());
 
 	state NetworkAddress addressSource = NetworkAddress::parse("127.0.0.0:1234");
 	INetworkConnections::net()->addMockTCPEndpoint("host-name", "1234", { addressSource });
 
 	// Test resolve.
-	state Optional<NetworkAddress> optionalAddress = wait(hn2.resolve());
-	ASSERT(hn2.status == Hostname::RESOLVED);
-	ASSERT(hn2.resolvedAddress.get() == addressSource && optionalAddress.get() == addressSource);
+	wait(store(optionalAddress, hn2.resolve()));
+	ASSERT(optionalAddress.present() && optionalAddress.get() == addressSource);
 	optionalAddress = Optional<NetworkAddress>();
 
-	// Test resolveWithRetry.
-	hn2.resetToUnresolved();
-	ASSERT(hn2.status == Hostname::UNRESOLVED && !hn2.resolvedAddress.present());
-
-	state NetworkAddress address = wait(hn2.resolveWithRetry());
-	ASSERT(hn2.status == Hostname::RESOLVED);
-	ASSERT(hn2.resolvedAddress.get() == addressSource && address == addressSource);
-
 	// Test resolveBlocking.
-	hn2.resetToUnresolved();
-	ASSERT(hn2.status == Hostname::UNRESOLVED && !hn2.resolvedAddress.present());
-
 	optionalAddress = hn2.resolveBlocking();
-	ASSERT(hn2.status == Hostname::RESOLVED);
-	ASSERT(hn2.resolvedAddress.get() == addressSource && optionalAddress.get() == addressSource);
+	ASSERT(optionalAddress.present() && optionalAddress.get() == addressSource);
 	optionalAddress = Optional<NetworkAddress>();
 
+	// Test resolveWithRetry.
+	wait(store(address, hn2.resolveWithRetry()));
+	ASSERT(address == addressSource);
+
 	return Void();
 }
diff --git a/flow/Hostname.h b/flow/Hostname.h
index 2492a17370e..c7871e5028f 100644
--- a/flow/Hostname.h
+++ b/flow/Hostname.h
@@ -33,16 +33,6 @@ struct Hostname {
 	Hostname(const std::string& host, const std::string& service, bool isTLS)
 	  : host(host), service(service), isTLS(isTLS) {}
 	Hostname() : host(""), service(""), isTLS(false) {}
-	Hostname(const Hostname& rhs) { operator=(rhs); }
-	Hostname& operator=(const Hostname& rhs) {
-		// Copy everything except AsyncTrigger resolveFinish.
-		host = rhs.host;
-		service = rhs.service;
-		isTLS = rhs.isTLS;
-		resolvedAddress = rhs.resolvedAddress;
-		status = rhs.status;
-		return *this;
-	}
 
 	bool operator==(const Hostname& r) const { return host == r.host && service == r.service && isTLS == r.isTLS; }
 	bool operator!=(const Hostname& r) const { return !(*this == r); }
@@ -72,20 +62,15 @@ struct Hostname {
 
 	std::string toString() const { return host + ":" + service + (isTLS ? ":tls" : ""); }
 
-	Optional<NetworkAddress> resolvedAddress;
-	enum HostnameStatus { UNRESOLVED, RESOLVING, RESOLVED };
 	// The resolve functions below use DNS cache.
 	Future<Optional<NetworkAddress>> resolve();
 	Future<NetworkAddress> resolveWithRetry();
 	Optional<NetworkAddress> resolveBlocking(); // This one should only be used when resolving asynchronously is
 	                                            // impossible. For all other cases, resolve() should be preferred.
-	void resetToUnresolved();
-	HostnameStatus status = UNRESOLVED;
-	AsyncTrigger resolveFinish;
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, host, service, isTLS, resolvedAddress, status);
+		serializer(ar, host, service, isTLS);
 	}
 };
 

From b9bd63ac231debb6d6f1c1cce18dcbab7e918350 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Tue, 10 May 2022 15:29:36 -0700
Subject: [PATCH 421/740] When an incompatible connection is closed, clear the
 state that prevents us from sending messages to it

---
 fdbrpc/FlowTransport.actor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 9e5a224d4c9..f0639e62b9a 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -736,6 +736,9 @@ ACTOR Future<Void> connectionKeeper(Reference<Peer> self,
 				    .errorUnsuppressed(e)
 				    .suppressFor(1.0)
 				    .detail("PeerAddr", self->destination);
+
+				// Since the connection has closed, we need to check the protocol version the next time we connect
+				self->incompatibleProtocolVersionNewer = false;
 			}
 
 			if (self->destination.isPublic() &&

From 9b34e14a3c4752d7034994fc59d2cc87399827fc Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Thu, 12 May 2022 13:12:23 -0700
Subject: [PATCH 422/740] revert "kill" command to previous 7.0 behavior
 because the current implementation is killing processes one at a time

---
 fdbcli/fdbcli.actor.cpp | 58 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 00369a7b5df..eddbd8dbc1b 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -1660,9 +1660,61 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 
 				if (tokencmp(tokens[0], "kill")) {
 					getTransaction(db, managementTenant, tr, options, intrans);
-					bool _result = wait(makeInterruptable(killCommandActor(db, tr, tokens, &address_interface)));
-					if (!_result)
-						is_error = true;
+					if (tokens.size() == 1) {
+						RangeResult kvs = wait(
+						    makeInterruptable(tr->getRange(KeyRangeRef(LiteralStringRef("\xff\xff/worker_interfaces/"),
+						                                               LiteralStringRef("\xff\xff/worker_interfaces0")),
+						                                   CLIENT_KNOBS->TOO_MANY)));
+						ASSERT(!kvs.more);
+						auto connectLock = makeReference<FlowLock>(CLIENT_KNOBS->CLI_CONNECT_PARALLELISM);
+						std::vector<Future<Void>> addInterfs;
+						for (auto it : kvs) {
+							addInterfs.push_back(addInterface(&address_interface, connectLock, it));
+						}
+						wait(waitForAll(addInterfs));
+					}
+					if (tokens.size() == 1 || tokencmp(tokens[1], "list")) {
+						if (address_interface.size() == 0) {
+							printf("\nNo addresses can be killed.\n");
+						} else if (address_interface.size() == 1) {
+							printf("\nThe following address can be killed:\n");
+						} else {
+							printf("\nThe following %zu addresses can be killed:\n", address_interface.size());
+						}
+						for (auto it : address_interface) {
+							printf("%s\n", printable(it.first).c_str());
+						}
+						printf("\n");
+					} else if (tokencmp(tokens[1], "all")) {
+						for (auto it : address_interface) {
+							BinaryReader::fromStringRef<ClientWorkerInterface>(it.second.first, IncludeVersion())
+							    .reboot.send(RebootRequest());
+						}
+						if (address_interface.size() == 0) {
+							fprintf(stderr,
+							        "ERROR: no processes to kill. You must run the `kill’ command before "
+							        "running `kill all’.\n");
+						} else {
+							printf("Attempted to kill %zu processes\n", address_interface.size());
+						}
+					} else {
+						for (int i = 1; i < tokens.size(); i++) {
+							if (!address_interface.count(tokens[i])) {
+								fprintf(stderr, "ERROR: process `%s' not recognized.\n", printable(tokens[i]).c_str());
+								is_error = true;
+								break;
+							}
+						}
+
+						if (!is_error) {
+							for (int i = 1; i < tokens.size(); i++) {
+								BinaryReader::fromStringRef<ClientWorkerInterface>(address_interface[tokens[i]].first,
+								                                                   IncludeVersion())
+								    .reboot.send(RebootRequest());
+							}
+							printf("Attempted to kill %zu processes\n", tokens.size() - 1);
+						}
+					}
 					continue;
 				}
 

From c3e66096d2e9b23cff0c4f12bc18ec7d857decce Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Thu, 12 May 2022 17:19:25 -0700
Subject: [PATCH 423/740] fixed compilation errors

---
 fdbcli/fdbcli.actor.cpp | 39 +++++++++++++++++++++++++++++++++++----
 fdbcli/fdbcli.actor.h   |  5 +----
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index eddbd8dbc1b..1a07463b512 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -1158,6 +1158,36 @@ Future<T> stopNetworkAfter(Future<T> what) {
 	}
 }
 
+ACTOR Future<Void> addInterface(std::map<Key, std::pair<Value, ClientLeaderRegInterface>>* address_interface,
+                                Reference<FlowLock> connectLock,
+                                KeyValue kv) {
+	wait(connectLock->take());
+	state FlowLock::Releaser releaser(*connectLock);
+	state ClientWorkerInterface workerInterf =
+	    BinaryReader::fromStringRef<ClientWorkerInterface>(kv.value, IncludeVersion());
+	state ClientLeaderRegInterface leaderInterf(workerInterf.address());
+	choose {
+		when(Optional<LeaderInfo> rep =
+		         wait(brokenPromiseToNever(leaderInterf.getLeader.getReply(GetLeaderRequest())))) {
+			StringRef ip_port =
+			    (kv.key.endsWith(LiteralStringRef(":tls")) ? kv.key.removeSuffix(LiteralStringRef(":tls")) : kv.key)
+			        .removePrefix(LiteralStringRef("\xff\xff/worker_interfaces/"));
+			(*address_interface)[ip_port] = std::make_pair(kv.value, leaderInterf);
+
+			if (workerInterf.reboot.getEndpoint().addresses.secondaryAddress.present()) {
+				Key full_ip_port2 =
+				    StringRef(workerInterf.reboot.getEndpoint().addresses.secondaryAddress.get().toString());
+				StringRef ip_port2 = full_ip_port2.endsWith(LiteralStringRef(":tls"))
+				                         ? full_ip_port2.removeSuffix(LiteralStringRef(":tls"))
+				                         : full_ip_port2;
+				(*address_interface)[ip_port2] = std::make_pair(kv.value, leaderInterf);
+			}
+		}
+		when(wait(delay(CLIENT_KNOBS->CLI_CONNECT_TIMEOUT))) {}
+	}
+	return Void();
+}
+
 ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 	state LineNoise& linenoise = *plinenoise;
 	state bool intrans = false;
@@ -1661,10 +1691,11 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 				if (tokencmp(tokens[0], "kill")) {
 					getTransaction(db, managementTenant, tr, options, intrans);
 					if (tokens.size() == 1) {
-						RangeResult kvs = wait(
-						    makeInterruptable(tr->getRange(KeyRangeRef(LiteralStringRef("\xff\xff/worker_interfaces/"),
-						                                               LiteralStringRef("\xff\xff/worker_interfaces0")),
-						                                   CLIENT_KNOBS->TOO_MANY)));
+						state ThreadFuture<RangeResult> wInterfF =
+						    tr->getRange(KeyRangeRef(LiteralStringRef("\xff\xff/worker_interfaces/"),
+						                             LiteralStringRef("\xff\xff/worker_interfaces0")),
+						                 CLIENT_KNOBS->TOO_MANY);
+						RangeResult kvs = wait(makeInterruptable(safeThreadFutureToFuture(wInterfF)));
 						ASSERT(!kvs.more);
 						auto connectLock = makeReference<FlowLock>(CLIENT_KNOBS->CLI_CONNECT_PARALLELISM);
 						std::vector<Future<Void>> addInterfs;
diff --git a/fdbcli/fdbcli.actor.h b/fdbcli/fdbcli.actor.h
index c0a180af012..81ef4aafe69 100644
--- a/fdbcli/fdbcli.actor.h
+++ b/fdbcli/fdbcli.actor.h
@@ -93,10 +93,7 @@ extern const KeyRangeRef processClassTypeSpecialKeyRange;
 // Other special keys
 inline const KeyRef errorMsgSpecialKey = LiteralStringRef("\xff\xff/error_message");
 // help functions (Copied from fdbcli.actor.cpp)
-// decode worker interfaces
-ACTOR Future<Void> addInterface(std::map<Key, std::pair<Value, ClientLeaderRegInterface>>* address_interface,
-                                Reference<FlowLock> connectLock,
-                                KeyValue kv);
+
 // get all workers' info
 ACTOR Future<bool> getWorkers(Reference<IDatabase> db, std::vector<ProcessData>* workers);
 

From 4e5a809613a25d38f3d9d77c8330dc7a43a70794 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Thu, 12 May 2022 11:05:28 -0700
Subject: [PATCH 424/740] Log a backtrace before throwing serialization_failed

---
 fdbrpc/FlowTransport.actor.cpp | 1 +
 flow/serialize.cpp             | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index f0639e62b9a..62caa8a732a 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -399,6 +399,7 @@ struct ConnectPacket {
 		serializer(ar, connectPacketLength);
 		if (connectPacketLength > sizeof(ConnectPacket) - sizeof(connectPacketLength)) {
 			ASSERT(!g_network->isSimulated());
+			TraceEvent("SerializationFailed").backtrace();
 			throw serialization_failed();
 		}
 
diff --git a/flow/serialize.cpp b/flow/serialize.cpp
index d51416a308a..e4d78379a58 100644
--- a/flow/serialize.cpp
+++ b/flow/serialize.cpp
@@ -25,6 +25,7 @@
 _AssumeVersion::_AssumeVersion(ProtocolVersion version) : v(version) {
 	if (!version.isValid()) {
 		ASSERT(!g_network->isSimulated());
+		TraceEvent("SerializationFailed").backtrace();
 		throw serialization_failed();
 	}
 }
@@ -34,6 +35,7 @@ const void* BinaryReader::readBytes(int bytes) {
 	const char* e = b + bytes;
 	if (e > end) {
 		ASSERT(!g_network->isSimulated());
+		TraceEvent("SerializationFailed").backtrace();
 		throw serialization_failed();
 	}
 	begin = e;

From b2d48d4ff52a995eff073c203a7944de75331b81 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 13 May 2022 09:04:30 -0700
Subject: [PATCH 425/740] Address comments by adding number of bytes

---
 fdbrpc/FlowTransport.actor.cpp | 2 +-
 flow/serialize.cpp             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 62caa8a732a..41487ee6c8a 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -399,7 +399,7 @@ struct ConnectPacket {
 		serializer(ar, connectPacketLength);
 		if (connectPacketLength > sizeof(ConnectPacket) - sizeof(connectPacketLength)) {
 			ASSERT(!g_network->isSimulated());
-			TraceEvent("SerializationFailed").backtrace();
+			TraceEvent("SerializationFailed").detail("PacketLength", connectPacketLength).backtrace();
 			throw serialization_failed();
 		}
 
diff --git a/flow/serialize.cpp b/flow/serialize.cpp
index e4d78379a58..e95f2d93db8 100644
--- a/flow/serialize.cpp
+++ b/flow/serialize.cpp
@@ -35,7 +35,7 @@ const void* BinaryReader::readBytes(int bytes) {
 	const char* e = b + bytes;
 	if (e > end) {
 		ASSERT(!g_network->isSimulated());
-		TraceEvent("SerializationFailed").backtrace();
+		TraceEvent("SerializationFailed").detail("Bytes", bytes).detail("Diff", e - end).backtrace();
 		throw serialization_failed();
 	}
 	begin = e;

From e6fa4d7422d23baa86d03bb79f1af7a245c1e3fa Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 12 May 2022 22:14:45 -0700
Subject: [PATCH 426/740] Update release notes 7.1.0 through 7.1.5

---
 .../release-notes/release-notes-710.rst       | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 84a3405b709..0c2ef672afe 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,52 @@
 Release Notes
 #############
 
+7.1.5
+=====
+* Fixed a fdbcli kill bug that was not killing in parallel. `(PR #7150) <https://github.com/apple/foundationdb/pull/7150>`_
+* Fixed a bug that prevents a peer from sending messages on a previously incompatible connection. `(PR #7124) <https://github.com/apple/foundationdb/pull/7124>`_
+* Added rocksdb throttling counters to trace event. `(PR #7096) <https://github.com/apple/foundationdb/pull/7096>`_
+* Added a backtrace before throwing serialization_failed. `(PR #7155) <https://github.com/apple/foundationdb/pull/7155>`_
+
+7.1.4
+=====
+* Fixed a bug that prevents client from connecting to a cluster. `(PR #7060) <https://github.com/apple/foundationdb/pull/7060>`_
+* Fixed a performance bug that overloads Resolver CPU. `(PR #7068) <https://github.com/apple/foundationdb/pull/7068>`_
+* Optimized storage server performance for "get range and flat map" feature. `(PR #7078) <https://github.com/apple/foundationdb/pull/7078>`_
+* Optimized both Proxy performance and Resolver (when version vector is enabled) performance. `(PR #7076) <https://github.com/apple/foundationdb/pull/7076>`_
+* Fixed a key size limit bug when using tenants. `(PR #6986) <https://github.com/apple/foundationdb/pull/6986>`_
+* Fixed operation_failed thrown incorrectly from transactions. `(PR #6993) <https://github.com/apple/foundationdb/pull/6993>`_
+* Fixed a version vector bug when GRV cache is used. `(PR #7057) <https://github.com/apple/foundationdb/pull/7057>`_
+* Fixed orphaned storage server due to force recovery. `(PR #7028) <https://github.com/apple/foundationdb/pull/7028>`_
+* Fixed a bug that a storage server reads stale cluster ID. `(PR #7026) <https://github.com/apple/foundationdb/pull/7026>`_
+* Fixed a storage server exclusion status bug that affects wiggling. `(PR #6984) <https://github.com/apple/foundationdb/pull/6984>`_
+* Fixed a bug that relocate shard tasks move data to a removed team. `(PR #7023) <https://github.com/apple/foundationdb/pull/7023>`_
+* Fixed recruitment thrashing when there are temporarily multiple cluster controllers. `(PR #7001) <https://github.com/apple/foundationdb/pull/7001>`_
+* Fixed change feed deletion due to multiple sources race. `(PR #6987) <https://github.com/apple/foundationdb/pull/6987>`_
+* Fixed TLog crash if more TLogs are absent than the replication factor. `(PR #6991) <https://github.com/apple/foundationdb/pull/6991>`_
+* Added hostname DNS resolution logic for cluster connection string. `(PR #6998) <https://github.com/apple/foundationdb/pull/6998>`_
+* Fixed a limit bug in indexPrefetch. `(PR #7005) <https://github.com/apple/foundationdb/pull/7005>`_
+
+7.1.3
+=====
+* Added logging measuring commit compute duration. `(PR #6906) <https://github.com/apple/foundationdb/pull/6906>`_
+* RocksDb used aggregated property metrics for pending compaction bytes. `(PR #6867) <https://github.com/apple/foundationdb/pull/6867>`_
+* Fixed a perpetual wiggle bug that would not react to a pause. `(PR #6933) <https://github.com/apple/foundationdb/pull/6933>`_
+* Fixed a crash of data distributor. `(PR #6938) <https://github.com/apple/foundationdb/pull/6938>`_
+* Added new c libs to client package. `(PR #6921) <https://github.com/apple/foundationdb/pull/6921>`_
+* Fixed a bug that prevents a cluster from fully recovered state after taking a snapshot. `(PR #6892) <https://github.com/apple/foundationdb/pull/6892>`_
+
+7.1.2
+=====
+* Fixed failing upgrades due to non-persisted initial cluster version. `(PR #6864) <https://github.com/apple/foundationdb/pull/6864>`_
+* Fixed a client load balancing bug because ClientDBInfo may be unintentionally not set. `(PR #6878) <https://github.com/apple/foundationdb/pull/6878>`_
+* Fixed stuck LogRouter due to races of multiple PeekStream requests. `(PR #6870) <https://github.com/apple/foundationdb/pull/6870>`_
+* Fixed a client-side infinite loop due to provisional GRV Proxy ID not set in GetReadVersionReply. `(PR #6849) <https://github.com/apple/foundationdb/pull/6849>`_
+
+7.1.1
+=====
+* Added new c libs to client package. `(PR #6828) <https://github.com/apple/foundationdb/pull/6828>`_
+
 7.1.0
 =====
 

From cc1c35c30a543048e993f97673953e62f54e6f91 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 16 May 2022 12:53:11 +0000
Subject: [PATCH 427/740] update version after 7.1.5 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fc82e6a399..881f03e8b25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.5
+  VERSION 7.1.6
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 10498455929457f1cdcc3585bfeebd493441c923 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Fri, 13 May 2022 10:10:43 -0700
Subject: [PATCH 428/740] Optimization: support removing index conditionally
 (#7116)

---
 bindings/c/fdb_c.cpp                          |  2 +
 bindings/c/foundationdb/fdb_c.h               |  1 +
 bindings/c/test/unit/fdb_api.cpp              |  2 +
 bindings/c/test/unit/fdb_api.hpp              |  1 +
 bindings/c/test/unit/unit_tests.cpp           | 27 +++++++++--
 bindings/java/fdbJNI.cpp                      |  2 +
 .../MappedRangeQueryIntegrationTest.java      | 12 ++---
 .../apple/foundationdb/FDBTransaction.java    | 28 ++++++-----
 .../apple/foundationdb/ReadTransaction.java   |  2 +-
 fdbclient/FDBTypes.h                          |  3 ++
 fdbclient/IClientApi.h                        |  1 +
 fdbclient/ISingleThreadTransaction.h          |  1 +
 fdbclient/MultiVersionTransaction.actor.cpp   |  5 +-
 fdbclient/MultiVersionTransaction.h           |  3 ++
 fdbclient/NativeAPI.actor.cpp                 | 30 ++++++++++--
 fdbclient/NativeAPI.actor.h                   |  2 +
 fdbclient/PaxosConfigTransaction.h            |  1 +
 fdbclient/ReadYourWrites.actor.cpp            | 20 +++++---
 fdbclient/ReadYourWrites.h                    |  1 +
 fdbclient/SimpleConfigTransaction.h           |  1 +
 fdbclient/StorageServerInterface.h            |  4 +-
 fdbclient/ThreadSafeTransaction.cpp           |  5 +-
 fdbclient/ThreadSafeTransaction.h             |  1 +
 fdbserver/storageserver.actor.cpp             | 18 +++++---
 fdbserver/workloads/ApiWorkload.h             |  8 +++-
 fdbserver/workloads/GetMappedRange.actor.cpp  | 46 ++++++++++++++-----
 26 files changed, 168 insertions(+), 59 deletions(-)

diff --git a/bindings/c/fdb_c.cpp b/bindings/c/fdb_c.cpp
index da54845475b..2d9ec68d78f 100644
--- a/bindings/c/fdb_c.cpp
+++ b/bindings/c/fdb_c.cpp
@@ -655,6 +655,7 @@ extern "C" DLLEXPORT FDBFuture* fdb_transaction_get_mapped_range(FDBTransaction*
                                                                  int target_bytes,
                                                                  FDBStreamingMode mode,
                                                                  int iteration,
+                                                                 int matchIndex,
                                                                  fdb_bool_t snapshot,
                                                                  fdb_bool_t reverse) {
 	FDBFuture* r = validate_and_update_parameters(limit, target_bytes, mode, iteration, reverse);
@@ -667,6 +668,7 @@ extern "C" DLLEXPORT FDBFuture* fdb_transaction_get_mapped_range(FDBTransaction*
 	                        KeySelectorRef(KeyRef(end_key_name, end_key_name_length), end_or_equal, end_offset),
 	                        StringRef(mapper_name, mapper_name_length),
 	                        GetRangeLimits(limit, target_bytes),
+	                        matchIndex,
 	                        snapshot,
 	                        reverse)
 	                    .extractPtr());
diff --git a/bindings/c/foundationdb/fdb_c.h b/bindings/c/foundationdb/fdb_c.h
index cbd90226e7b..0cd2b7019a1 100644
--- a/bindings/c/foundationdb/fdb_c.h
+++ b/bindings/c/foundationdb/fdb_c.h
@@ -384,6 +384,7 @@ DLLEXPORT WARN_UNUSED_RESULT FDBFuture* fdb_transaction_get_mapped_range(FDBTran
                                                                          int target_bytes,
                                                                          FDBStreamingMode mode,
                                                                          int iteration,
+                                                                         int matchIndex,
                                                                          fdb_bool_t snapshot,
                                                                          fdb_bool_t reverse);
 
diff --git a/bindings/c/test/unit/fdb_api.cpp b/bindings/c/test/unit/fdb_api.cpp
index 4684dd66dc4..b71b8b80033 100644
--- a/bindings/c/test/unit/fdb_api.cpp
+++ b/bindings/c/test/unit/fdb_api.cpp
@@ -271,6 +271,7 @@ MappedKeyValueArrayFuture Transaction::get_mapped_range(const uint8_t* begin_key
                                                         int target_bytes,
                                                         FDBStreamingMode mode,
                                                         int iteration,
+                                                        int matchIndex,
                                                         fdb_bool_t snapshot,
                                                         fdb_bool_t reverse) {
 	return MappedKeyValueArrayFuture(fdb_transaction_get_mapped_range(tr_,
@@ -288,6 +289,7 @@ MappedKeyValueArrayFuture Transaction::get_mapped_range(const uint8_t* begin_key
 	                                                                  target_bytes,
 	                                                                  mode,
 	                                                                  iteration,
+	                                                                  matchIndex,
 	                                                                  snapshot,
 	                                                                  reverse));
 }
diff --git a/bindings/c/test/unit/fdb_api.hpp b/bindings/c/test/unit/fdb_api.hpp
index f34338f6947..7f8f21072cf 100644
--- a/bindings/c/test/unit/fdb_api.hpp
+++ b/bindings/c/test/unit/fdb_api.hpp
@@ -304,6 +304,7 @@ class Transaction final {
 	                                           int target_bytes,
 	                                           FDBStreamingMode mode,
 	                                           int iteration,
+	                                           int matchIndex,
 	                                           fdb_bool_t snapshot,
 	                                           fdb_bool_t reverse);
 
diff --git a/bindings/c/test/unit/unit_tests.cpp b/bindings/c/test/unit/unit_tests.cpp
index 7ca44c1629d..242eca685ae 100644
--- a/bindings/c/test/unit/unit_tests.cpp
+++ b/bindings/c/test/unit/unit_tests.cpp
@@ -259,6 +259,7 @@ GetMappedRangeResult get_mapped_range(fdb::Transaction& tr,
                                       int target_bytes,
                                       FDBStreamingMode mode,
                                       int iteration,
+                                      int matchIndex,
                                       fdb_bool_t snapshot,
                                       fdb_bool_t reverse) {
 	fdb::MappedKeyValueArrayFuture f1 = tr.get_mapped_range(begin_key_name,
@@ -275,6 +276,7 @@ GetMappedRangeResult get_mapped_range(fdb::Transaction& tr,
 	                                                        target_bytes,
 	                                                        mode,
 	                                                        iteration,
+	                                                        matchIndex,
 	                                                        snapshot,
 	                                                        reverse);
 
@@ -949,7 +951,11 @@ std::map<std::string, std::string> fillInRecords(int n) {
 	return data;
 }
 
-GetMappedRangeResult getMappedIndexEntries(int beginId, int endId, fdb::Transaction& tr, std::string mapper) {
+GetMappedRangeResult getMappedIndexEntries(int beginId,
+                                           int endId,
+                                           fdb::Transaction& tr,
+                                           std::string mapper,
+                                           int matchIndex = MATCH_INDEX_ALL) {
 	std::string indexEntryKeyBegin = indexEntryKey(beginId);
 	std::string indexEntryKeyEnd = indexEntryKey(endId);
 
@@ -963,13 +969,17 @@ GetMappedRangeResult getMappedIndexEntries(int beginId, int endId, fdb::Transact
 	    /* target_bytes */ 0,
 	    /* FDBStreamingMode */ FDB_STREAMING_MODE_WANT_ALL,
 	    /* iteration */ 0,
+	    /* matchIndex */ matchIndex,
 	    /* snapshot */ false,
 	    /* reverse */ 0);
 }
 
-GetMappedRangeResult getMappedIndexEntries(int beginId, int endId, fdb::Transaction& tr) {
+GetMappedRangeResult getMappedIndexEntries(int beginId,
+                                           int endId,
+                                           fdb::Transaction& tr,
+                                           int matchIndex = MATCH_INDEX_ALL) {
 	std::string mapper = Tuple().append(prefix).append(RECORD).append("{K[3]}"_sr).append("{...}"_sr).pack().toString();
-	return getMappedIndexEntries(beginId, endId, tr, mapper);
+	return getMappedIndexEntries(beginId, endId, tr, mapper, matchIndex);
 }
 
 TEST_CASE("fdb_transaction_get_mapped_range") {
@@ -981,7 +991,8 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 	while (1) {
 		int beginId = 1;
 		int endId = 19;
-		auto result = getMappedIndexEntries(beginId, endId, tr);
+		const int matchIndex = deterministicRandom()->random01() > 0.5 ? MATCH_INDEX_NONE : MATCH_INDEX_ALL;
+		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex);
 
 		if (result.err) {
 			fdb::EmptyFuture f1 = tr.on_error(result.err);
@@ -996,7 +1007,11 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 		int id = beginId;
 		for (int i = 0; i < expectSize; i++, id++) {
 			const auto& [key, value, begin, end, range_results] = result.mkvs[i];
-			CHECK(indexEntryKey(id).compare(key) == 0);
+			if (matchIndex == MATCH_INDEX_ALL || i == 0 || i == expectSize - 1) {
+				CHECK(indexEntryKey(id).compare(key) == 0);
+			} else {
+				CHECK(EMPTY.compare(key) == 0);
+			}
 			CHECK(EMPTY.compare(value) == 0);
 			CHECK(range_results.size() == SPLIT_SIZE);
 			for (int split = 0; split < SPLIT_SIZE; split++) {
@@ -1022,6 +1037,7 @@ TEST_CASE("fdb_transaction_get_mapped_range_restricted_to_serializable") {
 	    /* target_bytes */ 0,
 	    /* FDBStreamingMode */ FDB_STREAMING_MODE_WANT_ALL,
 	    /* iteration */ 0,
+	    /* matchIndex */ MATCH_INDEX_ALL,
 	    /* snapshot */ true, // Set snapshot to true
 	    /* reverse */ 0);
 	ASSERT(result.err == error_code_unsupported_operation);
@@ -1041,6 +1057,7 @@ TEST_CASE("fdb_transaction_get_mapped_range_restricted_to_ryw_enable") {
 	    /* target_bytes */ 0,
 	    /* FDBStreamingMode */ FDB_STREAMING_MODE_WANT_ALL,
 	    /* iteration */ 0,
+	    /* matchIndex */ MATCH_INDEX_ALL,
 	    /* snapshot */ false,
 	    /* reverse */ 0);
 	ASSERT(result.err == error_code_unsupported_operation);
diff --git a/bindings/java/fdbJNI.cpp b/bindings/java/fdbJNI.cpp
index f44d52e1690..2392dc50c47 100644
--- a/bindings/java/fdbJNI.cpp
+++ b/bindings/java/fdbJNI.cpp
@@ -960,6 +960,7 @@ JNIEXPORT jlong JNICALL Java_com_apple_foundationdb_FDBTransaction_Transaction_1
                                                                                                jint targetBytes,
                                                                                                jint streamingMode,
                                                                                                jint iteration,
+                                                                                               jint matchIndex,
                                                                                                jboolean snapshot,
                                                                                                jboolean reverse) {
 	if (!tPtr || !keyBeginBytes || !keyEndBytes || !mapperBytes) {
@@ -1007,6 +1008,7 @@ JNIEXPORT jlong JNICALL Java_com_apple_foundationdb_FDBTransaction_Transaction_1
 	                                                targetBytes,
 	                                                (FDBStreamingMode)streamingMode,
 	                                                iteration,
+	                                                matchIndex,
 	                                                snapshot,
 	                                                reverse);
 	jenv->ReleaseByteArrayElements(keyBeginBytes, (jbyte*)barrBegin, JNI_ABORT);
diff --git a/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java b/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
index f8661f716ca..92ca4a6724c 100644
--- a/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
+++ b/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
@@ -192,12 +192,12 @@ public interface RangeQueryWithIndex {
 
 	RangeQueryWithIndex mappedRangeQuery = (int begin, int end, Database db) -> db.run(tr -> {
 		try {
-			List<MappedKeyValue> kvs =
-			    tr.getMappedRange(KeySelector.firstGreaterOrEqual(indexEntryKey(begin)),
-			                          KeySelector.firstGreaterOrEqual(indexEntryKey(end)), MAPPER,
-			                          ReadTransaction.ROW_LIMIT_UNLIMITED, false, StreamingMode.WANT_ALL)
-			        .asList()
-			        .get();
+			List<MappedKeyValue> kvs = tr.getMappedRange(KeySelector.firstGreaterOrEqual(indexEntryKey(begin)),
+			                                             KeySelector.firstGreaterOrEqual(indexEntryKey(end)), MAPPER,
+			                                             ReadTransaction.ROW_LIMIT_UNLIMITED,
+			                                             FDBTransaction.MATCH_INDEX_ALL, false, StreamingMode.WANT_ALL)
+			                               .asList()
+			                               .get();
 			Assertions.assertEquals(end - begin, kvs.size());
 
 			if (validate) {
diff --git a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
index 65a1e9f2548..7451959f228 100644
--- a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
@@ -32,6 +32,10 @@
 import com.apple.foundationdb.tuple.ByteArrayUtil;
 
 class FDBTransaction extends NativeObjectWrapper implements Transaction, OptionConsumer {
+
+	static public final int MATCH_INDEX_ALL = 0;
+	static public final int MATCH_INDEX_NONE = 1;
+
 	private final Database database;
 	private final Executor executor;
 	private final TransactionOptions options;
@@ -93,7 +97,8 @@ public CompletableFuture<KeyArrayResult> getRangeSplitPoints(Range range, long c
 
 		@Override
 		public AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelector end, byte[] mapper,
-		                                                        int limit, boolean reverse, StreamingMode mode) {
+		                                                    int limit, int matchIndex, boolean reverse,
+		                                                    StreamingMode mode) {
 
 			throw new UnsupportedOperationException("getMappedRange is only supported in serializable");
 		}
@@ -346,8 +351,8 @@ public CompletableFuture<KeyArrayResult> getRangeSplitPoints(Range range, long c
 	}
 
 	@Override
-	public AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelector end, byte[] mapper,
-	                                                        int limit, boolean reverse, StreamingMode mode) {
+	public AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelector end, byte[] mapper, int limit,
+	                                                    int matchIndex, boolean reverse, StreamingMode mode) {
 		if (mapper == null) {
 			throw new IllegalArgumentException("Mapper must be non-null");
 		}
@@ -467,9 +472,9 @@ protected FutureMappedResults getMappedRange_internal(KeySelector begin, KeySele
 			    begin.toString(), end.toString(), rowLimit, targetBytes, streamingMode,
 			    iteration, Boolean.toString(isSnapshot), Boolean.toString(reverse)));*/
 			return new FutureMappedResults(
-			    Transaction_getMappedRange(getPtr(), begin.getKey(), begin.orEqual(), begin.getOffset(),
-			                                   end.getKey(), end.orEqual(), end.getOffset(), mapper, rowLimit,
-			                                   targetBytes, streamingMode, iteration, isSnapshot, reverse),
+			    Transaction_getMappedRange(getPtr(), begin.getKey(), begin.orEqual(), begin.getOffset(), end.getKey(),
+			                               end.orEqual(), end.getOffset(), mapper, rowLimit, targetBytes, streamingMode,
+			                               iteration, MATCH_INDEX_ALL, isSnapshot, reverse),
 			    FDB.instance().isDirectBufferQueriesEnabled(), executor, eventKeeper);
 		} finally {
 			pointerReadLock.unlock();
@@ -809,12 +814,11 @@ private native long Transaction_getRange(long cPtr,
 			byte[] keyEnd, boolean orEqualEnd, int offsetEnd,
 			int rowLimit, int targetBytes, int streamingMode, int iteration,
 			boolean isSnapshot, boolean reverse);
-	private native long Transaction_getMappedRange(long cPtr, byte[] keyBegin, boolean orEqualBegin,
-	                                                   int offsetBegin, byte[] keyEnd, boolean orEqualEnd,
-	                                                   int offsetEnd,
-	                                                   byte[] mapper, // Nonnull
-	                                                   int rowLimit, int targetBytes, int streamingMode, int iteration,
-	                                                   boolean isSnapshot, boolean reverse);
+	private native long Transaction_getMappedRange(long cPtr, byte[] keyBegin, boolean orEqualBegin, int offsetBegin,
+	                                               byte[] keyEnd, boolean orEqualEnd, int offsetEnd,
+	                                               byte[] mapper, // Nonnull
+	                                               int rowLimit, int targetBytes, int streamingMode, int iteration,
+	                                               int matchIndex, boolean isSnapshot, boolean reverse);
 	private native void Transaction_addConflictRange(long cPtr,
 			byte[] keyBegin, byte[] keyEnd, int conflictRangeType);
 	private native void Transaction_set(long cPtr, byte[] key, byte[] value);
diff --git a/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java b/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java
index 417068441de..b8089e39009 100644
--- a/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java
@@ -458,7 +458,7 @@ AsyncIterable<KeyValue> getRange(Range range,
 	 * @return a handle to access the results of the asynchronous call
 	 */
 	AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelector end, byte[] mapper, int limit,
-	                                                 boolean reverse, StreamingMode mode);
+	                                             int matchIndex, boolean reverse, StreamingMode mode);
 
 	/**
 	 * Gets an estimate for the number of bytes stored in the given range.
diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index b5d6e553553..41ea9b2f149 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -167,6 +167,9 @@ static const Tag invalidTag{ tagLocalitySpecial, 0 };
 static const Tag txsTag{ tagLocalitySpecial, 1 };
 static const Tag cacheTag{ tagLocalitySpecial, 2 };
 
+const int MATCH_INDEX_ALL = 0;
+const int MATCH_INDEX_NONE = 1;
+
 enum { txsTagOld = -1, invalidTagOld = -100 };
 
 struct TagsAndMessage {
diff --git a/fdbclient/IClientApi.h b/fdbclient/IClientApi.h
index 91ef38eeae3..7579efbc19a 100644
--- a/fdbclient/IClientApi.h
+++ b/fdbclient/IClientApi.h
@@ -67,6 +67,7 @@ class ITransaction {
 	                                                       const KeySelectorRef& end,
 	                                                       const StringRef& mapper,
 	                                                       GetRangeLimits limits,
+	                                                       int matchIndex = MATCH_INDEX_ALL,
 	                                                       bool snapshot = false,
 	                                                       bool reverse = false) = 0;
 	virtual ThreadFuture<Standalone<VectorRef<const char*>>> getAddressesForKey(const KeyRef& key) = 0;
diff --git a/fdbclient/ISingleThreadTransaction.h b/fdbclient/ISingleThreadTransaction.h
index bb5a4913f19..e10e39d79be 100644
--- a/fdbclient/ISingleThreadTransaction.h
+++ b/fdbclient/ISingleThreadTransaction.h
@@ -74,6 +74,7 @@ class ISingleThreadTransaction : public ReferenceCounted<ISingleThreadTransactio
 	                                                 KeySelector end,
 	                                                 Key mapper,
 	                                                 GetRangeLimits limits,
+	                                                 int matchIndex = MATCH_INDEX_ALL,
 	                                                 Snapshot = Snapshot::False,
 	                                                 Reverse = Reverse::False) = 0;
 	virtual Future<Standalone<VectorRef<const char*>>> getAddressesForKey(Key const& key) = 0;
diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp
index 20517fc2647..27395c63e26 100644
--- a/fdbclient/MultiVersionTransaction.actor.cpp
+++ b/fdbclient/MultiVersionTransaction.actor.cpp
@@ -154,6 +154,7 @@ ThreadFuture<MappedRangeResult> DLTransaction::getMappedRange(const KeySelectorR
                                                               const KeySelectorRef& end,
                                                               const StringRef& mapper,
                                                               GetRangeLimits limits,
+                                                              int matchIndex,
                                                               bool snapshot,
                                                               bool reverse) {
 	FdbCApi::FDBFuture* f = api->transactionGetMappedRange(tr,
@@ -171,6 +172,7 @@ ThreadFuture<MappedRangeResult> DLTransaction::getMappedRange(const KeySelectorR
 	                                                       limits.bytes,
 	                                                       FDB_STREAMING_MODE_EXACT,
 	                                                       0,
+	                                                       matchIndex,
 	                                                       snapshot,
 	                                                       reverse);
 	return toThreadFuture<MappedRangeResult>(api, f, [](FdbCApi::FDBFuture* f, FdbCApi* api) {
@@ -975,10 +977,11 @@ ThreadFuture<MappedRangeResult> MultiVersionTransaction::getMappedRange(const Ke
                                                                         const KeySelectorRef& end,
                                                                         const StringRef& mapper,
                                                                         GetRangeLimits limits,
+                                                                        int matchIndex,
                                                                         bool snapshot,
                                                                         bool reverse) {
 	auto tr = getTransaction();
-	auto f = tr.transaction ? tr.transaction->getMappedRange(begin, end, mapper, limits, snapshot, reverse)
+	auto f = tr.transaction ? tr.transaction->getMappedRange(begin, end, mapper, limits, matchIndex, snapshot, reverse)
 	                        : makeTimeout<MappedRangeResult>();
 	return abortableFuture(f, tr.onChange);
 }
diff --git a/fdbclient/MultiVersionTransaction.h b/fdbclient/MultiVersionTransaction.h
index b13081ebc64..e9dc59fe997 100644
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@@ -218,6 +218,7 @@ struct FdbCApi : public ThreadSafeReferenceCounted<FdbCApi> {
 	                                        int targetBytes,
 	                                        FDBStreamingMode mode,
 	                                        int iteration,
+	                                        int matchIndex,
 	                                        fdb_bool_t snapshot,
 	                                        fdb_bool_t reverse);
 	FDBFuture* (*transactionGetVersionstamp)(FDBTransaction* tr);
@@ -349,6 +350,7 @@ class DLTransaction : public ITransaction, ThreadSafeReferenceCounted<DLTransact
 	                                               const KeySelectorRef& end,
 	                                               const StringRef& mapper,
 	                                               GetRangeLimits limits,
+	                                               int matchIndex,
 	                                               bool snapshot,
 	                                               bool reverse) override;
 	ThreadFuture<Standalone<VectorRef<const char*>>> getAddressesForKey(const KeyRef& key) override;
@@ -537,6 +539,7 @@ class MultiVersionTransaction : public ITransaction, ThreadSafeReferenceCounted<
 	                                               const KeySelectorRef& end,
 	                                               const StringRef& mapper,
 	                                               GetRangeLimits limits,
+	                                               int matchIndex,
 	                                               bool snapshot,
 	                                               bool reverse) override;
 	ThreadFuture<Standalone<VectorRef<const char*>>> getAddressesForKey(const KeyRef& key) override;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index b56c17d7afd..b3946f7263b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3784,12 +3784,24 @@ RequestStream<GetKeyValuesFamilyRequest> StorageServerInterface::*getRangeReques
 	}
 }
 
+template <class GetKeyValuesFamilyRequest>
+void setMatchIndex(GetKeyValuesFamilyRequest& req, int matchIndex) {
+	if constexpr (std::is_same<GetKeyValuesFamilyRequest, GetKeyValuesRequest>::value) {
+		// do nothing;
+	} else if (std::is_same<GetKeyValuesFamilyRequest, GetMappedKeyValuesRequest>::value) {
+		req.matchIndex = matchIndex;
+	} else {
+		UNREACHABLE();
+	}
+}
+
 ACTOR template <class GetKeyValuesFamilyRequest, class GetKeyValuesFamilyReply, class RangeResultFamily>
 Future<RangeResultFamily> getExactRange(Reference<TransactionState> trState,
                                         Version version,
                                         KeyRange keys,
                                         Key mapper,
                                         GetRangeLimits limits,
+                                        int matchIndex,
                                         Reverse reverse,
                                         UseTenant useTenant) {
 	state RangeResultFamily output;
@@ -3822,6 +3834,7 @@ Future<RangeResultFamily> getExactRange(Reference<TransactionState> trState,
 			req.version = version;
 			req.begin = firstGreaterOrEqual(range.begin);
 			req.end = firstGreaterOrEqual(range.end);
+			setMatchIndex<GetKeyValuesFamilyRequest>(req, matchIndex);
 			req.spanContext = span.context;
 			trState->cx->getLatestCommitVersions(
 			    locations[shard].locations, req.version, trState, req.ssLatestCommitVersions);
@@ -3996,6 +4009,7 @@ Future<RangeResultFamily> getRangeFallback(Reference<TransactionState> trState,
                                            KeySelector end,
                                            Key mapper,
                                            GetRangeLimits limits,
+                                           int matchIndex,
                                            Reverse reverse,
                                            UseTenant useTenant) {
 	if (version == latestVersion) {
@@ -4021,7 +4035,7 @@ Future<RangeResultFamily> getRangeFallback(Reference<TransactionState> trState,
 	// or allKeys.begin exists in the database/tenant and will be part of the conflict range anyways
 
 	RangeResultFamily _r = wait(getExactRange<GetKeyValuesFamilyRequest, GetKeyValuesFamilyReply, RangeResultFamily>(
-	    trState, version, KeyRangeRef(b, e), mapper, limits, reverse, useTenant));
+	    trState, version, KeyRangeRef(b, e), mapper, limits, matchIndex, reverse, useTenant));
 	RangeResultFamily r = _r;
 
 	if (b == allKeys.begin && ((reverse && !r.more) || !reverse))
@@ -4145,6 +4159,7 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
                                    Key mapper,
                                    GetRangeLimits limits,
                                    Promise<std::pair<Key, Key>> conflictRange,
+                                   int matchIndex,
                                    Snapshot snapshot,
                                    Reverse reverse,
                                    UseTenant useTenant = UseTenant::True) {
@@ -4197,7 +4212,7 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
 			state GetKeyValuesFamilyRequest req;
 			req.mapper = mapper;
 			req.arena.dependsOn(mapper.arena());
-
+			setMatchIndex<GetKeyValuesFamilyRequest>(req, matchIndex);
 			req.tenantInfo = useTenant ? trState->getTenantInfo() : TenantInfo();
 			req.isFetchKeys = (trState->taskID == TaskPriority::FetchKeys);
 			req.version = readVersion;
@@ -4377,6 +4392,7 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
 						        originalEnd,
 						        mapper,
 						        originalLimits,
+						        matchIndex,
 						        reverse,
 						        useTenant));
 						getRangeFinished(
@@ -4417,6 +4433,7 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
 						        originalEnd,
 						        mapper,
 						        originalLimits,
+						        matchIndex,
 						        reverse,
 						        useTenant));
 						getRangeFinished(
@@ -5002,6 +5019,7 @@ Future<RangeResult> getRange(Reference<TransactionState> const& trState,
 	                                                                     ""_sr,
 	                                                                     limits,
 	                                                                     Promise<std::pair<Key, Key>>(),
+	                                                                     MATCH_INDEX_ALL,
 	                                                                     Snapshot::True,
 	                                                                     reverse,
 	                                                                     useTenant);
@@ -5356,6 +5374,7 @@ Future<RangeResultFamily> Transaction::getRangeInternal(const KeySelector& begin
                                                         const KeySelector& end,
                                                         const Key& mapper,
                                                         GetRangeLimits limits,
+                                                        int matchIndex,
                                                         Snapshot snapshot,
                                                         Reverse reverse) {
 	++trState->cx->transactionLogicalReads;
@@ -5398,7 +5417,7 @@ Future<RangeResultFamily> Transaction::getRangeInternal(const KeySelector& begin
 	}
 
 	return ::getRange<GetKeyValuesFamilyRequest, GetKeyValuesFamilyReply, RangeResultFamily>(
-	    trState, getReadVersion(), b, e, mapper, limits, conflictRange, snapshot, reverse);
+	    trState, getReadVersion(), b, e, mapper, limits, conflictRange, matchIndex, snapshot, reverse);
 }
 
 Future<RangeResult> Transaction::getRange(const KeySelector& begin,
@@ -5407,17 +5426,18 @@ Future<RangeResult> Transaction::getRange(const KeySelector& begin,
                                           Snapshot snapshot,
                                           Reverse reverse) {
 	return getRangeInternal<GetKeyValuesRequest, GetKeyValuesReply, RangeResult>(
-	    begin, end, ""_sr, limits, snapshot, reverse);
+	    begin, end, ""_sr, limits, MATCH_INDEX_ALL, snapshot, reverse);
 }
 
 Future<MappedRangeResult> Transaction::getMappedRange(const KeySelector& begin,
                                                       const KeySelector& end,
                                                       const Key& mapper,
                                                       GetRangeLimits limits,
+                                                      int matchIndex,
                                                       Snapshot snapshot,
                                                       Reverse reverse) {
 	return getRangeInternal<GetMappedKeyValuesRequest, GetMappedKeyValuesReply, MappedRangeResult>(
-	    begin, end, mapper, limits, snapshot, reverse);
+	    begin, end, mapper, limits, matchIndex, snapshot, reverse);
 }
 
 Future<RangeResult> Transaction::getRange(const KeySelector& begin,
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 988e64aaf18..c2ad3ce1588 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -328,6 +328,7 @@ class Transaction : NonCopyable {
 	                                                       const KeySelector& end,
 	                                                       const Key& mapper,
 	                                                       GetRangeLimits limits,
+	                                                       int matchIndex = MATCH_INDEX_ALL,
 	                                                       Snapshot = Snapshot::False,
 	                                                       Reverse = Reverse::False);
 
@@ -337,6 +338,7 @@ class Transaction : NonCopyable {
 	                                           const KeySelector& end,
 	                                           const Key& mapper,
 	                                           GetRangeLimits limits,
+	                                           int matchIndex,
 	                                           Snapshot snapshot,
 	                                           Reverse reverse);
 
diff --git a/fdbclient/PaxosConfigTransaction.h b/fdbclient/PaxosConfigTransaction.h
index 67487fff32e..05c113e6d94 100644
--- a/fdbclient/PaxosConfigTransaction.h
+++ b/fdbclient/PaxosConfigTransaction.h
@@ -54,6 +54,7 @@ class PaxosConfigTransaction final : public IConfigTransaction, public FastAlloc
 	                                         KeySelector end,
 	                                         Key mapper,
 	                                         GetRangeLimits limits,
+	                                         int matchIndex = MATCH_INDEX_ALL,
 	                                         Snapshot = Snapshot::False,
 	                                         Reverse = Reverse::False) override {
 		throw client_invalid_operation();
diff --git a/fdbclient/ReadYourWrites.actor.cpp b/fdbclient/ReadYourWrites.actor.cpp
index c651adad32a..2d81c7245b1 100644
--- a/fdbclient/ReadYourWrites.actor.cpp
+++ b/fdbclient/ReadYourWrites.actor.cpp
@@ -77,11 +77,12 @@ class RYWImpl {
 
 	template <bool reverse>
 	struct GetMappedRangeReq {
-		GetMappedRangeReq(KeySelector begin, KeySelector end, Key mapper, GetRangeLimits limits)
-		  : begin(begin), end(end), mapper(mapper), limits(limits) {}
+		GetMappedRangeReq(KeySelector begin, KeySelector end, Key mapper, int matchIndex, GetRangeLimits limits)
+		  : begin(begin), end(end), mapper(mapper), limits(limits), matchIndex(matchIndex) {}
 		KeySelector begin, end;
 		Key mapper;
 		GetRangeLimits limits;
+		int matchIndex;
 		using Result = MappedRangeResult;
 	};
 
@@ -1140,9 +1141,13 @@ class RYWImpl {
 			else
 				read.end = KeySelector(firstGreaterOrEqual(key), key.arena());
 		}
-
-		MappedRangeResult v = wait(ryw->tr.getMappedRange(
-		    read.begin, read.end, read.mapper, read.limits, snapshot, backwards ? Reverse::True : Reverse::False));
+		MappedRangeResult v = wait(ryw->tr.getMappedRange(read.begin,
+		                                                  read.end,
+		                                                  read.mapper,
+		                                                  read.limits,
+		                                                  read.matchIndex,
+		                                                  snapshot,
+		                                                  backwards ? Reverse::True : Reverse::False));
 		return v;
 	}
 
@@ -1677,6 +1682,7 @@ Future<MappedRangeResult> ReadYourWritesTransaction::getMappedRange(KeySelector
                                                                     KeySelector end,
                                                                     Key mapper,
                                                                     GetRangeLimits limits,
+                                                                    int matchIndex,
                                                                     Snapshot snapshot,
                                                                     Reverse reverse) {
 	if (getDatabase()->apiVersionAtLeast(630)) {
@@ -1724,9 +1730,9 @@ Future<MappedRangeResult> ReadYourWritesTransaction::getMappedRange(KeySelector
 
 	Future<MappedRangeResult> result =
 	    reverse ? RYWImpl::readWithConflictRangeForGetMappedRange(
-	                  this, RYWImpl::GetMappedRangeReq<true>(begin, end, mapper, limits), snapshot)
+	                  this, RYWImpl::GetMappedRangeReq<true>(begin, end, mapper, matchIndex, limits), snapshot)
 	            : RYWImpl::readWithConflictRangeForGetMappedRange(
-	                  this, RYWImpl::GetMappedRangeReq<false>(begin, end, mapper, limits), snapshot);
+	                  this, RYWImpl::GetMappedRangeReq<false>(begin, end, mapper, matchIndex, limits), snapshot);
 
 	return result;
 }
diff --git a/fdbclient/ReadYourWrites.h b/fdbclient/ReadYourWrites.h
index 341dc4e2a1d..5c76a1dec6e 100644
--- a/fdbclient/ReadYourWrites.h
+++ b/fdbclient/ReadYourWrites.h
@@ -112,6 +112,7 @@ class ReadYourWritesTransaction final : NonCopyable,
 	                                         KeySelector end,
 	                                         Key mapper,
 	                                         GetRangeLimits limits,
+	                                         int matchIndex,
 	                                         Snapshot = Snapshot::False,
 	                                         Reverse = Reverse::False) override;
 
diff --git a/fdbclient/SimpleConfigTransaction.h b/fdbclient/SimpleConfigTransaction.h
index 83d84115182..903764aa942 100644
--- a/fdbclient/SimpleConfigTransaction.h
+++ b/fdbclient/SimpleConfigTransaction.h
@@ -63,6 +63,7 @@ class SimpleConfigTransaction final : public IConfigTransaction, public FastAllo
 	                                         KeySelector end,
 	                                         Key mapper,
 	                                         GetRangeLimits limits,
+	                                         int matchIndex,
 	                                         Snapshot = Snapshot::False,
 	                                         Reverse = Reverse::False) override {
 		throw client_invalid_operation();
diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index 221c2bf3641..fb662f8ae24 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -418,6 +418,7 @@ struct GetMappedKeyValuesRequest : TimedRequest {
 	KeyRef mapper;
 	Version version; // or latestVersion
 	int limit, limitBytes;
+	int matchIndex;
 	bool isFetchKeys;
 	Optional<TagSet> tags;
 	Optional<UID> debugID;
@@ -443,7 +444,8 @@ struct GetMappedKeyValuesRequest : TimedRequest {
 		           spanContext,
 		           tenantInfo,
 		           arena,
-		           ssLatestCommitVersions);
+		           ssLatestCommitVersions,
+		           matchIndex);
 	}
 };
 
diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index 84ab49504bb..2213bf183c0 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -306,6 +306,7 @@ ThreadFuture<MappedRangeResult> ThreadSafeTransaction::getMappedRange(const KeyS
                                                                       const KeySelectorRef& end,
                                                                       const StringRef& mapper,
                                                                       GetRangeLimits limits,
+                                                                      int matchIndex,
                                                                       bool snapshot,
                                                                       bool reverse) {
 	KeySelector b = begin;
@@ -313,9 +314,9 @@ ThreadFuture<MappedRangeResult> ThreadSafeTransaction::getMappedRange(const KeyS
 	Key h = mapper;
 
 	ISingleThreadTransaction* tr = this->tr;
-	return onMainThread([tr, b, e, h, limits, snapshot, reverse]() -> Future<MappedRangeResult> {
+	return onMainThread([tr, b, e, h, limits, matchIndex, snapshot, reverse]() -> Future<MappedRangeResult> {
 		tr->checkDeferredError();
-		return tr->getMappedRange(b, e, h, limits, Snapshot{ snapshot }, Reverse{ reverse });
+		return tr->getMappedRange(b, e, h, limits, matchIndex, Snapshot{ snapshot }, Reverse{ reverse });
 	});
 }
 
diff --git a/fdbclient/ThreadSafeTransaction.h b/fdbclient/ThreadSafeTransaction.h
index 0ace0a2cfe1..c33076b722a 100644
--- a/fdbclient/ThreadSafeTransaction.h
+++ b/fdbclient/ThreadSafeTransaction.h
@@ -136,6 +136,7 @@ class ThreadSafeTransaction : public ITransaction, ThreadSafeReferenceCounted<Th
 	                                               const KeySelectorRef& end,
 	                                               const StringRef& mapper,
 	                                               GetRangeLimits limits,
+	                                               int matchIndex,
 	                                               bool snapshot,
 	                                               bool reverse) override;
 	ThreadFuture<Standalone<VectorRef<const char*>>> getAddressesForKey(const KeyRef& key) override;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index c33abf94e9d..0e88b99b504 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3719,7 +3719,8 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
                                                    StringRef mapper,
                                                    // To provide span context, tags, debug ID to underlying lookups.
                                                    GetMappedKeyValuesRequest* pOriginalReq,
-                                                   Optional<Key> tenantPrefix) {
+                                                   Optional<Key> tenantPrefix,
+                                                   int matchIndex) {
 	state GetMappedKeyValuesReply result;
 	result.version = input.version;
 	result.more = input.more;
@@ -3737,15 +3738,20 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 		TraceEvent("MapperNotTuple").error(e).detail("Mapper", mapper.printable());
 		throw mapper_not_tuple();
 	}
-	state KeyValueRef* it = input.data.begin();
 	state std::vector<Optional<Tuple>> vt;
 	state bool isRangeQuery = false;
 	preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-	for (; it != input.data.end(); it++) {
+	state int sz = input.data.size();
+	state int i = 0;
+	for (; i < sz; i++) {
+		KeyValueRef* it = &input.data[i];
 		state MappedKeyValueRef kvm;
-		kvm.key = it->key;
-		kvm.value = it->value;
+		// need to keep the boundary, so that caller can use it as a continuation.
+		if ((i == 0 || i == sz - 1) || matchIndex == MATCH_INDEX_ALL) {
+			kvm.key = it->key;
+			kvm.value = it->value;
+		}
 
 		state Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
 		// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
@@ -3916,7 +3922,7 @@ ACTOR Future<Void> getMappedKeyValuesQ(StorageServer* data, GetMappedKeyValuesRe
 			try {
 				// Map the scanned range to another list of keys and look up.
 				GetMappedKeyValuesReply _r =
-				    wait(mapKeyValues(data, getKeyValuesReply, req.mapper, &req, tenantPrefix));
+				    wait(mapKeyValues(data, getKeyValuesReply, req.mapper, &req, tenantPrefix, req.matchIndex));
 				r = _r;
 			} catch (Error& e) {
 				TraceEvent("MapError").error(e);
diff --git a/fdbserver/workloads/ApiWorkload.h b/fdbserver/workloads/ApiWorkload.h
index 64836e03b6a..67007ef2f1f 100644
--- a/fdbserver/workloads/ApiWorkload.h
+++ b/fdbserver/workloads/ApiWorkload.h
@@ -56,6 +56,7 @@ struct TransactionWrapper : public ReferenceCounted<TransactionWrapper> {
 	                                                 KeySelector& end,
 	                                                 Key& mapper,
 	                                                 GetRangeLimits limits,
+	                                                 int matchIndex,
 	                                                 Snapshot snapshot,
 	                                                 Reverse reverse) = 0;
 
@@ -128,9 +129,10 @@ struct FlowTransactionWrapper : public TransactionWrapper {
 	                                         KeySelector& end,
 	                                         Key& mapper,
 	                                         GetRangeLimits limits,
+	                                         int matchIndex,
 	                                         Snapshot snapshot,
 	                                         Reverse reverse) override {
-		return transaction.getMappedRange(begin, end, mapper, limits, snapshot, reverse);
+		return transaction.getMappedRange(begin, end, mapper, limits, matchIndex, snapshot, reverse);
 	}
 
 	// Gets the key from the database specified by a given key selector
@@ -203,9 +205,11 @@ struct ThreadTransactionWrapper : public TransactionWrapper {
 	                                         KeySelector& end,
 	                                         Key& mapper,
 	                                         GetRangeLimits limits,
+	                                         int matchIndex,
 	                                         Snapshot snapshot,
 	                                         Reverse reverse) override {
-		return unsafeThreadFutureToFuture(transaction->getMappedRange(begin, end, mapper, limits, snapshot, reverse));
+		return unsafeThreadFutureToFuture(
+		    transaction->getMappedRange(begin, end, mapper, limits, matchIndex, snapshot, reverse));
 	}
 
 	// Gets the key from the database specified by a given key selector
diff --git a/fdbserver/workloads/GetMappedRange.actor.cpp b/fdbserver/workloads/GetMappedRange.actor.cpp
index cb454b6ef6c..cb977d6815b 100644
--- a/fdbserver/workloads/GetMappedRange.actor.cpp
+++ b/fdbserver/workloads/GetMappedRange.actor.cpp
@@ -145,10 +145,18 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	}
 
 	// Return true if need to retry.
-	static bool validateRecord(int expectedId, const MappedKeyValueRef* it, GetMappedRangeWorkload* self) {
+	static bool validateRecord(int expectedId,
+	                           const MappedKeyValueRef* it,
+	                           GetMappedRangeWorkload* self,
+	                           int matchIndex,
+	                           bool isBoundary) {
 		//		std::cout << "validateRecord expectedId " << expectedId << " it->key " << printable(it->key) << "
 		// indexEntryKey(expectedId) " << printable(indexEntryKey(expectedId)) << std::endl;
-		ASSERT(it->key == indexEntryKey(expectedId));
+		if (matchIndex == MATCH_INDEX_ALL || isBoundary) {
+			ASSERT(it->key == indexEntryKey(expectedId));
+		} else {
+			ASSERT(it->key == EMPTY);
+		}
 		ASSERT(it->value == EMPTY);
 
 		if (self->SPLIT_RECORDS) {
@@ -189,7 +197,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                                                          Key mapper,
 	                                                          int limit,
 	                                                          int expectedBeginId,
-	                                                          GetMappedRangeWorkload* self) {
+	                                                          GetMappedRangeWorkload* self,
+	                                                          int matchIndex) {
 
 		std::cout << "start scanMappedRangeWithLimits beginSelector:" << beginSelector.toString()
 		          << " endSelector:" << endSelector.toString() << " expectedBeginId:" << expectedBeginId
@@ -197,8 +206,13 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		loop {
 			state Reference<TransactionWrapper> tr = self->createTransaction();
 			try {
-				MappedRangeResult result = wait(tr->getMappedRange(
-				    beginSelector, endSelector, mapper, GetRangeLimits(limit), self->snapshot, Reverse::False));
+				MappedRangeResult result = wait(tr->getMappedRange(beginSelector,
+				                                                   endSelector,
+				                                                   mapper,
+				                                                   GetRangeLimits(limit),
+				                                                   matchIndex,
+				                                                   self->snapshot,
+				                                                   Reverse::False));
 				//			showResult(result);
 				if (self->BAD_MAPPER) {
 					TraceEvent("GetMappedRangeWorkloadShouldNotReachable").detail("ResultSize", result.size());
@@ -208,8 +222,10 @@ struct GetMappedRangeWorkload : ApiWorkload {
 				ASSERT(result.size() <= limit);
 				int expectedId = expectedBeginId;
 				bool needRetry = false;
-				for (const MappedKeyValueRef* it = result.begin(); it != result.end(); it++) {
-					if (validateRecord(expectedId, it, self)) {
+				int cnt = 0;
+				const MappedKeyValueRef* it = result.begin();
+				for (; cnt < result.size(); cnt++, it++) {
+					if (validateRecord(expectedId, it, self, matchIndex, cnt == 0 || cnt == result.size() - 1)) {
 						needRetry = true;
 						break;
 					}
@@ -236,7 +252,12 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		}
 	}
 
-	ACTOR Future<Void> scanMappedRange(Database cx, int beginId, int endId, Key mapper, GetMappedRangeWorkload* self) {
+	ACTOR Future<Void> scanMappedRange(Database cx,
+	                                   int beginId,
+	                                   int endId,
+	                                   Key mapper,
+	                                   GetMappedRangeWorkload* self,
+	                                   int matchIndex) {
 		Key beginTuple = Tuple().append(prefix).append(INDEX).append(indexKey(beginId)).getDataAsStandalone();
 		state KeySelector beginSelector = KeySelector(firstGreaterOrEqual(beginTuple));
 		Key endTuple = Tuple().append(prefix).append(INDEX).append(indexKey(endId)).getDataAsStandalone();
@@ -244,14 +265,15 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		state int limit = 100;
 		state int expectedBeginId = beginId;
 		while (true) {
-			MappedRangeResult result = wait(
-			    self->scanMappedRangeWithLimits(cx, beginSelector, endSelector, mapper, limit, expectedBeginId, self));
+			MappedRangeResult result = wait(self->scanMappedRangeWithLimits(
+			    cx, beginSelector, endSelector, mapper, limit, expectedBeginId, self, matchIndex));
 			expectedBeginId += result.size();
 			if (result.more) {
 				if (result.empty()) {
 					// This is usually not expected.
 					std::cout << "not result but have more, try again" << std::endl;
 				} else {
+					// auto& reqAndResult = std::get<GetRangeReqAndResultRef>(result.back().reqAndResult);
 					beginSelector = KeySelector(firstGreaterThan(result.back().key));
 				}
 			} else {
@@ -296,6 +318,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		                          endSelector,
 		                          mapper,
 		                          GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED),
+		                          MATCH_INDEX_ALL,
 		                          self->snapshot,
 		                          Reverse::False);
 	}
@@ -394,7 +417,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		Key mapper = getMapper(self);
 		// The scanned range cannot be too large to hit get_mapped_key_values_has_more. We have a unit validating the
 		// error is thrown when the range is large.
-		wait(self->scanMappedRange(cx, 10, 490, mapper, self));
+		int matchIndex = deterministicRandom()->random01() > 0.5 ? MATCH_INDEX_NONE : MATCH_INDEX_ALL;
+		wait(self->scanMappedRange(cx, 10, 490, mapper, self, matchIndex));
 		return Void();
 	}
 

From 20cab33954f912a5e141e9a8476c4d06d08a3986 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Wed, 18 May 2022 09:16:28 -0700
Subject: [PATCH 429/740] Enable MATCHED and UNMATCHED mode for index prefetch
 (#7162)

* Enable MATCHED and UNMATCHED mode for index prefetch

MATCHED mode returns index entries whose secondary KVs are present,
UNMATCHED mode returns index entries whose secondary KVs are absent.

Note that the conflict read range of this txn is set in 2 steps:
* Set the conflict range for primary query according to request
* Set the conflict ranges for secondary queries according to responses.

As a result, conflicts of different match_index mode are taken care of.

* Fix c binding
---
 bindings/c/foundationdb/fdb_c.h               |  1 +
 bindings/c/test/unit/unit_tests.cpp           | 35 ++++++++++++++++---
 .../apple/foundationdb/FDBTransaction.java    |  2 ++
 fdbclient/FDBTypes.h                          | 15 ++++++--
 fdbclient/MultiVersionTransaction.h           |  1 +
 fdbclient/NativeAPI.actor.cpp                 |  2 +-
 fdbserver/storageserver.actor.cpp             | 13 +++++--
 fdbserver/workloads/GetMappedRange.actor.cpp  | 23 +++++++++++-
 8 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/bindings/c/foundationdb/fdb_c.h b/bindings/c/foundationdb/fdb_c.h
index 0cd2b7019a1..25ba0a38d06 100644
--- a/bindings/c/foundationdb/fdb_c.h
+++ b/bindings/c/foundationdb/fdb_c.h
@@ -160,6 +160,7 @@ typedef struct mappedkeyvalue {
 	 * take the shortcut. */
 	FDBGetRangeReqAndResult getRange;
 	unsigned char buffer[32];
+	fdb_bool_t boundaryAndExist;
 } FDBMappedKeyValue;
 
 #pragma pack(push, 4)
diff --git a/bindings/c/test/unit/unit_tests.cpp b/bindings/c/test/unit/unit_tests.cpp
index 242eca685ae..c3c679d8f96 100644
--- a/bindings/c/test/unit/unit_tests.cpp
+++ b/bindings/c/test/unit/unit_tests.cpp
@@ -179,8 +179,8 @@ struct GetMappedRangeResult {
 	                       std::string, // value
 	                       std::string, // begin
 	                       std::string, // end
-	                       std::vector<std::pair<std::string, std::string>> // range results
-	                       >>
+	                       std::vector<std::pair<std::string, std::string>>, // range results
+	                       fdb_bool_t>>
 	    mkvs;
 	// True if values remain in the key range requested.
 	bool more;
@@ -304,6 +304,7 @@ GetMappedRangeResult get_mapped_range(fdb::Transaction& tr,
 		auto value = extractString(mkv.value);
 		auto begin = extractString(mkv.getRange.begin.key);
 		auto end = extractString(mkv.getRange.end.key);
+		bool boundaryAndExist = mkv.boundaryAndExist;
 		//		std::cout << "key:" << key << " value:" << value << " begin:" << begin << " end:" << end << std::endl;
 
 		std::vector<std::pair<std::string, std::string>> range_results;
@@ -314,7 +315,7 @@ GetMappedRangeResult get_mapped_range(fdb::Transaction& tr,
 			range_results.emplace_back(k, v);
 			// std::cout << "[" << i << "]" << k << " -> " << v << std::endl;
 		}
-		result.mkvs.emplace_back(key, value, begin, end, range_results);
+		result.mkvs.emplace_back(key, value, begin, end, range_results, boundaryAndExist);
 	}
 	return result;
 }
@@ -991,7 +992,15 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 	while (1) {
 		int beginId = 1;
 		int endId = 19;
-		const int matchIndex = deterministicRandom()->random01() > 0.5 ? MATCH_INDEX_NONE : MATCH_INDEX_ALL;
+		const double r = deterministicRandom()->random01();
+		int matchIndex = MATCH_INDEX_ALL;
+		if (r < 0.25) {
+			matchIndex = MATCH_INDEX_NONE;
+		} else if (r < 0.5) {
+			matchIndex = MATCH_INDEX_MATCHED_ONLY;
+		} else if (r < 0.75) {
+			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
+		}
 		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex);
 
 		if (result.err) {
@@ -1005,13 +1014,29 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 		CHECK(!result.more);
 
 		int id = beginId;
+		bool boundary;
 		for (int i = 0; i < expectSize; i++, id++) {
-			const auto& [key, value, begin, end, range_results] = result.mkvs[i];
+			boundary = i == 0 || i == expectSize - 1;
+			const auto& [key, value, begin, end, range_results, boundaryAndExist] = result.mkvs[i];
 			if (matchIndex == MATCH_INDEX_ALL || i == 0 || i == expectSize - 1) {
 				CHECK(indexEntryKey(id).compare(key) == 0);
+			} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
+				// now we cannot generate a workload that only has partial results matched
+				// thus expecting everything matched
+				// TODO: create tests to generate workloads with partial secondary results present
+				CHECK(indexEntryKey(id).compare(key) == 0);
+			} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
+				// now we cannot generate a workload that only has partial results matched
+				// thus expecting everything NOT matched(except for the boundary asserted above)
+				// TODO: create tests to generate workloads with partial secondary results present
+				CHECK(EMPTY.compare(key) == 0);
 			} else {
 				CHECK(EMPTY.compare(key) == 0);
 			}
+
+			// TODO: create tests to generate workloads with partial secondary results present
+			CHECK(boundaryAndExist == boundary);
+
 			CHECK(EMPTY.compare(value) == 0);
 			CHECK(range_results.size() == SPLIT_SIZE);
 			for (int split = 0; split < SPLIT_SIZE; split++) {
diff --git a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
index 7451959f228..c7b08b66260 100644
--- a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
@@ -35,6 +35,8 @@ class FDBTransaction extends NativeObjectWrapper implements Transaction, OptionC
 
 	static public final int MATCH_INDEX_ALL = 0;
 	static public final int MATCH_INDEX_NONE = 1;
+	static public final int MATCH_INDEX_MATCHED_ONLY = 2;
+	static public final int MATCH_INDEX_UNMATCHED_ONLY = 3;
 
 	private final Database database;
 	private final Executor executor;
diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index 41ea9b2f149..4a97ba33c65 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -169,6 +169,8 @@ static const Tag cacheTag{ tagLocalitySpecial, 2 };
 
 const int MATCH_INDEX_ALL = 0;
 const int MATCH_INDEX_NONE = 1;
+const int MATCH_INDEX_MATCHED_ONLY = 2;
+const int MATCH_INDEX_UNMATCHED_ONLY = 3;
 
 enum { txsTagOld = -1, invalidTagOld = -100 };
 
@@ -781,9 +783,18 @@ struct MappedKeyValueRef : KeyValueRef {
 
 	MappedReqAndResultRef reqAndResult;
 
+	// boundary KVs are always returned so that caller can use it as a continuation,
+	// for non-boundary KV, it is always false.
+	// for boundary KV, it is true only when the secondary query succeeds(return non-empty).
+	// Note: only MATCH_INDEX_MATCHED_ONLY and MATCH_INDEX_UNMATCHED_ONLY modes can make use of it,
+	// to decide whether the boudnary is a match/unmatch.
+	// In the case of MATCH_INDEX_ALL and MATCH_INDEX_NONE, caller should not care if boundary has a match or not.
+	bool boundaryAndExist;
+
 	MappedKeyValueRef() = default;
 	MappedKeyValueRef(Arena& a, const MappedKeyValueRef& copyFrom) : KeyValueRef(a, copyFrom) {
 		const auto& reqAndResultCopyFrom = copyFrom.reqAndResult;
+		boundaryAndExist = copyFrom.boundaryAndExist;
 		if (std::holds_alternative<GetValueReqAndResultRef>(reqAndResultCopyFrom)) {
 			auto getValue = std::get<GetValueReqAndResultRef>(reqAndResultCopyFrom);
 			reqAndResult = GetValueReqAndResultRef(a, getValue);
@@ -797,7 +808,7 @@ struct MappedKeyValueRef : KeyValueRef {
 
 	bool operator==(const MappedKeyValueRef& rhs) const {
 		return static_cast<const KeyValueRef&>(*this) == static_cast<const KeyValueRef&>(rhs) &&
-		       reqAndResult == rhs.reqAndResult;
+		       reqAndResult == rhs.reqAndResult && boundaryAndExist == rhs.boundaryAndExist;
 	}
 	bool operator!=(const MappedKeyValueRef& rhs) const { return !(rhs == *this); }
 
@@ -807,7 +818,7 @@ struct MappedKeyValueRef : KeyValueRef {
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, ((KeyValueRef&)*this), reqAndResult);
+		serializer(ar, ((KeyValueRef&)*this), reqAndResult, boundaryAndExist);
 	}
 };
 
diff --git a/fdbclient/MultiVersionTransaction.h b/fdbclient/MultiVersionTransaction.h
index e9dc59fe997..baca7e70dad 100644
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@@ -80,6 +80,7 @@ struct FdbCApi : public ThreadSafeReferenceCounted<FdbCApi> {
 		 * and take the shortcut. */
 		FDBGetRangeReqAndResult getRange;
 		unsigned char buffer[32];
+		bool boundaryAndExist;
 	} FDBMappedKeyValue;
 
 #pragma pack(push, 4)
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index b3946f7263b..e187d157930 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -4074,7 +4074,7 @@ int64_t inline getRangeResultFamilyBytes(MappedRangeResultRef result) {
 	int64_t bytes = 0;
 	for (const MappedKeyValueRef& mappedKeyValue : result) {
 		bytes += mappedKeyValue.key.size() + mappedKeyValue.value.size();
-
+		bytes += sizeof(mappedKeyValue.boundaryAndExist);
 		auto& reqAndResult = mappedKeyValue.reqAndResult;
 		if (std::holds_alternative<GetValueReqAndResultRef>(reqAndResult)) {
 			auto getValue = std::get<GetValueReqAndResultRef>(reqAndResult);
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 0e88b99b504..df8a99f1899 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3745,10 +3745,11 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	state int sz = input.data.size();
 	state int i = 0;
 	for (; i < sz; i++) {
-		KeyValueRef* it = &input.data[i];
+		state KeyValueRef* it = &input.data[i];
 		state MappedKeyValueRef kvm;
+		state bool isBoundary = i == 0 || i == sz - 1;
 		// need to keep the boundary, so that caller can use it as a continuation.
-		if ((i == 0 || i == sz - 1) || matchIndex == MATCH_INDEX_ALL) {
+		if (isBoundary || matchIndex == MATCH_INDEX_ALL) {
 			kvm.key = it->key;
 			kvm.value = it->value;
 		}
@@ -3764,11 +3765,19 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 			// Use the mappedKey as the prefix of the range query.
 			GetRangeReqAndResultRef getRange =
 			    wait(quickGetKeyValues(data, mappedKey, input.version, &(result.arena), pOriginalReq));
+			if (!getRange.result.empty() && matchIndex == MATCH_INDEX_MATCHED_ONLY ||
+			    getRange.result.empty() && matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
+				kvm.key = it->key;
+				kvm.value = it->value;
+			}
+
+			kvm.boundaryAndExist = isBoundary && !getRange.result.empty();
 			kvm.reqAndResult = getRange;
 		} else {
 			GetValueReqAndResultRef getValue =
 			    wait(quickGetValue(data, mappedKey, input.version, &(result.arena), pOriginalReq));
 			kvm.reqAndResult = getValue;
+			kvm.boundaryAndExist = isBoundary && getValue.result.present();
 		}
 		result.data.push_back(result.arena, kvm);
 	}
diff --git a/fdbserver/workloads/GetMappedRange.actor.cpp b/fdbserver/workloads/GetMappedRange.actor.cpp
index cb977d6815b..0809fbd2a2f 100644
--- a/fdbserver/workloads/GetMappedRange.actor.cpp
+++ b/fdbserver/workloads/GetMappedRange.actor.cpp
@@ -154,9 +154,22 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		// indexEntryKey(expectedId) " << printable(indexEntryKey(expectedId)) << std::endl;
 		if (matchIndex == MATCH_INDEX_ALL || isBoundary) {
 			ASSERT(it->key == indexEntryKey(expectedId));
+		} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
+			// now we cannot generate a workload that only has partial results matched
+			// thus expecting everything matched
+			// TODO: create tests to generate workloads with partial secondary results present
+			ASSERT(it->key == indexEntryKey(expectedId));
+		} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
+			// now we cannot generate a workload that only has partial results matched
+			// thus expecting everything NOT matched(except for the boundary asserted above)
+			// TODO: create tests to generate workloads with partial secondary results present
+			ASSERT(it->key == EMPTY);
 		} else {
 			ASSERT(it->key == EMPTY);
 		}
+		// TODO: create tests to generate workloads with partial secondary results present
+		ASSERT(it->boundaryAndExist == isBoundary);
+
 		ASSERT(it->value == EMPTY);
 
 		if (self->SPLIT_RECORDS) {
@@ -417,7 +430,15 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		Key mapper = getMapper(self);
 		// The scanned range cannot be too large to hit get_mapped_key_values_has_more. We have a unit validating the
 		// error is thrown when the range is large.
-		int matchIndex = deterministicRandom()->random01() > 0.5 ? MATCH_INDEX_NONE : MATCH_INDEX_ALL;
+		const double r = deterministicRandom()->random01();
+		int matchIndex = MATCH_INDEX_ALL;
+		if (r < 0.25) {
+			matchIndex = MATCH_INDEX_NONE;
+		} else if (r < 0.5) {
+			matchIndex = MATCH_INDEX_MATCHED_ONLY;
+		} else if (r < 0.75) {
+			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
+		}
 		wait(self->scanMappedRange(cx, 10, 490, mapper, self, matchIndex));
 		return Void();
 	}

From 01b2bd5aee578682f5fdbfdc5b41d91f3d41eab3 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 18 May 2022 10:45:13 -0700
Subject: [PATCH 430/740] Process should not crash when given invalid knob name

---
 fdbclient/IKnobCollection.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fdbclient/IKnobCollection.cpp b/fdbclient/IKnobCollection.cpp
index a170c8be807..b3de0b0b355 100644
--- a/fdbclient/IKnobCollection.cpp
+++ b/fdbclient/IKnobCollection.cpp
@@ -108,6 +108,11 @@ void IKnobCollection::setupKnobs(const std::vector<std::pair<std::string, std::s
 				TraceEvent(SevWarnAlways, "InvalidKnobValue")
 				    .detail("Knob", printable(knobName))
 				    .detail("Value", printable(knobValueString));
+			} else if (e.code() == error_code_invalid_option) {
+				std::cerr << "WARNING: Invalid knob option '" << knobName << "'\n'";
+				TraceEvent(SevWarnAlways, "InvalidKnobName")
+				    .detail("Knob", printable(knobName))
+				    .detail("Value", printable(knobValueString));
 			} else {
 				std::cerr << "ERROR: Failed to set knob option '" << knobName << "': " << e.what() << "\n";
 				TraceEvent(SevError, "FailedToSetKnob")

From 980b7afab2bd11beeb9eca66a7d259d84db5df86 Mon Sep 17 00:00:00 2001
From: Trevor Clinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 18 May 2022 10:54:19 -0700
Subject: [PATCH 431/740] Removed unnecessary apostrophe

Co-authored-by: A.J. Beamon <aj.beamon@snowflake.com>
---
 fdbclient/IKnobCollection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/IKnobCollection.cpp b/fdbclient/IKnobCollection.cpp
index b3de0b0b355..81d95f103ab 100644
--- a/fdbclient/IKnobCollection.cpp
+++ b/fdbclient/IKnobCollection.cpp
@@ -109,7 +109,7 @@ void IKnobCollection::setupKnobs(const std::vector<std::pair<std::string, std::s
 				    .detail("Knob", printable(knobName))
 				    .detail("Value", printable(knobValueString));
 			} else if (e.code() == error_code_invalid_option) {
-				std::cerr << "WARNING: Invalid knob option '" << knobName << "'\n'";
+				std::cerr << "WARNING: Invalid knob option '" << knobName << "'\n";
 				TraceEvent(SevWarnAlways, "InvalidKnobName")
 				    .detail("Knob", printable(knobName))
 				    .detail("Value", printable(knobValueString));

From 7825a3a7a90704c29213a2cd6bb94650262cf5eb Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 18 May 2022 11:08:56 -0700
Subject: [PATCH 432/740] Avoid printing warnings in
 LocalConfiguration::ManualKnobOverrides constructor

---
 fdbserver/LocalConfiguration.actor.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/fdbserver/LocalConfiguration.actor.cpp b/fdbserver/LocalConfiguration.actor.cpp
index e3c6a74ad93..fbc3380f9e2 100644
--- a/fdbserver/LocalConfiguration.actor.cpp
+++ b/fdbserver/LocalConfiguration.actor.cpp
@@ -127,18 +127,9 @@ class LocalConfigurationImpl {
 				} catch (Error& e) {
 					if (e.code() == error_code_invalid_option) {
 						TEST(true); // Attempted to manually set invalid knob option
-						if (!g_network->isSimulated()) {
-							fprintf(stderr, "WARNING: Unrecognized knob option '%s'\n", knobName.c_str());
-						}
 						TraceEvent(SevWarnAlways, "UnrecognizedKnobOption").detail("Knob", printable(knobName));
 					} else if (e.code() == error_code_invalid_option_value) {
 						TEST(true); // Invalid manually set knob value
-						if (!g_network->isSimulated()) {
-							fprintf(stderr,
-							        "WARNING: Invalid value '%s' for knob option '%s'\n",
-							        knobValueString.c_str(),
-							        knobName.c_str());
-						}
 						TraceEvent(SevWarnAlways, "InvalidKnobValue")
 						    .detail("Knob", printable(knobName))
 						    .detail("Value", printable(knobValueString));

From 4755fd88e4a9ecc731d61c7f15cd4f266cf48b45 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Wed, 18 May 2022 12:26:08 -0700
Subject: [PATCH 433/740] Update is_unknown_knob in test_argument_parsing.py

---
 tests/argument_parsing/test_argument_parsing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/argument_parsing/test_argument_parsing.py b/tests/argument_parsing/test_argument_parsing.py
index b1e379a6c12..c15ba4d097b 100755
--- a/tests/argument_parsing/test_argument_parsing.py
+++ b/tests/argument_parsing/test_argument_parsing.py
@@ -37,7 +37,7 @@ def is_unknown_option(output):
     return output.startswith('ERROR: unknown option')
 
 def is_unknown_knob(output):
-    return output.startswith('ERROR: Failed to set knob option')
+    return output.startswith('WARNING: Invalid knob option')
 
 def is_cli_usage(output):
     return output.startswith('FoundationDB CLI')

From 921fc4f8cee36854ba257e2915cfa9a1e4040fe1 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Wed, 18 May 2022 12:13:19 -0700
Subject: [PATCH 434/740] Add missing secondary queries tests for index
 prefetch (#7185)

* Add missing secondary queries tests for index prefetch

This change adds test for missing secondary queries for index prefetch,
in this case, MATCHED_ONLY mode would NOT return KV and UNMATCHED_ONLY
mode would return KV.

* remove default value for params
---
 bindings/c/test/unit/unit_tests.cpp          | 81 ++++++++++++++++----
 fdbserver/workloads/GetMappedRange.actor.cpp | 63 +++++++--------
 2 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/bindings/c/test/unit/unit_tests.cpp b/bindings/c/test/unit/unit_tests.cpp
index c3c679d8f96..f73695a2550 100644
--- a/bindings/c/test/unit/unit_tests.cpp
+++ b/bindings/c/test/unit/unit_tests.cpp
@@ -956,7 +956,7 @@ GetMappedRangeResult getMappedIndexEntries(int beginId,
                                            int endId,
                                            fdb::Transaction& tr,
                                            std::string mapper,
-                                           int matchIndex = MATCH_INDEX_ALL) {
+                                           int matchIndex) {
 	std::string indexEntryKeyBegin = indexEntryKey(beginId);
 	std::string indexEntryKeyEnd = indexEntryKey(endId);
 
@@ -978,8 +978,15 @@ GetMappedRangeResult getMappedIndexEntries(int beginId,
 GetMappedRangeResult getMappedIndexEntries(int beginId,
                                            int endId,
                                            fdb::Transaction& tr,
-                                           int matchIndex = MATCH_INDEX_ALL) {
-	std::string mapper = Tuple().append(prefix).append(RECORD).append("{K[3]}"_sr).append("{...}"_sr).pack().toString();
+                                           int matchIndex,
+                                           bool allMissing) {
+	std::string mapper = Tuple()
+	                         .append(prefix)
+	                         .append(RECORD)
+	                         .append(allMissing ? "{K[2]}"_sr : "{K[3]}"_sr)
+	                         .append("{...}"_sr)
+	                         .pack()
+	                         .toString();
 	return getMappedIndexEntries(beginId, endId, tr, mapper, matchIndex);
 }
 
@@ -1001,7 +1008,7 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 		} else if (r < 0.75) {
 			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
 		}
-		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex);
+		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex, false);
 
 		if (result.err) {
 			fdb::EmptyFuture f1 = tr.on_error(result.err);
@@ -1021,22 +1028,14 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 			if (matchIndex == MATCH_INDEX_ALL || i == 0 || i == expectSize - 1) {
 				CHECK(indexEntryKey(id).compare(key) == 0);
 			} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
-				// now we cannot generate a workload that only has partial results matched
-				// thus expecting everything matched
-				// TODO: create tests to generate workloads with partial secondary results present
 				CHECK(indexEntryKey(id).compare(key) == 0);
 			} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
-				// now we cannot generate a workload that only has partial results matched
-				// thus expecting everything NOT matched(except for the boundary asserted above)
-				// TODO: create tests to generate workloads with partial secondary results present
 				CHECK(EMPTY.compare(key) == 0);
 			} else {
 				CHECK(EMPTY.compare(key) == 0);
 			}
-
-			// TODO: create tests to generate workloads with partial secondary results present
-			CHECK(boundaryAndExist == boundary);
-
+			bool empty = range_results.empty();
+			CHECK(boundaryAndExist == (boundary && !empty));
 			CHECK(EMPTY.compare(value) == 0);
 			CHECK(range_results.size() == SPLIT_SIZE);
 			for (int split = 0; split < SPLIT_SIZE; split++) {
@@ -1049,6 +1048,58 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 	}
 }
 
+TEST_CASE("fdb_transaction_get_mapped_range_missing_all_secondary") {
+	const int TOTAL_RECORDS = 20;
+	fillInRecords(TOTAL_RECORDS);
+
+	fdb::Transaction tr(db);
+	// RYW should be enabled.
+	while (1) {
+		int beginId = 1;
+		int endId = 19;
+		const double r = deterministicRandom()->random01();
+		int matchIndex = MATCH_INDEX_ALL;
+		if (r < 0.25) {
+			matchIndex = MATCH_INDEX_NONE;
+		} else if (r < 0.5) {
+			matchIndex = MATCH_INDEX_MATCHED_ONLY;
+		} else if (r < 0.75) {
+			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
+		}
+		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex, true);
+
+		if (result.err) {
+			fdb::EmptyFuture f1 = tr.on_error(result.err);
+			fdb_check(wait_future(f1));
+			continue;
+		}
+
+		int expectSize = endId - beginId;
+		CHECK(result.mkvs.size() == expectSize);
+		CHECK(!result.more);
+
+		int id = beginId;
+		bool boundary;
+		for (int i = 0; i < expectSize; i++, id++) {
+			boundary = i == 0 || i == expectSize - 1;
+			const auto& [key, value, begin, end, range_results, boundaryAndExist] = result.mkvs[i];
+			if (matchIndex == MATCH_INDEX_ALL || i == 0 || i == expectSize - 1) {
+				CHECK(indexEntryKey(id).compare(key) == 0);
+			} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
+				CHECK(EMPTY.compare(key) == 0);
+			} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
+				CHECK(indexEntryKey(id).compare(key) == 0);
+			} else {
+				CHECK(EMPTY.compare(key) == 0);
+			}
+			bool empty = range_results.empty();
+			CHECK(boundaryAndExist == (boundary && !empty));
+			CHECK(EMPTY.compare(value) == 0);
+		}
+		break;
+	}
+}
+
 TEST_CASE("fdb_transaction_get_mapped_range_restricted_to_serializable") {
 	std::string mapper = Tuple().append(prefix).append(RECORD).append("{K[3]}"_sr).pack().toString();
 	fdb::Transaction tr(db);
@@ -1109,7 +1160,7 @@ TEST_CASE("fdb_transaction_get_mapped_range_fail_on_mapper_not_tuple") {
 	};
 	assertNotTuple(mapper);
 	fdb::Transaction tr(db);
-	auto result = getMappedIndexEntries(1, 3, tr, mapper);
+	auto result = getMappedIndexEntries(1, 3, tr, mapper, MATCH_INDEX_ALL);
 	ASSERT(result.err == error_code_mapper_not_tuple);
 }
 
diff --git a/fdbserver/workloads/GetMappedRange.actor.cpp b/fdbserver/workloads/GetMappedRange.actor.cpp
index 0809fbd2a2f..9a7eae6a7a2 100644
--- a/fdbserver/workloads/GetMappedRange.actor.cpp
+++ b/fdbserver/workloads/GetMappedRange.actor.cpp
@@ -149,33 +149,26 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                           const MappedKeyValueRef* it,
 	                           GetMappedRangeWorkload* self,
 	                           int matchIndex,
-	                           bool isBoundary) {
+	                           bool isBoundary,
+	                           bool allMissing) {
 		//		std::cout << "validateRecord expectedId " << expectedId << " it->key " << printable(it->key) << "
 		// indexEntryKey(expectedId) " << printable(indexEntryKey(expectedId)) << std::endl;
 		if (matchIndex == MATCH_INDEX_ALL || isBoundary) {
 			ASSERT(it->key == indexEntryKey(expectedId));
 		} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
-			// now we cannot generate a workload that only has partial results matched
-			// thus expecting everything matched
-			// TODO: create tests to generate workloads with partial secondary results present
-			ASSERT(it->key == indexEntryKey(expectedId));
+			ASSERT(it->key == (allMissing ? EMPTY : indexEntryKey(expectedId)));
 		} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
-			// now we cannot generate a workload that only has partial results matched
-			// thus expecting everything NOT matched(except for the boundary asserted above)
-			// TODO: create tests to generate workloads with partial secondary results present
-			ASSERT(it->key == EMPTY);
+			ASSERT(it->key == (allMissing ? indexEntryKey(expectedId) : EMPTY));
 		} else {
 			ASSERT(it->key == EMPTY);
 		}
-		// TODO: create tests to generate workloads with partial secondary results present
-		ASSERT(it->boundaryAndExist == isBoundary);
-
 		ASSERT(it->value == EMPTY);
 
 		if (self->SPLIT_RECORDS) {
 			ASSERT(std::holds_alternative<GetRangeReqAndResultRef>(it->reqAndResult));
 			auto& getRange = std::get<GetRangeReqAndResultRef>(it->reqAndResult);
 			auto& rangeResult = getRange.result;
+			ASSERT(it->boundaryAndExist == (isBoundary && !rangeResult.empty()));
 			//					std::cout << "rangeResult.size()=" << rangeResult.size() << std::endl;
 			// In the future, we may be able to do the continuation more efficiently by combining partial results
 			// together and then validate.
@@ -183,17 +176,20 @@ struct GetMappedRangeWorkload : ApiWorkload {
 				// Retry if the underlying request is not fully completed.
 				return true;
 			}
-			ASSERT(rangeResult.size() == SPLIT_SIZE);
-			for (int split = 0; split < SPLIT_SIZE; split++) {
-				auto& kv = rangeResult[split];
-				//						std::cout << "kv.key=" << printable(kv.key)
-				//						          << ", recordKey(id, split)=" << printable(recordKey(id, split)) <<
-				// std::endl; std::cout << "kv.value=" << printable(kv.value)
-				//						          << ", recordValue(id, split)=" << printable(recordValue(id, split)) <<
-				// std::endl;
-				ASSERT(kv.key == recordKey(expectedId, split));
-				ASSERT(kv.value == recordValue(expectedId, split));
+			if (!allMissing) {
+				ASSERT(rangeResult.size() == SPLIT_SIZE);
+				for (int split = 0; split < SPLIT_SIZE; split++) {
+					auto& kv = rangeResult[split];
+					//				std::cout << "kv.key=" << printable(kv.key)
+					//						   << ", recordKey(id, split)=" << printable(recordKey(id, split)) <<
+					// std::endl; std::cout << "kv.value=" << printable(kv.value)
+					//						   << ", recordValue(id, split)=" << printable(recordValue(id,split)) <<
+					// std::endl;
+					ASSERT(kv.key == recordKey(expectedId, split));
+					ASSERT(kv.value == recordValue(expectedId, split));
+				}
 			}
+
 		} else {
 			ASSERT(std::holds_alternative<GetValueReqAndResultRef>(it->reqAndResult));
 			auto& getValue = std::get<GetValueReqAndResultRef>(it->reqAndResult);
@@ -211,7 +207,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                                                          int limit,
 	                                                          int expectedBeginId,
 	                                                          GetMappedRangeWorkload* self,
-	                                                          int matchIndex) {
+	                                                          int matchIndex,
+	                                                          bool allMissing) {
 
 		std::cout << "start scanMappedRangeWithLimits beginSelector:" << beginSelector.toString()
 		          << " endSelector:" << endSelector.toString() << " expectedBeginId:" << expectedBeginId
@@ -238,7 +235,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 				int cnt = 0;
 				const MappedKeyValueRef* it = result.begin();
 				for (; cnt < result.size(); cnt++, it++) {
-					if (validateRecord(expectedId, it, self, matchIndex, cnt == 0 || cnt == result.size() - 1)) {
+					if (validateRecord(
+					        expectedId, it, self, matchIndex, cnt == 0 || cnt == result.size() - 1, allMissing)) {
 						needRetry = true;
 						break;
 					}
@@ -270,7 +268,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                                   int endId,
 	                                   Key mapper,
 	                                   GetMappedRangeWorkload* self,
-	                                   int matchIndex) {
+	                                   int matchIndex,
+	                                   bool allMissing = false) {
 		Key beginTuple = Tuple().append(prefix).append(INDEX).append(indexKey(beginId)).getDataAsStandalone();
 		state KeySelector beginSelector = KeySelector(firstGreaterOrEqual(beginTuple));
 		Key endTuple = Tuple().append(prefix).append(INDEX).append(indexKey(endId)).getDataAsStandalone();
@@ -279,7 +278,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		state int expectedBeginId = beginId;
 		while (true) {
 			MappedRangeResult result = wait(self->scanMappedRangeWithLimits(
-			    cx, beginSelector, endSelector, mapper, limit, expectedBeginId, self, matchIndex));
+			    cx, beginSelector, endSelector, mapper, limit, expectedBeginId, self, matchIndex, allMissing));
 			expectedBeginId += result.size();
 			if (result.more) {
 				if (result.empty()) {
@@ -322,7 +321,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                                                   int endId,
 	                                                   Reference<TransactionWrapper>& tr,
 	                                                   GetMappedRangeWorkload* self) {
-		Key mapper = getMapper(self);
+		Key mapper = getMapper(self, false);
 		Key beginTuple = Tuple().append(prefix).append(INDEX).append(indexKey(beginId)).getDataAsStandalone();
 		KeySelector beginSelector = KeySelector(firstGreaterOrEqual(beginTuple));
 		Key endTuple = Tuple().append(prefix).append(INDEX).append(indexKey(endId)).getDataAsStandalone();
@@ -427,7 +426,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		std::cout << "Test configuration: transactionType:" << self->transactionType << " snapshot:" << self->snapshot
 		          << "bad_mapper:" << self->BAD_MAPPER << std::endl;
 
-		Key mapper = getMapper(self);
+		Key mapper = getMapper(self, false);
 		// The scanned range cannot be too large to hit get_mapped_key_values_has_more. We have a unit validating the
 		// error is thrown when the range is large.
 		const double r = deterministicRandom()->random01();
@@ -440,15 +439,19 @@ struct GetMappedRangeWorkload : ApiWorkload {
 			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
 		}
 		wait(self->scanMappedRange(cx, 10, 490, mapper, self, matchIndex));
+
+		Key mapper = getMapper(self, true);
+		wait(self->scanMappedRange(cx, 10, 490, mapper, self, MATCH_INDEX_UNMATCHED_ONLY, true));
+
 		return Void();
 	}
 
-	static Key getMapper(GetMappedRangeWorkload* self) {
+	static Key getMapper(GetMappedRangeWorkload* self, bool mapperForAllMissing) {
 		Tuple mapperTuple;
 		if (self->BAD_MAPPER) {
 			mapperTuple << prefix << RECORD << "{K[xxx]}"_sr;
 		} else {
-			mapperTuple << prefix << RECORD << "{K[3]}"_sr;
+			mapperTuple << prefix << RECORD << (mapperForAllMissing ? "{K[2]}"_sr : "{K[3]}"_sr);
 			if (self->SPLIT_RECORDS) {
 				mapperTuple << "{...}"_sr;
 			}

From 81e7ddc68a02cc7a5f35ffef68cb680557b0d3b8 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Fri, 20 May 2022 11:32:25 -0700
Subject: [PATCH 435/740] Make java binding work for prefetch match index
 modes. (#7186) (#7206)

* Make java binding work for prefetch match index modes.

It adds boundaryAndExist in return value, so that caller can see
whether a boundary index is orphan or not.

* Make Java code work with index match modes

* Add test for boundaryAndExist in java binding test
---
 bindings/java/fdbJNI.cpp                      | 10 ++++--
 .../MappedRangeQueryIntegrationTest.java      |  6 +++-
 .../apple/foundationdb/FDBTransaction.java    |  8 +++--
 .../apple/foundationdb/MappedKeyValue.java    | 34 ++++++++++++++-----
 .../apple/foundationdb/MappedRangeQuery.java  | 20 +++++++----
 ...MappedRangeResultDirectBufferIterator.java |  4 ++-
 6 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/bindings/java/fdbJNI.cpp b/bindings/java/fdbJNI.cpp
index 2392dc50c47..c6704745e93 100644
--- a/bindings/java/fdbJNI.cpp
+++ b/bindings/java/fdbJNI.cpp
@@ -533,10 +533,14 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureMappedResults_Future
 		FDBMappedKeyValue kvm = kvms[i];
 		int kvm_count = kvm.getRange.m_size;
 
-		const int totalLengths = 4 + kvm_count * 2;
+		// now it has 5 field, key, value, getRange.begin, getRange.end, boundaryAndExist
+		// this needs to change if FDBMappedKeyValue definition is changed.
+		const int totalFieldFDBMappedKeyValue = 5;
+
+		const int totalLengths = totalFieldFDBMappedKeyValue + kvm_count * 2;
 
 		int totalBytes = kvm.key.key_length + kvm.value.key_length + kvm.getRange.begin.key.key_length +
-		                 kvm.getRange.end.key.key_length;
+		                 kvm.getRange.end.key.key_length + sizeof(kvm.boundaryAndExist);
 		for (int i = 0; i < kvm_count; i++) {
 			auto kv = kvm.getRange.data[i];
 			totalBytes += kv.key_length + kv.value_length;
@@ -580,6 +584,7 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureMappedResults_Future
 				cpBytesAndLength(pByte, pLength, kvm.value);
 				cpBytesAndLength(pByte, pLength, kvm.getRange.begin.key);
 				cpBytesAndLength(pByte, pLength, kvm.getRange.end.key);
+				cpBytesAndLengthInner(pByte, pLength, (uint8_t*)&(kvm.boundaryAndExist), sizeof(kvm.boundaryAndExist));
 				for (int kvm_i = 0; kvm_i < kvm_count; kvm_i++) {
 					auto kv = kvm.getRange.data[kvm_i];
 					cpBytesAndLengthInner(pByte, pLength, kv.key, kv.key_length);
@@ -588,6 +593,7 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureMappedResults_Future
 			}
 		}
 		// After native arrays are released
+		// call public static method MappedKeyValue::fromBytes()
 		jobject mkv = jenv->CallStaticObjectMethod(
 		    mapped_key_value_class, mapped_key_value_from_bytes, (jbyteArray)bytesArray, (jintArray)lengthArray);
 		if (jenv->ExceptionOccurred())
diff --git a/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java b/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
index 92ca4a6724c..beebd531d3d 100644
--- a/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
+++ b/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
@@ -208,7 +208,11 @@ public interface RangeQueryWithIndex {
 					assertByteArrayEquals(indexEntryKey(id), mappedKeyValue.getKey());
 					assertByteArrayEquals(EMPTY, mappedKeyValue.getValue());
 					assertByteArrayEquals(indexEntryKey(id), mappedKeyValue.getKey());
-
+					if (id == begin || id == end - 1) {
+						Assertions.assertTrue(mappedKeyValue.getBoundaryAndExist());
+					} else {
+						Assertions.assertFalse(mappedKeyValue.getBoundaryAndExist());
+					}
 					byte[] prefix = recordKeyPrefix(id);
 					assertByteArrayEquals(prefix, mappedKeyValue.getRangeBegin());
 					prefix[prefix.length - 1] = (byte)0x01;
diff --git a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
index c7b08b66260..b35196c1463 100644
--- a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
@@ -358,7 +358,8 @@ public AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelect
 		if (mapper == null) {
 			throw new IllegalArgumentException("Mapper must be non-null");
 		}
-		return new MappedRangeQuery(FDBTransaction.this, false, begin, end, mapper, limit, reverse, mode, eventKeeper);
+		return new MappedRangeQuery(FDBTransaction.this, false, begin, end, mapper, limit, matchIndex, reverse, mode,
+		                            eventKeeper);
 	}
 
 	///////////////////
@@ -463,7 +464,8 @@ protected FutureResults getRange_internal(KeySelector begin, KeySelector end,
 	protected FutureMappedResults getMappedRange_internal(KeySelector begin, KeySelector end,
 	                                                      byte[] mapper, // Nullable
 	                                                      int rowLimit, int targetBytes, int streamingMode,
-	                                                      int iteration, boolean isSnapshot, boolean reverse) {
+	                                                      int iteration, boolean isSnapshot, boolean reverse,
+	                                                      int matchIndex) {
 		if (eventKeeper != null) {
 			eventKeeper.increment(Events.JNI_CALL);
 		}
@@ -476,7 +478,7 @@ protected FutureMappedResults getMappedRange_internal(KeySelector begin, KeySele
 			return new FutureMappedResults(
 			    Transaction_getMappedRange(getPtr(), begin.getKey(), begin.orEqual(), begin.getOffset(), end.getKey(),
 			                               end.orEqual(), end.getOffset(), mapper, rowLimit, targetBytes, streamingMode,
-			                               iteration, MATCH_INDEX_ALL, isSnapshot, reverse),
+			                               iteration, matchIndex, isSnapshot, reverse),
 			    FDB.instance().isDirectBufferQueriesEnabled(), executor, eventKeeper);
 		} finally {
 			pointerReadLock.unlock();
diff --git a/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java b/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
index 7a0bcf6e4a8..ed2a97a1e64 100644
--- a/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
+++ b/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
@@ -22,6 +22,8 @@
 
 import com.apple.foundationdb.tuple.ByteArrayUtil;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -31,24 +33,35 @@ public class MappedKeyValue extends KeyValue {
 	private final byte[] rangeBegin;
 	private final byte[] rangeEnd;
 	private final List<KeyValue> rangeResult;
+	private final int boundaryAndExist;
 
-	MappedKeyValue(byte[] key, byte[] value, byte[] rangeBegin, byte[] rangeEnd, List<KeyValue> rangeResult) {
+	// now it has 5 field, key, value, getRange.begin, getRange.end, boundaryAndExist
+	// this needs to change if FDBMappedKeyValue definition is changed.
+	private static final int TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue = 5;
+
+	public MappedKeyValue(byte[] key, byte[] value, byte[] rangeBegin, byte[] rangeEnd, List<KeyValue> rangeResult,
+	               int boundaryAndExist) {
 		super(key, value);
 		this.rangeBegin = rangeBegin;
 		this.rangeEnd = rangeEnd;
 		this.rangeResult = rangeResult;
+		this.boundaryAndExist = boundaryAndExist;
 	}
 
 	public byte[] getRangeBegin() { return rangeBegin; }
 
 	public byte[] getRangeEnd() { return rangeEnd; }
 
+	public boolean getBoundaryAndExist() { return boundaryAndExist == 0 ? false : true; }
+
 	public List<KeyValue> getRangeResult() { return rangeResult; }
 
 	public static MappedKeyValue fromBytes(byte[] bytes, int[] lengths) {
 		// Lengths include: key, value, rangeBegin, rangeEnd, count * (underlying key, underlying value)
-		if (lengths.length < 4) {
-			throw new IllegalArgumentException("There needs to be at least 4 lengths to cover the metadata");
+		if (lengths.length < TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue) {
+			throw new IllegalArgumentException("There needs to be at least " +
+			                                   TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue +
+			                                   " lengths to cover the metadata");
 		}
 
 		Offset offset = new Offset();
@@ -56,18 +69,20 @@ public static MappedKeyValue fromBytes(byte[] bytes, int[] lengths) {
 		byte[] value = takeBytes(offset, bytes, lengths);
 		byte[] rangeBegin = takeBytes(offset, bytes, lengths);
 		byte[] rangeEnd = takeBytes(offset, bytes, lengths);
+		byte[] boundaryAndExistBytes = takeBytes(offset, bytes, lengths);
+		int boundaryAndExist = ByteBuffer.wrap(boundaryAndExistBytes).order(ByteOrder.LITTLE_ENDIAN).getInt();
 
-		if ((lengths.length - 4) % 2 != 0) {
+		if ((lengths.length - TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue) % 2 != 0) {
 			throw new IllegalArgumentException("There needs to be an even number of lengths!");
 		}
-		int count = (lengths.length - 4) / 2;
+		int count = (lengths.length - TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue) / 2;
 		List<KeyValue> rangeResult = new ArrayList<>(count);
 		for (int i = 0; i < count; i++) {
 			byte[] k = takeBytes(offset, bytes, lengths);
 			byte[] v = takeBytes(offset, bytes, lengths);
 			rangeResult.add(new KeyValue(k, v));
 		}
-		return new MappedKeyValue(key, value, rangeBegin, rangeEnd, rangeResult);
+		return new MappedKeyValue(key, value, rangeBegin, rangeEnd, rangeResult, boundaryAndExist);
 	}
 
 	static class Offset {
@@ -96,13 +111,15 @@ public boolean equals(Object obj) {
 		MappedKeyValue rhs = (MappedKeyValue) obj;
 		return Arrays.equals(rangeBegin, rhs.rangeBegin)
 				&& Arrays.equals(rangeEnd, rhs.rangeEnd)
-				&& Objects.equals(rangeResult, rhs.rangeResult);
+				&& Objects.equals(rangeResult, rhs.rangeResult)
+				&& boundaryAndExist == rhs.boundaryAndExist;
 	}
 
 	@Override
 	public int hashCode() {
 		int hashForResult = rangeResult == null ? 0 : rangeResult.hashCode();
-		return 17 + (29 * hashForResult + 37 * Arrays.hashCode(rangeBegin) + Arrays.hashCode(rangeEnd));
+		return 17 +
+		    (29 * hashForResult + boundaryAndExist + 37 * Arrays.hashCode(rangeBegin) + Arrays.hashCode(rangeEnd));
 	}
 
 	@Override
@@ -111,6 +128,7 @@ public String toString() {
 		sb.append("rangeBegin=").append(ByteArrayUtil.printable(rangeBegin));
 		sb.append(", rangeEnd=").append(ByteArrayUtil.printable(rangeEnd));
 		sb.append(", rangeResult=").append(rangeResult);
+		sb.append(", boundaryAndExist=").append(boundaryAndExist);
 		sb.append('}');
 		return super.toString() + "->" + sb.toString();
 	}
diff --git a/bindings/java/src/main/com/apple/foundationdb/MappedRangeQuery.java b/bindings/java/src/main/com/apple/foundationdb/MappedRangeQuery.java
index 9de3753ec32..aea411cec41 100644
--- a/bindings/java/src/main/com/apple/foundationdb/MappedRangeQuery.java
+++ b/bindings/java/src/main/com/apple/foundationdb/MappedRangeQuery.java
@@ -53,18 +53,21 @@ class MappedRangeQuery implements AsyncIterable<MappedKeyValue> {
 	private final byte[] mapper; // Nonnull
 	private final boolean snapshot;
 	private final int rowLimit;
+	private final int matchIndex;
 	private final boolean reverse;
 	private final StreamingMode streamingMode;
 	private final EventKeeper eventKeeper;
 
 	MappedRangeQuery(FDBTransaction transaction, boolean isSnapshot, KeySelector begin, KeySelector end, byte[] mapper,
-	                 int rowLimit, boolean reverse, StreamingMode streamingMode, EventKeeper eventKeeper) {
+	                 int rowLimit, int matchIndex, boolean reverse, StreamingMode streamingMode,
+	                 EventKeeper eventKeeper) {
 		this.tr = transaction;
 		this.begin = begin;
 		this.end = end;
 		this.mapper = mapper;
 		this.snapshot = isSnapshot;
 		this.rowLimit = rowLimit;
+		this.matchIndex = matchIndex;
 		this.reverse = reverse;
 		this.streamingMode = streamingMode;
 		this.eventKeeper = eventKeeper;
@@ -88,14 +91,14 @@ public CompletableFuture<List<MappedKeyValue>> asList() {
 
 			FutureMappedResults range =
 			    tr.getMappedRange_internal(this.begin, this.end, this.mapper, this.rowLimit, 0,
-			                               StreamingMode.EXACT.code(), 1, this.snapshot, this.reverse);
+			                               StreamingMode.EXACT.code(), 1, this.snapshot, this.reverse, this.matchIndex);
 			return range.thenApply(result -> result.get().values).whenComplete((result, e) -> range.close());
 		}
 
 		// If the streaming mode is not EXACT, simply collect the results of an
 		// iteration into a list
 		return AsyncUtil.collect(
-		    new MappedRangeQuery(tr, snapshot, begin, end, mapper, rowLimit, reverse, mode, eventKeeper),
+		    new MappedRangeQuery(tr, snapshot, begin, end, mapper, rowLimit, matchIndex, reverse, mode, eventKeeper),
 		    tr.getExecutor());
 	}
 
@@ -106,7 +109,7 @@ public CompletableFuture<List<MappedKeyValue>> asList() {
 	 */
 	@Override
 	public AsyncRangeIterator iterator() {
-		return new AsyncRangeIterator(this.rowLimit, this.reverse, this.streamingMode);
+		return new AsyncRangeIterator(this.rowLimit, this.matchIndex, this.reverse, this.streamingMode);
 	}
 
 	private class AsyncRangeIterator implements AsyncIterator<MappedKeyValue> {
@@ -114,6 +117,7 @@ private class AsyncRangeIterator implements AsyncIterator<MappedKeyValue> {
 		private final boolean rowsLimited;
 		private final boolean reverse;
 		private final StreamingMode streamingMode;
+		private final int matchIndex;
 
 		// There is the chance for parallelism in the two "chunks" for fetched data
 		private MappedRangeResult chunk = null;
@@ -131,12 +135,13 @@ private class AsyncRangeIterator implements AsyncIterator<MappedKeyValue> {
 		private CompletableFuture<Boolean> nextFuture;
 		private boolean isCancelled = false;
 
-		private AsyncRangeIterator(int rowLimit, boolean reverse, StreamingMode streamingMode) {
+		private AsyncRangeIterator(int rowLimit, int matchIndex, boolean reverse, StreamingMode streamingMode) {
 			this.begin = MappedRangeQuery.this.begin;
 			this.end = MappedRangeQuery.this.end;
 			this.rowsLimited = rowLimit != 0;
 			this.rowsRemaining = rowLimit;
 			this.reverse = reverse;
+			this.matchIndex = matchIndex;
 			this.streamingMode = streamingMode;
 
 			startNextFetch();
@@ -217,8 +222,9 @@ private synchronized void startNextFetch() {
 
 			nextFuture = new CompletableFuture<>();
 			final long sTime = System.nanoTime();
-			fetchingChunk = tr.getMappedRange_internal(begin, end, mapper, rowsLimited ? rowsRemaining : 0, 0,
-			                                           streamingMode.code(), ++iteration, snapshot, reverse);
+			fetchingChunk =
+			    tr.getMappedRange_internal(begin, end, mapper, rowsLimited ? rowsRemaining : 0, 0, streamingMode.code(),
+			                               ++iteration, snapshot, reverse, matchIndex);
 
 			BiConsumer<MappedRangeResultInfo, Throwable> cons = new FetchComplete(fetchingChunk, nextFuture);
 			if (eventKeeper != null) {
diff --git a/bindings/java/src/main/com/apple/foundationdb/MappedRangeResultDirectBufferIterator.java b/bindings/java/src/main/com/apple/foundationdb/MappedRangeResultDirectBufferIterator.java
index 169cef42e0f..6257596d85b 100644
--- a/bindings/java/src/main/com/apple/foundationdb/MappedRangeResultDirectBufferIterator.java
+++ b/bindings/java/src/main/com/apple/foundationdb/MappedRangeResultDirectBufferIterator.java
@@ -51,6 +51,8 @@ public MappedKeyValue next() {
 		final byte[] value = getString();
 		final byte[] rangeBegin = getString();
 		final byte[] rangeEnd = getString();
+		final byte[] boundaryAndExistBytes = getString();
+		final int boundaryAndExist = ByteBuffer.wrap(boundaryAndExistBytes).getInt();
 		final int rangeResultSize = byteBuffer.getInt();
 		List<KeyValue> rangeResult = new ArrayList();
 		for (int i = 0; i < rangeResultSize; i++) {
@@ -59,7 +61,7 @@ public MappedKeyValue next() {
 			rangeResult.add(new KeyValue(k, v));
 		}
 		current += 1;
-		return new MappedKeyValue(key, value, rangeBegin, rangeEnd, rangeResult);
+		return new MappedKeyValue(key, value, rangeBegin, rangeEnd, rangeResult, boundaryAndExist);
 	}
 
 	private byte[] getString() {

From 93ec0988550369f9146ae489ab4c2580c4457c90 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Fri, 20 May 2022 22:56:19 +0000
Subject: [PATCH 436/740] disable AVX for 7.1.6 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From c288112c9c79109130da59ee77078357a87f37e5 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Fri, 20 May 2022 23:01:43 +0000
Subject: [PATCH 437/740] enable AVX for 7.1.7 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From e8764ae6d88b525f9b9a73b7b70f6883e3ca5f09 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Fri, 20 May 2022 23:02:36 +0000
Subject: [PATCH 438/740] update version after 7.1.6 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 881f03e8b25..0e987b5884a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.6
+  VERSION 7.1.7
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 6d392384f1cbd6293d9b2a2c1f4ae26e4b4ed6a8 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 20 May 2022 17:33:16 -0700
Subject: [PATCH 439/740] Revert "Make java binding work for prefetch match
 index modes. (#7186) (#7206)"

This reverts commit 81e7ddc68a02cc7a5f35ffef68cb680557b0d3b8.
---
 bindings/java/fdbJNI.cpp                      | 10 ++----
 .../MappedRangeQueryIntegrationTest.java      |  6 +---
 .../apple/foundationdb/FDBTransaction.java    |  8 ++---
 .../apple/foundationdb/MappedKeyValue.java    | 34 +++++--------------
 .../apple/foundationdb/MappedRangeQuery.java  | 20 ++++-------
 ...MappedRangeResultDirectBufferIterator.java |  4 +--
 6 files changed, 22 insertions(+), 60 deletions(-)

diff --git a/bindings/java/fdbJNI.cpp b/bindings/java/fdbJNI.cpp
index c6704745e93..2392dc50c47 100644
--- a/bindings/java/fdbJNI.cpp
+++ b/bindings/java/fdbJNI.cpp
@@ -533,14 +533,10 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureMappedResults_Future
 		FDBMappedKeyValue kvm = kvms[i];
 		int kvm_count = kvm.getRange.m_size;
 
-		// now it has 5 field, key, value, getRange.begin, getRange.end, boundaryAndExist
-		// this needs to change if FDBMappedKeyValue definition is changed.
-		const int totalFieldFDBMappedKeyValue = 5;
-
-		const int totalLengths = totalFieldFDBMappedKeyValue + kvm_count * 2;
+		const int totalLengths = 4 + kvm_count * 2;
 
 		int totalBytes = kvm.key.key_length + kvm.value.key_length + kvm.getRange.begin.key.key_length +
-		                 kvm.getRange.end.key.key_length + sizeof(kvm.boundaryAndExist);
+		                 kvm.getRange.end.key.key_length;
 		for (int i = 0; i < kvm_count; i++) {
 			auto kv = kvm.getRange.data[i];
 			totalBytes += kv.key_length + kv.value_length;
@@ -584,7 +580,6 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureMappedResults_Future
 				cpBytesAndLength(pByte, pLength, kvm.value);
 				cpBytesAndLength(pByte, pLength, kvm.getRange.begin.key);
 				cpBytesAndLength(pByte, pLength, kvm.getRange.end.key);
-				cpBytesAndLengthInner(pByte, pLength, (uint8_t*)&(kvm.boundaryAndExist), sizeof(kvm.boundaryAndExist));
 				for (int kvm_i = 0; kvm_i < kvm_count; kvm_i++) {
 					auto kv = kvm.getRange.data[kvm_i];
 					cpBytesAndLengthInner(pByte, pLength, kv.key, kv.key_length);
@@ -593,7 +588,6 @@ JNIEXPORT jobject JNICALL Java_com_apple_foundationdb_FutureMappedResults_Future
 			}
 		}
 		// After native arrays are released
-		// call public static method MappedKeyValue::fromBytes()
 		jobject mkv = jenv->CallStaticObjectMethod(
 		    mapped_key_value_class, mapped_key_value_from_bytes, (jbyteArray)bytesArray, (jintArray)lengthArray);
 		if (jenv->ExceptionOccurred())
diff --git a/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java b/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
index beebd531d3d..92ca4a6724c 100644
--- a/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
+++ b/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
@@ -208,11 +208,7 @@ public interface RangeQueryWithIndex {
 					assertByteArrayEquals(indexEntryKey(id), mappedKeyValue.getKey());
 					assertByteArrayEquals(EMPTY, mappedKeyValue.getValue());
 					assertByteArrayEquals(indexEntryKey(id), mappedKeyValue.getKey());
-					if (id == begin || id == end - 1) {
-						Assertions.assertTrue(mappedKeyValue.getBoundaryAndExist());
-					} else {
-						Assertions.assertFalse(mappedKeyValue.getBoundaryAndExist());
-					}
+
 					byte[] prefix = recordKeyPrefix(id);
 					assertByteArrayEquals(prefix, mappedKeyValue.getRangeBegin());
 					prefix[prefix.length - 1] = (byte)0x01;
diff --git a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
index b35196c1463..c7b08b66260 100644
--- a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
@@ -358,8 +358,7 @@ public AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelect
 		if (mapper == null) {
 			throw new IllegalArgumentException("Mapper must be non-null");
 		}
-		return new MappedRangeQuery(FDBTransaction.this, false, begin, end, mapper, limit, matchIndex, reverse, mode,
-		                            eventKeeper);
+		return new MappedRangeQuery(FDBTransaction.this, false, begin, end, mapper, limit, reverse, mode, eventKeeper);
 	}
 
 	///////////////////
@@ -464,8 +463,7 @@ protected FutureResults getRange_internal(KeySelector begin, KeySelector end,
 	protected FutureMappedResults getMappedRange_internal(KeySelector begin, KeySelector end,
 	                                                      byte[] mapper, // Nullable
 	                                                      int rowLimit, int targetBytes, int streamingMode,
-	                                                      int iteration, boolean isSnapshot, boolean reverse,
-	                                                      int matchIndex) {
+	                                                      int iteration, boolean isSnapshot, boolean reverse) {
 		if (eventKeeper != null) {
 			eventKeeper.increment(Events.JNI_CALL);
 		}
@@ -478,7 +476,7 @@ protected FutureMappedResults getMappedRange_internal(KeySelector begin, KeySele
 			return new FutureMappedResults(
 			    Transaction_getMappedRange(getPtr(), begin.getKey(), begin.orEqual(), begin.getOffset(), end.getKey(),
 			                               end.orEqual(), end.getOffset(), mapper, rowLimit, targetBytes, streamingMode,
-			                               iteration, matchIndex, isSnapshot, reverse),
+			                               iteration, MATCH_INDEX_ALL, isSnapshot, reverse),
 			    FDB.instance().isDirectBufferQueriesEnabled(), executor, eventKeeper);
 		} finally {
 			pointerReadLock.unlock();
diff --git a/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java b/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
index ed2a97a1e64..7a0bcf6e4a8 100644
--- a/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
+++ b/bindings/java/src/main/com/apple/foundationdb/MappedKeyValue.java
@@ -22,8 +22,6 @@
 
 import com.apple.foundationdb.tuple.ByteArrayUtil;
 
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -33,35 +31,24 @@ public class MappedKeyValue extends KeyValue {
 	private final byte[] rangeBegin;
 	private final byte[] rangeEnd;
 	private final List<KeyValue> rangeResult;
-	private final int boundaryAndExist;
 
-	// now it has 5 field, key, value, getRange.begin, getRange.end, boundaryAndExist
-	// this needs to change if FDBMappedKeyValue definition is changed.
-	private static final int TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue = 5;
-
-	public MappedKeyValue(byte[] key, byte[] value, byte[] rangeBegin, byte[] rangeEnd, List<KeyValue> rangeResult,
-	               int boundaryAndExist) {
+	MappedKeyValue(byte[] key, byte[] value, byte[] rangeBegin, byte[] rangeEnd, List<KeyValue> rangeResult) {
 		super(key, value);
 		this.rangeBegin = rangeBegin;
 		this.rangeEnd = rangeEnd;
 		this.rangeResult = rangeResult;
-		this.boundaryAndExist = boundaryAndExist;
 	}
 
 	public byte[] getRangeBegin() { return rangeBegin; }
 
 	public byte[] getRangeEnd() { return rangeEnd; }
 
-	public boolean getBoundaryAndExist() { return boundaryAndExist == 0 ? false : true; }
-
 	public List<KeyValue> getRangeResult() { return rangeResult; }
 
 	public static MappedKeyValue fromBytes(byte[] bytes, int[] lengths) {
 		// Lengths include: key, value, rangeBegin, rangeEnd, count * (underlying key, underlying value)
-		if (lengths.length < TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue) {
-			throw new IllegalArgumentException("There needs to be at least " +
-			                                   TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue +
-			                                   " lengths to cover the metadata");
+		if (lengths.length < 4) {
+			throw new IllegalArgumentException("There needs to be at least 4 lengths to cover the metadata");
 		}
 
 		Offset offset = new Offset();
@@ -69,20 +56,18 @@ public static MappedKeyValue fromBytes(byte[] bytes, int[] lengths) {
 		byte[] value = takeBytes(offset, bytes, lengths);
 		byte[] rangeBegin = takeBytes(offset, bytes, lengths);
 		byte[] rangeEnd = takeBytes(offset, bytes, lengths);
-		byte[] boundaryAndExistBytes = takeBytes(offset, bytes, lengths);
-		int boundaryAndExist = ByteBuffer.wrap(boundaryAndExistBytes).order(ByteOrder.LITTLE_ENDIAN).getInt();
 
-		if ((lengths.length - TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue) % 2 != 0) {
+		if ((lengths.length - 4) % 2 != 0) {
 			throw new IllegalArgumentException("There needs to be an even number of lengths!");
 		}
-		int count = (lengths.length - TOTAL_SERIALIZED_FIELD_FDBMappedKeyValue) / 2;
+		int count = (lengths.length - 4) / 2;
 		List<KeyValue> rangeResult = new ArrayList<>(count);
 		for (int i = 0; i < count; i++) {
 			byte[] k = takeBytes(offset, bytes, lengths);
 			byte[] v = takeBytes(offset, bytes, lengths);
 			rangeResult.add(new KeyValue(k, v));
 		}
-		return new MappedKeyValue(key, value, rangeBegin, rangeEnd, rangeResult, boundaryAndExist);
+		return new MappedKeyValue(key, value, rangeBegin, rangeEnd, rangeResult);
 	}
 
 	static class Offset {
@@ -111,15 +96,13 @@ public boolean equals(Object obj) {
 		MappedKeyValue rhs = (MappedKeyValue) obj;
 		return Arrays.equals(rangeBegin, rhs.rangeBegin)
 				&& Arrays.equals(rangeEnd, rhs.rangeEnd)
-				&& Objects.equals(rangeResult, rhs.rangeResult)
-				&& boundaryAndExist == rhs.boundaryAndExist;
+				&& Objects.equals(rangeResult, rhs.rangeResult);
 	}
 
 	@Override
 	public int hashCode() {
 		int hashForResult = rangeResult == null ? 0 : rangeResult.hashCode();
-		return 17 +
-		    (29 * hashForResult + boundaryAndExist + 37 * Arrays.hashCode(rangeBegin) + Arrays.hashCode(rangeEnd));
+		return 17 + (29 * hashForResult + 37 * Arrays.hashCode(rangeBegin) + Arrays.hashCode(rangeEnd));
 	}
 
 	@Override
@@ -128,7 +111,6 @@ public String toString() {
 		sb.append("rangeBegin=").append(ByteArrayUtil.printable(rangeBegin));
 		sb.append(", rangeEnd=").append(ByteArrayUtil.printable(rangeEnd));
 		sb.append(", rangeResult=").append(rangeResult);
-		sb.append(", boundaryAndExist=").append(boundaryAndExist);
 		sb.append('}');
 		return super.toString() + "->" + sb.toString();
 	}
diff --git a/bindings/java/src/main/com/apple/foundationdb/MappedRangeQuery.java b/bindings/java/src/main/com/apple/foundationdb/MappedRangeQuery.java
index aea411cec41..9de3753ec32 100644
--- a/bindings/java/src/main/com/apple/foundationdb/MappedRangeQuery.java
+++ b/bindings/java/src/main/com/apple/foundationdb/MappedRangeQuery.java
@@ -53,21 +53,18 @@ class MappedRangeQuery implements AsyncIterable<MappedKeyValue> {
 	private final byte[] mapper; // Nonnull
 	private final boolean snapshot;
 	private final int rowLimit;
-	private final int matchIndex;
 	private final boolean reverse;
 	private final StreamingMode streamingMode;
 	private final EventKeeper eventKeeper;
 
 	MappedRangeQuery(FDBTransaction transaction, boolean isSnapshot, KeySelector begin, KeySelector end, byte[] mapper,
-	                 int rowLimit, int matchIndex, boolean reverse, StreamingMode streamingMode,
-	                 EventKeeper eventKeeper) {
+	                 int rowLimit, boolean reverse, StreamingMode streamingMode, EventKeeper eventKeeper) {
 		this.tr = transaction;
 		this.begin = begin;
 		this.end = end;
 		this.mapper = mapper;
 		this.snapshot = isSnapshot;
 		this.rowLimit = rowLimit;
-		this.matchIndex = matchIndex;
 		this.reverse = reverse;
 		this.streamingMode = streamingMode;
 		this.eventKeeper = eventKeeper;
@@ -91,14 +88,14 @@ public CompletableFuture<List<MappedKeyValue>> asList() {
 
 			FutureMappedResults range =
 			    tr.getMappedRange_internal(this.begin, this.end, this.mapper, this.rowLimit, 0,
-			                               StreamingMode.EXACT.code(), 1, this.snapshot, this.reverse, this.matchIndex);
+			                               StreamingMode.EXACT.code(), 1, this.snapshot, this.reverse);
 			return range.thenApply(result -> result.get().values).whenComplete((result, e) -> range.close());
 		}
 
 		// If the streaming mode is not EXACT, simply collect the results of an
 		// iteration into a list
 		return AsyncUtil.collect(
-		    new MappedRangeQuery(tr, snapshot, begin, end, mapper, rowLimit, matchIndex, reverse, mode, eventKeeper),
+		    new MappedRangeQuery(tr, snapshot, begin, end, mapper, rowLimit, reverse, mode, eventKeeper),
 		    tr.getExecutor());
 	}
 
@@ -109,7 +106,7 @@ public CompletableFuture<List<MappedKeyValue>> asList() {
 	 */
 	@Override
 	public AsyncRangeIterator iterator() {
-		return new AsyncRangeIterator(this.rowLimit, this.matchIndex, this.reverse, this.streamingMode);
+		return new AsyncRangeIterator(this.rowLimit, this.reverse, this.streamingMode);
 	}
 
 	private class AsyncRangeIterator implements AsyncIterator<MappedKeyValue> {
@@ -117,7 +114,6 @@ private class AsyncRangeIterator implements AsyncIterator<MappedKeyValue> {
 		private final boolean rowsLimited;
 		private final boolean reverse;
 		private final StreamingMode streamingMode;
-		private final int matchIndex;
 
 		// There is the chance for parallelism in the two "chunks" for fetched data
 		private MappedRangeResult chunk = null;
@@ -135,13 +131,12 @@ private class AsyncRangeIterator implements AsyncIterator<MappedKeyValue> {
 		private CompletableFuture<Boolean> nextFuture;
 		private boolean isCancelled = false;
 
-		private AsyncRangeIterator(int rowLimit, int matchIndex, boolean reverse, StreamingMode streamingMode) {
+		private AsyncRangeIterator(int rowLimit, boolean reverse, StreamingMode streamingMode) {
 			this.begin = MappedRangeQuery.this.begin;
 			this.end = MappedRangeQuery.this.end;
 			this.rowsLimited = rowLimit != 0;
 			this.rowsRemaining = rowLimit;
 			this.reverse = reverse;
-			this.matchIndex = matchIndex;
 			this.streamingMode = streamingMode;
 
 			startNextFetch();
@@ -222,9 +217,8 @@ private synchronized void startNextFetch() {
 
 			nextFuture = new CompletableFuture<>();
 			final long sTime = System.nanoTime();
-			fetchingChunk =
-			    tr.getMappedRange_internal(begin, end, mapper, rowsLimited ? rowsRemaining : 0, 0, streamingMode.code(),
-			                               ++iteration, snapshot, reverse, matchIndex);
+			fetchingChunk = tr.getMappedRange_internal(begin, end, mapper, rowsLimited ? rowsRemaining : 0, 0,
+			                                           streamingMode.code(), ++iteration, snapshot, reverse);
 
 			BiConsumer<MappedRangeResultInfo, Throwable> cons = new FetchComplete(fetchingChunk, nextFuture);
 			if (eventKeeper != null) {
diff --git a/bindings/java/src/main/com/apple/foundationdb/MappedRangeResultDirectBufferIterator.java b/bindings/java/src/main/com/apple/foundationdb/MappedRangeResultDirectBufferIterator.java
index 6257596d85b..169cef42e0f 100644
--- a/bindings/java/src/main/com/apple/foundationdb/MappedRangeResultDirectBufferIterator.java
+++ b/bindings/java/src/main/com/apple/foundationdb/MappedRangeResultDirectBufferIterator.java
@@ -51,8 +51,6 @@ public MappedKeyValue next() {
 		final byte[] value = getString();
 		final byte[] rangeBegin = getString();
 		final byte[] rangeEnd = getString();
-		final byte[] boundaryAndExistBytes = getString();
-		final int boundaryAndExist = ByteBuffer.wrap(boundaryAndExistBytes).getInt();
 		final int rangeResultSize = byteBuffer.getInt();
 		List<KeyValue> rangeResult = new ArrayList();
 		for (int i = 0; i < rangeResultSize; i++) {
@@ -61,7 +59,7 @@ public MappedKeyValue next() {
 			rangeResult.add(new KeyValue(k, v));
 		}
 		current += 1;
-		return new MappedKeyValue(key, value, rangeBegin, rangeEnd, rangeResult, boundaryAndExist);
+		return new MappedKeyValue(key, value, rangeBegin, rangeEnd, rangeResult);
 	}
 
 	private byte[] getString() {

From 1e4519d35778c0b2397314cde45578a1d9dbb850 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 20 May 2022 17:33:32 -0700
Subject: [PATCH 440/740] Revert "Add missing secondary queries tests for index
 prefetch (#7185)"

This reverts commit 921fc4f8cee36854ba257e2915cfa9a1e4040fe1.
---
 bindings/c/test/unit/unit_tests.cpp          | 81 ++++----------------
 fdbserver/workloads/GetMappedRange.actor.cpp | 63 ++++++++-------
 2 files changed, 45 insertions(+), 99 deletions(-)

diff --git a/bindings/c/test/unit/unit_tests.cpp b/bindings/c/test/unit/unit_tests.cpp
index f73695a2550..c3c679d8f96 100644
--- a/bindings/c/test/unit/unit_tests.cpp
+++ b/bindings/c/test/unit/unit_tests.cpp
@@ -956,7 +956,7 @@ GetMappedRangeResult getMappedIndexEntries(int beginId,
                                            int endId,
                                            fdb::Transaction& tr,
                                            std::string mapper,
-                                           int matchIndex) {
+                                           int matchIndex = MATCH_INDEX_ALL) {
 	std::string indexEntryKeyBegin = indexEntryKey(beginId);
 	std::string indexEntryKeyEnd = indexEntryKey(endId);
 
@@ -978,15 +978,8 @@ GetMappedRangeResult getMappedIndexEntries(int beginId,
 GetMappedRangeResult getMappedIndexEntries(int beginId,
                                            int endId,
                                            fdb::Transaction& tr,
-                                           int matchIndex,
-                                           bool allMissing) {
-	std::string mapper = Tuple()
-	                         .append(prefix)
-	                         .append(RECORD)
-	                         .append(allMissing ? "{K[2]}"_sr : "{K[3]}"_sr)
-	                         .append("{...}"_sr)
-	                         .pack()
-	                         .toString();
+                                           int matchIndex = MATCH_INDEX_ALL) {
+	std::string mapper = Tuple().append(prefix).append(RECORD).append("{K[3]}"_sr).append("{...}"_sr).pack().toString();
 	return getMappedIndexEntries(beginId, endId, tr, mapper, matchIndex);
 }
 
@@ -1008,7 +1001,7 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 		} else if (r < 0.75) {
 			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
 		}
-		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex, false);
+		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex);
 
 		if (result.err) {
 			fdb::EmptyFuture f1 = tr.on_error(result.err);
@@ -1028,14 +1021,22 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 			if (matchIndex == MATCH_INDEX_ALL || i == 0 || i == expectSize - 1) {
 				CHECK(indexEntryKey(id).compare(key) == 0);
 			} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
+				// now we cannot generate a workload that only has partial results matched
+				// thus expecting everything matched
+				// TODO: create tests to generate workloads with partial secondary results present
 				CHECK(indexEntryKey(id).compare(key) == 0);
 			} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
+				// now we cannot generate a workload that only has partial results matched
+				// thus expecting everything NOT matched(except for the boundary asserted above)
+				// TODO: create tests to generate workloads with partial secondary results present
 				CHECK(EMPTY.compare(key) == 0);
 			} else {
 				CHECK(EMPTY.compare(key) == 0);
 			}
-			bool empty = range_results.empty();
-			CHECK(boundaryAndExist == (boundary && !empty));
+
+			// TODO: create tests to generate workloads with partial secondary results present
+			CHECK(boundaryAndExist == boundary);
+
 			CHECK(EMPTY.compare(value) == 0);
 			CHECK(range_results.size() == SPLIT_SIZE);
 			for (int split = 0; split < SPLIT_SIZE; split++) {
@@ -1048,58 +1049,6 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 	}
 }
 
-TEST_CASE("fdb_transaction_get_mapped_range_missing_all_secondary") {
-	const int TOTAL_RECORDS = 20;
-	fillInRecords(TOTAL_RECORDS);
-
-	fdb::Transaction tr(db);
-	// RYW should be enabled.
-	while (1) {
-		int beginId = 1;
-		int endId = 19;
-		const double r = deterministicRandom()->random01();
-		int matchIndex = MATCH_INDEX_ALL;
-		if (r < 0.25) {
-			matchIndex = MATCH_INDEX_NONE;
-		} else if (r < 0.5) {
-			matchIndex = MATCH_INDEX_MATCHED_ONLY;
-		} else if (r < 0.75) {
-			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
-		}
-		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex, true);
-
-		if (result.err) {
-			fdb::EmptyFuture f1 = tr.on_error(result.err);
-			fdb_check(wait_future(f1));
-			continue;
-		}
-
-		int expectSize = endId - beginId;
-		CHECK(result.mkvs.size() == expectSize);
-		CHECK(!result.more);
-
-		int id = beginId;
-		bool boundary;
-		for (int i = 0; i < expectSize; i++, id++) {
-			boundary = i == 0 || i == expectSize - 1;
-			const auto& [key, value, begin, end, range_results, boundaryAndExist] = result.mkvs[i];
-			if (matchIndex == MATCH_INDEX_ALL || i == 0 || i == expectSize - 1) {
-				CHECK(indexEntryKey(id).compare(key) == 0);
-			} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
-				CHECK(EMPTY.compare(key) == 0);
-			} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
-				CHECK(indexEntryKey(id).compare(key) == 0);
-			} else {
-				CHECK(EMPTY.compare(key) == 0);
-			}
-			bool empty = range_results.empty();
-			CHECK(boundaryAndExist == (boundary && !empty));
-			CHECK(EMPTY.compare(value) == 0);
-		}
-		break;
-	}
-}
-
 TEST_CASE("fdb_transaction_get_mapped_range_restricted_to_serializable") {
 	std::string mapper = Tuple().append(prefix).append(RECORD).append("{K[3]}"_sr).pack().toString();
 	fdb::Transaction tr(db);
@@ -1160,7 +1109,7 @@ TEST_CASE("fdb_transaction_get_mapped_range_fail_on_mapper_not_tuple") {
 	};
 	assertNotTuple(mapper);
 	fdb::Transaction tr(db);
-	auto result = getMappedIndexEntries(1, 3, tr, mapper, MATCH_INDEX_ALL);
+	auto result = getMappedIndexEntries(1, 3, tr, mapper);
 	ASSERT(result.err == error_code_mapper_not_tuple);
 }
 
diff --git a/fdbserver/workloads/GetMappedRange.actor.cpp b/fdbserver/workloads/GetMappedRange.actor.cpp
index 9a7eae6a7a2..0809fbd2a2f 100644
--- a/fdbserver/workloads/GetMappedRange.actor.cpp
+++ b/fdbserver/workloads/GetMappedRange.actor.cpp
@@ -149,26 +149,33 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                           const MappedKeyValueRef* it,
 	                           GetMappedRangeWorkload* self,
 	                           int matchIndex,
-	                           bool isBoundary,
-	                           bool allMissing) {
+	                           bool isBoundary) {
 		//		std::cout << "validateRecord expectedId " << expectedId << " it->key " << printable(it->key) << "
 		// indexEntryKey(expectedId) " << printable(indexEntryKey(expectedId)) << std::endl;
 		if (matchIndex == MATCH_INDEX_ALL || isBoundary) {
 			ASSERT(it->key == indexEntryKey(expectedId));
 		} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
-			ASSERT(it->key == (allMissing ? EMPTY : indexEntryKey(expectedId)));
+			// now we cannot generate a workload that only has partial results matched
+			// thus expecting everything matched
+			// TODO: create tests to generate workloads with partial secondary results present
+			ASSERT(it->key == indexEntryKey(expectedId));
 		} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
-			ASSERT(it->key == (allMissing ? indexEntryKey(expectedId) : EMPTY));
+			// now we cannot generate a workload that only has partial results matched
+			// thus expecting everything NOT matched(except for the boundary asserted above)
+			// TODO: create tests to generate workloads with partial secondary results present
+			ASSERT(it->key == EMPTY);
 		} else {
 			ASSERT(it->key == EMPTY);
 		}
+		// TODO: create tests to generate workloads with partial secondary results present
+		ASSERT(it->boundaryAndExist == isBoundary);
+
 		ASSERT(it->value == EMPTY);
 
 		if (self->SPLIT_RECORDS) {
 			ASSERT(std::holds_alternative<GetRangeReqAndResultRef>(it->reqAndResult));
 			auto& getRange = std::get<GetRangeReqAndResultRef>(it->reqAndResult);
 			auto& rangeResult = getRange.result;
-			ASSERT(it->boundaryAndExist == (isBoundary && !rangeResult.empty()));
 			//					std::cout << "rangeResult.size()=" << rangeResult.size() << std::endl;
 			// In the future, we may be able to do the continuation more efficiently by combining partial results
 			// together and then validate.
@@ -176,20 +183,17 @@ struct GetMappedRangeWorkload : ApiWorkload {
 				// Retry if the underlying request is not fully completed.
 				return true;
 			}
-			if (!allMissing) {
-				ASSERT(rangeResult.size() == SPLIT_SIZE);
-				for (int split = 0; split < SPLIT_SIZE; split++) {
-					auto& kv = rangeResult[split];
-					//				std::cout << "kv.key=" << printable(kv.key)
-					//						   << ", recordKey(id, split)=" << printable(recordKey(id, split)) <<
-					// std::endl; std::cout << "kv.value=" << printable(kv.value)
-					//						   << ", recordValue(id, split)=" << printable(recordValue(id,split)) <<
-					// std::endl;
-					ASSERT(kv.key == recordKey(expectedId, split));
-					ASSERT(kv.value == recordValue(expectedId, split));
-				}
+			ASSERT(rangeResult.size() == SPLIT_SIZE);
+			for (int split = 0; split < SPLIT_SIZE; split++) {
+				auto& kv = rangeResult[split];
+				//						std::cout << "kv.key=" << printable(kv.key)
+				//						          << ", recordKey(id, split)=" << printable(recordKey(id, split)) <<
+				// std::endl; std::cout << "kv.value=" << printable(kv.value)
+				//						          << ", recordValue(id, split)=" << printable(recordValue(id, split)) <<
+				// std::endl;
+				ASSERT(kv.key == recordKey(expectedId, split));
+				ASSERT(kv.value == recordValue(expectedId, split));
 			}
-
 		} else {
 			ASSERT(std::holds_alternative<GetValueReqAndResultRef>(it->reqAndResult));
 			auto& getValue = std::get<GetValueReqAndResultRef>(it->reqAndResult);
@@ -207,8 +211,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                                                          int limit,
 	                                                          int expectedBeginId,
 	                                                          GetMappedRangeWorkload* self,
-	                                                          int matchIndex,
-	                                                          bool allMissing) {
+	                                                          int matchIndex) {
 
 		std::cout << "start scanMappedRangeWithLimits beginSelector:" << beginSelector.toString()
 		          << " endSelector:" << endSelector.toString() << " expectedBeginId:" << expectedBeginId
@@ -235,8 +238,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 				int cnt = 0;
 				const MappedKeyValueRef* it = result.begin();
 				for (; cnt < result.size(); cnt++, it++) {
-					if (validateRecord(
-					        expectedId, it, self, matchIndex, cnt == 0 || cnt == result.size() - 1, allMissing)) {
+					if (validateRecord(expectedId, it, self, matchIndex, cnt == 0 || cnt == result.size() - 1)) {
 						needRetry = true;
 						break;
 					}
@@ -268,8 +270,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                                   int endId,
 	                                   Key mapper,
 	                                   GetMappedRangeWorkload* self,
-	                                   int matchIndex,
-	                                   bool allMissing = false) {
+	                                   int matchIndex) {
 		Key beginTuple = Tuple().append(prefix).append(INDEX).append(indexKey(beginId)).getDataAsStandalone();
 		state KeySelector beginSelector = KeySelector(firstGreaterOrEqual(beginTuple));
 		Key endTuple = Tuple().append(prefix).append(INDEX).append(indexKey(endId)).getDataAsStandalone();
@@ -278,7 +279,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		state int expectedBeginId = beginId;
 		while (true) {
 			MappedRangeResult result = wait(self->scanMappedRangeWithLimits(
-			    cx, beginSelector, endSelector, mapper, limit, expectedBeginId, self, matchIndex, allMissing));
+			    cx, beginSelector, endSelector, mapper, limit, expectedBeginId, self, matchIndex));
 			expectedBeginId += result.size();
 			if (result.more) {
 				if (result.empty()) {
@@ -321,7 +322,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                                                   int endId,
 	                                                   Reference<TransactionWrapper>& tr,
 	                                                   GetMappedRangeWorkload* self) {
-		Key mapper = getMapper(self, false);
+		Key mapper = getMapper(self);
 		Key beginTuple = Tuple().append(prefix).append(INDEX).append(indexKey(beginId)).getDataAsStandalone();
 		KeySelector beginSelector = KeySelector(firstGreaterOrEqual(beginTuple));
 		Key endTuple = Tuple().append(prefix).append(INDEX).append(indexKey(endId)).getDataAsStandalone();
@@ -426,7 +427,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		std::cout << "Test configuration: transactionType:" << self->transactionType << " snapshot:" << self->snapshot
 		          << "bad_mapper:" << self->BAD_MAPPER << std::endl;
 
-		Key mapper = getMapper(self, false);
+		Key mapper = getMapper(self);
 		// The scanned range cannot be too large to hit get_mapped_key_values_has_more. We have a unit validating the
 		// error is thrown when the range is large.
 		const double r = deterministicRandom()->random01();
@@ -439,19 +440,15 @@ struct GetMappedRangeWorkload : ApiWorkload {
 			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
 		}
 		wait(self->scanMappedRange(cx, 10, 490, mapper, self, matchIndex));
-
-		Key mapper = getMapper(self, true);
-		wait(self->scanMappedRange(cx, 10, 490, mapper, self, MATCH_INDEX_UNMATCHED_ONLY, true));
-
 		return Void();
 	}
 
-	static Key getMapper(GetMappedRangeWorkload* self, bool mapperForAllMissing) {
+	static Key getMapper(GetMappedRangeWorkload* self) {
 		Tuple mapperTuple;
 		if (self->BAD_MAPPER) {
 			mapperTuple << prefix << RECORD << "{K[xxx]}"_sr;
 		} else {
-			mapperTuple << prefix << RECORD << (mapperForAllMissing ? "{K[2]}"_sr : "{K[3]}"_sr);
+			mapperTuple << prefix << RECORD << "{K[3]}"_sr;
 			if (self->SPLIT_RECORDS) {
 				mapperTuple << "{...}"_sr;
 			}

From 9e9b9914e518990ae34e3ca220d7ff875cdb1089 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 20 May 2022 17:34:58 -0700
Subject: [PATCH 441/740] Revert "Enable MATCHED and UNMATCHED mode for index
 prefetch (#7162)"

This reverts commit 20cab33954f912a5e141e9a8476c4d06d08a3986.
---
 bindings/c/foundationdb/fdb_c.h               |  1 -
 bindings/c/test/unit/unit_tests.cpp           | 35 +++----------------
 .../apple/foundationdb/FDBTransaction.java    |  2 --
 fdbclient/FDBTypes.h                          | 15 ++------
 fdbclient/MultiVersionTransaction.h           |  1 -
 fdbclient/NativeAPI.actor.cpp                 |  2 +-
 fdbserver/storageserver.actor.cpp             | 13 ++-----
 fdbserver/workloads/GetMappedRange.actor.cpp  | 23 +-----------
 8 files changed, 11 insertions(+), 81 deletions(-)

diff --git a/bindings/c/foundationdb/fdb_c.h b/bindings/c/foundationdb/fdb_c.h
index 25ba0a38d06..0cd2b7019a1 100644
--- a/bindings/c/foundationdb/fdb_c.h
+++ b/bindings/c/foundationdb/fdb_c.h
@@ -160,7 +160,6 @@ typedef struct mappedkeyvalue {
 	 * take the shortcut. */
 	FDBGetRangeReqAndResult getRange;
 	unsigned char buffer[32];
-	fdb_bool_t boundaryAndExist;
 } FDBMappedKeyValue;
 
 #pragma pack(push, 4)
diff --git a/bindings/c/test/unit/unit_tests.cpp b/bindings/c/test/unit/unit_tests.cpp
index c3c679d8f96..242eca685ae 100644
--- a/bindings/c/test/unit/unit_tests.cpp
+++ b/bindings/c/test/unit/unit_tests.cpp
@@ -179,8 +179,8 @@ struct GetMappedRangeResult {
 	                       std::string, // value
 	                       std::string, // begin
 	                       std::string, // end
-	                       std::vector<std::pair<std::string, std::string>>, // range results
-	                       fdb_bool_t>>
+	                       std::vector<std::pair<std::string, std::string>> // range results
+	                       >>
 	    mkvs;
 	// True if values remain in the key range requested.
 	bool more;
@@ -304,7 +304,6 @@ GetMappedRangeResult get_mapped_range(fdb::Transaction& tr,
 		auto value = extractString(mkv.value);
 		auto begin = extractString(mkv.getRange.begin.key);
 		auto end = extractString(mkv.getRange.end.key);
-		bool boundaryAndExist = mkv.boundaryAndExist;
 		//		std::cout << "key:" << key << " value:" << value << " begin:" << begin << " end:" << end << std::endl;
 
 		std::vector<std::pair<std::string, std::string>> range_results;
@@ -315,7 +314,7 @@ GetMappedRangeResult get_mapped_range(fdb::Transaction& tr,
 			range_results.emplace_back(k, v);
 			// std::cout << "[" << i << "]" << k << " -> " << v << std::endl;
 		}
-		result.mkvs.emplace_back(key, value, begin, end, range_results, boundaryAndExist);
+		result.mkvs.emplace_back(key, value, begin, end, range_results);
 	}
 	return result;
 }
@@ -992,15 +991,7 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 	while (1) {
 		int beginId = 1;
 		int endId = 19;
-		const double r = deterministicRandom()->random01();
-		int matchIndex = MATCH_INDEX_ALL;
-		if (r < 0.25) {
-			matchIndex = MATCH_INDEX_NONE;
-		} else if (r < 0.5) {
-			matchIndex = MATCH_INDEX_MATCHED_ONLY;
-		} else if (r < 0.75) {
-			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
-		}
+		const int matchIndex = deterministicRandom()->random01() > 0.5 ? MATCH_INDEX_NONE : MATCH_INDEX_ALL;
 		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex);
 
 		if (result.err) {
@@ -1014,29 +1005,13 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 		CHECK(!result.more);
 
 		int id = beginId;
-		bool boundary;
 		for (int i = 0; i < expectSize; i++, id++) {
-			boundary = i == 0 || i == expectSize - 1;
-			const auto& [key, value, begin, end, range_results, boundaryAndExist] = result.mkvs[i];
+			const auto& [key, value, begin, end, range_results] = result.mkvs[i];
 			if (matchIndex == MATCH_INDEX_ALL || i == 0 || i == expectSize - 1) {
 				CHECK(indexEntryKey(id).compare(key) == 0);
-			} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
-				// now we cannot generate a workload that only has partial results matched
-				// thus expecting everything matched
-				// TODO: create tests to generate workloads with partial secondary results present
-				CHECK(indexEntryKey(id).compare(key) == 0);
-			} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
-				// now we cannot generate a workload that only has partial results matched
-				// thus expecting everything NOT matched(except for the boundary asserted above)
-				// TODO: create tests to generate workloads with partial secondary results present
-				CHECK(EMPTY.compare(key) == 0);
 			} else {
 				CHECK(EMPTY.compare(key) == 0);
 			}
-
-			// TODO: create tests to generate workloads with partial secondary results present
-			CHECK(boundaryAndExist == boundary);
-
 			CHECK(EMPTY.compare(value) == 0);
 			CHECK(range_results.size() == SPLIT_SIZE);
 			for (int split = 0; split < SPLIT_SIZE; split++) {
diff --git a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
index c7b08b66260..7451959f228 100644
--- a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
@@ -35,8 +35,6 @@ class FDBTransaction extends NativeObjectWrapper implements Transaction, OptionC
 
 	static public final int MATCH_INDEX_ALL = 0;
 	static public final int MATCH_INDEX_NONE = 1;
-	static public final int MATCH_INDEX_MATCHED_ONLY = 2;
-	static public final int MATCH_INDEX_UNMATCHED_ONLY = 3;
 
 	private final Database database;
 	private final Executor executor;
diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index 4a97ba33c65..41ea9b2f149 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -169,8 +169,6 @@ static const Tag cacheTag{ tagLocalitySpecial, 2 };
 
 const int MATCH_INDEX_ALL = 0;
 const int MATCH_INDEX_NONE = 1;
-const int MATCH_INDEX_MATCHED_ONLY = 2;
-const int MATCH_INDEX_UNMATCHED_ONLY = 3;
 
 enum { txsTagOld = -1, invalidTagOld = -100 };
 
@@ -783,18 +781,9 @@ struct MappedKeyValueRef : KeyValueRef {
 
 	MappedReqAndResultRef reqAndResult;
 
-	// boundary KVs are always returned so that caller can use it as a continuation,
-	// for non-boundary KV, it is always false.
-	// for boundary KV, it is true only when the secondary query succeeds(return non-empty).
-	// Note: only MATCH_INDEX_MATCHED_ONLY and MATCH_INDEX_UNMATCHED_ONLY modes can make use of it,
-	// to decide whether the boudnary is a match/unmatch.
-	// In the case of MATCH_INDEX_ALL and MATCH_INDEX_NONE, caller should not care if boundary has a match or not.
-	bool boundaryAndExist;
-
 	MappedKeyValueRef() = default;
 	MappedKeyValueRef(Arena& a, const MappedKeyValueRef& copyFrom) : KeyValueRef(a, copyFrom) {
 		const auto& reqAndResultCopyFrom = copyFrom.reqAndResult;
-		boundaryAndExist = copyFrom.boundaryAndExist;
 		if (std::holds_alternative<GetValueReqAndResultRef>(reqAndResultCopyFrom)) {
 			auto getValue = std::get<GetValueReqAndResultRef>(reqAndResultCopyFrom);
 			reqAndResult = GetValueReqAndResultRef(a, getValue);
@@ -808,7 +797,7 @@ struct MappedKeyValueRef : KeyValueRef {
 
 	bool operator==(const MappedKeyValueRef& rhs) const {
 		return static_cast<const KeyValueRef&>(*this) == static_cast<const KeyValueRef&>(rhs) &&
-		       reqAndResult == rhs.reqAndResult && boundaryAndExist == rhs.boundaryAndExist;
+		       reqAndResult == rhs.reqAndResult;
 	}
 	bool operator!=(const MappedKeyValueRef& rhs) const { return !(rhs == *this); }
 
@@ -818,7 +807,7 @@ struct MappedKeyValueRef : KeyValueRef {
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, ((KeyValueRef&)*this), reqAndResult, boundaryAndExist);
+		serializer(ar, ((KeyValueRef&)*this), reqAndResult);
 	}
 };
 
diff --git a/fdbclient/MultiVersionTransaction.h b/fdbclient/MultiVersionTransaction.h
index baca7e70dad..e9dc59fe997 100644
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@@ -80,7 +80,6 @@ struct FdbCApi : public ThreadSafeReferenceCounted<FdbCApi> {
 		 * and take the shortcut. */
 		FDBGetRangeReqAndResult getRange;
 		unsigned char buffer[32];
-		bool boundaryAndExist;
 	} FDBMappedKeyValue;
 
 #pragma pack(push, 4)
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index e187d157930..b3946f7263b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -4074,7 +4074,7 @@ int64_t inline getRangeResultFamilyBytes(MappedRangeResultRef result) {
 	int64_t bytes = 0;
 	for (const MappedKeyValueRef& mappedKeyValue : result) {
 		bytes += mappedKeyValue.key.size() + mappedKeyValue.value.size();
-		bytes += sizeof(mappedKeyValue.boundaryAndExist);
+
 		auto& reqAndResult = mappedKeyValue.reqAndResult;
 		if (std::holds_alternative<GetValueReqAndResultRef>(reqAndResult)) {
 			auto getValue = std::get<GetValueReqAndResultRef>(reqAndResult);
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index df8a99f1899..0e88b99b504 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3745,11 +3745,10 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	state int sz = input.data.size();
 	state int i = 0;
 	for (; i < sz; i++) {
-		state KeyValueRef* it = &input.data[i];
+		KeyValueRef* it = &input.data[i];
 		state MappedKeyValueRef kvm;
-		state bool isBoundary = i == 0 || i == sz - 1;
 		// need to keep the boundary, so that caller can use it as a continuation.
-		if (isBoundary || matchIndex == MATCH_INDEX_ALL) {
+		if ((i == 0 || i == sz - 1) || matchIndex == MATCH_INDEX_ALL) {
 			kvm.key = it->key;
 			kvm.value = it->value;
 		}
@@ -3765,19 +3764,11 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 			// Use the mappedKey as the prefix of the range query.
 			GetRangeReqAndResultRef getRange =
 			    wait(quickGetKeyValues(data, mappedKey, input.version, &(result.arena), pOriginalReq));
-			if (!getRange.result.empty() && matchIndex == MATCH_INDEX_MATCHED_ONLY ||
-			    getRange.result.empty() && matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
-				kvm.key = it->key;
-				kvm.value = it->value;
-			}
-
-			kvm.boundaryAndExist = isBoundary && !getRange.result.empty();
 			kvm.reqAndResult = getRange;
 		} else {
 			GetValueReqAndResultRef getValue =
 			    wait(quickGetValue(data, mappedKey, input.version, &(result.arena), pOriginalReq));
 			kvm.reqAndResult = getValue;
-			kvm.boundaryAndExist = isBoundary && getValue.result.present();
 		}
 		result.data.push_back(result.arena, kvm);
 	}
diff --git a/fdbserver/workloads/GetMappedRange.actor.cpp b/fdbserver/workloads/GetMappedRange.actor.cpp
index 0809fbd2a2f..cb977d6815b 100644
--- a/fdbserver/workloads/GetMappedRange.actor.cpp
+++ b/fdbserver/workloads/GetMappedRange.actor.cpp
@@ -154,22 +154,9 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		// indexEntryKey(expectedId) " << printable(indexEntryKey(expectedId)) << std::endl;
 		if (matchIndex == MATCH_INDEX_ALL || isBoundary) {
 			ASSERT(it->key == indexEntryKey(expectedId));
-		} else if (matchIndex == MATCH_INDEX_MATCHED_ONLY) {
-			// now we cannot generate a workload that only has partial results matched
-			// thus expecting everything matched
-			// TODO: create tests to generate workloads with partial secondary results present
-			ASSERT(it->key == indexEntryKey(expectedId));
-		} else if (matchIndex == MATCH_INDEX_UNMATCHED_ONLY) {
-			// now we cannot generate a workload that only has partial results matched
-			// thus expecting everything NOT matched(except for the boundary asserted above)
-			// TODO: create tests to generate workloads with partial secondary results present
-			ASSERT(it->key == EMPTY);
 		} else {
 			ASSERT(it->key == EMPTY);
 		}
-		// TODO: create tests to generate workloads with partial secondary results present
-		ASSERT(it->boundaryAndExist == isBoundary);
-
 		ASSERT(it->value == EMPTY);
 
 		if (self->SPLIT_RECORDS) {
@@ -430,15 +417,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		Key mapper = getMapper(self);
 		// The scanned range cannot be too large to hit get_mapped_key_values_has_more. We have a unit validating the
 		// error is thrown when the range is large.
-		const double r = deterministicRandom()->random01();
-		int matchIndex = MATCH_INDEX_ALL;
-		if (r < 0.25) {
-			matchIndex = MATCH_INDEX_NONE;
-		} else if (r < 0.5) {
-			matchIndex = MATCH_INDEX_MATCHED_ONLY;
-		} else if (r < 0.75) {
-			matchIndex = MATCH_INDEX_UNMATCHED_ONLY;
-		}
+		int matchIndex = deterministicRandom()->random01() > 0.5 ? MATCH_INDEX_NONE : MATCH_INDEX_ALL;
 		wait(self->scanMappedRange(cx, 10, 490, mapper, self, matchIndex));
 		return Void();
 	}

From 5c33fee7fb1f171b624878eb0df032d34a98ad77 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 20 May 2022 17:35:11 -0700
Subject: [PATCH 442/740] Revert "Optimization: support removing index
 conditionally (#7116)"

This reverts commit 10498455929457f1cdcc3585bfeebd493441c923.
---
 bindings/c/fdb_c.cpp                          |  2 -
 bindings/c/foundationdb/fdb_c.h               |  1 -
 bindings/c/test/unit/fdb_api.cpp              |  2 -
 bindings/c/test/unit/fdb_api.hpp              |  1 -
 bindings/c/test/unit/unit_tests.cpp           | 27 ++---------
 bindings/java/fdbJNI.cpp                      |  2 -
 .../MappedRangeQueryIntegrationTest.java      | 12 ++---
 .../apple/foundationdb/FDBTransaction.java    | 28 +++++------
 .../apple/foundationdb/ReadTransaction.java   |  2 +-
 fdbclient/FDBTypes.h                          |  3 --
 fdbclient/IClientApi.h                        |  1 -
 fdbclient/ISingleThreadTransaction.h          |  1 -
 fdbclient/MultiVersionTransaction.actor.cpp   |  5 +-
 fdbclient/MultiVersionTransaction.h           |  3 --
 fdbclient/NativeAPI.actor.cpp                 | 30 ++----------
 fdbclient/NativeAPI.actor.h                   |  2 -
 fdbclient/PaxosConfigTransaction.h            |  1 -
 fdbclient/ReadYourWrites.actor.cpp            | 20 +++-----
 fdbclient/ReadYourWrites.h                    |  1 -
 fdbclient/SimpleConfigTransaction.h           |  1 -
 fdbclient/StorageServerInterface.h            |  4 +-
 fdbclient/ThreadSafeTransaction.cpp           |  5 +-
 fdbclient/ThreadSafeTransaction.h             |  1 -
 fdbserver/storageserver.actor.cpp             | 18 +++-----
 fdbserver/workloads/ApiWorkload.h             |  8 +---
 fdbserver/workloads/GetMappedRange.actor.cpp  | 46 +++++--------------
 26 files changed, 59 insertions(+), 168 deletions(-)

diff --git a/bindings/c/fdb_c.cpp b/bindings/c/fdb_c.cpp
index 2d9ec68d78f..da54845475b 100644
--- a/bindings/c/fdb_c.cpp
+++ b/bindings/c/fdb_c.cpp
@@ -655,7 +655,6 @@ extern "C" DLLEXPORT FDBFuture* fdb_transaction_get_mapped_range(FDBTransaction*
                                                                  int target_bytes,
                                                                  FDBStreamingMode mode,
                                                                  int iteration,
-                                                                 int matchIndex,
                                                                  fdb_bool_t snapshot,
                                                                  fdb_bool_t reverse) {
 	FDBFuture* r = validate_and_update_parameters(limit, target_bytes, mode, iteration, reverse);
@@ -668,7 +667,6 @@ extern "C" DLLEXPORT FDBFuture* fdb_transaction_get_mapped_range(FDBTransaction*
 	                        KeySelectorRef(KeyRef(end_key_name, end_key_name_length), end_or_equal, end_offset),
 	                        StringRef(mapper_name, mapper_name_length),
 	                        GetRangeLimits(limit, target_bytes),
-	                        matchIndex,
 	                        snapshot,
 	                        reverse)
 	                    .extractPtr());
diff --git a/bindings/c/foundationdb/fdb_c.h b/bindings/c/foundationdb/fdb_c.h
index 0cd2b7019a1..cbd90226e7b 100644
--- a/bindings/c/foundationdb/fdb_c.h
+++ b/bindings/c/foundationdb/fdb_c.h
@@ -384,7 +384,6 @@ DLLEXPORT WARN_UNUSED_RESULT FDBFuture* fdb_transaction_get_mapped_range(FDBTran
                                                                          int target_bytes,
                                                                          FDBStreamingMode mode,
                                                                          int iteration,
-                                                                         int matchIndex,
                                                                          fdb_bool_t snapshot,
                                                                          fdb_bool_t reverse);
 
diff --git a/bindings/c/test/unit/fdb_api.cpp b/bindings/c/test/unit/fdb_api.cpp
index b71b8b80033..4684dd66dc4 100644
--- a/bindings/c/test/unit/fdb_api.cpp
+++ b/bindings/c/test/unit/fdb_api.cpp
@@ -271,7 +271,6 @@ MappedKeyValueArrayFuture Transaction::get_mapped_range(const uint8_t* begin_key
                                                         int target_bytes,
                                                         FDBStreamingMode mode,
                                                         int iteration,
-                                                        int matchIndex,
                                                         fdb_bool_t snapshot,
                                                         fdb_bool_t reverse) {
 	return MappedKeyValueArrayFuture(fdb_transaction_get_mapped_range(tr_,
@@ -289,7 +288,6 @@ MappedKeyValueArrayFuture Transaction::get_mapped_range(const uint8_t* begin_key
 	                                                                  target_bytes,
 	                                                                  mode,
 	                                                                  iteration,
-	                                                                  matchIndex,
 	                                                                  snapshot,
 	                                                                  reverse));
 }
diff --git a/bindings/c/test/unit/fdb_api.hpp b/bindings/c/test/unit/fdb_api.hpp
index 7f8f21072cf..f34338f6947 100644
--- a/bindings/c/test/unit/fdb_api.hpp
+++ b/bindings/c/test/unit/fdb_api.hpp
@@ -304,7 +304,6 @@ class Transaction final {
 	                                           int target_bytes,
 	                                           FDBStreamingMode mode,
 	                                           int iteration,
-	                                           int matchIndex,
 	                                           fdb_bool_t snapshot,
 	                                           fdb_bool_t reverse);
 
diff --git a/bindings/c/test/unit/unit_tests.cpp b/bindings/c/test/unit/unit_tests.cpp
index 242eca685ae..7ca44c1629d 100644
--- a/bindings/c/test/unit/unit_tests.cpp
+++ b/bindings/c/test/unit/unit_tests.cpp
@@ -259,7 +259,6 @@ GetMappedRangeResult get_mapped_range(fdb::Transaction& tr,
                                       int target_bytes,
                                       FDBStreamingMode mode,
                                       int iteration,
-                                      int matchIndex,
                                       fdb_bool_t snapshot,
                                       fdb_bool_t reverse) {
 	fdb::MappedKeyValueArrayFuture f1 = tr.get_mapped_range(begin_key_name,
@@ -276,7 +275,6 @@ GetMappedRangeResult get_mapped_range(fdb::Transaction& tr,
 	                                                        target_bytes,
 	                                                        mode,
 	                                                        iteration,
-	                                                        matchIndex,
 	                                                        snapshot,
 	                                                        reverse);
 
@@ -951,11 +949,7 @@ std::map<std::string, std::string> fillInRecords(int n) {
 	return data;
 }
 
-GetMappedRangeResult getMappedIndexEntries(int beginId,
-                                           int endId,
-                                           fdb::Transaction& tr,
-                                           std::string mapper,
-                                           int matchIndex = MATCH_INDEX_ALL) {
+GetMappedRangeResult getMappedIndexEntries(int beginId, int endId, fdb::Transaction& tr, std::string mapper) {
 	std::string indexEntryKeyBegin = indexEntryKey(beginId);
 	std::string indexEntryKeyEnd = indexEntryKey(endId);
 
@@ -969,17 +963,13 @@ GetMappedRangeResult getMappedIndexEntries(int beginId,
 	    /* target_bytes */ 0,
 	    /* FDBStreamingMode */ FDB_STREAMING_MODE_WANT_ALL,
 	    /* iteration */ 0,
-	    /* matchIndex */ matchIndex,
 	    /* snapshot */ false,
 	    /* reverse */ 0);
 }
 
-GetMappedRangeResult getMappedIndexEntries(int beginId,
-                                           int endId,
-                                           fdb::Transaction& tr,
-                                           int matchIndex = MATCH_INDEX_ALL) {
+GetMappedRangeResult getMappedIndexEntries(int beginId, int endId, fdb::Transaction& tr) {
 	std::string mapper = Tuple().append(prefix).append(RECORD).append("{K[3]}"_sr).append("{...}"_sr).pack().toString();
-	return getMappedIndexEntries(beginId, endId, tr, mapper, matchIndex);
+	return getMappedIndexEntries(beginId, endId, tr, mapper);
 }
 
 TEST_CASE("fdb_transaction_get_mapped_range") {
@@ -991,8 +981,7 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 	while (1) {
 		int beginId = 1;
 		int endId = 19;
-		const int matchIndex = deterministicRandom()->random01() > 0.5 ? MATCH_INDEX_NONE : MATCH_INDEX_ALL;
-		auto result = getMappedIndexEntries(beginId, endId, tr, matchIndex);
+		auto result = getMappedIndexEntries(beginId, endId, tr);
 
 		if (result.err) {
 			fdb::EmptyFuture f1 = tr.on_error(result.err);
@@ -1007,11 +996,7 @@ TEST_CASE("fdb_transaction_get_mapped_range") {
 		int id = beginId;
 		for (int i = 0; i < expectSize; i++, id++) {
 			const auto& [key, value, begin, end, range_results] = result.mkvs[i];
-			if (matchIndex == MATCH_INDEX_ALL || i == 0 || i == expectSize - 1) {
-				CHECK(indexEntryKey(id).compare(key) == 0);
-			} else {
-				CHECK(EMPTY.compare(key) == 0);
-			}
+			CHECK(indexEntryKey(id).compare(key) == 0);
 			CHECK(EMPTY.compare(value) == 0);
 			CHECK(range_results.size() == SPLIT_SIZE);
 			for (int split = 0; split < SPLIT_SIZE; split++) {
@@ -1037,7 +1022,6 @@ TEST_CASE("fdb_transaction_get_mapped_range_restricted_to_serializable") {
 	    /* target_bytes */ 0,
 	    /* FDBStreamingMode */ FDB_STREAMING_MODE_WANT_ALL,
 	    /* iteration */ 0,
-	    /* matchIndex */ MATCH_INDEX_ALL,
 	    /* snapshot */ true, // Set snapshot to true
 	    /* reverse */ 0);
 	ASSERT(result.err == error_code_unsupported_operation);
@@ -1057,7 +1041,6 @@ TEST_CASE("fdb_transaction_get_mapped_range_restricted_to_ryw_enable") {
 	    /* target_bytes */ 0,
 	    /* FDBStreamingMode */ FDB_STREAMING_MODE_WANT_ALL,
 	    /* iteration */ 0,
-	    /* matchIndex */ MATCH_INDEX_ALL,
 	    /* snapshot */ false,
 	    /* reverse */ 0);
 	ASSERT(result.err == error_code_unsupported_operation);
diff --git a/bindings/java/fdbJNI.cpp b/bindings/java/fdbJNI.cpp
index 2392dc50c47..f44d52e1690 100644
--- a/bindings/java/fdbJNI.cpp
+++ b/bindings/java/fdbJNI.cpp
@@ -960,7 +960,6 @@ JNIEXPORT jlong JNICALL Java_com_apple_foundationdb_FDBTransaction_Transaction_1
                                                                                                jint targetBytes,
                                                                                                jint streamingMode,
                                                                                                jint iteration,
-                                                                                               jint matchIndex,
                                                                                                jboolean snapshot,
                                                                                                jboolean reverse) {
 	if (!tPtr || !keyBeginBytes || !keyEndBytes || !mapperBytes) {
@@ -1008,7 +1007,6 @@ JNIEXPORT jlong JNICALL Java_com_apple_foundationdb_FDBTransaction_Transaction_1
 	                                                targetBytes,
 	                                                (FDBStreamingMode)streamingMode,
 	                                                iteration,
-	                                                matchIndex,
 	                                                snapshot,
 	                                                reverse);
 	jenv->ReleaseByteArrayElements(keyBeginBytes, (jbyte*)barrBegin, JNI_ABORT);
diff --git a/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java b/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
index 92ca4a6724c..f8661f716ca 100644
--- a/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
+++ b/bindings/java/src/integration/com/apple/foundationdb/MappedRangeQueryIntegrationTest.java
@@ -192,12 +192,12 @@ public interface RangeQueryWithIndex {
 
 	RangeQueryWithIndex mappedRangeQuery = (int begin, int end, Database db) -> db.run(tr -> {
 		try {
-			List<MappedKeyValue> kvs = tr.getMappedRange(KeySelector.firstGreaterOrEqual(indexEntryKey(begin)),
-			                                             KeySelector.firstGreaterOrEqual(indexEntryKey(end)), MAPPER,
-			                                             ReadTransaction.ROW_LIMIT_UNLIMITED,
-			                                             FDBTransaction.MATCH_INDEX_ALL, false, StreamingMode.WANT_ALL)
-			                               .asList()
-			                               .get();
+			List<MappedKeyValue> kvs =
+			    tr.getMappedRange(KeySelector.firstGreaterOrEqual(indexEntryKey(begin)),
+			                          KeySelector.firstGreaterOrEqual(indexEntryKey(end)), MAPPER,
+			                          ReadTransaction.ROW_LIMIT_UNLIMITED, false, StreamingMode.WANT_ALL)
+			        .asList()
+			        .get();
 			Assertions.assertEquals(end - begin, kvs.size());
 
 			if (validate) {
diff --git a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
index 7451959f228..65a1e9f2548 100644
--- a/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/FDBTransaction.java
@@ -32,10 +32,6 @@
 import com.apple.foundationdb.tuple.ByteArrayUtil;
 
 class FDBTransaction extends NativeObjectWrapper implements Transaction, OptionConsumer {
-
-	static public final int MATCH_INDEX_ALL = 0;
-	static public final int MATCH_INDEX_NONE = 1;
-
 	private final Database database;
 	private final Executor executor;
 	private final TransactionOptions options;
@@ -97,8 +93,7 @@ public CompletableFuture<KeyArrayResult> getRangeSplitPoints(Range range, long c
 
 		@Override
 		public AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelector end, byte[] mapper,
-		                                                    int limit, int matchIndex, boolean reverse,
-		                                                    StreamingMode mode) {
+		                                                        int limit, boolean reverse, StreamingMode mode) {
 
 			throw new UnsupportedOperationException("getMappedRange is only supported in serializable");
 		}
@@ -351,8 +346,8 @@ public CompletableFuture<KeyArrayResult> getRangeSplitPoints(Range range, long c
 	}
 
 	@Override
-	public AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelector end, byte[] mapper, int limit,
-	                                                    int matchIndex, boolean reverse, StreamingMode mode) {
+	public AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelector end, byte[] mapper,
+	                                                        int limit, boolean reverse, StreamingMode mode) {
 		if (mapper == null) {
 			throw new IllegalArgumentException("Mapper must be non-null");
 		}
@@ -472,9 +467,9 @@ protected FutureMappedResults getMappedRange_internal(KeySelector begin, KeySele
 			    begin.toString(), end.toString(), rowLimit, targetBytes, streamingMode,
 			    iteration, Boolean.toString(isSnapshot), Boolean.toString(reverse)));*/
 			return new FutureMappedResults(
-			    Transaction_getMappedRange(getPtr(), begin.getKey(), begin.orEqual(), begin.getOffset(), end.getKey(),
-			                               end.orEqual(), end.getOffset(), mapper, rowLimit, targetBytes, streamingMode,
-			                               iteration, MATCH_INDEX_ALL, isSnapshot, reverse),
+			    Transaction_getMappedRange(getPtr(), begin.getKey(), begin.orEqual(), begin.getOffset(),
+			                                   end.getKey(), end.orEqual(), end.getOffset(), mapper, rowLimit,
+			                                   targetBytes, streamingMode, iteration, isSnapshot, reverse),
 			    FDB.instance().isDirectBufferQueriesEnabled(), executor, eventKeeper);
 		} finally {
 			pointerReadLock.unlock();
@@ -814,11 +809,12 @@ private native long Transaction_getRange(long cPtr,
 			byte[] keyEnd, boolean orEqualEnd, int offsetEnd,
 			int rowLimit, int targetBytes, int streamingMode, int iteration,
 			boolean isSnapshot, boolean reverse);
-	private native long Transaction_getMappedRange(long cPtr, byte[] keyBegin, boolean orEqualBegin, int offsetBegin,
-	                                               byte[] keyEnd, boolean orEqualEnd, int offsetEnd,
-	                                               byte[] mapper, // Nonnull
-	                                               int rowLimit, int targetBytes, int streamingMode, int iteration,
-	                                               int matchIndex, boolean isSnapshot, boolean reverse);
+	private native long Transaction_getMappedRange(long cPtr, byte[] keyBegin, boolean orEqualBegin,
+	                                                   int offsetBegin, byte[] keyEnd, boolean orEqualEnd,
+	                                                   int offsetEnd,
+	                                                   byte[] mapper, // Nonnull
+	                                                   int rowLimit, int targetBytes, int streamingMode, int iteration,
+	                                                   boolean isSnapshot, boolean reverse);
 	private native void Transaction_addConflictRange(long cPtr,
 			byte[] keyBegin, byte[] keyEnd, int conflictRangeType);
 	private native void Transaction_set(long cPtr, byte[] key, byte[] value);
diff --git a/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java b/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java
index b8089e39009..417068441de 100644
--- a/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java
+++ b/bindings/java/src/main/com/apple/foundationdb/ReadTransaction.java
@@ -458,7 +458,7 @@ AsyncIterable<KeyValue> getRange(Range range,
 	 * @return a handle to access the results of the asynchronous call
 	 */
 	AsyncIterable<MappedKeyValue> getMappedRange(KeySelector begin, KeySelector end, byte[] mapper, int limit,
-	                                             int matchIndex, boolean reverse, StreamingMode mode);
+	                                                 boolean reverse, StreamingMode mode);
 
 	/**
 	 * Gets an estimate for the number of bytes stored in the given range.
diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index 41ea9b2f149..b5d6e553553 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -167,9 +167,6 @@ static const Tag invalidTag{ tagLocalitySpecial, 0 };
 static const Tag txsTag{ tagLocalitySpecial, 1 };
 static const Tag cacheTag{ tagLocalitySpecial, 2 };
 
-const int MATCH_INDEX_ALL = 0;
-const int MATCH_INDEX_NONE = 1;
-
 enum { txsTagOld = -1, invalidTagOld = -100 };
 
 struct TagsAndMessage {
diff --git a/fdbclient/IClientApi.h b/fdbclient/IClientApi.h
index 7579efbc19a..91ef38eeae3 100644
--- a/fdbclient/IClientApi.h
+++ b/fdbclient/IClientApi.h
@@ -67,7 +67,6 @@ class ITransaction {
 	                                                       const KeySelectorRef& end,
 	                                                       const StringRef& mapper,
 	                                                       GetRangeLimits limits,
-	                                                       int matchIndex = MATCH_INDEX_ALL,
 	                                                       bool snapshot = false,
 	                                                       bool reverse = false) = 0;
 	virtual ThreadFuture<Standalone<VectorRef<const char*>>> getAddressesForKey(const KeyRef& key) = 0;
diff --git a/fdbclient/ISingleThreadTransaction.h b/fdbclient/ISingleThreadTransaction.h
index e10e39d79be..bb5a4913f19 100644
--- a/fdbclient/ISingleThreadTransaction.h
+++ b/fdbclient/ISingleThreadTransaction.h
@@ -74,7 +74,6 @@ class ISingleThreadTransaction : public ReferenceCounted<ISingleThreadTransactio
 	                                                 KeySelector end,
 	                                                 Key mapper,
 	                                                 GetRangeLimits limits,
-	                                                 int matchIndex = MATCH_INDEX_ALL,
 	                                                 Snapshot = Snapshot::False,
 	                                                 Reverse = Reverse::False) = 0;
 	virtual Future<Standalone<VectorRef<const char*>>> getAddressesForKey(Key const& key) = 0;
diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp
index 27395c63e26..20517fc2647 100644
--- a/fdbclient/MultiVersionTransaction.actor.cpp
+++ b/fdbclient/MultiVersionTransaction.actor.cpp
@@ -154,7 +154,6 @@ ThreadFuture<MappedRangeResult> DLTransaction::getMappedRange(const KeySelectorR
                                                               const KeySelectorRef& end,
                                                               const StringRef& mapper,
                                                               GetRangeLimits limits,
-                                                              int matchIndex,
                                                               bool snapshot,
                                                               bool reverse) {
 	FdbCApi::FDBFuture* f = api->transactionGetMappedRange(tr,
@@ -172,7 +171,6 @@ ThreadFuture<MappedRangeResult> DLTransaction::getMappedRange(const KeySelectorR
 	                                                       limits.bytes,
 	                                                       FDB_STREAMING_MODE_EXACT,
 	                                                       0,
-	                                                       matchIndex,
 	                                                       snapshot,
 	                                                       reverse);
 	return toThreadFuture<MappedRangeResult>(api, f, [](FdbCApi::FDBFuture* f, FdbCApi* api) {
@@ -977,11 +975,10 @@ ThreadFuture<MappedRangeResult> MultiVersionTransaction::getMappedRange(const Ke
                                                                         const KeySelectorRef& end,
                                                                         const StringRef& mapper,
                                                                         GetRangeLimits limits,
-                                                                        int matchIndex,
                                                                         bool snapshot,
                                                                         bool reverse) {
 	auto tr = getTransaction();
-	auto f = tr.transaction ? tr.transaction->getMappedRange(begin, end, mapper, limits, matchIndex, snapshot, reverse)
+	auto f = tr.transaction ? tr.transaction->getMappedRange(begin, end, mapper, limits, snapshot, reverse)
 	                        : makeTimeout<MappedRangeResult>();
 	return abortableFuture(f, tr.onChange);
 }
diff --git a/fdbclient/MultiVersionTransaction.h b/fdbclient/MultiVersionTransaction.h
index e9dc59fe997..b13081ebc64 100644
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@@ -218,7 +218,6 @@ struct FdbCApi : public ThreadSafeReferenceCounted<FdbCApi> {
 	                                        int targetBytes,
 	                                        FDBStreamingMode mode,
 	                                        int iteration,
-	                                        int matchIndex,
 	                                        fdb_bool_t snapshot,
 	                                        fdb_bool_t reverse);
 	FDBFuture* (*transactionGetVersionstamp)(FDBTransaction* tr);
@@ -350,7 +349,6 @@ class DLTransaction : public ITransaction, ThreadSafeReferenceCounted<DLTransact
 	                                               const KeySelectorRef& end,
 	                                               const StringRef& mapper,
 	                                               GetRangeLimits limits,
-	                                               int matchIndex,
 	                                               bool snapshot,
 	                                               bool reverse) override;
 	ThreadFuture<Standalone<VectorRef<const char*>>> getAddressesForKey(const KeyRef& key) override;
@@ -539,7 +537,6 @@ class MultiVersionTransaction : public ITransaction, ThreadSafeReferenceCounted<
 	                                               const KeySelectorRef& end,
 	                                               const StringRef& mapper,
 	                                               GetRangeLimits limits,
-	                                               int matchIndex,
 	                                               bool snapshot,
 	                                               bool reverse) override;
 	ThreadFuture<Standalone<VectorRef<const char*>>> getAddressesForKey(const KeyRef& key) override;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index b3946f7263b..b56c17d7afd 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3784,24 +3784,12 @@ RequestStream<GetKeyValuesFamilyRequest> StorageServerInterface::*getRangeReques
 	}
 }
 
-template <class GetKeyValuesFamilyRequest>
-void setMatchIndex(GetKeyValuesFamilyRequest& req, int matchIndex) {
-	if constexpr (std::is_same<GetKeyValuesFamilyRequest, GetKeyValuesRequest>::value) {
-		// do nothing;
-	} else if (std::is_same<GetKeyValuesFamilyRequest, GetMappedKeyValuesRequest>::value) {
-		req.matchIndex = matchIndex;
-	} else {
-		UNREACHABLE();
-	}
-}
-
 ACTOR template <class GetKeyValuesFamilyRequest, class GetKeyValuesFamilyReply, class RangeResultFamily>
 Future<RangeResultFamily> getExactRange(Reference<TransactionState> trState,
                                         Version version,
                                         KeyRange keys,
                                         Key mapper,
                                         GetRangeLimits limits,
-                                        int matchIndex,
                                         Reverse reverse,
                                         UseTenant useTenant) {
 	state RangeResultFamily output;
@@ -3834,7 +3822,6 @@ Future<RangeResultFamily> getExactRange(Reference<TransactionState> trState,
 			req.version = version;
 			req.begin = firstGreaterOrEqual(range.begin);
 			req.end = firstGreaterOrEqual(range.end);
-			setMatchIndex<GetKeyValuesFamilyRequest>(req, matchIndex);
 			req.spanContext = span.context;
 			trState->cx->getLatestCommitVersions(
 			    locations[shard].locations, req.version, trState, req.ssLatestCommitVersions);
@@ -4009,7 +3996,6 @@ Future<RangeResultFamily> getRangeFallback(Reference<TransactionState> trState,
                                            KeySelector end,
                                            Key mapper,
                                            GetRangeLimits limits,
-                                           int matchIndex,
                                            Reverse reverse,
                                            UseTenant useTenant) {
 	if (version == latestVersion) {
@@ -4035,7 +4021,7 @@ Future<RangeResultFamily> getRangeFallback(Reference<TransactionState> trState,
 	// or allKeys.begin exists in the database/tenant and will be part of the conflict range anyways
 
 	RangeResultFamily _r = wait(getExactRange<GetKeyValuesFamilyRequest, GetKeyValuesFamilyReply, RangeResultFamily>(
-	    trState, version, KeyRangeRef(b, e), mapper, limits, matchIndex, reverse, useTenant));
+	    trState, version, KeyRangeRef(b, e), mapper, limits, reverse, useTenant));
 	RangeResultFamily r = _r;
 
 	if (b == allKeys.begin && ((reverse && !r.more) || !reverse))
@@ -4159,7 +4145,6 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
                                    Key mapper,
                                    GetRangeLimits limits,
                                    Promise<std::pair<Key, Key>> conflictRange,
-                                   int matchIndex,
                                    Snapshot snapshot,
                                    Reverse reverse,
                                    UseTenant useTenant = UseTenant::True) {
@@ -4212,7 +4197,7 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
 			state GetKeyValuesFamilyRequest req;
 			req.mapper = mapper;
 			req.arena.dependsOn(mapper.arena());
-			setMatchIndex<GetKeyValuesFamilyRequest>(req, matchIndex);
+
 			req.tenantInfo = useTenant ? trState->getTenantInfo() : TenantInfo();
 			req.isFetchKeys = (trState->taskID == TaskPriority::FetchKeys);
 			req.version = readVersion;
@@ -4392,7 +4377,6 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
 						        originalEnd,
 						        mapper,
 						        originalLimits,
-						        matchIndex,
 						        reverse,
 						        useTenant));
 						getRangeFinished(
@@ -4433,7 +4417,6 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
 						        originalEnd,
 						        mapper,
 						        originalLimits,
-						        matchIndex,
 						        reverse,
 						        useTenant));
 						getRangeFinished(
@@ -5019,7 +5002,6 @@ Future<RangeResult> getRange(Reference<TransactionState> const& trState,
 	                                                                     ""_sr,
 	                                                                     limits,
 	                                                                     Promise<std::pair<Key, Key>>(),
-	                                                                     MATCH_INDEX_ALL,
 	                                                                     Snapshot::True,
 	                                                                     reverse,
 	                                                                     useTenant);
@@ -5374,7 +5356,6 @@ Future<RangeResultFamily> Transaction::getRangeInternal(const KeySelector& begin
                                                         const KeySelector& end,
                                                         const Key& mapper,
                                                         GetRangeLimits limits,
-                                                        int matchIndex,
                                                         Snapshot snapshot,
                                                         Reverse reverse) {
 	++trState->cx->transactionLogicalReads;
@@ -5417,7 +5398,7 @@ Future<RangeResultFamily> Transaction::getRangeInternal(const KeySelector& begin
 	}
 
 	return ::getRange<GetKeyValuesFamilyRequest, GetKeyValuesFamilyReply, RangeResultFamily>(
-	    trState, getReadVersion(), b, e, mapper, limits, conflictRange, matchIndex, snapshot, reverse);
+	    trState, getReadVersion(), b, e, mapper, limits, conflictRange, snapshot, reverse);
 }
 
 Future<RangeResult> Transaction::getRange(const KeySelector& begin,
@@ -5426,18 +5407,17 @@ Future<RangeResult> Transaction::getRange(const KeySelector& begin,
                                           Snapshot snapshot,
                                           Reverse reverse) {
 	return getRangeInternal<GetKeyValuesRequest, GetKeyValuesReply, RangeResult>(
-	    begin, end, ""_sr, limits, MATCH_INDEX_ALL, snapshot, reverse);
+	    begin, end, ""_sr, limits, snapshot, reverse);
 }
 
 Future<MappedRangeResult> Transaction::getMappedRange(const KeySelector& begin,
                                                       const KeySelector& end,
                                                       const Key& mapper,
                                                       GetRangeLimits limits,
-                                                      int matchIndex,
                                                       Snapshot snapshot,
                                                       Reverse reverse) {
 	return getRangeInternal<GetMappedKeyValuesRequest, GetMappedKeyValuesReply, MappedRangeResult>(
-	    begin, end, mapper, limits, matchIndex, snapshot, reverse);
+	    begin, end, mapper, limits, snapshot, reverse);
 }
 
 Future<RangeResult> Transaction::getRange(const KeySelector& begin,
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index c2ad3ce1588..988e64aaf18 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -328,7 +328,6 @@ class Transaction : NonCopyable {
 	                                                       const KeySelector& end,
 	                                                       const Key& mapper,
 	                                                       GetRangeLimits limits,
-	                                                       int matchIndex = MATCH_INDEX_ALL,
 	                                                       Snapshot = Snapshot::False,
 	                                                       Reverse = Reverse::False);
 
@@ -338,7 +337,6 @@ class Transaction : NonCopyable {
 	                                           const KeySelector& end,
 	                                           const Key& mapper,
 	                                           GetRangeLimits limits,
-	                                           int matchIndex,
 	                                           Snapshot snapshot,
 	                                           Reverse reverse);
 
diff --git a/fdbclient/PaxosConfigTransaction.h b/fdbclient/PaxosConfigTransaction.h
index 05c113e6d94..67487fff32e 100644
--- a/fdbclient/PaxosConfigTransaction.h
+++ b/fdbclient/PaxosConfigTransaction.h
@@ -54,7 +54,6 @@ class PaxosConfigTransaction final : public IConfigTransaction, public FastAlloc
 	                                         KeySelector end,
 	                                         Key mapper,
 	                                         GetRangeLimits limits,
-	                                         int matchIndex = MATCH_INDEX_ALL,
 	                                         Snapshot = Snapshot::False,
 	                                         Reverse = Reverse::False) override {
 		throw client_invalid_operation();
diff --git a/fdbclient/ReadYourWrites.actor.cpp b/fdbclient/ReadYourWrites.actor.cpp
index 2d81c7245b1..c651adad32a 100644
--- a/fdbclient/ReadYourWrites.actor.cpp
+++ b/fdbclient/ReadYourWrites.actor.cpp
@@ -77,12 +77,11 @@ class RYWImpl {
 
 	template <bool reverse>
 	struct GetMappedRangeReq {
-		GetMappedRangeReq(KeySelector begin, KeySelector end, Key mapper, int matchIndex, GetRangeLimits limits)
-		  : begin(begin), end(end), mapper(mapper), limits(limits), matchIndex(matchIndex) {}
+		GetMappedRangeReq(KeySelector begin, KeySelector end, Key mapper, GetRangeLimits limits)
+		  : begin(begin), end(end), mapper(mapper), limits(limits) {}
 		KeySelector begin, end;
 		Key mapper;
 		GetRangeLimits limits;
-		int matchIndex;
 		using Result = MappedRangeResult;
 	};
 
@@ -1141,13 +1140,9 @@ class RYWImpl {
 			else
 				read.end = KeySelector(firstGreaterOrEqual(key), key.arena());
 		}
-		MappedRangeResult v = wait(ryw->tr.getMappedRange(read.begin,
-		                                                  read.end,
-		                                                  read.mapper,
-		                                                  read.limits,
-		                                                  read.matchIndex,
-		                                                  snapshot,
-		                                                  backwards ? Reverse::True : Reverse::False));
+
+		MappedRangeResult v = wait(ryw->tr.getMappedRange(
+		    read.begin, read.end, read.mapper, read.limits, snapshot, backwards ? Reverse::True : Reverse::False));
 		return v;
 	}
 
@@ -1682,7 +1677,6 @@ Future<MappedRangeResult> ReadYourWritesTransaction::getMappedRange(KeySelector
                                                                     KeySelector end,
                                                                     Key mapper,
                                                                     GetRangeLimits limits,
-                                                                    int matchIndex,
                                                                     Snapshot snapshot,
                                                                     Reverse reverse) {
 	if (getDatabase()->apiVersionAtLeast(630)) {
@@ -1730,9 +1724,9 @@ Future<MappedRangeResult> ReadYourWritesTransaction::getMappedRange(KeySelector
 
 	Future<MappedRangeResult> result =
 	    reverse ? RYWImpl::readWithConflictRangeForGetMappedRange(
-	                  this, RYWImpl::GetMappedRangeReq<true>(begin, end, mapper, matchIndex, limits), snapshot)
+	                  this, RYWImpl::GetMappedRangeReq<true>(begin, end, mapper, limits), snapshot)
 	            : RYWImpl::readWithConflictRangeForGetMappedRange(
-	                  this, RYWImpl::GetMappedRangeReq<false>(begin, end, mapper, matchIndex, limits), snapshot);
+	                  this, RYWImpl::GetMappedRangeReq<false>(begin, end, mapper, limits), snapshot);
 
 	return result;
 }
diff --git a/fdbclient/ReadYourWrites.h b/fdbclient/ReadYourWrites.h
index 5c76a1dec6e..341dc4e2a1d 100644
--- a/fdbclient/ReadYourWrites.h
+++ b/fdbclient/ReadYourWrites.h
@@ -112,7 +112,6 @@ class ReadYourWritesTransaction final : NonCopyable,
 	                                         KeySelector end,
 	                                         Key mapper,
 	                                         GetRangeLimits limits,
-	                                         int matchIndex,
 	                                         Snapshot = Snapshot::False,
 	                                         Reverse = Reverse::False) override;
 
diff --git a/fdbclient/SimpleConfigTransaction.h b/fdbclient/SimpleConfigTransaction.h
index 903764aa942..83d84115182 100644
--- a/fdbclient/SimpleConfigTransaction.h
+++ b/fdbclient/SimpleConfigTransaction.h
@@ -63,7 +63,6 @@ class SimpleConfigTransaction final : public IConfigTransaction, public FastAllo
 	                                         KeySelector end,
 	                                         Key mapper,
 	                                         GetRangeLimits limits,
-	                                         int matchIndex,
 	                                         Snapshot = Snapshot::False,
 	                                         Reverse = Reverse::False) override {
 		throw client_invalid_operation();
diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index fb662f8ae24..221c2bf3641 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -418,7 +418,6 @@ struct GetMappedKeyValuesRequest : TimedRequest {
 	KeyRef mapper;
 	Version version; // or latestVersion
 	int limit, limitBytes;
-	int matchIndex;
 	bool isFetchKeys;
 	Optional<TagSet> tags;
 	Optional<UID> debugID;
@@ -444,8 +443,7 @@ struct GetMappedKeyValuesRequest : TimedRequest {
 		           spanContext,
 		           tenantInfo,
 		           arena,
-		           ssLatestCommitVersions,
-		           matchIndex);
+		           ssLatestCommitVersions);
 	}
 };
 
diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index 2213bf183c0..84ab49504bb 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -306,7 +306,6 @@ ThreadFuture<MappedRangeResult> ThreadSafeTransaction::getMappedRange(const KeyS
                                                                       const KeySelectorRef& end,
                                                                       const StringRef& mapper,
                                                                       GetRangeLimits limits,
-                                                                      int matchIndex,
                                                                       bool snapshot,
                                                                       bool reverse) {
 	KeySelector b = begin;
@@ -314,9 +313,9 @@ ThreadFuture<MappedRangeResult> ThreadSafeTransaction::getMappedRange(const KeyS
 	Key h = mapper;
 
 	ISingleThreadTransaction* tr = this->tr;
-	return onMainThread([tr, b, e, h, limits, matchIndex, snapshot, reverse]() -> Future<MappedRangeResult> {
+	return onMainThread([tr, b, e, h, limits, snapshot, reverse]() -> Future<MappedRangeResult> {
 		tr->checkDeferredError();
-		return tr->getMappedRange(b, e, h, limits, matchIndex, Snapshot{ snapshot }, Reverse{ reverse });
+		return tr->getMappedRange(b, e, h, limits, Snapshot{ snapshot }, Reverse{ reverse });
 	});
 }
 
diff --git a/fdbclient/ThreadSafeTransaction.h b/fdbclient/ThreadSafeTransaction.h
index c33076b722a..0ace0a2cfe1 100644
--- a/fdbclient/ThreadSafeTransaction.h
+++ b/fdbclient/ThreadSafeTransaction.h
@@ -136,7 +136,6 @@ class ThreadSafeTransaction : public ITransaction, ThreadSafeReferenceCounted<Th
 	                                               const KeySelectorRef& end,
 	                                               const StringRef& mapper,
 	                                               GetRangeLimits limits,
-	                                               int matchIndex,
 	                                               bool snapshot,
 	                                               bool reverse) override;
 	ThreadFuture<Standalone<VectorRef<const char*>>> getAddressesForKey(const KeyRef& key) override;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 0e88b99b504..c33abf94e9d 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3719,8 +3719,7 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
                                                    StringRef mapper,
                                                    // To provide span context, tags, debug ID to underlying lookups.
                                                    GetMappedKeyValuesRequest* pOriginalReq,
-                                                   Optional<Key> tenantPrefix,
-                                                   int matchIndex) {
+                                                   Optional<Key> tenantPrefix) {
 	state GetMappedKeyValuesReply result;
 	result.version = input.version;
 	result.more = input.more;
@@ -3738,20 +3737,15 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 		TraceEvent("MapperNotTuple").error(e).detail("Mapper", mapper.printable());
 		throw mapper_not_tuple();
 	}
+	state KeyValueRef* it = input.data.begin();
 	state std::vector<Optional<Tuple>> vt;
 	state bool isRangeQuery = false;
 	preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-	state int sz = input.data.size();
-	state int i = 0;
-	for (; i < sz; i++) {
-		KeyValueRef* it = &input.data[i];
+	for (; it != input.data.end(); it++) {
 		state MappedKeyValueRef kvm;
-		// need to keep the boundary, so that caller can use it as a continuation.
-		if ((i == 0 || i == sz - 1) || matchIndex == MATCH_INDEX_ALL) {
-			kvm.key = it->key;
-			kvm.value = it->value;
-		}
+		kvm.key = it->key;
+		kvm.value = it->value;
 
 		state Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
 		// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
@@ -3922,7 +3916,7 @@ ACTOR Future<Void> getMappedKeyValuesQ(StorageServer* data, GetMappedKeyValuesRe
 			try {
 				// Map the scanned range to another list of keys and look up.
 				GetMappedKeyValuesReply _r =
-				    wait(mapKeyValues(data, getKeyValuesReply, req.mapper, &req, tenantPrefix, req.matchIndex));
+				    wait(mapKeyValues(data, getKeyValuesReply, req.mapper, &req, tenantPrefix));
 				r = _r;
 			} catch (Error& e) {
 				TraceEvent("MapError").error(e);
diff --git a/fdbserver/workloads/ApiWorkload.h b/fdbserver/workloads/ApiWorkload.h
index 67007ef2f1f..64836e03b6a 100644
--- a/fdbserver/workloads/ApiWorkload.h
+++ b/fdbserver/workloads/ApiWorkload.h
@@ -56,7 +56,6 @@ struct TransactionWrapper : public ReferenceCounted<TransactionWrapper> {
 	                                                 KeySelector& end,
 	                                                 Key& mapper,
 	                                                 GetRangeLimits limits,
-	                                                 int matchIndex,
 	                                                 Snapshot snapshot,
 	                                                 Reverse reverse) = 0;
 
@@ -129,10 +128,9 @@ struct FlowTransactionWrapper : public TransactionWrapper {
 	                                         KeySelector& end,
 	                                         Key& mapper,
 	                                         GetRangeLimits limits,
-	                                         int matchIndex,
 	                                         Snapshot snapshot,
 	                                         Reverse reverse) override {
-		return transaction.getMappedRange(begin, end, mapper, limits, matchIndex, snapshot, reverse);
+		return transaction.getMappedRange(begin, end, mapper, limits, snapshot, reverse);
 	}
 
 	// Gets the key from the database specified by a given key selector
@@ -205,11 +203,9 @@ struct ThreadTransactionWrapper : public TransactionWrapper {
 	                                         KeySelector& end,
 	                                         Key& mapper,
 	                                         GetRangeLimits limits,
-	                                         int matchIndex,
 	                                         Snapshot snapshot,
 	                                         Reverse reverse) override {
-		return unsafeThreadFutureToFuture(
-		    transaction->getMappedRange(begin, end, mapper, limits, matchIndex, snapshot, reverse));
+		return unsafeThreadFutureToFuture(transaction->getMappedRange(begin, end, mapper, limits, snapshot, reverse));
 	}
 
 	// Gets the key from the database specified by a given key selector
diff --git a/fdbserver/workloads/GetMappedRange.actor.cpp b/fdbserver/workloads/GetMappedRange.actor.cpp
index cb977d6815b..cb454b6ef6c 100644
--- a/fdbserver/workloads/GetMappedRange.actor.cpp
+++ b/fdbserver/workloads/GetMappedRange.actor.cpp
@@ -145,18 +145,10 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	}
 
 	// Return true if need to retry.
-	static bool validateRecord(int expectedId,
-	                           const MappedKeyValueRef* it,
-	                           GetMappedRangeWorkload* self,
-	                           int matchIndex,
-	                           bool isBoundary) {
+	static bool validateRecord(int expectedId, const MappedKeyValueRef* it, GetMappedRangeWorkload* self) {
 		//		std::cout << "validateRecord expectedId " << expectedId << " it->key " << printable(it->key) << "
 		// indexEntryKey(expectedId) " << printable(indexEntryKey(expectedId)) << std::endl;
-		if (matchIndex == MATCH_INDEX_ALL || isBoundary) {
-			ASSERT(it->key == indexEntryKey(expectedId));
-		} else {
-			ASSERT(it->key == EMPTY);
-		}
+		ASSERT(it->key == indexEntryKey(expectedId));
 		ASSERT(it->value == EMPTY);
 
 		if (self->SPLIT_RECORDS) {
@@ -197,8 +189,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 	                                                          Key mapper,
 	                                                          int limit,
 	                                                          int expectedBeginId,
-	                                                          GetMappedRangeWorkload* self,
-	                                                          int matchIndex) {
+	                                                          GetMappedRangeWorkload* self) {
 
 		std::cout << "start scanMappedRangeWithLimits beginSelector:" << beginSelector.toString()
 		          << " endSelector:" << endSelector.toString() << " expectedBeginId:" << expectedBeginId
@@ -206,13 +197,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		loop {
 			state Reference<TransactionWrapper> tr = self->createTransaction();
 			try {
-				MappedRangeResult result = wait(tr->getMappedRange(beginSelector,
-				                                                   endSelector,
-				                                                   mapper,
-				                                                   GetRangeLimits(limit),
-				                                                   matchIndex,
-				                                                   self->snapshot,
-				                                                   Reverse::False));
+				MappedRangeResult result = wait(tr->getMappedRange(
+				    beginSelector, endSelector, mapper, GetRangeLimits(limit), self->snapshot, Reverse::False));
 				//			showResult(result);
 				if (self->BAD_MAPPER) {
 					TraceEvent("GetMappedRangeWorkloadShouldNotReachable").detail("ResultSize", result.size());
@@ -222,10 +208,8 @@ struct GetMappedRangeWorkload : ApiWorkload {
 				ASSERT(result.size() <= limit);
 				int expectedId = expectedBeginId;
 				bool needRetry = false;
-				int cnt = 0;
-				const MappedKeyValueRef* it = result.begin();
-				for (; cnt < result.size(); cnt++, it++) {
-					if (validateRecord(expectedId, it, self, matchIndex, cnt == 0 || cnt == result.size() - 1)) {
+				for (const MappedKeyValueRef* it = result.begin(); it != result.end(); it++) {
+					if (validateRecord(expectedId, it, self)) {
 						needRetry = true;
 						break;
 					}
@@ -252,12 +236,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		}
 	}
 
-	ACTOR Future<Void> scanMappedRange(Database cx,
-	                                   int beginId,
-	                                   int endId,
-	                                   Key mapper,
-	                                   GetMappedRangeWorkload* self,
-	                                   int matchIndex) {
+	ACTOR Future<Void> scanMappedRange(Database cx, int beginId, int endId, Key mapper, GetMappedRangeWorkload* self) {
 		Key beginTuple = Tuple().append(prefix).append(INDEX).append(indexKey(beginId)).getDataAsStandalone();
 		state KeySelector beginSelector = KeySelector(firstGreaterOrEqual(beginTuple));
 		Key endTuple = Tuple().append(prefix).append(INDEX).append(indexKey(endId)).getDataAsStandalone();
@@ -265,15 +244,14 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		state int limit = 100;
 		state int expectedBeginId = beginId;
 		while (true) {
-			MappedRangeResult result = wait(self->scanMappedRangeWithLimits(
-			    cx, beginSelector, endSelector, mapper, limit, expectedBeginId, self, matchIndex));
+			MappedRangeResult result = wait(
+			    self->scanMappedRangeWithLimits(cx, beginSelector, endSelector, mapper, limit, expectedBeginId, self));
 			expectedBeginId += result.size();
 			if (result.more) {
 				if (result.empty()) {
 					// This is usually not expected.
 					std::cout << "not result but have more, try again" << std::endl;
 				} else {
-					// auto& reqAndResult = std::get<GetRangeReqAndResultRef>(result.back().reqAndResult);
 					beginSelector = KeySelector(firstGreaterThan(result.back().key));
 				}
 			} else {
@@ -318,7 +296,6 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		                          endSelector,
 		                          mapper,
 		                          GetRangeLimits(GetRangeLimits::ROW_LIMIT_UNLIMITED),
-		                          MATCH_INDEX_ALL,
 		                          self->snapshot,
 		                          Reverse::False);
 	}
@@ -417,8 +394,7 @@ struct GetMappedRangeWorkload : ApiWorkload {
 		Key mapper = getMapper(self);
 		// The scanned range cannot be too large to hit get_mapped_key_values_has_more. We have a unit validating the
 		// error is thrown when the range is large.
-		int matchIndex = deterministicRandom()->random01() > 0.5 ? MATCH_INDEX_NONE : MATCH_INDEX_ALL;
-		wait(self->scanMappedRange(cx, 10, 490, mapper, self, matchIndex));
+		wait(self->scanMappedRange(cx, 10, 490, mapper, self));
 		return Void();
 	}
 

From 042616aaf006f36cd0da8f61a4ce9ab63737b440 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Fri, 20 May 2022 17:26:52 -0700
Subject: [PATCH 443/740] Explicitly cancel byte sample recovery on failure of
 a recovered storage server to prevent it from trying to read from the
 IKeyValueStore after shutdown.

---
 fdbserver/storageserver.actor.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index c33abf94e9d..9cde2e569d4 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -9231,6 +9231,10 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 
 		throw internal_error();
 	} catch (Error& e) {
+		if (self.byteSampleRecovery.isValid()) {
+			self.byteSampleRecovery.cancel();
+		}
+
 		if (recovered.canBeSet())
 			recovered.send(Void());
 

From d0035074e959e232f45eae958bb40f2ccaec5aa8 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Sat, 21 May 2022 05:36:13 +0000
Subject: [PATCH 444/740] disable AVX and reset version for 7.1.6 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e987b5884a..881f03e8b25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.7
+  VERSION 7.1.6
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From a88e049b28d8208519cba90f38522e8f54b61be7 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Sat, 21 May 2022 05:40:11 +0000
Subject: [PATCH 445/740] enable AVX and reset version for 7.1.7 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 881f03e8b25..0e987b5884a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.6
+  VERSION 7.1.7
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 965eca8336e57f894284144f7545382f38bc86a2 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Wed, 18 May 2022 09:56:03 -0700
Subject: [PATCH 446/740] Extend the reboot interface to accept comma-delimited
 string; Only fetch requested worker interfaces in rebootWorkerActor Add
 killall test to multiprocess_fdbcli_tests Make the rebootWorker only sends
 requests if all the requested workers are valid Add comments; Organize print
 texts; Fix the bug clear the map every time run
 kill/suspend/expensive_data_check

---
 bindings/python/tests/fdbcli_tests.py      | 30 ++++++++-
 fdbcli/ExpensiveDataCheckCommand.actor.cpp | 48 ++++++++-----
 fdbcli/KillCommand.actor.cpp               | 48 ++++++++-----
 fdbcli/SuspendCommand.actor.cpp            | 30 ++++++---
 fdbcli/fdbcli.actor.cpp                    | 59 +---------------
 fdbclient/IClientApi.h                     |  6 +-
 fdbclient/NativeAPI.actor.cpp              | 78 +++++++++++++---------
 7 files changed, 166 insertions(+), 133 deletions(-)

diff --git a/bindings/python/tests/fdbcli_tests.py b/bindings/python/tests/fdbcli_tests.py
index 736e2405e03..779646e1003 100755
--- a/bindings/python/tests/fdbcli_tests.py
+++ b/bindings/python/tests/fdbcli_tests.py
@@ -215,6 +215,26 @@ def kill(logger):
     assert new_generation > old_generation
 
 
+@enable_logging()
+def killall(logger):
+    # test is designed to make sure 'kill all' sends all requests simultaneously
+    old_generation = get_value_from_status_json(False, 'cluster', 'generation')
+    # This is currently an issue with fdbcli,
+    # where you need to first run 'kill' to initialize processes' list
+    # and then specify the certain process to kill
+    process = subprocess.Popen(command_template[:-1], stdin=subprocess.PIPE, stdout=subprocess.PIPE, env=fdbcli_env)
+    output, error = process.communicate(input='kill; kill all; sleep 1\n'.encode())
+    logger.debug(output)
+    # wait for a second for the cluster recovery
+    time.sleep(1)
+    new_generation = get_value_from_status_json(True, 'cluster', 'generation')
+    logger.debug("Old generation: {}, New generation: {}".format(old_generation, new_generation))
+    # Make sure the kill is not happening sequentially
+    # Pre: each recovery will increase the generated number by 2
+    # Relax the condition to allow one additional recovery happening when we fetched the old generation
+    assert new_generation <= (old_generation + 4)
+
+
 @enable_logging()
 def suspend(logger):
     if not shutil.which("pidof"):
@@ -582,6 +602,7 @@ def triggerddteaminfolog(logger):
     output = run_fdbcli_command('triggerddteaminfolog')
     assert output == 'Triggered team info logging in data distribution.'
 
+
 @enable_logging()
 def tenants(logger):
     output = run_fdbcli_command('listtenants')
@@ -610,7 +631,7 @@ def tenants(logger):
     assert len(lines) == 2
     assert lines[0].strip().startswith('id: ')
     assert lines[1].strip().startswith('prefix: ')
-    
+
     output = run_fdbcli_command('usetenant')
     assert output == 'Using the default tenant'
 
@@ -652,7 +673,8 @@ def tenants(logger):
     assert lines[3] == '`tenant_test\' is `default_tenant\''
 
     process = subprocess.Popen(command_template[:-1], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=fdbcli_env)
-    cmd_sequence = ['writemode on', 'usetenant tenant', 'clear tenant_test', 'deletetenant tenant', 'get tenant_test', 'defaulttenant', 'usetenant tenant']
+    cmd_sequence = ['writemode on', 'usetenant tenant', 'clear tenant_test',
+                    'deletetenant tenant', 'get tenant_test', 'defaulttenant', 'usetenant tenant']
     output, error_output = process.communicate(input='\n'.join(cmd_sequence).encode())
 
     lines = output.decode().strip().split('\n')[-7:]
@@ -680,6 +702,7 @@ def tenants(logger):
 
     run_fdbcli_command('writemode on; clear tenant_test')
 
+
 if __name__ == '__main__':
     parser = ArgumentParser(formatter_class=RawDescriptionHelpFormatter,
                             description="""
@@ -731,5 +754,6 @@ def tenants(logger):
         assert args.process_number > 1, "Process number should be positive"
         coordinators()
         exclude()
+        killall()
         # TODO: fix the failure where one process is not available after setclass call
-        #setclass()
+        # setclass()
diff --git a/fdbcli/ExpensiveDataCheckCommand.actor.cpp b/fdbcli/ExpensiveDataCheckCommand.actor.cpp
index 58c50396d62..e9d5c5b9896 100644
--- a/fdbcli/ExpensiveDataCheckCommand.actor.cpp
+++ b/fdbcli/ExpensiveDataCheckCommand.actor.cpp
@@ -18,6 +18,8 @@
  * limitations under the License.
  */
 
+#include "boost/algorithm/string.hpp"
+
 #include "fdbcli/fdbcli.actor.h"
 
 #include "fdbclient/FDBOptions.g.h"
@@ -40,8 +42,10 @@ ACTOR Future<bool> expensiveDataCheckCommandActor(
     std::vector<StringRef> tokens,
     std::map<Key, std::pair<Value, ClientLeaderRegInterface>>* address_interface) {
 	state bool result = true;
+	state std::string addressesStr;
 	if (tokens.size() == 1) {
 		// initialize worker interfaces
+		address_interface->clear();
 		wait(getWorkerInterfaces(tr, address_interface));
 	}
 	if (tokens.size() == 1 || tokencmp(tokens[1], "list")) {
@@ -57,20 +61,26 @@ ACTOR Future<bool> expensiveDataCheckCommandActor(
 		}
 		printf("\n");
 	} else if (tokencmp(tokens[1], "all")) {
-		state std::map<Key, std::pair<Value, ClientLeaderRegInterface>>::const_iterator it;
-		for (it = address_interface->cbegin(); it != address_interface->cend(); it++) {
-			int64_t checkRequestSent = wait(safeThreadFutureToFuture(db->rebootWorker(it->first, true, 0)));
-			if (!checkRequestSent) {
-				result = false;
-				fprintf(stderr, "ERROR: failed to send request to check process `%s'.\n", it->first.toString().c_str());
-			}
-		}
 		if (address_interface->size() == 0) {
 			fprintf(stderr,
 			        "ERROR: no processes to check. You must run the `expensive_data_check’ "
 			        "command before running `expensive_data_check all’.\n");
 		} else {
-			printf("Attempted to kill and check %zu processes\n", address_interface->size());
+			std::vector<std::string> addressesVec;
+			for (const auto& [address, _] : *address_interface) {
+				addressesVec.push_back(address.toString());
+			}
+			addressesStr = boost::algorithm::join(addressesVec, ",");
+			// make sure we only call the interface once to send requests in parallel
+			int64_t checkRequestsSent = wait(safeThreadFutureToFuture(db->rebootWorker(addressesStr, true, 0)));
+			if (!checkRequestsSent) {
+				result = false;
+				fprintf(stderr,
+				        "ERROR: failed to send requests to check all processes, please run the `expensive_data_check’ "
+				        "command again to fetch latest addresses.\n");
+			} else {
+				printf("Attempted to kill and check %zu processes\n", address_interface->size());
+			}
 		}
 	} else {
 		state int i;
@@ -83,15 +93,21 @@ ACTOR Future<bool> expensiveDataCheckCommandActor(
 		}
 
 		if (result) {
+			std::vector<std::string> addressesVec;
 			for (i = 1; i < tokens.size(); i++) {
-				int64_t checkRequestSent = wait(safeThreadFutureToFuture(db->rebootWorker(tokens[i], true, 0)));
-				if (!checkRequestSent) {
-					result = false;
-					fprintf(
-					    stderr, "ERROR: failed to send request to check process `%s'.\n", tokens[i].toString().c_str());
-				}
+				addressesVec.push_back(tokens[i].toString());
+			}
+			addressesStr = boost::algorithm::join(addressesVec, ",");
+			int64_t checkRequestsSent = wait(safeThreadFutureToFuture(db->rebootWorker(addressesStr, true, 0)));
+			if (!checkRequestsSent) {
+				result = false;
+				fprintf(stderr,
+				        "ERROR: failed to send requests to check processes `%s', please run the `expensive_data_check’ "
+				        "command again to fetch latest addresses.\n",
+				        addressesStr.c_str());
+			} else {
+				printf("Attempted to kill and check %zu processes\n", tokens.size() - 1);
 			}
-			printf("Attempted to kill and check %zu processes\n", tokens.size() - 1);
 		}
 	}
 	return result;
diff --git a/fdbcli/KillCommand.actor.cpp b/fdbcli/KillCommand.actor.cpp
index 4ce89b59192..5272508925a 100644
--- a/fdbcli/KillCommand.actor.cpp
+++ b/fdbcli/KillCommand.actor.cpp
@@ -18,6 +18,8 @@
  * limitations under the License.
  */
 
+#include "boost/algorithm/string.hpp"
+
 #include "fdbcli/fdbcli.actor.h"
 
 #include "fdbclient/FDBOptions.g.h"
@@ -37,8 +39,10 @@ ACTOR Future<bool> killCommandActor(Reference<IDatabase> db,
                                     std::map<Key, std::pair<Value, ClientLeaderRegInterface>>* address_interface) {
 	ASSERT(tokens.size() >= 1);
 	state bool result = true;
+	state std::string addressesStr;
 	if (tokens.size() == 1) {
 		// initialize worker interfaces
+		address_interface->clear();
 		wait(getWorkerInterfaces(tr, address_interface));
 	}
 	if (tokens.size() == 1 || tokencmp(tokens[1], "list")) {
@@ -54,21 +58,27 @@ ACTOR Future<bool> killCommandActor(Reference<IDatabase> db,
 		}
 		printf("\n");
 	} else if (tokencmp(tokens[1], "all")) {
-		state std::map<Key, std::pair<Value, ClientLeaderRegInterface>>::const_iterator it;
-		for (it = address_interface->cbegin(); it != address_interface->cend(); it++) {
-			int64_t killRequestSent = wait(safeThreadFutureToFuture(db->rebootWorker(it->first, false, 0)));
-			if (!killRequestSent) {
-				result = false;
-				fprintf(stderr, "ERROR: failed to send request to kill process `%s'.\n", it->first.toString().c_str());
-			}
-		}
 		if (address_interface->size() == 0) {
 			result = false;
 			fprintf(stderr,
 			        "ERROR: no processes to kill. You must run the `kill’ command before "
 			        "running `kill all’.\n");
 		} else {
-			printf("Attempted to kill %zu processes\n", address_interface->size());
+			std::vector<std::string> addressesVec;
+			for (const auto& [address, _] : *address_interface) {
+				addressesVec.push_back(address.toString());
+			}
+			addressesStr = boost::algorithm::join(addressesVec, ",");
+			// make sure we only call the interface once to send requests in parallel
+			int64_t killRequestsSent = wait(safeThreadFutureToFuture(db->rebootWorker(addressesStr, false, 0)));
+			if (!killRequestsSent) {
+				result = false;
+				fprintf(stderr,
+				        "ERROR: failed to send requests to all processes, please run the `kill’ command again to fetch "
+				        "latest addresses.\n");
+			} else {
+				printf("Attempted to kill %zu processes\n", address_interface->size());
+			}
 		}
 	} else {
 		state int i;
@@ -81,15 +91,21 @@ ACTOR Future<bool> killCommandActor(Reference<IDatabase> db,
 		}
 
 		if (result) {
+			std::vector<std::string> addressesVec;
 			for (i = 1; i < tokens.size(); i++) {
-				int64_t killRequestSent = wait(safeThreadFutureToFuture(db->rebootWorker(tokens[i], false, 0)));
-				if (!killRequestSent) {
-					result = false;
-					fprintf(
-					    stderr, "ERROR: failed to send request to kill process `%s'.\n", tokens[i].toString().c_str());
-				}
+				addressesVec.push_back(tokens[i].toString());
+			}
+			addressesStr = boost::algorithm::join(addressesVec, ",");
+			int64_t killRequestsSent = wait(safeThreadFutureToFuture(db->rebootWorker(addressesStr, false, 0)));
+			if (!killRequestsSent) {
+				result = false;
+				fprintf(stderr,
+				        "ERROR: failed to send requests to kill processes `%s', please run the `kill’ command again to "
+				        "fetch latest addresses.\n",
+				        addressesStr.c_str());
+			} else {
+				printf("Attempted to kill %zu processes\n", tokens.size() - 1);
 			}
-			printf("Attempted to kill %zu processes\n", tokens.size() - 1);
 		}
 	}
 	return result;
diff --git a/fdbcli/SuspendCommand.actor.cpp b/fdbcli/SuspendCommand.actor.cpp
index 813f6bc0a08..78a7fa1ed93 100644
--- a/fdbcli/SuspendCommand.actor.cpp
+++ b/fdbcli/SuspendCommand.actor.cpp
@@ -18,6 +18,8 @@
  * limitations under the License.
  */
 
+#include "boost/algorithm/string.hpp"
+
 #include "fdbcli/fdbcli.actor.h"
 
 #include "fdbclient/FDBOptions.g.h"
@@ -37,8 +39,10 @@ ACTOR Future<bool> suspendCommandActor(Reference<IDatabase> db,
                                        std::map<Key, std::pair<Value, ClientLeaderRegInterface>>* address_interface) {
 	ASSERT(tokens.size() >= 1);
 	state bool result = true;
+	state std::string addressesStr;
 	if (tokens.size() == 1) {
 		// initialize worker interfaces
+		address_interface->clear();
 		wait(getWorkerInterfaces(tr, address_interface));
 		if (address_interface->size() == 0) {
 			printf("\nNo addresses can be suspended.\n");
@@ -72,19 +76,23 @@ ACTOR Future<bool> suspendCommandActor(Reference<IDatabase> db,
 				printUsage(tokens[0]);
 				result = false;
 			} else {
-				int64_t timeout_ms = seconds * 1000;
-				tr->setOption(FDBTransactionOptions::TIMEOUT, StringRef((uint8_t*)&timeout_ms, sizeof(int64_t)));
+				std::vector<std::string> addressesVec;
 				for (i = 2; i < tokens.size(); i++) {
-					int64_t suspendRequestSent =
-					    wait(safeThreadFutureToFuture(db->rebootWorker(tokens[i], false, static_cast<int>(seconds))));
-					if (!suspendRequestSent) {
-						result = false;
-						fprintf(stderr,
-						        "ERROR: failed to send request to suspend process `%s'.\n",
-						        tokens[i].toString().c_str());
-					}
+					addressesVec.push_back(tokens[i].toString());
+				}
+				addressesStr = boost::algorithm::join(addressesVec, ",");
+				int64_t suspendRequestSent =
+				    wait(safeThreadFutureToFuture(db->rebootWorker(addressesStr, false, static_cast<int>(seconds))));
+				if (!suspendRequestSent) {
+					result = false;
+					fprintf(
+					    stderr,
+					    "ERROR: failed to send requests to suspend processes `%s', please run the `suspend’ command "
+					    "to fetch latest addresses.\n",
+					    addressesStr.c_str());
+				} else {
+					printf("Attempted to suspend %zu processes\n", tokens.size() - 2);
 				}
-				printf("Attempted to suspend %zu processes\n", tokens.size() - 2);
 			}
 		}
 	}
diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp
index 1a07463b512..c132695f326 100644
--- a/fdbcli/fdbcli.actor.cpp
+++ b/fdbcli/fdbcli.actor.cpp
@@ -1690,62 +1690,9 @@ ACTOR Future<int> cli(CLIOptions opt, LineNoise* plinenoise) {
 
 				if (tokencmp(tokens[0], "kill")) {
 					getTransaction(db, managementTenant, tr, options, intrans);
-					if (tokens.size() == 1) {
-						state ThreadFuture<RangeResult> wInterfF =
-						    tr->getRange(KeyRangeRef(LiteralStringRef("\xff\xff/worker_interfaces/"),
-						                             LiteralStringRef("\xff\xff/worker_interfaces0")),
-						                 CLIENT_KNOBS->TOO_MANY);
-						RangeResult kvs = wait(makeInterruptable(safeThreadFutureToFuture(wInterfF)));
-						ASSERT(!kvs.more);
-						auto connectLock = makeReference<FlowLock>(CLIENT_KNOBS->CLI_CONNECT_PARALLELISM);
-						std::vector<Future<Void>> addInterfs;
-						for (auto it : kvs) {
-							addInterfs.push_back(addInterface(&address_interface, connectLock, it));
-						}
-						wait(waitForAll(addInterfs));
-					}
-					if (tokens.size() == 1 || tokencmp(tokens[1], "list")) {
-						if (address_interface.size() == 0) {
-							printf("\nNo addresses can be killed.\n");
-						} else if (address_interface.size() == 1) {
-							printf("\nThe following address can be killed:\n");
-						} else {
-							printf("\nThe following %zu addresses can be killed:\n", address_interface.size());
-						}
-						for (auto it : address_interface) {
-							printf("%s\n", printable(it.first).c_str());
-						}
-						printf("\n");
-					} else if (tokencmp(tokens[1], "all")) {
-						for (auto it : address_interface) {
-							BinaryReader::fromStringRef<ClientWorkerInterface>(it.second.first, IncludeVersion())
-							    .reboot.send(RebootRequest());
-						}
-						if (address_interface.size() == 0) {
-							fprintf(stderr,
-							        "ERROR: no processes to kill. You must run the `kill’ command before "
-							        "running `kill all’.\n");
-						} else {
-							printf("Attempted to kill %zu processes\n", address_interface.size());
-						}
-					} else {
-						for (int i = 1; i < tokens.size(); i++) {
-							if (!address_interface.count(tokens[i])) {
-								fprintf(stderr, "ERROR: process `%s' not recognized.\n", printable(tokens[i]).c_str());
-								is_error = true;
-								break;
-							}
-						}
-
-						if (!is_error) {
-							for (int i = 1; i < tokens.size(); i++) {
-								BinaryReader::fromStringRef<ClientWorkerInterface>(address_interface[tokens[i]].first,
-								                                                   IncludeVersion())
-								    .reboot.send(RebootRequest());
-							}
-							printf("Attempted to kill %zu processes\n", tokens.size() - 1);
-						}
-					}
+					bool _result = wait(makeInterruptable(killCommandActor(db, tr, tokens, &address_interface)));
+					if (!_result)
+						is_error = true;
 					continue;
 				}
 
diff --git a/fdbclient/IClientApi.h b/fdbclient/IClientApi.h
index 91ef38eeae3..520d0aab774 100644
--- a/fdbclient/IClientApi.h
+++ b/fdbclient/IClientApi.h
@@ -151,7 +151,11 @@ class IDatabase {
 	virtual void addref() = 0;
 	virtual void delref() = 0;
 
-	// Management API, attempt to kill or suspend a process, return 1 for request sent out, 0 for failure
+	// Management API, attempt to kill or suspend a process, return 1 for request being sent out, 0 for failure
+	// The address string can be extended to a comma-delimited string like <addr1>,<addr2>...,<addrN> to send reboot
+	// requests to multiple processes simultaneously
+	// If multiple addresses are provided, it returns 1 for requests being sent out to all provided addresses.
+	// On the contrary, if the client cannot connect to any of the given address, no requests will be sent out
 	virtual ThreadFuture<int64_t> rebootWorker(const StringRef& address, bool check, int duration) = 0;
 	// Management API, force the database to recover into DCID, causing the database to lose the most recently committed
 	// mutations
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index b56c17d7afd..38b04031efd 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -29,6 +29,7 @@
 #include <utility>
 #include <vector>
 
+#include "boost/algorithm/string.hpp"
 #include "contrib/fmt-8.1.1/include/fmt/format.h"
 
 #include "fdbclient/FDBOptions.g.h"
@@ -8230,57 +8231,74 @@ ACTOR Future<bool> checkSafeExclusions(Database cx, std::vector<AddressExclusion
 	return (ddCheck && coordinatorCheck);
 }
 
-ACTOR Future<Void> addInterfaceActor(std::map<Key, std::pair<Value, ClientLeaderRegInterface>>* address_interface,
-                                     Reference<FlowLock> connectLock,
-                                     KeyValue kv) {
+// returns true if we can connect to the given worker interface
+ACTOR Future<bool> verifyInterfaceActor(Reference<FlowLock> connectLock, ClientWorkerInterface workerInterf) {
 	wait(connectLock->take());
 	state FlowLock::Releaser releaser(*connectLock);
-	state ClientWorkerInterface workerInterf =
-	    BinaryReader::fromStringRef<ClientWorkerInterface>(kv.value, IncludeVersion());
 	state ClientLeaderRegInterface leaderInterf(workerInterf.address());
 	choose {
 		when(Optional<LeaderInfo> rep =
 		         wait(brokenPromiseToNever(leaderInterf.getLeader.getReply(GetLeaderRequest())))) {
-			StringRef ip_port =
-			    kv.key.endsWith(LiteralStringRef(":tls")) ? kv.key.removeSuffix(LiteralStringRef(":tls")) : kv.key;
-			(*address_interface)[ip_port] = std::make_pair(kv.value, leaderInterf);
-
-			if (workerInterf.reboot.getEndpoint().addresses.secondaryAddress.present()) {
-				Key full_ip_port2 =
-				    StringRef(workerInterf.reboot.getEndpoint().addresses.secondaryAddress.get().toString());
-				StringRef ip_port2 = full_ip_port2.endsWith(LiteralStringRef(":tls"))
-				                         ? full_ip_port2.removeSuffix(LiteralStringRef(":tls"))
-				                         : full_ip_port2;
-				(*address_interface)[ip_port2] = std::make_pair(kv.value, leaderInterf);
-			}
+			return true;
+		}
+		when(wait(delay(CLIENT_KNOBS->CLI_CONNECT_TIMEOUT))) {
+			// NOTE : change timeout time here if necessary
+			return false;
 		}
-		when(wait(delay(CLIENT_KNOBS->CLI_CONNECT_TIMEOUT))) {} // NOTE : change timeout time here if necessary
 	}
-	return Void();
 }
 
 ACTOR static Future<int64_t> rebootWorkerActor(DatabaseContext* cx, ValueRef addr, bool check, int duration) {
 	// ignore negative value
 	if (duration < 0)
 		duration = 0;
-	// fetch the addresses of all workers
-	state std::map<Key, std::pair<Value, ClientLeaderRegInterface>> address_interface;
 	if (!cx->getConnectionRecord())
 		return 0;
+	// fetch all workers' addresses and interfaces from CC
 	RangeResult kvs = wait(getWorkerInterfaces(cx->getConnectionRecord()));
 	ASSERT(!kvs.more);
+	// map worker network address to its interface
+	state std::map<Key, ClientWorkerInterface> workerInterfaces;
+	for (const auto& it : kvs) {
+		ClientWorkerInterface workerInterf =
+		    BinaryReader::fromStringRef<ClientWorkerInterface>(it.value, IncludeVersion());
+		Key primaryAddress =
+		    it.key.endsWith(LiteralStringRef(":tls")) ? it.key.removeSuffix(LiteralStringRef(":tls")) : it.key;
+		workerInterfaces[primaryAddress] = workerInterf;
+		// Also add mapping from a worker's second address(if present) to its interface
+		if (workerInterf.reboot.getEndpoint().addresses.secondaryAddress.present()) {
+			Key secondAddress =
+			    StringRef(workerInterf.reboot.getEndpoint().addresses.secondaryAddress.get().toString());
+			secondAddress = secondAddress.endsWith(LiteralStringRef(":tls"))
+			                    ? secondAddress.removeSuffix(LiteralStringRef(":tls"))
+			                    : secondAddress;
+			workerInterfaces[secondAddress] = workerInterf;
+		}
+	}
+	// split and get all the requested addresses to send reboot requests
+	state std::vector<std::string> addressesVec;
+	boost::algorithm::split(addressesVec, addr.toString(), boost::is_any_of(","));
 	// Note: reuse this knob from fdbcli, change it if necessary
 	Reference<FlowLock> connectLock(new FlowLock(CLIENT_KNOBS->CLI_CONNECT_PARALLELISM));
-	std::vector<Future<Void>> addInterfs;
-	for (const auto& it : kvs) {
-		addInterfs.push_back(addInterfaceActor(&address_interface, connectLock, it));
+	state std::vector<Future<bool>> verifyInterfs;
+	for (const auto& requestedAddress : addressesVec) {
+		// step 1: check that the requested address is in the worker list provided by CC
+		if (!workerInterfaces.count(Key(requestedAddress)))
+			return 0;
+		// step 2: try to establish connections to the requested worker
+		verifyInterfs.push_back(verifyInterfaceActor(connectLock, workerInterfaces[Key(requestedAddress)]));
+	}
+	// step 3: check if we can establish connections to all requested workers, return if not
+	wait(waitForAll(verifyInterfs));
+	for (const auto& f : verifyInterfs) {
+		if (!f.get())
+			return 0;
+	}
+	// step 4: After verifying we can connect to all requested workers, send reboot requests together
+	for (const auto& address : addressesVec) {
+		// Note: We want to make sure these requests are sent in parallel
+		workerInterfaces[Key(address)].reboot.send(RebootRequest(false, check, duration));
 	}
-	wait(waitForAll(addInterfs));
-	if (!address_interface.count(addr))
-		return 0;
-
-	BinaryReader::fromStringRef<ClientWorkerInterface>(address_interface[addr].first, IncludeVersion())
-	    .reboot.send(RebootRequest(false, check, duration));
 	return 1;
 }
 

From 0d9102bcb3f02ba7908f9d59f0d58836716059ed Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Sun, 22 May 2022 18:21:49 +0000
Subject: [PATCH 447/740] update version after 7.1.7 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e987b5884a..ad43ceac621 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.7
+  VERSION 7.1.8
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 0007a7418004af81ed5c42cc5ff4a94fd6a73e7f Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Tue, 24 May 2022 22:53:52 -0700
Subject: [PATCH 448/740] coordinatorsKey should not always store IP addresses
 (release-7.1). (#7203)

* coordinatorsKey should not storing IP addresses.

Currently, when we do a commit of coordinator change, we are always converting hostnames to IP addresses and store the converted results in coordinatorsKey (\xff/coordinators). This result in ForwardRequest also sending IP addresses, and receivers will update their cluster files with IPs, then we lose the dynamic IP feature.

* Remove the legacy coordinators() function.

* Update async_resolve().

ip::basic_resolver::async_resolve(const query & q, ResolveHandler && handler) is deprecated.

* Clean code format.

* Fix typo.

* Remove SpecifiedQuorumChange and NoQuorumChange.
---
 fdbclient/AutoPublicAddress.cpp               |   8 +-
 fdbclient/CoordinationInterface.h             |   1 -
 fdbclient/ManagementAPI.actor.cpp             | 127 ++++++++----------
 fdbclient/ManagementAPI.actor.h               |   6 +-
 fdbclient/MonitorLeader.actor.cpp             |  12 +-
 fdbclient/PaxosConfigTransaction.actor.cpp    |   4 +-
 fdbclient/SimpleConfigTransaction.actor.cpp   |   4 +-
 fdbclient/SpecialKeySpace.actor.cpp           |  36 ++---
 fdbserver/Coordination.actor.cpp              |   2 +-
 fdbserver/fdbserver.actor.cpp                 |   2 +-
 fdbserver/worker.actor.cpp                    |   6 +-
 .../SpecialKeySpaceCorrectness.actor.cpp      |   5 +-
 flow/Net2.actor.cpp                           |  57 ++++----
 13 files changed, 125 insertions(+), 145 deletions(-)

diff --git a/fdbclient/AutoPublicAddress.cpp b/fdbclient/AutoPublicAddress.cpp
index 9b94d89e2cb..5b805649832 100644
--- a/fdbclient/AutoPublicAddress.cpp
+++ b/fdbclient/AutoPublicAddress.cpp
@@ -31,7 +31,7 @@
 // Determine public IP address by calling the first available coordinator.
 // If fail connecting all coordinators, throw bind_failed().
 IPAddress determinePublicIPAutomatically(ClusterConnectionString& ccs) {
-	int size = ccs.coordinators().size() + ccs.hostnames.size();
+	int size = ccs.coords.size() + ccs.hostnames.size();
 	int index = 0;
 	loop {
 		try {
@@ -42,10 +42,10 @@ IPAddress determinePublicIPAutomatically(ClusterConnectionString& ccs) {
 
 			NetworkAddress coordAddr;
 			// Try coords first, because they don't need to be resolved.
-			if (index < ccs.coordinators().size()) {
-				coordAddr = ccs.coordinators()[index];
+			if (index < ccs.coords.size()) {
+				coordAddr = ccs.coords[index];
 			} else {
-				Hostname& h = ccs.hostnames[index - ccs.coordinators().size()];
+				Hostname& h = ccs.hostnames[index - ccs.coords.size()];
 				Optional<NetworkAddress> resolvedAddr = h.resolveBlocking();
 				if (!resolvedAddr.present()) {
 					throw lookup_failed();
diff --git a/fdbclient/CoordinationInterface.h b/fdbclient/CoordinationInterface.h
index 4bfb4f75120..eb0f99895b5 100644
--- a/fdbclient/CoordinationInterface.h
+++ b/fdbclient/CoordinationInterface.h
@@ -66,7 +66,6 @@ class ClusterConnectionString {
 	ClusterConnectionString(const std::vector<NetworkAddress>& coordinators, Key key);
 	ClusterConnectionString(const std::vector<Hostname>& hosts, Key key);
 
-	std::vector<NetworkAddress> const& coordinators() const { return coords; }
 	Key clusterKey() const { return key; }
 	Key clusterKeyName() const {
 		return keyDesc;
diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp
index 04648144e63..f627168e8bd 100644
--- a/fdbclient/ManagementAPI.actor.cpp
+++ b/fdbclient/ManagementAPI.actor.cpp
@@ -796,8 +796,8 @@ ACTOR Future<Optional<ClusterConnectionString>> getConnectionString(Database cx)
 }
 
 ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
-                                                               Reference<IQuorumChange> change,
-                                                               std::vector<NetworkAddress> desiredCoordinators) {
+                                                               ClusterConnectionString* conn,
+                                                               std::string newName) {
 	tr->setOption(FDBTransactionOptions::LOCK_AWARE);
 	tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 	tr->setOption(FDBTransactionOptions::USE_PROVISIONAL_PROXIES);
@@ -813,34 +813,30 @@ ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
 	        tr->getDatabase()->getConnectionRecord()->getConnectionString().clusterKeyName())
 		return CoordinatorsResult::BAD_DATABASE_STATE; // Someone changed the "name" of the database??
 
-	state std::vector<NetworkAddress> oldCoordinators = wait(old.tryResolveHostnames());
-	state CoordinatorsResult result = CoordinatorsResult::SUCCESS;
-	if (!desiredCoordinators.size()) {
-		std::vector<NetworkAddress> _desiredCoordinators = wait(change->getDesiredCoordinators(
-		    tr,
-		    oldCoordinators,
-		    Reference<ClusterConnectionMemoryRecord>(new ClusterConnectionMemoryRecord(old)),
-		    result));
-		desiredCoordinators = _desiredCoordinators;
+	if (conn->hostnames.size() + conn->coords.size() == 0) {
+		conn->hostnames = old.hostnames;
+		conn->coords = old.coords;
+	}
+	std::vector<NetworkAddress> desiredCoordinators = wait(conn->tryResolveHostnames());
+	if (desiredCoordinators.size() != conn->hostnames.size() + conn->coords.size()) {
+		TraceEvent("ChangeQuorumCheckerEarlyTermination")
+		    .detail("Reason", "One or more hostnames are unresolvable")
+		    .backtrace();
+		return CoordinatorsResult::COORDINATOR_UNREACHABLE;
 	}
 
-	if (result != CoordinatorsResult::SUCCESS)
-		return result;
-
-	if (!desiredCoordinators.size())
-		return CoordinatorsResult::INVALID_NETWORK_ADDRESSES;
-
-	std::sort(desiredCoordinators.begin(), desiredCoordinators.end());
-
-	std::string newName = change->getDesiredClusterKeyName();
-	if (newName.empty())
+	if (newName.empty()) {
 		newName = old.clusterKeyName().toString();
-
-	if (oldCoordinators == desiredCoordinators && old.clusterKeyName() == newName)
+	}
+	std::sort(conn->hostnames.begin(), conn->hostnames.end());
+	std::sort(conn->coords.begin(), conn->coords.end());
+	std::sort(old.hostnames.begin(), old.hostnames.end());
+	std::sort(old.coords.begin(), old.coords.end());
+	if (conn->hostnames == old.hostnames && conn->coords == old.coords && old.clusterKeyName() == newName) {
 		return CoordinatorsResult::SAME_NETWORK_ADDRESSES;
+	}
 
-	state ClusterConnectionString conn(desiredCoordinators,
-	                                   StringRef(newName + ':' + deterministicRandom()->randomAlphaNumeric(32)));
+	conn->parseKey(newName + ':' + deterministicRandom()->randomAlphaNumeric(32));
 
 	if (g_network->isSimulated()) {
 		int i = 0;
@@ -865,19 +861,27 @@ ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
 	}
 
 	std::vector<Future<Optional<LeaderInfo>>> leaderServers;
-	ClientCoordinators coord(Reference<ClusterConnectionMemoryRecord>(new ClusterConnectionMemoryRecord(conn)));
+	ClientCoordinators coord(Reference<ClusterConnectionMemoryRecord>(new ClusterConnectionMemoryRecord(*conn)));
 
 	leaderServers.reserve(coord.clientLeaderServers.size());
-	for (int i = 0; i < coord.clientLeaderServers.size(); i++)
-		leaderServers.push_back(retryBrokenPromise(coord.clientLeaderServers[i].getLeader,
-		                                           GetLeaderRequest(coord.clusterKey, UID()),
-		                                           TaskPriority::CoordinationReply));
+	for (int i = 0; i < coord.clientLeaderServers.size(); i++) {
+		if (coord.clientLeaderServers[i].hostname.present()) {
+			leaderServers.push_back(retryGetReplyFromHostname(GetLeaderRequest(coord.clusterKey, UID()),
+			                                                  coord.clientLeaderServers[i].hostname.get(),
+			                                                  WLTOKEN_CLIENTLEADERREG_GETLEADER,
+			                                                  TaskPriority::CoordinationReply));
+		} else {
+			leaderServers.push_back(retryBrokenPromise(coord.clientLeaderServers[i].getLeader,
+			                                           GetLeaderRequest(coord.clusterKey, UID()),
+			                                           TaskPriority::CoordinationReply));
+		}
+	}
 
 	choose {
 		when(wait(waitForAll(leaderServers))) {}
 		when(wait(delay(5.0))) { return CoordinatorsResult::COORDINATOR_UNREACHABLE; }
 	}
-	tr->set(coordinatorsKey, conn.toString());
+	tr->set(coordinatorsKey, conn->toString());
 	return Optional<CoordinatorsResult>();
 }
 
@@ -987,32 +991,6 @@ ACTOR Future<CoordinatorsResult> changeQuorum(Database cx, Reference<IQuorumChan
 	}
 }
 
-struct SpecifiedQuorumChange final : IQuorumChange {
-	std::vector<NetworkAddress> desired;
-	explicit SpecifiedQuorumChange(std::vector<NetworkAddress> const& desired) : desired(desired) {}
-	Future<std::vector<NetworkAddress>> getDesiredCoordinators(Transaction* tr,
-	                                                           std::vector<NetworkAddress> oldCoordinators,
-	                                                           Reference<IClusterConnectionRecord>,
-	                                                           CoordinatorsResult&) override {
-		return desired;
-	}
-};
-Reference<IQuorumChange> specifiedQuorumChange(std::vector<NetworkAddress> const& addresses) {
-	return Reference<IQuorumChange>(new SpecifiedQuorumChange(addresses));
-}
-
-struct NoQuorumChange final : IQuorumChange {
-	Future<std::vector<NetworkAddress>> getDesiredCoordinators(Transaction* tr,
-	                                                           std::vector<NetworkAddress> oldCoordinators,
-	                                                           Reference<IClusterConnectionRecord>,
-	                                                           CoordinatorsResult&) override {
-		return oldCoordinators;
-	}
-};
-Reference<IQuorumChange> noQuorumChange() {
-	return Reference<IQuorumChange>(new NoQuorumChange);
-}
-
 struct NameQuorumChange final : IQuorumChange {
 	std::string newName;
 	Reference<IQuorumChange> otherChange;
@@ -1059,12 +1037,30 @@ struct AutoQuorumChange final : IQuorumChange {
 	                                       Reference<IClusterConnectionRecord> ccr,
 	                                       int desiredCount,
 	                                       std::set<AddressExclusion>* excluded) {
+		ClusterConnectionString cs = ccr->getConnectionString();
+		if (oldCoordinators.size() != cs.hostnames.size() + cs.coords.size()) {
+			return false;
+		}
+
 		// Are there enough coordinators for the redundancy level?
 		if (oldCoordinators.size() < desiredCount)
 			return false;
 		if (oldCoordinators.size() % 2 != 1)
 			return false;
 
+		// Check exclusions
+		for (auto& c : oldCoordinators) {
+			if (addressExcluded(*excluded, c))
+				return false;
+		}
+
+		// Check locality
+		// FIXME: Actual locality!
+		std::sort(oldCoordinators.begin(), oldCoordinators.end());
+		for (int i = 1; i < oldCoordinators.size(); i++)
+			if (oldCoordinators[i - 1].ip == oldCoordinators[i].ip)
+				return false; // Multiple coordinators share an IP
+
 		// Check availability
 		ClientCoordinators coord(ccr);
 		std::vector<Future<Optional<LeaderInfo>>> leaderServers;
@@ -1092,19 +1088,6 @@ struct AutoQuorumChange final : IQuorumChange {
 			}
 		}
 
-		// Check exclusions
-		for (auto& c : oldCoordinators) {
-			if (addressExcluded(*excluded, c))
-				return false;
-		}
-
-		// Check locality
-		// FIXME: Actual locality!
-		std::sort(oldCoordinators.begin(), oldCoordinators.end());
-		for (int i = 1; i < oldCoordinators.size(); i++)
-			if (oldCoordinators[i - 1].ip == oldCoordinators[i].ip)
-				return false; // Multiple coordinators share an IP
-
 		return true; // The status quo seems fine
 	}
 
@@ -1146,8 +1129,10 @@ struct AutoQuorumChange final : IQuorumChange {
 
 		if (checkAcceptable) {
 			bool ok = wait(isAcceptable(self.getPtr(), tr, oldCoordinators, ccr, desiredCount, &excluded));
-			if (ok)
+			if (ok) {
+				*err = CoordinatorsResult::SAME_NETWORK_ADDRESSES;
 				return oldCoordinators;
+			}
 		}
 
 		std::vector<NetworkAddress> chosen;
diff --git a/fdbclient/ManagementAPI.actor.h b/fdbclient/ManagementAPI.actor.h
index 82c8bb4ee91..5ddaf2ffbd3 100644
--- a/fdbclient/ManagementAPI.actor.h
+++ b/fdbclient/ManagementAPI.actor.h
@@ -55,12 +55,10 @@ struct IQuorumChange : ReferenceCounted<IQuorumChange> {
 
 // Change to use the given set of coordination servers
 ACTOR Future<Optional<CoordinatorsResult>> changeQuorumChecker(Transaction* tr,
-                                                               Reference<IQuorumChange> change,
-                                                               std::vector<NetworkAddress> desiredCoordinators);
+                                                               ClusterConnectionString* conn,
+                                                               std::string newName);
 ACTOR Future<CoordinatorsResult> changeQuorum(Database cx, Reference<IQuorumChange> change);
 Reference<IQuorumChange> autoQuorumChange(int desired = -1);
-Reference<IQuorumChange> noQuorumChange();
-Reference<IQuorumChange> specifiedQuorumChange(std::vector<NetworkAddress> const&);
 Reference<IQuorumChange> nameQuorumChange(std::string const& name, Reference<IQuorumChange> const& other);
 
 // Exclude the given set of servers from use as state servers.  Returns as soon as the change is durable, without
diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index 0182bc15347..9155091e356 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -250,7 +250,7 @@ TEST_CASE("/fdbclient/MonitorLeader/ConnectionString/hostname") {
 
 		ClusterConnectionString cs(hostnames, LiteralStringRef("TestCluster:0"));
 		ASSERT(cs.hostnames.size() == 2);
-		ASSERT(cs.coordinators().size() == 0);
+		ASSERT(cs.coords.size() == 0);
 		ASSERT(cs.toString() == connectionString);
 	}
 
@@ -301,7 +301,7 @@ TEST_CASE("/fdbclient/MonitorLeader/PartialResolve") {
 	INetworkConnections::net()->addMockTCPEndpoint(hn, port, { address });
 
 	ClusterConnectionString cs(connectionString);
-	state std::vector<NetworkAddress> allCoordinators = wait(cs.tryResolveHostnames());
+	std::vector<NetworkAddress> allCoordinators = wait(cs.tryResolveHostnames());
 	ASSERT(allCoordinators.size() == 1 &&
 	       std::find(allCoordinators.begin(), allCoordinators.end(), address) != allCoordinators.end());
 
@@ -460,7 +460,7 @@ ClientCoordinators::ClientCoordinators(Reference<IClusterConnectionRecord> ccr)
 	for (auto h : cs.hostnames) {
 		clientLeaderServers.push_back(ClientLeaderRegInterface(h));
 	}
-	for (auto s : cs.coordinators()) {
+	for (auto s : cs.coords) {
 		clientLeaderServers.push_back(ClientLeaderRegInterface(s));
 	}
 }
@@ -866,7 +866,7 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
     Reference<ReferencedObject<Standalone<VectorRef<ClientVersionRef>>>> supportedVersions,
     Key traceLogGroup) {
 	state ClusterConnectionString cs = info.intermediateConnRecord->getConnectionString();
-	state int coordinatorsSize = cs.hostnames.size() + cs.coordinators().size();
+	state int coordinatorsSize = cs.hostnames.size() + cs.coords.size();
 	state int index = 0;
 	state int successIndex = 0;
 	state Optional<double> incorrectTime;
@@ -880,7 +880,7 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 	for (const auto& h : cs.hostnames) {
 		clientLeaderServers.push_back(ClientLeaderRegInterface(h));
 	}
-	for (const auto& c : cs.coordinators()) {
+	for (const auto& c : cs.coords) {
 		clientLeaderServers.push_back(ClientLeaderRegInterface(c));
 	}
 
@@ -894,7 +894,7 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 
 		req.clusterKey = cs.clusterKey();
 		req.hostnames = cs.hostnames;
-		req.coordinators = cs.coordinators();
+		req.coordinators = cs.coords;
 		req.knownClientInfoID = clientInfo->get().id;
 		req.supportedVersions = supportedVersions->get();
 		req.traceLogGroup = traceLogGroup;
diff --git a/fdbclient/PaxosConfigTransaction.actor.cpp b/fdbclient/PaxosConfigTransaction.actor.cpp
index 50ebbd1a4c0..c9a22cd5de4 100644
--- a/fdbclient/PaxosConfigTransaction.actor.cpp
+++ b/fdbclient/PaxosConfigTransaction.actor.cpp
@@ -409,11 +409,11 @@ class PaxosConfigTransactionImpl {
 
 	PaxosConfigTransactionImpl(Database const& cx) : cx(cx) {
 		const ClusterConnectionString& cs = cx->getConnectionRecord()->getConnectionString();
-		ctis.reserve(cs.hostnames.size() + cs.coordinators().size());
+		ctis.reserve(cs.hostnames.size() + cs.coords.size());
 		for (const auto& h : cs.hostnames) {
 			ctis.emplace_back(h);
 		}
-		for (const auto& c : cs.coordinators()) {
+		for (const auto& c : cs.coords) {
 			ctis.emplace_back(c);
 		}
 		getGenerationQuorum = GetGenerationQuorum{ ctis };
diff --git a/fdbclient/SimpleConfigTransaction.actor.cpp b/fdbclient/SimpleConfigTransaction.actor.cpp
index 2e71cd73c4c..500d287b18d 100644
--- a/fdbclient/SimpleConfigTransaction.actor.cpp
+++ b/fdbclient/SimpleConfigTransaction.actor.cpp
@@ -162,8 +162,8 @@ class SimpleConfigTransactionImpl {
 public:
 	SimpleConfigTransactionImpl(Database const& cx) : cx(cx) {
 		const ClusterConnectionString& cs = cx->getConnectionRecord()->getConnectionString();
-		if (cs.coordinators().size()) {
-			std::vector<NetworkAddress> coordinators = cs.coordinators();
+		if (cs.coords.size()) {
+			std::vector<NetworkAddress> coordinators = cs.coords;
 			std::sort(coordinators.begin(), coordinators.end());
 			cti = ConfigTransactionInterface(coordinators[0]);
 		} else {
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 0db0a30f761..52b9247693f 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -1674,7 +1674,6 @@ Future<RangeResult> CoordinatorsImpl::getRange(ReadYourWritesTransaction* ryw,
 }
 
 ACTOR static Future<Optional<std::string>> coordinatorsCommitActor(ReadYourWritesTransaction* ryw, KeyRangeRef kr) {
-	state Reference<IQuorumChange> change;
 	state ClusterConnectionString conn; // We don't care about the Key here.
 	state std::vector<std::string> process_address_or_hostname_strs;
 	state Optional<std::string> msg;
@@ -1720,15 +1719,7 @@ ACTOR static Future<Optional<std::string>> coordinatorsCommitActor(ReadYourWrite
 		}
 	}
 
-	std::vector<NetworkAddress> addressesVec = wait(conn.tryResolveHostnames());
-	if (addressesVec.size() != conn.hostnames.size() + conn.coordinators().size()) {
-		return ManagementAPIError::toJsonString(false, "coordinators", "One or more hostnames are not resolvable.");
-	} else if (addressesVec.size()) {
-		change = specifiedQuorumChange(addressesVec);
-	} else {
-		change = noQuorumChange();
-	}
-
+	std::string newName;
 	// check update for cluster_description
 	Key cluster_decription_key = LiteralStringRef("cluster_description").withPrefix(kr.begin);
 	auto entry = ryw->getSpecialKeySpaceWriteMap()[cluster_decription_key];
@@ -1736,7 +1727,7 @@ ACTOR static Future<Optional<std::string>> coordinatorsCommitActor(ReadYourWrite
 		// check valid description [a-zA-Z0-9_]+
 		if (entry.second.present() && isAlphaNumeric(entry.second.get().toString())) {
 			// do the name change
-			change = nameQuorumChange(entry.second.get().toString(), change);
+			newName = entry.second.get().toString();
 		} else {
 			// throw the error
 			return ManagementAPIError::toJsonString(
@@ -1744,13 +1735,11 @@ ACTOR static Future<Optional<std::string>> coordinatorsCommitActor(ReadYourWrite
 		}
 	}
 
-	ASSERT(change.isValid());
-
 	TraceEvent(SevDebug, "SKSChangeCoordinatorsStart")
-	    .detail("NewAddresses", describe(addressesVec))
+	    .detail("NewConnectionString", conn.toString())
 	    .detail("Description", entry.first ? entry.second.get().toString() : "");
 
-	Optional<CoordinatorsResult> r = wait(changeQuorumChecker(&ryw->getTransaction(), change, addressesVec));
+	Optional<CoordinatorsResult> r = wait(changeQuorumChecker(&ryw->getTransaction(), &conn, newName));
 
 	TraceEvent(SevDebug, "SKSChangeCoordinatorsFinish")
 	    .detail("Result", r.present() ? static_cast<int>(r.get()) : -1); // -1 means success
@@ -1819,9 +1808,20 @@ ACTOR static Future<RangeResult> CoordinatorsAutoImplActor(ReadYourWritesTransac
 		throw special_keys_api_failure();
 	}
 
-	for (const auto& address : _desiredCoordinators) {
-		autoCoordinatorsKey += autoCoordinatorsKey.size() ? "," : "";
-		autoCoordinatorsKey += address.toString();
+	if (result == CoordinatorsResult::SAME_NETWORK_ADDRESSES) {
+		for (const auto& host : old.hostnames) {
+			autoCoordinatorsKey += autoCoordinatorsKey.size() ? "," : "";
+			autoCoordinatorsKey += host.toString();
+		}
+		for (const auto& coord : old.coords) {
+			autoCoordinatorsKey += autoCoordinatorsKey.size() ? "," : "";
+			autoCoordinatorsKey += coord.toString();
+		}
+	} else {
+		for (const auto& address : _desiredCoordinators) {
+			autoCoordinatorsKey += autoCoordinatorsKey.size() ? "," : "";
+			autoCoordinatorsKey += address.toString();
+		}
 	}
 	res.push_back_deep(res.arena(), KeyValueRef(kr.begin, Value(autoCoordinatorsKey)));
 	return res;
diff --git a/fdbserver/Coordination.actor.cpp b/fdbserver/Coordination.actor.cpp
index a3746c4f5ec..2a208ffe29e 100644
--- a/fdbserver/Coordination.actor.cpp
+++ b/fdbserver/Coordination.actor.cpp
@@ -104,7 +104,7 @@ ServerCoordinators::ServerCoordinators(Reference<IClusterConnectionRecord> ccr)
 		stateServers.emplace_back(h);
 		configServers.emplace_back(h);
 	}
-	for (auto s : cs.coordinators()) {
+	for (auto s : cs.coords) {
 		leaderElectionServers.emplace_back(s);
 		stateServers.emplace_back(s);
 		configServers.emplace_back(s);
diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp
index 2bcfca7347e..d4f07dd157f 100644
--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@@ -855,7 +855,7 @@ std::pair<NetworkAddressList, NetworkAddressList> buildNetworkAddresses(
 	NetworkAddressList listenNetworkAddresses;
 
 	std::vector<Hostname>& hostnames = connectionRecord.getConnectionString().hostnames;
-	const std::vector<NetworkAddress>& coords = connectionRecord.getConnectionString().coordinators();
+	const std::vector<NetworkAddress>& coords = connectionRecord.getConnectionString().coords;
 	ASSERT(hostnames.size() + coords.size() > 0);
 
 	for (int ii = 0; ii < publicAddressStrs.size(); ++ii) {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 191a7b5ec27..4b720a54c01 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -2670,7 +2670,7 @@ ACTOR Future<MonitorLeaderInfo> monitorLeaderWithDelayedCandidacyImplOneGenerati
     Reference<AsyncVar<Value>> result,
     MonitorLeaderInfo info) {
 	ClusterConnectionString cs = info.intermediateConnRecord->getConnectionString();
-	state int coordinatorsSize = cs.hostnames.size() + cs.coordinators().size();
+	state int coordinatorsSize = cs.hostnames.size() + cs.coords.size();
 	state ElectionResultRequest request;
 	state int index = 0;
 	state int successIndex = 0;
@@ -2680,14 +2680,14 @@ ACTOR Future<MonitorLeaderInfo> monitorLeaderWithDelayedCandidacyImplOneGenerati
 	for (const auto& h : cs.hostnames) {
 		leaderElectionServers.push_back(LeaderElectionRegInterface(h));
 	}
-	for (const auto& c : cs.coordinators()) {
+	for (const auto& c : cs.coords) {
 		leaderElectionServers.push_back(LeaderElectionRegInterface(c));
 	}
 	deterministicRandom()->randomShuffle(leaderElectionServers);
 
 	request.key = cs.clusterKey();
 	request.hostnames = cs.hostnames;
-	request.coordinators = cs.coordinators();
+	request.coordinators = cs.coords;
 
 	loop {
 		LeaderElectionRegInterface interf = leaderElectionServers[index];
diff --git a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
index 82397daeace..261076e2428 100644
--- a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
+++ b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
@@ -956,7 +956,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 				state std::vector<std::string> process_addresses;
 				boost::split(
 				    process_addresses, coordinator_processes_key.get().toString(), [](char c) { return c == ','; });
-				ASSERT(process_addresses.size() == cs.coordinators().size() + cs.hostnames.size());
+				ASSERT(process_addresses.size() == cs.coords.size() + cs.hostnames.size());
 				// compare the coordinator process network addresses one by one
 				std::vector<NetworkAddress> coordinators = wait(cs.tryResolveHostnames());
 				for (const auto& network_address : coordinators) {
@@ -1080,8 +1080,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 					ClusterConnectionString csNew(res.get().toString());
 					// verify the cluster decription
 					ASSERT(new_cluster_description == csNew.clusterKeyName().toString());
-					ASSERT(csNew.hostnames.size() + csNew.coordinators().size() ==
-					       old_coordinators_processes.size() + 1);
+					ASSERT(csNew.hostnames.size() + csNew.coords.size() == old_coordinators_processes.size() + 1);
 					std::vector<NetworkAddress> newCoordinators = wait(csNew.tryResolveHostnames());
 					// verify the coordinators' addresses
 					for (const auto& network_address : newCoordinators) {
diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index 8c67f1b0568..177f9f1b0af 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -1856,35 +1856,34 @@ ACTOR static Future<std::vector<NetworkAddress>> resolveTCPEndpoint_impl(Net2* s
 	Promise<std::vector<NetworkAddress>> promise;
 	state Future<std::vector<NetworkAddress>> result = promise.getFuture();
 
-	tcpResolver.async_resolve(tcp::resolver::query(host, service),
-	                          [=](const boost::system::error_code& ec, tcp::resolver::iterator iter) {
-		                          if (ec) {
-			                          self->dnsCache.remove(host, service);
-			                          promise.sendError(lookup_failed());
-			                          return;
-		                          }
-
-		                          std::vector<NetworkAddress> addrs;
-
-		                          tcp::resolver::iterator end;
-		                          while (iter != end) {
-			                          auto endpoint = iter->endpoint();
-			                          auto addr = endpoint.address();
-			                          if (addr.is_v6()) {
-				                          addrs.emplace_back(IPAddress(addr.to_v6().to_bytes()), endpoint.port());
-			                          } else {
-				                          addrs.emplace_back(addr.to_v4().to_ulong(), endpoint.port());
-			                          }
-			                          ++iter;
-		                          }
-
-		                          if (addrs.empty()) {
-			                          self->dnsCache.remove(host, service);
-			                          promise.sendError(lookup_failed());
-		                          } else {
-			                          promise.send(addrs);
-		                          }
-	                          });
+	tcpResolver.async_resolve(host, service, [=](const boost::system::error_code& ec, tcp::resolver::iterator iter) {
+		if (ec) {
+			self->dnsCache.remove(host, service);
+			promise.sendError(lookup_failed());
+			return;
+		}
+
+		std::vector<NetworkAddress> addrs;
+
+		tcp::resolver::iterator end;
+		while (iter != end) {
+			auto endpoint = iter->endpoint();
+			auto addr = endpoint.address();
+			if (addr.is_v6()) {
+				addrs.emplace_back(IPAddress(addr.to_v6().to_bytes()), endpoint.port());
+			} else {
+				addrs.emplace_back(addr.to_v4().to_ulong(), endpoint.port());
+			}
+			++iter;
+		}
+
+		if (addrs.empty()) {
+			self->dnsCache.remove(host, service);
+			promise.sendError(lookup_failed());
+		} else {
+			promise.send(addrs);
+		}
+	});
 
 	wait(ready(result));
 	tcpResolver.cancel();

From cff11f90d300a8976e68fb791366626484314c80 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 24 May 2022 18:00:37 -0700
Subject: [PATCH 449/740] Cherry pick #7236 to release-7.1

---
 fdbserver/TLogServer.actor.cpp    | 66 ++++++++++++++++++-------------
 fdbserver/storageserver.actor.cpp | 44 +++++++++++----------
 2 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 4f6c9f17e75..49519e88183 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -2431,10 +2431,15 @@ ACTOR Future<Void> rejoinClusterController(TLogData* self,
 			// Read and cache cluster ID before displacing this tlog. We want
 			// to avoid removing the tlogs data if it has joined a new cluster
 			// with a different cluster ID.
-			state UID clusterId = wait(getClusterId(self));
-			ASSERT(clusterId.isValid());
-			self->ccClusterId = clusterId;
-			ev.detail("ClusterId", clusterId).detail("SelfClusterId", self->durableClusterId);
+
+			// TODO: #5375
+			/*
+			            state UID clusterId = wait(getClusterId(self));
+			            ASSERT(clusterId.isValid());
+			            self->ccClusterId = clusterId;
+			            ev.detail("ClusterId", clusterId).detail("SelfClusterId", self->durableClusterId);
+			*/
+
 			if (BUGGIFY)
 				wait(delay(SERVER_KNOBS->BUGGIFY_WORKER_REMOVED_MAX_LAG * deterministicRandom()->random01()));
 			throw worker_removed();
@@ -3638,30 +3643,35 @@ ACTOR Future<Void> tLog(IKeyValueStore* persistentData,
 				}
 			}
 		} catch (Error& e) {
-			if (e.code() != error_code_worker_removed) {
-				throw;
-			}
-			// Don't need to worry about deleting data if there is no durable
-			// cluster ID.
-			if (!self.durableClusterId.isValid()) {
-				throw;
-			}
-			// When a tlog joins a new cluster and has data for an old cluster,
-			// it should automatically exclude itself to avoid being used in
-			// the new cluster.
-			auto recoveryState = self.dbInfo->get().recoveryState;
-			if (recoveryState == RecoveryState::FULLY_RECOVERED && self.ccClusterId.isValid() &&
-			    self.durableClusterId.isValid() && self.ccClusterId != self.durableClusterId) {
-				state NetworkAddress address = g_network->getLocalAddress();
-				wait(excludeServers(self.cx, { AddressExclusion{ address.ip, address.port } }));
-				TraceEvent(SevWarnAlways, "TLogBelongsToExistingCluster")
-				    .detail("ClusterId", self.durableClusterId)
-				    .detail("NewClusterId", self.ccClusterId);
-			}
-			// If the tlog has a valid durable cluster ID, we don't want it to
-			// wipe its data! Throw this error to signal to `tlogTerminated` to
-			// close the persistent data store instead of deleting it.
-			throw invalid_cluster_id();
+			throw;
+
+			// TODO: #5375
+			/*
+			            if (e.code() != error_code_worker_removed) {
+			                throw;
+			            }
+			            // Don't need to worry about deleting data if there is no durable
+			            // cluster ID.
+			            if (!self.durableClusterId.isValid()) {
+			                throw;
+			            }
+			            // When a tlog joins a new cluster and has data for an old cluster,
+			            // it should automatically exclude itself to avoid being used in
+			            // the new cluster.
+			            auto recoveryState = self.dbInfo->get().recoveryState;
+			            if (recoveryState == RecoveryState::FULLY_RECOVERED && self.ccClusterId.isValid() &&
+			                self.durableClusterId.isValid() && self.ccClusterId != self.durableClusterId) {
+			                state NetworkAddress address = g_network->getLocalAddress();
+			                wait(excludeServers(self.cx, { AddressExclusion{ address.ip, address.port } }));
+			                TraceEvent(SevWarnAlways, "TLogBelongsToExistingCluster")
+			                    .detail("ClusterId", self.durableClusterId)
+			                    .detail("NewClusterId", self.ccClusterId);
+			            }
+			            // If the tlog has a valid durable cluster ID, we don't want it to
+			            // wipe its data! Throw this error to signal to `tlogTerminated` to
+			            // close the persistent data store instead of deleting it.
+			            throw invalid_cluster_id();
+			*/
 		}
 	} catch (Error& e) {
 		self.terminated.send(Void());
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 9cde2e569d4..8d5e63edccd 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -9198,26 +9198,30 @@ ACTOR Future<Void> storageServer(IKeyValueStore* persistentData,
 		if (e.isError()) {
 			Error e = f.getError();
 
-			if (e.code() != error_code_worker_removed) {
-				throw e;
-			}
-			state UID clusterId = wait(getClusterId(&self));
-			ASSERT(self.clusterId.isValid());
-			UID durableClusterId = wait(self.clusterId.getFuture());
-			ASSERT(durableClusterId.isValid());
-			if (clusterId == durableClusterId) {
-				throw worker_removed();
-			}
-			// When a storage server connects to a new cluster, it deletes its
-			// old data and creates a new, empty data file for the new cluster.
-			// We want to avoid this and force a manual removal of the storage
-			// servers' old data when being assigned to a new cluster to avoid
-			// accidental data loss.
-			TraceEvent(SevWarn, "StorageServerBelongsToExistingCluster")
-			    .detail("ServerID", ssi.id())
-			    .detail("ClusterID", durableClusterId)
-			    .detail("NewClusterID", clusterId);
-			wait(Future<Void>(Never()));
+			throw e;
+			// TODO: #5375
+			/*
+			            if (e.code() != error_code_worker_removed) {
+			                throw e;
+			            }
+			            state UID clusterId = wait(getClusterId(&self));
+			            ASSERT(self.clusterId.isValid());
+			            UID durableClusterId = wait(self.clusterId.getFuture());
+			            ASSERT(durableClusterId.isValid());
+			            if (clusterId == durableClusterId) {
+			                throw worker_removed();
+			            }
+			            // When a storage server connects to a new cluster, it deletes its
+			            // old data and creates a new, empty data file for the new cluster.
+			            // We want to avoid this and force a manual removal of the storage
+			            // servers' old data when being assigned to a new cluster to avoid
+			            // accidental data loss.
+			            TraceEvent(SevWarn, "StorageServerBelongsToExistingCluster")
+			                .detail("ServerID", ssi.id())
+			                .detail("ClusterID", durableClusterId)
+			                .detail("NewClusterID", clusterId);
+			            wait(Future<Void>(Never()));
+			*/
 		}
 
 		self.interfaceRegistered =

From 4a80e017cfb5ffa4a34c0ecb40cf53c097ec0379 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Thu, 19 May 2022 14:12:29 -0700
Subject: [PATCH 450/740] Don't pop every generation of old log router

---
 fdbserver/TagPartitionedLogSystem.actor.cpp | 86 ++++++++++++++-------
 fdbserver/TagPartitionedLogSystem.actor.h   |  7 +-
 2 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp
index a4822a7ef58..2028159c386 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.cpp
+++ b/fdbserver/TagPartitionedLogSystem.actor.cpp
@@ -1357,42 +1357,67 @@ Future<Void> TagPartitionedLogSystem::onKnownCommittedVersionChange() {
 	return waitForAny(result);
 }
 
-void TagPartitionedLogSystem::popLogRouter(
-    Version upTo,
-    Tag tag,
-    Version durableKnownCommittedVersion,
-    int8_t popLocality) { // FIXME: do not need to pop all generations of old logs
+void TagPartitionedLogSystem::popLogRouter(Version upTo,
+                                           Tag tag,
+                                           Version durableKnownCommittedVersion,
+                                           int8_t popLocality) {
 	if (!upTo)
 		return;
-	for (auto& t : tLogs) {
-		if (t->locality == popLocality) {
-			for (auto& log : t->logRouters) {
-				Version prev = outstandingPops[std::make_pair(log->get().id(), tag)].first;
-				if (prev < upTo)
-					outstandingPops[std::make_pair(log->get().id(), tag)] =
-					    std::make_pair(upTo, durableKnownCommittedVersion);
-				if (prev == 0) {
-					popActors.add(popFromLog(
-					    this, log, tag, 0.0)); // Fast pop time because log routers can only hold 5 seconds of data.
-				}
-			}
-		}
-	}
 
-	for (auto& old : oldLogData) {
-		for (auto& t : old.tLogs) {
+	Version lastGenerationStartVersion = TagPartitionedLogSystem::getMaxLocalStartVersion(tLogs);
+	if (upTo >= lastGenerationStartVersion) {
+		for (auto& t : tLogs) {
 			if (t->locality == popLocality) {
 				for (auto& log : t->logRouters) {
 					Version prev = outstandingPops[std::make_pair(log->get().id(), tag)].first;
-					if (prev < upTo)
+					if (prev < upTo) {
 						outstandingPops[std::make_pair(log->get().id(), tag)] =
 						    std::make_pair(upTo, durableKnownCommittedVersion);
-					if (prev == 0)
-						popActors.add(popFromLog(this, log, tag, 0.0));
+					}
+					if (prev == 0) {
+						popActors.add(popFromLog(this,
+						                         log,
+						                         tag,
+						                         /*delayBeforePop=*/0.0,
+						                         /*popLogRouter=*/true)); // Fast pop time because log routers can only
+						                                                  // hold 5 seconds of data.
+					}
 				}
 			}
 		}
 	}
+
+	Version nextGenerationStartVersion = lastGenerationStartVersion;
+	for (const auto& old : oldLogData) {
+		Version generationStartVersion = TagPartitionedLogSystem::getMaxLocalStartVersion(old.tLogs);
+		if (generationStartVersion <= upTo) {
+			for (auto& t : old.tLogs) {
+				if (t->locality == popLocality) {
+					for (auto& log : t->logRouters) {
+						auto logRouterIdTagPair = std::make_pair(log->get().id(), tag);
+
+						// We pop the log router only if the popped version is within this generation's version range.
+						// That is between the current generation's start version and the next generation's start
+						// version.
+						if (logRouterLastPops.find(logRouterIdTagPair) == logRouterLastPops.end() ||
+						    logRouterLastPops[logRouterIdTagPair] < nextGenerationStartVersion) {
+							Version prev = outstandingPops[logRouterIdTagPair].first;
+							if (prev < upTo) {
+								outstandingPops[logRouterIdTagPair] =
+								    std::make_pair(upTo, durableKnownCommittedVersion);
+							}
+							if (prev == 0) {
+								popActors.add(
+								    popFromLog(this, log, tag, /*delayBeforePop=*/0.0, /*popLogRouter=*/true));
+							}
+						}
+					}
+				}
+			}
+		}
+
+		nextGenerationStartVersion = generationStartVersion;
+	}
 }
 
 void TagPartitionedLogSystem::popTxs(Version upTo, int8_t popLocality) {
@@ -1424,7 +1449,8 @@ void TagPartitionedLogSystem::pop(Version upTo, Tag tag, Version durableKnownCom
 				}
 				if (prev == 0) {
 					// pop tag from log upto version defined in outstandingPops[].first
-					popActors.add(popFromLog(this, log, tag, 1.0)); //< FIXME: knob
+					popActors.add(
+					    popFromLog(this, log, tag, /*delayBeforePop*/ 1.0, /*popLogRouter=*/false)); //< FIXME: knob
 				}
 			}
 		}
@@ -1434,10 +1460,11 @@ void TagPartitionedLogSystem::pop(Version upTo, Tag tag, Version durableKnownCom
 ACTOR Future<Void> TagPartitionedLogSystem::popFromLog(TagPartitionedLogSystem* self,
                                                        Reference<AsyncVar<OptionalInterface<TLogInterface>>> log,
                                                        Tag tag,
-                                                       double time) {
+                                                       double delayBeforePop,
+                                                       bool popLogRouter) {
 	state Version last = 0;
 	loop {
-		wait(delay(time, TaskPriority::TLogPop));
+		wait(delay(delayBeforePop, TaskPriority::TLogPop));
 
 		// to: first is upto version, second is durableKnownComittedVersion
 		state std::pair<Version, Version> to = self->outstandingPops[std::make_pair(log->get().id(), tag)];
@@ -1453,6 +1480,10 @@ ACTOR Future<Void> TagPartitionedLogSystem::popFromLog(TagPartitionedLogSystem*
 			wait(log->get().interf().popMessages.getReply(TLogPopRequest(to.first, to.second, tag),
 			                                              TaskPriority::TLogPop));
 
+			if (popLogRouter) {
+				self->logRouterLastPops[std::make_pair(log->get().id(), tag)] = to.first;
+			}
+
 			last = to.first;
 		} catch (Error& e) {
 			if (e.code() == error_code_actor_cancelled)
@@ -2843,6 +2874,7 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 	    .detail("OldLogRouterTags", oldLogSystem->logRouterTags);
 	if (oldLogSystem->logRouterTags > 0 ||
 	    logSystem->tLogs[0]->startVersion < oldLogSystem->knownCommittedVersion + 1) {
+		// Use log routers to recover [knownCommittedVersion, recoveryVersion] from the old generation.
 		oldRouterRecruitment = TagPartitionedLogSystem::recruitOldLogRouters(oldLogSystem.getPtr(),
 		                                                                     recr.oldLogRouters,
 		                                                                     recoveryCount,
diff --git a/fdbserver/TagPartitionedLogSystem.actor.h b/fdbserver/TagPartitionedLogSystem.actor.h
index baf1a467113..bee4eda6fa5 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.h
+++ b/fdbserver/TagPartitionedLogSystem.actor.h
@@ -115,6 +115,10 @@ struct TagPartitionedLogSystem final : ILogSystem, ReferenceCounted<TagPartition
 	// sending a pop for anything less than durableKnownCommittedVersion for the TLog will be absurd.
 	std::map<std::pair<UID, Tag>, std::pair<Version, Version>> outstandingPops;
 
+	// Stores each <log router, tag> pair's last popped version. This is used to determine whether we need to pop an old
+	// generation log router.
+	std::map<std::pair<UID, Tag>, Version> logRouterLastPops;
+
 	Optional<PromiseStream<Future<Void>>> addActor;
 	ActorCollection popActors;
 	std::vector<OldLogData> oldLogData; // each element has the log info. in one old epoch.
@@ -246,7 +250,8 @@ struct TagPartitionedLogSystem final : ILogSystem, ReferenceCounted<TagPartition
 	ACTOR static Future<Void> popFromLog(TagPartitionedLogSystem* self,
 	                                     Reference<AsyncVar<OptionalInterface<TLogInterface>>> log,
 	                                     Tag tag,
-	                                     double time);
+	                                     double delayBeforePop,
+	                                     bool popLogRouter);
 
 	ACTOR static Future<Version> getPoppedFromTLog(Reference<AsyncVar<OptionalInterface<TLogInterface>>> log, Tag tag);
 

From 27963defe83fd951db35673acd425c12f290c974 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Wed, 25 May 2022 16:26:46 -0400
Subject: [PATCH 451/740] cherry pick PR 7199  (#7229)

* put buggigy knob conditionals in standard format

* Fix MAX_WRITE_TRANSACTION_LIFE_VERSIONS initialization.

* fomatting problem
---
 fdbclient/ServerKnobs.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index e1ba2514d7e..1d8aab4194b 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -33,12 +33,14 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( VERSIONS_PER_SECOND,                                   1e6 );
 	init( MAX_VERSIONS_IN_FLIGHT,                100 * VERSIONS_PER_SECOND );
 	init( MAX_VERSIONS_IN_FLIGHT_FORCED,         6e5 * VERSIONS_PER_SECOND ); //one week of versions
-	init( MAX_READ_TRANSACTION_LIFE_VERSIONS,      5 * VERSIONS_PER_SECOND ); if (randomize && BUGGIFY) MAX_READ_TRANSACTION_LIFE_VERSIONS = VERSIONS_PER_SECOND; else if (randomize && BUGGIFY) MAX_READ_TRANSACTION_LIFE_VERSIONS = std::max<int>(1, 0.1 * VERSIONS_PER_SECOND); else if( randomize && BUGGIFY ) MAX_READ_TRANSACTION_LIFE_VERSIONS = 10 * VERSIONS_PER_SECOND;
+	init( ENABLE_VERSION_VECTOR_TLOG_UNICAST,                  false );
+	init( ENABLE_VERSION_VECTOR,                               false );
+
+	bool buggifyShortReadWindow = randomize && BUGGIFY && !ENABLE_VERSION_VECTOR;
+	init( MAX_READ_TRANSACTION_LIFE_VERSIONS,      5 * VERSIONS_PER_SECOND ); if (randomize && BUGGIFY) MAX_READ_TRANSACTION_LIFE_VERSIONS = VERSIONS_PER_SECOND; else if (buggifyShortReadWindow) MAX_READ_TRANSACTION_LIFE_VERSIONS = std::max<int>(1, 0.1 * VERSIONS_PER_SECOND); else if( randomize && BUGGIFY ) MAX_READ_TRANSACTION_LIFE_VERSIONS = 10 * VERSIONS_PER_SECOND;
 	init( MAX_WRITE_TRANSACTION_LIFE_VERSIONS,     5 * VERSIONS_PER_SECOND ); if (randomize && BUGGIFY) MAX_WRITE_TRANSACTION_LIFE_VERSIONS=std::max<int>(1, 1 * VERSIONS_PER_SECOND);
 	init( MAX_COMMIT_BATCH_INTERVAL,                             2.0 ); if( randomize && BUGGIFY ) MAX_COMMIT_BATCH_INTERVAL = 0.5; // Each commit proxy generates a CommitTransactionBatchRequest at least this often, so that versions always advance smoothly
 	MAX_COMMIT_BATCH_INTERVAL = std::min(MAX_COMMIT_BATCH_INTERVAL, MAX_READ_TRANSACTION_LIFE_VERSIONS/double(2*VERSIONS_PER_SECOND)); // Ensure that the proxy commits 2 times every MAX_READ_TRANSACTION_LIFE_VERSIONS, otherwise the master will not give out versions fast enough
-	init( ENABLE_VERSION_VECTOR,                               false );
-	init( ENABLE_VERSION_VECTOR_TLOG_UNICAST,                  false );
 	init( MAX_VERSION_RATE_MODIFIER,                             0.1 );
 	init( MAX_VERSION_RATE_OFFSET,               VERSIONS_PER_SECOND ); // If the calculated version is more than this amount away from the expected version, it will be clamped to this value. This prevents huge version jumps.
 
@@ -456,7 +458,9 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( TXN_STATE_SEND_AMOUNT,                                    4 );
 	init( REPORT_TRANSACTION_COST_ESTIMATION_DELAY,               0.1 );
 	init( PROXY_REJECT_BATCH_QUEUED_TOO_LONG,                    true );
-	init( PROXY_USE_RESOLVER_PRIVATE_MUTATIONS,                 false ); if( !ENABLE_VERSION_VECTOR_TLOG_UNICAST && randomize && BUGGIFY ) PROXY_USE_RESOLVER_PRIVATE_MUTATIONS = deterministicRandom()->coinflip();
+
+	bool buggfyUseResolverPrivateMutations = randomize && BUGGIFY && !ENABLE_VERSION_VECTOR_TLOG_UNICAST;
+	init( PROXY_USE_RESOLVER_PRIVATE_MUTATIONS,                 false ); if( buggfyUseResolverPrivateMutations ) PROXY_USE_RESOLVER_PRIVATE_MUTATIONS = deterministicRandom()->coinflip();
 
 	init( RESET_MASTER_BATCHES,                                   200 );
 	init( RESET_RESOLVER_BATCHES,                                 200 );

From 2d8a9d111cf8e101afe6b011d15158f2d420fb9f Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 25 May 2022 12:08:30 -0700
Subject: [PATCH 452/740] Cherry pick #7244 to release-7.1

---
 fdbclient/PaxosConfigTransaction.actor.cpp | 19 ++++++++++++++-----
 fdbserver/PaxosConfigConsumer.actor.cpp    | 13 ++++++++++---
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/fdbclient/PaxosConfigTransaction.actor.cpp b/fdbclient/PaxosConfigTransaction.actor.cpp
index c9a22cd5de4..4b7c19c05af 100644
--- a/fdbclient/PaxosConfigTransaction.actor.cpp
+++ b/fdbclient/PaxosConfigTransaction.actor.cpp
@@ -44,13 +44,18 @@ class CommitQuorum {
 		} else if (failed >= ctis.size() / 2 + 1 && result.canBeSet()) {
 			// Rollforwards could cause a version that didn't have quorum to
 			// commit, so send commit_unknown_result instead of commit_failed.
-			result.sendError(commit_unknown_result());
+
+			// Calling sendError could delete this
+			auto local = this->result;
+			local.sendError(commit_unknown_result());
 		} else {
 			// Check if it is possible to ever receive quorum agreement
 			auto totalRequestsOutstanding = ctis.size() - (failed + successful + maybeCommitted);
 			if ((failed + totalRequestsOutstanding < ctis.size() / 2 + 1) &&
 			    (successful + totalRequestsOutstanding < ctis.size() / 2 + 1) && result.canBeSet()) {
-				result.sendError(commit_unknown_result());
+				// Calling sendError could delete this
+				auto local = this->result;
+				local.sendError(commit_unknown_result());
 			}
 		}
 	}
@@ -112,7 +117,7 @@ class CommitQuorum {
 		}
 		return result.getFuture();
 	}
-	bool committed() const { return result.isSet(); }
+	bool committed() const { return result.isSet() && !result.isError(); }
 };
 
 class GetGenerationQuorum {
@@ -155,7 +160,9 @@ class GetGenerationQuorum {
 				} else if (self->maxAgreement + (self->ctis.size() - self->totalRepliesReceived) <
 				           (self->ctis.size() / 2 + 1)) {
 					if (!self->result.isError()) {
-						self->result.sendError(failed_to_reach_quorum());
+						// Calling sendError could delete self
+						auto local = self->result;
+						local.sendError(failed_to_reach_quorum());
 					}
 				}
 				break;
@@ -166,7 +173,9 @@ class GetGenerationQuorum {
 					++self->totalRepliesReceived;
 					if (self->totalRepliesReceived == self->ctis.size() && self->result.canBeSet() &&
 					    !self->result.isError()) {
-						self->result.sendError(failed_to_reach_quorum());
+						// Calling sendError could delete self
+						auto local = self->result;
+						local.sendError(failed_to_reach_quorum());
 					}
 					break;
 				} else {
diff --git a/fdbserver/PaxosConfigConsumer.actor.cpp b/fdbserver/PaxosConfigConsumer.actor.cpp
index aee3b83bbe6..d3434ca2eb5 100644
--- a/fdbserver/PaxosConfigConsumer.actor.cpp
+++ b/fdbserver/PaxosConfigConsumer.actor.cpp
@@ -215,11 +215,15 @@ class GetCommittedVersionQuorum {
 			++self->totalRepliesReceived;
 			if (e.code() == error_code_version_already_compacted) {
 				if (self->quorumVersion.canBeSet()) {
-					self->quorumVersion.sendError(e);
+					// Calling sendError could delete self
+					auto local = self->quorumVersion;
+					local.sendError(e);
 				}
 			} else if (e.code() != error_code_timed_out && e.code() != error_code_broken_promise) {
 				if (self->quorumVersion.canBeSet()) {
-					self->quorumVersion.sendError(e);
+					// Calling sendError could delete self
+					auto local = self->quorumVersion;
+					local.sendError(e);
 				}
 			} else if (self->totalRepliesReceived == self->cfis.size() && self->quorumVersion.canBeSet() &&
 			           !self->quorumVersion.isError()) {
@@ -238,7 +242,10 @@ class GetCommittedVersionQuorum {
 				} else if (!self->quorumVersion.isSet()) {
 					// Otherwise, if a quorum agree on the committed version,
 					// some other occurred. Notify the caller of it.
-					self->quorumVersion.sendError(e);
+
+					// Calling sendError could delete self
+					auto local = self->quorumVersion;
+					local.sendError(e);
 				}
 			}
 		}

From 654bd709ae872c238543b075b55b93da523c7a65 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 24 May 2022 11:24:22 -0700
Subject: [PATCH 453/740] Update 7.1.6 and 7.1.7 release notes.

---
 .../sphinx/source/release-notes/release-notes-710.rst  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 0c2ef672afe..b0dbd7c7147 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,16 @@
 Release Notes
 #############
 
+7.1.7
+=====
+* Same as 7.1.6 release with AVX enabled.
+
+7.1.6
+=====
+* Released with AVX disabled.
+* Fixed a fdbserver crash when given invalid knob name. `(PR #7189) <https://github.com/apple/foundationdb/pull/7189>`_
+* Fixed a storage server bug that read data after its failure. `(PR #7217) <https://github.com/apple/foundationdb/pull/7217>`_
+
 7.1.5
 =====
 * Fixed a fdbcli kill bug that was not killing in parallel. `(PR #7150) <https://github.com/apple/foundationdb/pull/7150>`_

From 842ceff6f5c0e2f3e04a035eaea34fee53d51ae7 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Tue, 24 May 2022 22:06:06 -0700
Subject: [PATCH 454/740] Defensive changes to protocol version monitoring.

---
 fdbclient/MonitorLeader.actor.cpp | 26 +++++++++++++++++---------
 fdbclient/NativeAPI.actor.cpp     | 20 +++++++++++++-------
 fdbrpc/FlowTransport.actor.cpp    | 10 ++++++++--
 fdbrpc/FlowTransport.h            |  2 +-
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index 9155091e356..c6950a9d58a 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -890,8 +890,6 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 		state ClientLeaderRegInterface clientLeaderServer = clientLeaderServers[index];
 		state OpenDatabaseCoordRequest req;
 
-		coordinator->set(clientLeaderServer);
-
 		req.clusterKey = cs.clusterKey();
 		req.hostnames = cs.hostnames;
 		req.coordinators = cs.coords;
@@ -922,16 +920,26 @@ ACTOR Future<MonitorLeaderInfo> monitorProxiesOneGeneration(
 			incorrectTime = Optional<double>();
 		}
 
-		state ErrorOr<CachedSerialization<ClientDBInfo>> rep;
+		state Future<ErrorOr<CachedSerialization<ClientDBInfo>>> repFuture;
 		if (clientLeaderServer.hostname.present()) {
-			wait(store(rep,
-			           tryGetReplyFromHostname(req,
-			                                   clientLeaderServer.hostname.get(),
-			                                   WLTOKEN_CLIENTLEADERREG_OPENDATABASE,
-			                                   TaskPriority::CoordinationReply)));
+			repFuture = tryGetReplyFromHostname(req,
+			                                    clientLeaderServer.hostname.get(),
+			                                    WLTOKEN_CLIENTLEADERREG_OPENDATABASE,
+			                                    TaskPriority::CoordinationReply);
 		} else {
-			wait(store(rep, clientLeaderServer.openDatabase.tryGetReply(req, TaskPriority::CoordinationReply)));
+			repFuture = clientLeaderServer.openDatabase.tryGetReply(req, TaskPriority::CoordinationReply);
 		}
+
+		// We need to update the coordinator even if it hasn't changed in case we are establishing a new connection in
+		// FlowTransport. If so, setting the coordinator here forces protocol version monitoring to restart with the new
+		// peer object.
+		//
+		// Both the tryGetReply call and the creation of the ClientLeaderRegInterface above should result in the Peer
+		// object being created in FlowTransport. Having this peer is a prerequisite to us signaling the AsyncVar.
+		coordinator->setUnconditional(clientLeaderServer);
+
+		state ErrorOr<CachedSerialization<ClientDBInfo>> rep = wait(repFuture);
+
 		if (rep.present()) {
 			if (rep.get().read().forward.present()) {
 				TraceEvent("MonitorProxiesForwarding")
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 38b04031efd..c04c7c1760b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -6955,24 +6955,30 @@ ACTOR Future<Optional<ProtocolVersion>> getCoordinatorProtocolFromConnectPacket(
 		coordinatorAddress = coordinator->get().get().getLeader.getEndpoint().getPrimaryAddress();
 	}
 
-	state Reference<AsyncVar<Optional<ProtocolVersion>> const> protocolVersion =
+	state Optional<Reference<AsyncVar<Optional<ProtocolVersion>> const>> protocolVersion =
 	    FlowTransport::transport().getPeerProtocolAsyncVar(coordinatorAddress);
 
+	if (!protocolVersion.present()) {
+		TraceEvent(SevWarnAlways, "GetCoordinatorProtocolPeerMissing").detail("Address", coordinatorAddress);
+		wait(delay(FLOW_KNOBS->CONNECTION_MONITOR_TIMEOUT));
+		return Optional<ProtocolVersion>();
+	}
+
 	loop {
-		if (protocolVersion->get().present() && protocolVersion->get() != expectedVersion) {
-			return protocolVersion->get();
+		if (protocolVersion.get()->get().present() && protocolVersion.get()->get() != expectedVersion) {
+			return protocolVersion.get()->get();
 		}
 
-		Future<Void> change = protocolVersion->onChange();
-		if (!protocolVersion->get().present()) {
+		Future<Void> change = protocolVersion.get()->onChange();
+		if (!protocolVersion.get()->get().present()) {
 			// If we still don't have any connection info after a timeout, retry sending the protocol version request
 			change = timeout(change, FLOW_KNOBS->CONNECTION_MONITOR_TIMEOUT, Void());
 		}
 
 		wait(change);
 
-		if (!protocolVersion->get().present()) {
-			return protocolVersion->get();
+		if (!protocolVersion.get()->get().present()) {
+			return protocolVersion.get()->get();
 		}
 	}
 }
diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 41487ee6c8a..123120f4c0e 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -1781,8 +1781,14 @@ Reference<AsyncVar<bool>> FlowTransport::getDegraded() {
 //
 // Note that this function does not establish a connection to the peer. In order to obtain a peer's protocol
 // version, some other mechanism should be used to connect to that peer.
-Reference<AsyncVar<Optional<ProtocolVersion>> const> FlowTransport::getPeerProtocolAsyncVar(NetworkAddress addr) {
-	return self->peers.at(addr)->protocolVersion;
+Optional<Reference<AsyncVar<Optional<ProtocolVersion>> const>> FlowTransport::getPeerProtocolAsyncVar(
+    NetworkAddress addr) {
+	auto itr = self->peers.find(addr);
+	if (itr != self->peers.end()) {
+		return itr->second->protocolVersion;
+	} else {
+		return Optional<Reference<AsyncVar<Optional<ProtocolVersion>> const>>();
+	}
 }
 
 void FlowTransport::resetConnection(NetworkAddress address) {
diff --git a/fdbrpc/FlowTransport.h b/fdbrpc/FlowTransport.h
index d70b98c4017..1f283a1674e 100644
--- a/fdbrpc/FlowTransport.h
+++ b/fdbrpc/FlowTransport.h
@@ -261,7 +261,7 @@ class FlowTransport {
 	//
 	// Note that this function does not establish a connection to the peer. In order to obtain a peer's protocol
 	// version, some other mechanism should be used to connect to that peer.
-	Reference<AsyncVar<Optional<ProtocolVersion>> const> getPeerProtocolAsyncVar(NetworkAddress addr);
+	Optional<Reference<AsyncVar<Optional<ProtocolVersion>> const>> getPeerProtocolAsyncVar(NetworkAddress addr);
 
 	static FlowTransport& transport() {
 		return *static_cast<FlowTransport*>((void*)g_network->global(INetwork::enFlowTransport));

From dcb337272e7cf8f176cf9b4ad2fddb4a23ee0f3d Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Wed, 25 May 2022 15:14:53 -0700
Subject: [PATCH 455/740] Move the resolve of coordinator hostname from
 getCoordinatorProtocol() to getClusterProtocolImpl().

---
 fdbclient/NativeAPI.actor.cpp | 38 ++++++++++++++---------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index c04c7c1760b..929b9040c0c 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -6925,18 +6925,10 @@ Future<Standalone<StringRef>> Transaction::getVersionstamp() {
 }
 
 // Gets the protocol version reported by a coordinator via the protocol info interface
-ACTOR Future<ProtocolVersion> getCoordinatorProtocol(
-    Reference<AsyncVar<Optional<ClientLeaderRegInterface>> const> coordinator) {
-	state ProtocolInfoReply reply;
-	if (coordinator->get().get().hostname.present()) {
-		wait(store(reply,
-		           retryGetReplyFromHostname(
-		               ProtocolInfoRequest{}, coordinator->get().get().hostname.get(), WLTOKEN_PROTOCOL_INFO)));
-	} else {
-		RequestStream<ProtocolInfoRequest> requestStream(
-		    Endpoint::wellKnown({ coordinator->get().get().getLeader.getEndpoint().addresses }, WLTOKEN_PROTOCOL_INFO));
-		wait(store(reply, retryBrokenPromise(requestStream, ProtocolInfoRequest{})));
-	}
+ACTOR Future<ProtocolVersion> getCoordinatorProtocol(NetworkAddress coordinatorAddress) {
+	RequestStream<ProtocolInfoRequest> requestStream(
+	    Endpoint::wellKnown({ coordinatorAddress }, WLTOKEN_PROTOCOL_INFO));
+	ProtocolInfoReply reply = wait(retryBrokenPromise(requestStream, ProtocolInfoRequest{}));
 	return reply.version;
 }
 
@@ -6945,16 +6937,8 @@ ACTOR Future<ProtocolVersion> getCoordinatorProtocol(
 // function will return with an unset result.
 // If an expected version is given, this future won't return if the actual protocol version matches the expected version
 ACTOR Future<Optional<ProtocolVersion>> getCoordinatorProtocolFromConnectPacket(
-    Reference<AsyncVar<Optional<ClientLeaderRegInterface>> const> coordinator,
+    NetworkAddress coordinatorAddress,
     Optional<ProtocolVersion> expectedVersion) {
-	state NetworkAddress coordinatorAddress;
-	if (coordinator->get().get().hostname.present()) {
-		Hostname h = coordinator->get().get().hostname.get();
-		wait(store(coordinatorAddress, h.resolveWithRetry()));
-	} else {
-		coordinatorAddress = coordinator->get().get().getLeader.getEndpoint().getPrimaryAddress();
-	}
-
 	state Optional<Reference<AsyncVar<Optional<ProtocolVersion>> const>> protocolVersion =
 	    FlowTransport::transport().getPeerProtocolAsyncVar(coordinatorAddress);
 
@@ -6995,10 +6979,18 @@ ACTOR Future<ProtocolVersion> getClusterProtocolImpl(
 		if (!coordinator->get().present()) {
 			wait(coordinator->onChange());
 		} else {
+			state NetworkAddress coordinatorAddress;
+			if (coordinator->get().get().hostname.present()) {
+				Hostname h = coordinator->get().get().hostname.get();
+				wait(store(coordinatorAddress, h.resolveWithRetry()));
+			} else {
+				coordinatorAddress = coordinator->get().get().getLeader.getEndpoint().getPrimaryAddress();
+			}
+
 			if (needToConnect) {
 				// Even though we typically rely on the connect packet to get the protocol version, we need to send some
 				// request in order to start a connection. This protocol version request serves that purpose.
-				protocolVersion = getCoordinatorProtocol(coordinator);
+				protocolVersion = getCoordinatorProtocol(coordinatorAddress);
 				needToConnect = false;
 			}
 			choose {
@@ -7015,7 +7007,7 @@ ACTOR Future<ProtocolVersion> getClusterProtocolImpl(
 				// Older versions of FDB don't have an endpoint to return the protocol version, so we get this info from
 				// the connect packet
 				when(Optional<ProtocolVersion> pv =
-				         wait(getCoordinatorProtocolFromConnectPacket(coordinator, expectedVersion))) {
+				         wait(getCoordinatorProtocolFromConnectPacket(coordinatorAddress, expectedVersion))) {
 					if (pv.present()) {
 						return pv.get();
 					} else {

From 693ac6f541be239b363417a68e8d4676d67fa194 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Wed, 25 May 2022 15:15:47 -0700
Subject: [PATCH 456/740] Guard DNS Cache behind a knob.

---
 fdbrpc/sim2.actor.cpp | 16 ++++++++++------
 flow/Knobs.cpp        |  1 +
 flow/Knobs.h          |  1 +
 flow/Net2.actor.cpp   | 16 ++++++++++------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index fc62d046f1b..7312f6526e9 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -990,9 +990,11 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 		if (mock.present()) {
 			return mock.get();
 		}
-		Optional<std::vector<NetworkAddress>> cache = dnsCache.find(host, service);
-		if (cache.present()) {
-			return cache.get();
+		if (FLOW_KNOBS->ENABLE_COORDINATOR_DNS_CACHE) {
+			Optional<std::vector<NetworkAddress>> cache = dnsCache.find(host, service);
+			if (cache.present()) {
+				return cache.get();
+			}
 		}
 		return SimExternalConnection::resolveTCPEndpoint(host, service, &dnsCache);
 	}
@@ -1012,9 +1014,11 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 		if (mock.present()) {
 			return mock.get();
 		}
-		Optional<std::vector<NetworkAddress>> cache = dnsCache.find(host, service);
-		if (cache.present()) {
-			return cache.get();
+		if (FLOW_KNOBS->ENABLE_COORDINATOR_DNS_CACHE) {
+			Optional<std::vector<NetworkAddress>> cache = dnsCache.find(host, service);
+			if (cache.present()) {
+				return cache.get();
+			}
 		}
 		return SimExternalConnection::resolveTCPEndpointBlocking(host, service, &dnsCache);
 	}
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index 4af76ac6ed2..bfbb3edd02f 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -44,6 +44,7 @@ void FlowKnobs::initialize(Randomize randomize, IsSimulated isSimulated) {
 	init( HOSTNAME_RESOLVE_MAX_INTERVAL,                       1.0 );
 	init( HOSTNAME_RECONNECT_INIT_INTERVAL,                    .05 );
 	init( HOSTNAME_RECONNECT_MAX_INTERVAL,                     1.0 );
+	init( ENABLE_COORDINATOR_DNS_CACHE,                      false ); if( randomize && BUGGIFY ) ENABLE_COORDINATOR_DNS_CACHE = true;
 	init( CACHE_REFRESH_INTERVAL_WHEN_ALL_ALTERNATIVES_FAILED, 1.0 );
 
 	init( DELAY_JITTER_OFFSET,                                 0.9 );
diff --git a/flow/Knobs.h b/flow/Knobs.h
index 8aca2204547..cc069e2941a 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -117,6 +117,7 @@ class FlowKnobs : public KnobsImpl<FlowKnobs> {
 	double HOSTNAME_RESOLVE_MAX_INTERVAL;
 	double HOSTNAME_RECONNECT_INIT_INTERVAL;
 	double HOSTNAME_RECONNECT_MAX_INTERVAL;
+	bool ENABLE_COORDINATOR_DNS_CACHE;
 	double CACHE_REFRESH_INTERVAL_WHEN_ALL_ALTERNATIVES_FAILED;
 
 	double DELAY_JITTER_OFFSET;
diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index 177f9f1b0af..a711ac84f36 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -1899,9 +1899,11 @@ Future<std::vector<NetworkAddress>> Net2::resolveTCPEndpoint(const std::string&
 
 Future<std::vector<NetworkAddress>> Net2::resolveTCPEndpointWithDNSCache(const std::string& host,
                                                                          const std::string& service) {
-	Optional<std::vector<NetworkAddress>> cache = dnsCache.find(host, service);
-	if (cache.present()) {
-		return cache.get();
+	if (FLOW_KNOBS->ENABLE_COORDINATOR_DNS_CACHE) {
+		Optional<std::vector<NetworkAddress>> cache = dnsCache.find(host, service);
+		if (cache.present()) {
+			return cache.get();
+		}
 	}
 	return resolveTCPEndpoint_impl(this, host, service);
 }
@@ -1934,9 +1936,11 @@ std::vector<NetworkAddress> Net2::resolveTCPEndpointBlocking(const std::string&
 
 std::vector<NetworkAddress> Net2::resolveTCPEndpointBlockingWithDNSCache(const std::string& host,
                                                                          const std::string& service) {
-	Optional<std::vector<NetworkAddress>> cache = dnsCache.find(host, service);
-	if (cache.present()) {
-		return cache.get();
+	if (FLOW_KNOBS->ENABLE_COORDINATOR_DNS_CACHE) {
+		Optional<std::vector<NetworkAddress>> cache = dnsCache.find(host, service);
+		if (cache.present()) {
+			return cache.get();
+		}
 	}
 	return resolveTCPEndpointBlocking(host, service);
 }

From 292090bfd0820f9138a2237d94f1212573a82280 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Mon, 23 May 2022 08:44:50 -0700
Subject: [PATCH 457/740] Remove documentation of the tenant prefix
 configuration key.

---
 documentation/sphinx/source/tenants.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/documentation/sphinx/source/tenants.rst b/documentation/sphinx/source/tenants.rst
index 531d956c2f4..4ef41f74b49 100644
--- a/documentation/sphinx/source/tenants.rst
+++ b/documentation/sphinx/source/tenants.rst
@@ -13,8 +13,6 @@ Overview
 
 A tenant in a FoundationDB cluster maps a byte-string name to a key-space that can be used to store data associated with that tenant. This key-space is stored in the clusters global key-space under a prefix assigned to that tenant, with each tenant being assigned a separate non-intersecting prefix.
 
-In addition to being each assigned a separate tenant prefix, tenants can be configured to have a common shared prefix. By default, the shared prefix is empty and tenants are allocated prefixes throughout the normal key-space. To configure an alternate shared prefix, set the ``\xff/tenantDataPrefix`` key to have the desired prefix as the value.
-
 Tenant operations are implicitly confined to the key-space associated with the tenant. It is not necessary for client applications to use or be aware of the prefix assigned to the tenant.
 
 Enabling tenants

From 89ad8fc7d1c596123eeafb4edec7c7fd158f033e Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <82616783+sbodagala@users.noreply.github.com>
Date: Thu, 26 May 2022 16:38:57 -0400
Subject: [PATCH 458/740] Merge pull request #7256 from sbodagala/main

Make sequencer accept the recovery transaction version unconditionally
---
 fdbserver/masterserver.actor.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index 7cb99d8d21d..c555b84e4c8 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -301,18 +301,16 @@ ACTOR Future<Void> updateRecoveryData(Reference<MasterData> self) {
 	loop {
 		UpdateRecoveryDataRequest req = waitNext(self->myInterface.updateRecoveryData.getFuture());
 		TraceEvent("UpdateRecoveryData", self->dbgid)
-		    .detail("RecoveryTxnVersion", req.recoveryTransactionVersion)
-		    .detail("LastEpochEnd", req.lastEpochEnd)
+		    .detail("ReceivedRecoveryTxnVersion", req.recoveryTransactionVersion)
+		    .detail("ReceivedLastEpochEnd", req.lastEpochEnd)
+		    .detail("CurrentRecoveryTxnVersion", self->recoveryTransactionVersion)
+		    .detail("CurrentLastEpochEnd", self->lastEpochEnd)
 		    .detail("NumCommitProxies", req.commitProxies.size())
 		    .detail("VersionEpoch", req.versionEpoch);
 
-		if (self->recoveryTransactionVersion == invalidVersion ||
-		    req.recoveryTransactionVersion > self->recoveryTransactionVersion) {
-			self->recoveryTransactionVersion = req.recoveryTransactionVersion;
-		}
-		if (self->lastEpochEnd == invalidVersion || req.lastEpochEnd > self->lastEpochEnd) {
-			self->lastEpochEnd = req.lastEpochEnd;
-		}
+		self->recoveryTransactionVersion = req.recoveryTransactionVersion;
+		self->lastEpochEnd = req.lastEpochEnd;
+
 		if (req.commitProxies.size() > 0) {
 			self->lastCommitProxyVersionReplies.clear();
 

From 80466e7b56db0e06aa77d686b26526d33ac45cee Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Wed, 27 Apr 2022 15:45:24 -0400
Subject: [PATCH 459/740] Refactor profiling special keys to use GlobalConfig

The special keys `\xff\xff/management/profiling/client_txn_sample_rate`
and `\xff\xff/management/profiling/client_txn_size_limit` are deprecated
in FDB 7.2. However, GlobalConfig was introduced in 7.0, and reading and
writing these keys through the special key space was broken in 7.0+.
This change modifies the profiling special keys to use GlobalConfig
behind the scenes, fixing the broken special keys.

The following Python script was used to make sure both GlobalConfig and
the profiling special key can be used to read/write/clear profiling
data:

```
import fdb
import time

fdb.api_version(710)

@fdb.transactional
def set_sample_rate(tr):
    tr.options.set_special_key_space_enable_writes()
    # Alternative way to write the key
    #tr[b'\xff\xff/global_config/config/fdb_client_info/client_txn_sample_rate'] = fdb.tuple.pack((5.0,))
    tr[b'\xff\xff/management/profiling/client_txn_sample_rate'] = '5.0'

@fdb.transactional
def clear_sample_rate(tr):
    tr.options.set_special_key_space_enable_writes()
    # Alternative way to clear the key
    #tr.clear(b'\xff\xff/global_config/config/fdb_client_info/client_txn_sample_rate')
    tr[b'\xff\xff/management/profiling/client_txn_sample_rate'] = 'default'

@fdb.transactional
def get_sample_rate(tr):
    print(tr.get(b'\xff\xff/global_config/config/fdb_client_info/client_txn_sample_rate'))
    # Alternative way to read the key
    #print(tr.get(b'\xff\xff/management/profiling/client_txn_sample_rate'))

fdb.options.set_trace_enable()
fdb.options.set_trace_format('json')
db = fdb.open()

get_sample_rate(db) # None (or 'default')
set_sample_rate(db)
time.sleep(1)       # Allow time for global config changes to propagate
get_sample_rate(db) # 5.0
clear_sample_rate(db)
time.sleep(1)
get_sample_rate(db) # None (or 'default')
```

It can be run with `PYTHONPATH=./bindings/python/ python profiling.py`,
and reads the `fdb.cluster` file in the current directory.

```
$ PYTHONPATH=./bindings/python/ python sps.py
None
5.000000
None
```
---
 fdbclient/GlobalConfig.actor.cpp      | 27 ++++++++++
 fdbclient/GlobalConfig.actor.h        |  9 ++++
 fdbclient/SpecialKeySpace.actor.cpp   | 77 +++++++++++----------------
 fdbserver/ClusterController.actor.cpp |  2 +-
 4 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index 93b43de0d4f..ee25a2d48e8 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -39,6 +39,33 @@ const KeyRef samplingWindow = LiteralStringRef("visibility/sampling/window");
 
 GlobalConfig::GlobalConfig(const Database& cx) : cx(cx), lastUpdate(0) {}
 
+void GlobalConfig::applyChanges(Transaction& tr,
+                                const VectorRef<KeyValueRef>& insertions,
+                                const VectorRef<KeyRangeRef>& clears) {
+	VersionHistory vh{ 0 };
+	for (const auto& kv : insertions) {
+		vh.mutations.emplace_back_deep(vh.mutations.arena(), MutationRef(MutationRef::SetValue, kv.key, kv.value));
+		tr.set(kv.key.withPrefix(globalConfigKeysPrefix), kv.value);
+	}
+	for (const auto& range : clears) {
+		vh.mutations.emplace_back_deep(vh.mutations.arena(),
+		                               MutationRef(MutationRef::ClearRange, range.begin, range.end));
+		tr.clear(
+		    KeyRangeRef(range.begin.withPrefix(globalConfigKeysPrefix), range.end.withPrefix(globalConfigKeysPrefix)));
+	}
+
+	// Record the mutations in this commit into the global configuration history.
+	Key historyKey = addVersionStampAtEnd(globalConfigHistoryPrefix);
+	ObjectWriter historyWriter(IncludeVersion());
+	historyWriter.serialize(vh);
+	tr.atomicOp(historyKey, historyWriter.toStringRef(), MutationRef::SetVersionstampedKey);
+
+	// Write version key to trigger update in cluster controller.
+	tr.atomicOp(globalConfigVersionKey,
+	            LiteralStringRef("0123456789\x00\x00\x00\x00"), // versionstamp
+	            MutationRef::SetVersionstampedValue);
+}
+
 Key GlobalConfig::prefixedKey(KeyRef key) {
 	return key.withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::GLOBALCONFIG).begin);
 }
diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index 5e430a30375..ce6e154dab3 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -85,6 +85,15 @@ class GlobalConfig : NonCopyable {
 		_forward = forward(db, std::addressof(dbInfoChanged));
 	}
 
+	// Given a list of insertions and clears, applies the necessary changes to
+	// the given transaction to update the global configuration database. Keys
+	// in the list of mutations should not include the global configuration
+	// prefix (`\xff\xff/global_config/`). The caller must still commit the
+	// given transaction in order to persist the changes.
+	static void applyChanges(Transaction& tr,
+	                         const VectorRef<KeyValueRef>& insertions,
+	                         const VectorRef<KeyRangeRef>& clears);
+
 	// Use this function to turn a global configuration key defined above into
 	// the full path needed to set the value in the database.
 	//
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 52b9247693f..408d0ba608f 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -1515,7 +1515,8 @@ ACTOR Future<Optional<std::string>> globalConfigCommitActor(GlobalConfigImpl* gl
 		}
 	}
 
-	VersionHistory vh{ 0 };
+	Standalone<VectorRef<KeyValueRef>> insertions;
+	Standalone<VectorRef<KeyRangeRef>> clears;
 
 	// Transform writes from the special-key-space (\xff\xff/global_config/) to
 	// the system key space (\xff/globalConfig/), and writes mutations to
@@ -1528,36 +1529,17 @@ ACTOR Future<Optional<std::string>> globalConfigCommitActor(GlobalConfigImpl* gl
 		if (entry.first) {
 			if (entry.second.present() && iter->begin().startsWith(globalConfig->getKeyRange().begin)) {
 				Key bareKey = iter->begin().removePrefix(globalConfig->getKeyRange().begin);
-				vh.mutations.emplace_back_deep(vh.mutations.arena(),
-				                               MutationRef(MutationRef::SetValue, bareKey, entry.second.get()));
-
-				Key systemKey = bareKey.withPrefix(globalConfigKeysPrefix);
-				tr.set(systemKey, entry.second.get());
+				insertions.push_back_deep(insertions.arena(), KeyValueRef(bareKey, entry.second.get()));
 			} else if (!entry.second.present() && iter->range().begin.startsWith(globalConfig->getKeyRange().begin) &&
 			           iter->range().end.startsWith(globalConfig->getKeyRange().begin)) {
 				KeyRef bareRangeBegin = iter->range().begin.removePrefix(globalConfig->getKeyRange().begin);
 				KeyRef bareRangeEnd = iter->range().end.removePrefix(globalConfig->getKeyRange().begin);
-				vh.mutations.emplace_back_deep(vh.mutations.arena(),
-				                               MutationRef(MutationRef::ClearRange, bareRangeBegin, bareRangeEnd));
-
-				Key systemRangeBegin = bareRangeBegin.withPrefix(globalConfigKeysPrefix);
-				Key systemRangeEnd = bareRangeEnd.withPrefix(globalConfigKeysPrefix);
-				tr.clear(KeyRangeRef(systemRangeBegin, systemRangeEnd));
+				clears.push_back_deep(clears.arena(), KeyRangeRef(bareRangeBegin, bareRangeEnd));
 			}
 		}
 		++iter;
 	}
-
-	// Record the mutations in this commit into the global configuration history.
-	Key historyKey = addVersionStampAtEnd(globalConfigHistoryPrefix);
-	ObjectWriter historyWriter(IncludeVersion());
-	historyWriter.serialize(vh);
-	tr.atomicOp(historyKey, historyWriter.toStringRef(), MutationRef::SetVersionstampedKey);
-
-	// Write version key to trigger update in cluster controller.
-	tr.atomicOp(globalConfigVersionKey,
-	            LiteralStringRef("0123456789\x00\x00\x00\x00"), // versionstamp
-	            MutationRef::SetVersionstampedValue);
+	GlobalConfig::applyChanges(tr, insertions, clears);
 
 	return Optional<std::string>();
 }
@@ -1966,13 +1948,11 @@ ACTOR static Future<RangeResult> ClientProfilingGetRangeActor(ReadYourWritesTran
 			ASSERT(entry.second.present());
 			result.push_back_deep(result.arena(), KeyValueRef(sampleRateKey, entry.second.get()));
 		} else {
-			Optional<Value> f = wait(ryw->getTransaction().get(fdbClientInfoTxnSampleRate));
 			std::string sampleRateStr = "default";
-			if (f.present()) {
-				const double sampleRateDbl = BinaryReader::fromStringRef<double>(f.get(), Unversioned());
-				if (!std::isinf(sampleRateDbl)) {
-					sampleRateStr = boost::lexical_cast<std::string>(sampleRateDbl);
-				}
+			const double sampleRateDbl = ryw->getDatabase()->globalConfig->get<double>(
+			    fdbClientInfoTxnSampleRate, std::numeric_limits<double>::infinity());
+			if (!std::isinf(sampleRateDbl)) {
+				sampleRateStr = std::to_string(sampleRateDbl);
 			}
 			result.push_back_deep(result.arena(), KeyValueRef(sampleRateKey, Value(sampleRateStr)));
 		}
@@ -1986,13 +1966,10 @@ ACTOR static Future<RangeResult> ClientProfilingGetRangeActor(ReadYourWritesTran
 			ASSERT(entry.second.present());
 			result.push_back_deep(result.arena(), KeyValueRef(txnSizeLimitKey, entry.second.get()));
 		} else {
-			Optional<Value> f = wait(ryw->getTransaction().get(fdbClientInfoTxnSizeLimit));
 			std::string sizeLimitStr = "default";
-			if (f.present()) {
-				const int64_t sizeLimit = BinaryReader::fromStringRef<int64_t>(f.get(), Unversioned());
-				if (sizeLimit != -1) {
-					sizeLimitStr = boost::lexical_cast<std::string>(sizeLimit);
-				}
+			const int64_t sizeLimit = ryw->getDatabase()->globalConfig->get<int64_t>(fdbClientInfoTxnSizeLimit, -1);
+			if (sizeLimit != -1) {
+				sizeLimitStr = boost::lexical_cast<std::string>(sizeLimit);
 			}
 			result.push_back_deep(result.arena(), KeyValueRef(txnSizeLimitKey, Value(sizeLimitStr)));
 		}
@@ -2010,43 +1987,49 @@ Future<RangeResult> ClientProfilingImpl::getRange(ReadYourWritesTransaction* ryw
 Future<Optional<std::string>> ClientProfilingImpl::commit(ReadYourWritesTransaction* ryw) {
 	ryw->getTransaction().setOption(FDBTransactionOptions::RAW_ACCESS);
 
+	Standalone<VectorRef<KeyValueRef>> insertions;
+	Standalone<VectorRef<KeyRangeRef>> clears;
+
 	// client_txn_sample_rate
 	Key sampleRateKey = LiteralStringRef("client_txn_sample_rate").withPrefix(getKeyRange().begin);
 	auto rateEntry = ryw->getSpecialKeySpaceWriteMap()[sampleRateKey];
 
 	if (rateEntry.first && rateEntry.second.present()) {
 		std::string sampleRateStr = rateEntry.second.get().toString();
-		double sampleRate;
-		if (sampleRateStr == "default")
-			sampleRate = std::numeric_limits<double>::infinity();
-		else {
+		if (sampleRateStr == "default") {
+			clears.push_back_deep(clears.arena(),
+			                      KeyRangeRef(fdbClientInfoTxnSampleRate, keyAfter(fdbClientInfoTxnSampleRate)));
+		} else {
 			try {
-				sampleRate = boost::lexical_cast<double>(sampleRateStr);
+				double sampleRate = boost::lexical_cast<double>(sampleRateStr);
+				Tuple rate = Tuple().appendDouble(sampleRate);
+				insertions.push_back_deep(insertions.arena(), KeyValueRef(fdbClientInfoTxnSampleRate, rate.pack()));
 			} catch (boost::bad_lexical_cast& e) {
 				return Optional<std::string>(ManagementAPIError::toJsonString(
 				    false, "profile", "Invalid transaction sample rate(double): " + sampleRateStr));
 			}
 		}
-		ryw->getTransaction().set(fdbClientInfoTxnSampleRate, BinaryWriter::toValue(sampleRate, Unversioned()));
 	}
 	// client_txn_size_limit
 	Key txnSizeLimitKey = LiteralStringRef("client_txn_size_limit").withPrefix(getKeyRange().begin);
 	auto sizeLimitEntry = ryw->getSpecialKeySpaceWriteMap()[txnSizeLimitKey];
 	if (sizeLimitEntry.first && sizeLimitEntry.second.present()) {
 		std::string sizeLimitStr = sizeLimitEntry.second.get().toString();
-		int64_t sizeLimit;
-		if (sizeLimitStr == "default")
-			sizeLimit = -1;
-		else {
+		if (sizeLimitStr == "default") {
+			clears.push_back_deep(clears.arena(),
+			                      KeyRangeRef(fdbClientInfoTxnSizeLimit, keyAfter(fdbClientInfoTxnSizeLimit)));
+		} else {
 			try {
-				sizeLimit = boost::lexical_cast<int64_t>(sizeLimitStr);
+				int64_t sizeLimit = boost::lexical_cast<int64_t>(sizeLimitStr);
+				Tuple size = Tuple().append(sizeLimit);
+				insertions.push_back_deep(insertions.arena(), KeyValueRef(fdbClientInfoTxnSizeLimit, size.pack()));
 			} catch (boost::bad_lexical_cast& e) {
 				return Optional<std::string>(ManagementAPIError::toJsonString(
 				    false, "profile", "Invalid transaction size limit(int64_t): " + sizeLimitStr));
 			}
 		}
-		ryw->getTransaction().set(fdbClientInfoTxnSizeLimit, BinaryWriter::toValue(sizeLimit, Unversioned()));
 	}
+	GlobalConfig::applyChanges(ryw->getTransaction(), insertions, clears);
 	return Optional<std::string>();
 }
 
diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 911d1e68649..7715c9a8c10 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -3167,4 +3167,4 @@ TEST_CASE("/fdbserver/clustercontroller/shouldTriggerFailoverDueToDegradedServer
 	return Void();
 }
 
-} // namespace
\ No newline at end of file
+} // namespace

From f0abb0b476fb42f2a05431dfd25545c145493f7d Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 16 May 2022 16:50:50 -0700
Subject: [PATCH 460/740] Add retry loop

---
 fdbclient/GlobalConfig.actor.cpp | 95 ++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 40 deletions(-)

diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index ee25a2d48e8..4682cb523ba 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -155,45 +155,52 @@ void GlobalConfig::erase(KeyRangeRef range) {
 // function performs a one-time migration of data in these keys to the new
 // global configuration key space.
 ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
-	state Reference<ReadYourWritesTransaction> tr = makeReference<ReadYourWritesTransaction>(self->cx);
-	tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
-
-	state Key migratedKey("\xff\x02/fdbClientInfo/migrated/"_sr);
-	state Optional<Value> migrated = wait(tr->get(migratedKey));
-	if (migrated.present()) {
-		// Already performed migration.
-		return Void();
-	}
+	state Reference<ReadYourWritesTransaction> tr;
+	try {
+		loop {
+			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(self->cx)));
+			wait(delay(0));
+			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
+
+			try {
+				state Key migratedKey("\xff\x02/fdbClientInfo/migrated/"_sr);
+				state Optional<Value> migrated = wait(tr->get(migratedKey));
+				if (migrated.present()) {
+					// Already performed migration.
+					return Void();
+				}
 
-	state Optional<Value> sampleRate = wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_sample_rate/"_sr)));
-	state Optional<Value> sizeLimit = wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_size_limit/"_sr)));
+				state Optional<Value> sampleRate =
+				    wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_sample_rate/"_sr)));
+				state Optional<Value> sizeLimit =
+				    wait(tr->get(Key("\xff\x02/fdbClientInfo/client_txn_size_limit/"_sr)));
+
+				tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
+				// The value doesn't matter too much, as long as the key is set.
+				tr->set(migratedKey.contents(), "1"_sr);
+				if (sampleRate.present()) {
+					const double sampleRateDbl =
+					    BinaryReader::fromStringRef<double>(sampleRate.get().contents(), Unversioned());
+					Tuple rate = Tuple().appendDouble(sampleRateDbl);
+					tr->set(GlobalConfig::prefixedKey(fdbClientInfoTxnSampleRate), rate.pack());
+				}
+				if (sizeLimit.present()) {
+					const int64_t sizeLimitInt =
+					    BinaryReader::fromStringRef<int64_t>(sizeLimit.get().contents(), Unversioned());
+					Tuple size = Tuple().append(sizeLimitInt);
+					tr->set(GlobalConfig::prefixedKey(fdbClientInfoTxnSizeLimit), size.pack());
+				}
 
-	try {
-		tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
-		// The value doesn't matter too much, as long as the key is set.
-		tr->set(migratedKey.contents(), "1"_sr);
-		if (sampleRate.present()) {
-			const double sampleRateDbl =
-			    BinaryReader::fromStringRef<double>(sampleRate.get().contents(), Unversioned());
-			Tuple rate = Tuple().appendDouble(sampleRateDbl);
-			tr->set(GlobalConfig::prefixedKey(fdbClientInfoTxnSampleRate), rate.pack());
-		}
-		if (sizeLimit.present()) {
-			const int64_t sizeLimitInt =
-			    BinaryReader::fromStringRef<int64_t>(sizeLimit.get().contents(), Unversioned());
-			Tuple size = Tuple().append(sizeLimitInt);
-			tr->set(GlobalConfig::prefixedKey(fdbClientInfoTxnSizeLimit), size.pack());
+				wait(tr->commit());
+				break;
+			} catch (Error& e) {
+				TraceEvent(SevInfo, "GlobalConfig_MigrationError").error(e);
+				wait(tr->onError(e));
+			}
 		}
-
-		wait(tr->commit());
 	} catch (Error& e) {
-		// If multiple fdbserver processes are started at once, they will all
-		// attempt this migration at the same time, sometimes resulting in
-		// aborts due to conflicts. Purposefully avoid retrying, making this
-		// migration best-effort.
-		TraceEvent(SevInfo, "GlobalConfig_MigrationError").detail("What", e.what());
+		// Catch non-retryable errors (and do nothing).
 	}
-
 	return Void();
 }
 
@@ -203,12 +210,20 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 	// TraceEvent trace(SevInfo, "GlobalConfig_Refresh");
 	self->erase(KeyRangeRef(""_sr, "\xff"_sr));
 
-	Transaction tr(self->cx);
-	tr.setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
-	RangeResult result = wait(tr.getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY));
-	for (const auto& kv : result) {
-		KeyRef systemKey = kv.key.removePrefix(globalConfigKeysPrefix);
-		self->insert(systemKey, kv.value);
+	state Transaction tr(self->cx);
+	loop {
+		try {
+			tr.setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
+			RangeResult result = wait(tr.getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY));
+			for (const auto& kv : result) {
+				KeyRef systemKey = kv.key.removePrefix(globalConfigKeysPrefix);
+				self->insert(systemKey, kv.value);
+			}
+			break;
+		} catch (Error& e) {
+			TraceEvent("GlobalConfigRefreshError").errorUnsuppressed(e).suppressFor(1.0);
+			wait(tr.onError(e));
+		}
 	}
 	return Void();
 }

From a4c3f64efa5b63f171814ee72de2696cdc49da07 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 16 May 2022 16:53:21 -0700
Subject: [PATCH 461/740] Initialize GlobalConfig on Database clone

---
 fdbclient/DatabaseContext.h    | 30 ++++++++++++++++--------------
 fdbclient/GlobalConfig.actor.h |  1 -
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index df3904d23eb..097f22d37dc 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -23,6 +23,7 @@
 #include "fdbclient/Notified.h"
 #include "flow/FastAlloc.h"
 #include "flow/FastRef.h"
+#include "fdbclient/GlobalConfig.actor.h"
 #include "fdbclient/StorageServerInterface.h"
 #include "flow/genericactors.actor.h"
 #include <vector>
@@ -222,8 +223,6 @@ struct KeyRangeLocationInfo {
 	  : tenantEntry(tenantEntry), range(range), locations(locations) {}
 };
 
-class GlobalConfig;
-
 class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAllocated<DatabaseContext>, NonCopyable {
 public:
 	static DatabaseContext* allocateOnForeignThread() {
@@ -245,18 +244,21 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 
 	// Constructs a new copy of this DatabaseContext from the parameters of this DatabaseContext
 	Database clone() const {
-		return Database(new DatabaseContext(connectionRecord,
-		                                    clientInfo,
-		                                    coordinator,
-		                                    clientInfoMonitor,
-		                                    taskID,
-		                                    clientLocality,
-		                                    enableLocalityLoadBalance,
-		                                    lockAware,
-		                                    internal,
-		                                    apiVersion,
-		                                    switchable,
-		                                    defaultTenant));
+		Database cx = Database(new DatabaseContext(connectionRecord,
+		                                           clientInfo,
+		                                           coordinator,
+		                                           clientInfoMonitor,
+		                                           taskID,
+		                                           clientLocality,
+		                                           enableLocalityLoadBalance,
+		                                           lockAware,
+		                                           internal,
+		                                           apiVersion,
+		                                           switchable,
+		                                           defaultTenant));
+		cx->globalConfig->init(Reference<AsyncVar<ClientDBInfo> const>(cx->clientInfo),
+		                       std::addressof(cx->clientInfo->get()));
+		return cx;
 	}
 
 	Optional<KeyRangeLocationInfo> getCachedLocation(const Optional<TenantName>& tenant,
diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index ce6e154dab3..b2a0d70634d 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -33,7 +33,6 @@
 #include <unordered_map>
 
 #include "fdbclient/CommitProxyInterface.h"
-#include "fdbclient/DatabaseContext.h"
 #include "fdbclient/GlobalConfig.h"
 #include "fdbclient/ReadYourWrites.h"
 

From 2766a42c5d3d4eb300d05194d432438a36f03654 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 16 May 2022 17:23:09 -0700
Subject: [PATCH 462/740] Fix reference cycle in GlobalConfig

---
 fdbclient/GlobalConfig.actor.cpp | 12 +++++++-----
 fdbclient/GlobalConfig.actor.h   |  6 +++---
 fdbclient/NativeAPI.actor.cpp    |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index 4682cb523ba..f643d2cd488 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -37,7 +37,7 @@ const KeyRef transactionTagSampleCost = LiteralStringRef("config/transaction_tag
 const KeyRef samplingFrequency = LiteralStringRef("visibility/sampling/frequency");
 const KeyRef samplingWindow = LiteralStringRef("visibility/sampling/window");
 
-GlobalConfig::GlobalConfig(const Database& cx) : cx(cx), lastUpdate(0) {}
+GlobalConfig::GlobalConfig(DatabaseContext* cx) : cx(cx), lastUpdate(0) {}
 
 void GlobalConfig::applyChanges(Transaction& tr,
                                 const VectorRef<KeyValueRef>& insertions,
@@ -210,11 +210,13 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 	// TraceEvent trace(SevInfo, "GlobalConfig_Refresh");
 	self->erase(KeyRangeRef(""_sr, "\xff"_sr));
 
-	state Transaction tr(self->cx);
+	state Reference<ReadYourWritesTransaction> tr;
 	loop {
 		try {
-			tr.setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
-			RangeResult result = wait(tr.getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY));
+			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(self->cx)));
+			wait(delay(0));
+			tr->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
+			RangeResult result = wait(tr->getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY));
 			for (const auto& kv : result) {
 				KeyRef systemKey = kv.key.removePrefix(globalConfigKeysPrefix);
 				self->insert(systemKey, kv.value);
@@ -222,7 +224,7 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 			break;
 		} catch (Error& e) {
 			TraceEvent("GlobalConfigRefreshError").errorUnsuppressed(e).suppressFor(1.0);
-			wait(tr.onError(e));
+			wait(tr->onError(e));
 		}
 	}
 	return Void();
diff --git a/fdbclient/GlobalConfig.actor.h b/fdbclient/GlobalConfig.actor.h
index b2a0d70634d..c7757b68744 100644
--- a/fdbclient/GlobalConfig.actor.h
+++ b/fdbclient/GlobalConfig.actor.h
@@ -66,9 +66,9 @@ struct ConfigValue : ReferenceCounted<ConfigValue> {
 
 class GlobalConfig : NonCopyable {
 public:
-	// Requires a database object to allow global configuration to run
+	// Requires a database pointer to allow global configuration to run
 	// transactions on the database.
-	explicit GlobalConfig(const Database& cx);
+	explicit GlobalConfig(DatabaseContext* cx);
 
 	// Requires an AsyncVar object to watch for changes on. The ClientDBInfo pointer
 	// should point to a ClientDBInfo object which will contain the updated
@@ -167,7 +167,7 @@ class GlobalConfig : NonCopyable {
 	ACTOR static Future<Void> refresh(GlobalConfig* self);
 	ACTOR static Future<Void> updater(GlobalConfig* self, const ClientDBInfo* dbInfo);
 
-	Database cx;
+	DatabaseContext* cx;
 	AsyncTrigger dbInfoChanged;
 	Future<Void> _forward;
 	Future<Void> _updater;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 929b9040c0c..8c54a1d4f17 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1475,7 +1475,7 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
 	cacheListMonitor = monitorCacheList(this);
 
 	smoothMidShardSize.reset(CLIENT_KNOBS->INIT_MID_SHARD_BYTES);
-	globalConfig = std::make_unique<GlobalConfig>(Database(this));
+	globalConfig = std::make_unique<GlobalConfig>(this);
 
 	if (apiVersionAtLeast(710)) {
 		registerSpecialKeySpaceModule(

From b9a0a92e12667f9cdc4c934c524c8d7b2edea713 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 16 May 2022 16:55:00 -0700
Subject: [PATCH 463/740] Modify workload to use GlobalConfig for profiling
 keys

---
 .../SpecialKeySpaceCorrectness.actor.cpp      | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
index 261076e2428..b1b326b56ac 100644
--- a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
+++ b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
@@ -645,6 +645,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 		// All management api related tests
 		state Database cx = cx_->clone();
 		state Reference<ReadYourWritesTransaction> tx = makeReference<ReadYourWritesTransaction>(cx);
+		wait(cx->globalConfig->onInitialized());
 		// test ordered option keys
 		{
 			tx->setOption(FDBTransactionOptions::RAW_ACCESS);
@@ -1181,7 +1182,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 				    wait(tx->get(LiteralStringRef("client_txn_sample_rate")
 				                     .withPrefix(SpecialKeySpace::getManagementApiCommandPrefix("profile"))));
 				ASSERT(txnSampleRate.present());
-				Optional<Value> txnSampleRateKey = wait(tx->get(fdbClientInfoTxnSampleRate));
+				Optional<Value> txnSampleRateKey = wait(tx->get(GlobalConfig::prefixedKey(fdbClientInfoTxnSampleRate)));
 				if (txnSampleRateKey.present()) {
 					const double sampleRateDbl =
 					    BinaryReader::fromStringRef<double>(txnSampleRateKey.get(), Unversioned());
@@ -1198,7 +1199,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 				    wait(tx->get(LiteralStringRef("client_txn_size_limit")
 				                     .withPrefix(SpecialKeySpace::getManagementApiCommandPrefix("profile"))));
 				ASSERT(txnSizeLimit.present());
-				Optional<Value> txnSizeLimitKey = wait(tx->get(fdbClientInfoTxnSizeLimit));
+				Optional<Value> txnSizeLimitKey = wait(tx->get(GlobalConfig::prefixedKey(fdbClientInfoTxnSizeLimit)));
 				if (txnSizeLimitKey.present()) {
 					const int64_t sizeLimit =
 					    BinaryReader::fromStringRef<int64_t>(txnSizeLimitKey.get(), Unversioned());
@@ -1241,13 +1242,18 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 			// commit successfully, verify the system key changed
 			loop {
 				try {
-					tx->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
-					Optional<Value> sampleRate = wait(tx->get(fdbClientInfoTxnSampleRate));
+					state Optional<Value> sampleRate =
+					    wait(tx->get(GlobalConfig::prefixedKey(fdbClientInfoTxnSampleRate)));
+					if (!sampleRate.present()) {
+						// Wait for GlobalConfig synchronization
+						wait(delayJittered(1.0));
+						continue;
+					}
 					ASSERT(sampleRate.present());
-					ASSERT(r_sample_rate == BinaryReader::fromStringRef<double>(sampleRate.get(), Unversioned()));
-					Optional<Value> sizeLimit = wait(tx->get(fdbClientInfoTxnSizeLimit));
+					ASSERT_LT(r_sample_rate - boost::lexical_cast<double>(sampleRate.get().toString()), 0.001);
+					Optional<Value> sizeLimit = wait(tx->get(GlobalConfig::prefixedKey(fdbClientInfoTxnSizeLimit)));
 					ASSERT(sizeLimit.present());
-					ASSERT(r_size_limit == BinaryReader::fromStringRef<int64_t>(sizeLimit.get(), Unversioned()));
+					ASSERT(r_size_limit == boost::lexical_cast<int64_t>(sizeLimit.get().toString()));
 					tx->reset();
 					break;
 				} catch (Error& e) {

From 79dd2345bc6f9a32531ceea681b65c74ecc04a81 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 23 May 2022 11:56:37 -0700
Subject: [PATCH 464/740] Always restart updater

---
 fdbclient/GlobalConfig.actor.cpp | 100 ++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 41 deletions(-)

diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index f643d2cd488..78c42dd4045 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -155,15 +155,14 @@ void GlobalConfig::erase(KeyRangeRef range) {
 // function performs a one-time migration of data in these keys to the new
 // global configuration key space.
 ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
+	state Key migratedKey("\xff\x02/fdbClientInfo/migrated/"_sr);
 	state Reference<ReadYourWritesTransaction> tr;
 	try {
 		loop {
 			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(self->cx)));
-			wait(delay(0));
 			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
 
 			try {
-				state Key migratedKey("\xff\x02/fdbClientInfo/migrated/"_sr);
 				state Optional<Value> migrated = wait(tr->get(migratedKey));
 				if (migrated.present()) {
 					// Already performed migration.
@@ -194,12 +193,19 @@ ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
 				wait(tr->commit());
 				break;
 			} catch (Error& e) {
-				TraceEvent(SevInfo, "GlobalConfig_MigrationError").error(e);
+				// If multiple fdbserver processes are started at once, they will all
+				// attempt this migration at the same time, sometimes resulting in
+				// aborts due to conflicts. Purposefully avoid retrying, making this
+				// migration best-effort.
+				TraceEvent(SevInfo, "GlobalConfig_RetryableMigrationError").error(e);
 				wait(tr->onError(e));
+				tr.clear();
+				wait(delay(0));
 			}
 		}
 	} catch (Error& e) {
 		// Catch non-retryable errors (and do nothing).
+		TraceEvent(SevWarnAlways, "GlobalConfig_MigrationError").error(e);
 	}
 	return Void();
 }
@@ -214,7 +220,6 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 	loop {
 		try {
 			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(self->cx)));
-			wait(delay(0));
 			tr->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);
 			RangeResult result = wait(tr->getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY));
 			for (const auto& kv : result) {
@@ -225,6 +230,8 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 		} catch (Error& e) {
 			TraceEvent("GlobalConfigRefreshError").errorUnsuppressed(e).suppressFor(1.0);
 			wait(tr->onError(e));
+			tr.clear();
+			wait(delay(0));
 		}
 	}
 	return Void();
@@ -233,56 +240,67 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 // Applies updates to the local copy of the global configuration when this
 // process receives an updated history.
 ACTOR Future<Void> GlobalConfig::updater(GlobalConfig* self, const ClientDBInfo* dbInfo) {
-	wait(self->cx->onConnected());
-	wait(self->migrate(self));
-
-	wait(self->refresh(self));
-	self->initialized.send(Void());
-
 	loop {
 		try {
-			wait(self->dbInfoChanged.onTrigger());
+			if (self->initialized.canBeSet()) {
+				wait(self->cx->onConnected());
+				wait(self->migrate(self));
 
-			auto& history = dbInfo->history;
-			if (history.size() == 0) {
-				continue;
+				wait(self->refresh(self));
+				self->initialized.send(Void());
 			}
 
-			if (self->lastUpdate < history[0].version) {
-				// This process missed too many global configuration
-				// history updates or the protocol version changed, so it
-				// must re-read the entire configuration range.
-				wait(self->refresh(self));
-				if (dbInfo->history.size() > 0) {
-					self->lastUpdate = dbInfo->history.back().version;
-				}
-			} else {
-				// Apply history in order, from lowest version to highest
-				// version. Mutation history should already be stored in
-				// ascending version order.
-				for (const auto& vh : history) {
-					if (vh.version <= self->lastUpdate) {
-						continue; // already applied this mutation
+			loop {
+				try {
+					wait(self->dbInfoChanged.onTrigger());
+
+					auto& history = dbInfo->history;
+					if (history.size() == 0) {
+						continue;
 					}
 
-					for (const auto& mutation : vh.mutations.contents()) {
-						if (mutation.type == MutationRef::SetValue) {
-							self->insert(mutation.param1, mutation.param2);
-						} else if (mutation.type == MutationRef::ClearRange) {
-							self->erase(KeyRangeRef(mutation.param1, mutation.param2));
-						} else {
-							ASSERT(false);
+					if (self->lastUpdate < history[0].version) {
+						// This process missed too many global configuration
+						// history updates or the protocol version changed, so it
+						// must re-read the entire configuration range.
+						wait(self->refresh(self));
+						if (dbInfo->history.size() > 0) {
+							self->lastUpdate = dbInfo->history.back().version;
+						}
+					} else {
+						// Apply history in order, from lowest version to highest
+						// version. Mutation history should already be stored in
+						// ascending version order.
+						for (const auto& vh : history) {
+							if (vh.version <= self->lastUpdate) {
+								continue; // already applied this mutation
+							}
+
+							for (const auto& mutation : vh.mutations.contents()) {
+								if (mutation.type == MutationRef::SetValue) {
+									self->insert(mutation.param1, mutation.param2);
+								} else if (mutation.type == MutationRef::ClearRange) {
+									self->erase(KeyRangeRef(mutation.param1, mutation.param2));
+								} else {
+									ASSERT(false);
+								}
+							}
+
+							ASSERT(vh.version > self->lastUpdate);
+							self->lastUpdate = vh.version;
 						}
 					}
 
-					ASSERT(vh.version > self->lastUpdate);
-					self->lastUpdate = vh.version;
+					self->configChanged.trigger();
+				} catch (Error& e) {
+					throw;
 				}
 			}
-
-			self->configChanged.trigger();
 		} catch (Error& e) {
-			throw;
+			// There shouldn't be any uncaught errors that fall to this point,
+			// but in case there are, catch them and restart the updater.
+			TraceEvent("GlobalConfigUpdaterError").error(e);
+			wait(delay(1.0));
 		}
 	}
 }

From d19da689630c0c2bf58f24a17b296aaf52768db4 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Mon, 23 May 2022 13:02:17 -0700
Subject: [PATCH 465/740] Remove actor for client profiling get range

Since the client profiling special key range now uses global config,
there is no longer any `wait` required.
---
 fdbclient/SpecialKeySpace.actor.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index 408d0ba608f..bace6d7b8fd 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -1932,12 +1932,13 @@ Future<Optional<std::string>> VersionEpochImpl::commit(ReadYourWritesTransaction
 
 ClientProfilingImpl::ClientProfilingImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
 
-ACTOR static Future<RangeResult> ClientProfilingGetRangeActor(ReadYourWritesTransaction* ryw,
-                                                              KeyRef prefix,
-                                                              KeyRangeRef kr) {
-	state RangeResult result;
+Future<RangeResult> ClientProfilingImpl::getRange(ReadYourWritesTransaction* ryw,
+                                                  KeyRangeRef kr,
+                                                  GetRangeLimits limitsHint) const {
+	KeyRef prefix = getKeyRange().begin;
+	RangeResult result = RangeResult();
 	// client_txn_sample_rate
-	state Key sampleRateKey = LiteralStringRef("client_txn_sample_rate").withPrefix(prefix);
+	Key sampleRateKey = LiteralStringRef("client_txn_sample_rate").withPrefix(prefix);
 
 	ryw->getTransaction().setOption(FDBTransactionOptions::RAW_ACCESS);
 
@@ -1958,7 +1959,7 @@ ACTOR static Future<RangeResult> ClientProfilingGetRangeActor(ReadYourWritesTran
 		}
 	}
 	// client_txn_size_limit
-	state Key txnSizeLimitKey = LiteralStringRef("client_txn_size_limit").withPrefix(prefix);
+	Key txnSizeLimitKey = LiteralStringRef("client_txn_size_limit").withPrefix(prefix);
 	if (kr.contains(txnSizeLimitKey)) {
 		auto entry = ryw->getSpecialKeySpaceWriteMap()[txnSizeLimitKey];
 		if (!ryw->readYourWritesDisabled() && entry.first) {
@@ -1977,13 +1978,6 @@ ACTOR static Future<RangeResult> ClientProfilingGetRangeActor(ReadYourWritesTran
 	return result;
 }
 
-// TODO : add limitation on set operation
-Future<RangeResult> ClientProfilingImpl::getRange(ReadYourWritesTransaction* ryw,
-                                                  KeyRangeRef kr,
-                                                  GetRangeLimits limitsHint) const {
-	return ClientProfilingGetRangeActor(ryw, getKeyRange().begin, kr);
-}
-
 Future<Optional<std::string>> ClientProfilingImpl::commit(ReadYourWritesTransaction* ryw) {
 	ryw->getTransaction().setOption(FDBTransactionOptions::RAW_ACCESS);
 

From b450623fa0a2f8e7bb4a160512655b0fca2cce5a Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Fri, 8 Apr 2022 10:33:23 +0100
Subject: [PATCH 466/740] Add support for the reboot command in go bindings

---
 bindings/go/README.md           |  1 -
 bindings/go/src/fdb/database.go | 27 +++++++++++++++++++++++++++
 bindings/go/src/fdb/fdb_test.go |  3 +--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/bindings/go/README.md b/bindings/go/README.md
index 87bf502d361..31000c3ea19 100644
--- a/bindings/go/README.md
+++ b/bindings/go/README.md
@@ -25,7 +25,6 @@ You can also build this package, in the top level of this repository run:
 
 This will create binary packages for the appropriate platform within the "build" subdirectory of this folder.
 
-
 Documentation
 -------------
 
diff --git a/bindings/go/src/fdb/database.go b/bindings/go/src/fdb/database.go
index 0e18ab908c6..e2cc60b123d 100644
--- a/bindings/go/src/fdb/database.go
+++ b/bindings/go/src/fdb/database.go
@@ -27,6 +27,7 @@ package fdb
 import "C"
 
 import (
+	"errors"
 	"runtime"
 
 	"golang.org/x/xerrors"
@@ -82,6 +83,32 @@ func (d Database) CreateTransaction() (Transaction, error) {
 	return Transaction{t}, nil
 }
 
+// RebootWorker is a wrapper around fdb_database_reboot_worker and allows to reboot processes
+// from the go bindings. If a suspendDuration > 0 is provided the rebooted process will be
+// suspended for suspendDuration seconds. If checkFile is set to true the process will check
+// if the data directory is writeable by creating a validation file. The address must be a
+// process address is the form of IP:Port pair.
+func (d Database) RebootWorker(address string, checkFile bool, suspendDuration int) error {
+	t := &futureInt64{
+		future: newFuture(C.fdb_database_reboot_worker(
+			d.ptr,
+			byteSliceToPtr([]byte(address)),
+			C.int(len(address)),
+			C.fdb_bool_t(boolToInt(checkFile)),
+			C.int(suspendDuration),
+		),
+		),
+	}
+
+	dbVersion, err := t.Get()
+
+	if dbVersion == 0 {
+		return errors.New("failed to send reboot process request")
+	}
+
+	return err
+}
+
 func retryable(wrapped func() (interface{}, error), onError func(Error) FutureNil) (ret interface{}, e error) {
 	for {
 		ret, e = wrapped()
diff --git a/bindings/go/src/fdb/fdb_test.go b/bindings/go/src/fdb/fdb_test.go
index 1b6a56b934b..690b49d8d54 100644
--- a/bindings/go/src/fdb/fdb_test.go
+++ b/bindings/go/src/fdb/fdb_test.go
@@ -101,7 +101,7 @@ func TestReadTransactionOptions(t *testing.T) {
 	fdb.MustAPIVersion(710)
 	db := fdb.MustOpenDefault()
 	_, e := db.ReadTransact(func(rtr fdb.ReadTransaction) (interface{}, error) {
-		rtr.Options().SetAccessSystemKeys();
+		rtr.Options().SetAccessSystemKeys()
 		return rtr.Get(fdb.Key("\xff/")).MustGet(), nil
 	})
 	if e != nil {
@@ -109,7 +109,6 @@ func TestReadTransactionOptions(t *testing.T) {
 	}
 }
 
-
 func ExampleTransactor() {
 	fdb.MustAPIVersion(710)
 	db := fdb.MustOpenDefault()

From e8c727added97bb7222d449426bf20af2456f87b Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Fri, 27 May 2022 15:10:08 -0700
Subject: [PATCH 467/740] Avoid creating new RequestStream when retry
 (release-7.1). (#7264)

* Avoid creating new RequestStream when retry.

* Use unique pointer to avoid memory leak.
---
 fdbrpc/genericactors.actor.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index ab52b52c615..0130ae7c37c 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -137,10 +137,13 @@ Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(Req request, Hostname hostname
 	// Suitable for use with hostname, where RequestStream is NOT initialized yet.
 	// Not normally useful for endpoints initialized with NetworkAddress.
 	state double reconnetInterval = FLOW_KNOBS->HOSTNAME_RECONNECT_INIT_INTERVAL;
+	state std::unique_ptr<RequestStream<Req>> to;
 	loop {
 		NetworkAddress address = wait(hostname.resolveWithRetry());
-		RequestStream<Req> to(Endpoint::wellKnown({ address }, token));
-		state ErrorOr<REPLY_TYPE(Req)> reply = wait(to.tryGetReply(request));
+		if (to == nullptr || to->getEndpoint().getPrimaryAddress() != address) {
+			to = std::make_unique<RequestStream<Req>>(Endpoint::wellKnown({ address }, token));
+		}
+		state ErrorOr<REPLY_TYPE(Req)> reply = wait(to->tryGetReply(request));
 		if (reply.isError()) {
 			resetReply(request);
 			if (reply.getError().code() == error_code_request_maybe_delivered) {
@@ -166,10 +169,13 @@ Future<REPLY_TYPE(Req)> retryGetReplyFromHostname(Req request,
 	// Suitable for use with hostname, where RequestStream is NOT initialized yet.
 	// Not normally useful for endpoints initialized with NetworkAddress.
 	state double reconnetInterval = FLOW_KNOBS->HOSTNAME_RECONNECT_INIT_INTERVAL;
+	state std::unique_ptr<RequestStream<Req>> to;
 	loop {
 		NetworkAddress address = wait(hostname.resolveWithRetry());
-		RequestStream<Req> to(Endpoint::wellKnown({ address }, token));
-		state ErrorOr<REPLY_TYPE(Req)> reply = wait(to.tryGetReply(request, taskID));
+		if (to == nullptr || to->getEndpoint().getPrimaryAddress() != address) {
+			to = std::make_unique<RequestStream<Req>>(Endpoint::wellKnown({ address }, token));
+		}
+		state ErrorOr<REPLY_TYPE(Req)> reply = wait(to->tryGetReply(request, taskID));
 		if (reply.isError()) {
 			resetReply(request);
 			if (reply.getError().code() == error_code_request_maybe_delivered) {

From 8c3cd9d9a8043adc5484639a268cde5a76b54116 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 24 May 2022 14:51:22 -0700
Subject: [PATCH 468/740] CC sends recovery txn version during TLog recruitment

This simplifies the logic for TLog to wait for recovery txn before replying
back to peeks.
---
 fdbserver/ClusterRecovery.actor.cpp         |  2 ++
 fdbserver/LogSystem.h                       |  1 +
 fdbserver/TLogServer.actor.cpp              | 36 ++++++++-------------
 fdbserver/TagPartitionedLogSystem.actor.cpp |  8 +++++
 fdbserver/TagPartitionedLogSystem.actor.h   |  3 ++
 fdbserver/WorkerInterface.actor.h           |  4 ++-
 6 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
index c1b8474bf5c..b5747c0a3f6 100644
--- a/fdbserver/ClusterRecovery.actor.cpp
+++ b/fdbserver/ClusterRecovery.actor.cpp
@@ -297,6 +297,7 @@ ACTOR Future<Void> newTLogServers(Reference<ClusterRecoveryData> self,
 		                                                                 self->clusterId,
 		                                                                 self->configuration,
 		                                                                 self->cstate.myDBState.recoveryCount + 1,
+		                                                                 self->recoveryTransactionVersion,
 		                                                                 self->primaryLocality,
 		                                                                 self->dcId_locality[remoteDcId],
 		                                                                 self->allTags,
@@ -310,6 +311,7 @@ ACTOR Future<Void> newTLogServers(Reference<ClusterRecoveryData> self,
 		                                                                 self->clusterId,
 		                                                                 self->configuration,
 		                                                                 self->cstate.myDBState.recoveryCount + 1,
+		                                                                 self->recoveryTransactionVersion,
 		                                                                 self->primaryLocality,
 		                                                                 tagLocalitySpecial,
 		                                                                 self->allTags,
diff --git a/fdbserver/LogSystem.h b/fdbserver/LogSystem.h
index a8c7a6397dc..6178a6ad934 100644
--- a/fdbserver/LogSystem.h
+++ b/fdbserver/LogSystem.h
@@ -643,6 +643,7 @@ struct ILogSystem {
 	    UID clusterId,
 	    DatabaseConfiguration const& config,
 	    LogEpoch recoveryCount,
+	    Version recoveryTransactionVersion,
 	    int8_t primaryLocality,
 	    int8_t remoteLocality,
 	    std::vector<Tag> const& allTags,
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 49519e88183..755bacf9aeb 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -568,7 +568,6 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	Promise<Void> recoveryComplete, committingQueue;
 	Version unrecoveredBefore, recoveredAt;
 	Version recoveryTxnVersion;
-	Promise<Void> recoveryTxnReceived;
 
 	struct PeekTrackerData {
 		std::map<int, Promise<std::pair<Version, bool>>>
@@ -1757,12 +1756,19 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 		wait(logData->version.whenAtLeast(reqBegin));
 		wait(delay(SERVER_KNOBS->TLOG_PEEK_DELAY, g_network->getCurrentTask()));
 	}
-	if (!logData->stopped && reqTag.locality != tagLocalityTxs && reqTag != txsTag) {
+	if (!logData->stopped && reqTag.locality != tagLocalityTxs && reqTag != txsTag &&
+	    logData->version.get() < logData->recoveryTxnVersion) {
+		DisabledTraceEvent("TLogPeekMessages1", self->dbgid)
+		    .detail("LogId", logData->logId)
+		    .detail("Tag", reqTag.toString())
+		    .detail("ReqBegin", reqBegin)
+		    .detail("Version", logData->version.get())
+		    .detail("RecoveredAt", logData->recoveredAt);
 		// Make sure the peek reply has the recovery txn for the current TLog.
 		// Older generation TLog has been stopped and doesn't wait here.
 		// Similarly during recovery, reading transaction state store
 		// doesn't wait here.
-		wait(logData->recoveryTxnReceived.getFuture());
+		wait(logData->version.whenAtLeast(logData->recoveryTxnVersion));
 	}
 
 	if (logData->locality != tagLocalitySatellite && reqTag.locality == tagLocalityLogRouter) {
@@ -2242,9 +2248,6 @@ ACTOR Future<Void> tLogCommit(TLogData* self,
 		g_traceBatch.addEvent("CommitDebug", tlogDebugID.get().first(), "TLog.tLogCommit.BeforeWaitForVersion");
 	}
 
-	if (req.prevVersion == logData->recoveredAt) {
-		logData->recoveryTxnVersion = req.version;
-	}
 	logData->minKnownCommittedVersion = std::max(logData->minKnownCommittedVersion, req.minKnownCommittedVersion);
 
 	wait(logData->version.whenAtLeast(req.prevVersion));
@@ -2298,15 +2301,6 @@ ACTOR Future<Void> tLogCommit(TLogData* self,
 		}
 		// Notifies the commitQueue actor to commit persistentQueue, and also unblocks tLogPeekMessages actors
 		logData->version.set(req.version);
-		if (logData->recoveryTxnReceived.canBeSet() &&
-		    (req.prevVersion == 0 || req.prevVersion == logData->recoveredAt)) {
-			TraceEvent("TLogInfo", self->dbgid)
-			    .detail("Log", logData->logId)
-			    .detail("Prev", req.prevVersion)
-			    .detail("RecoveredAt", logData->recoveredAt)
-			    .detail("RecoveryTxnVersion", req.version);
-			logData->recoveryTxnReceived.send(Void());
-		}
 		if (SERVER_KNOBS->ENABLE_VERSION_VECTOR_TLOG_UNICAST) {
 			self->unknownCommittedVersions.push_front(std::make_tuple(req.version, req.tLogCount));
 			while (!self->unknownCommittedVersions.empty() &&
@@ -2853,13 +2847,6 @@ ACTOR Future<Void> pullAsyncData(TLogData* self,
 					// Notifies the commitQueue actor to commit persistentQueue, and also unblocks tLogPeekMessages
 					// actors
 					logData->version.set(ver);
-					if (logData->recoveryTxnReceived.canBeSet() && !pullingRecoveryData && ver > logData->recoveredAt) {
-						TraceEvent("TLogInfo", self->dbgid)
-						    .detail("Log", logData->logId)
-						    .detail("RecoveredAt", logData->recoveredAt)
-						    .detail("RecoveryTxnVersion", ver);
-						logData->recoveryTxnReceived.send(Void());
-					}
 					wait(yield(TaskPriority::TLogCommit));
 				}
 				lastVer = ver;
@@ -3425,11 +3412,14 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	self->id_data[recruited.id()] = logData;
 	logData->locality = req.locality;
 	logData->recoveryCount = req.epoch;
+	logData->recoveryTxnVersion = req.recoveryTransactionVersion;
 	logData->removed = rejoinClusterController(self, recruited, req.epoch, Future<Void>(Void()), req.isPrimary);
 	self->popOrder.push_back(recruited.id());
 	self->spillOrder.push_back(recruited.id());
 
-	TraceEvent("TLogStart", logData->logId).detail("RecoveryCount", logData->recoveryCount);
+	TraceEvent("TLogStart", logData->logId)
+	    .detail("RecoveryCount", logData->recoveryCount)
+	    .detail("RecoveryTxnVersion", logData->recoveryTxnVersion);
 
 	state Future<Void> updater;
 	state bool pulledRecoveryVersions = false;
diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp
index 2028159c386..30b6ddf4cbf 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.cpp
+++ b/fdbserver/TagPartitionedLogSystem.actor.cpp
@@ -1638,6 +1638,7 @@ Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
     UID clusterId,
     DatabaseConfiguration const& config,
     LogEpoch recoveryCount,
+    Version recoveryTransactionVersion,
     int8_t primaryLocality,
     int8_t remoteLocality,
     std::vector<Tag> const& allTags,
@@ -1648,6 +1649,7 @@ Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 	                clusterId,
 	                config,
 	                recoveryCount,
+	                recoveryTransactionVersion,
 	                primaryLocality,
 	                remoteLocality,
 	                allTags,
@@ -2547,6 +2549,7 @@ ACTOR Future<Void> TagPartitionedLogSystem::newRemoteEpoch(TagPartitionedLogSyst
                                                            UID clusterId,
                                                            DatabaseConfiguration configuration,
                                                            LogEpoch recoveryCount,
+                                                           Version recoveryTransactionVersion,
                                                            int8_t remoteLocality,
                                                            std::vector<Tag> allTags) {
 	TraceEvent("RemoteLogRecruitment_WaitingForWorkers").log();
@@ -2686,6 +2689,7 @@ ACTOR Future<Void> TagPartitionedLogSystem::newRemoteEpoch(TagPartitionedLogSyst
 		req.logRouterTags = 0;
 		req.txsTags = self->txsTags;
 		req.clusterId = clusterId;
+		req.recoveryTransactionVersion = recoveryTransactionVersion;
 	}
 
 	remoteTLogInitializationReplies.reserve(remoteWorkers.remoteTLogs.size());
@@ -2737,6 +2741,7 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
     UID clusterId,
     DatabaseConfiguration configuration,
     LogEpoch recoveryCount,
+    Version recoveryTransactionVersion,
     int8_t primaryLocality,
     int8_t remoteLocality,
     std::vector<Tag> allTags,
@@ -2957,6 +2962,7 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 		req.logRouterTags = logSystem->logRouterTags;
 		req.txsTags = logSystem->txsTags;
 		req.clusterId = clusterId;
+		req.recoveryTransactionVersion = recoveryTransactionVersion;
 	}
 
 	initializationReplies.reserve(recr.tLogs.size());
@@ -3024,6 +3030,7 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 			req.logRouterTags = logSystem->logRouterTags;
 			req.txsTags = logSystem->txsTags;
 			req.clusterId = clusterId;
+			req.recoveryTransactionVersion = recoveryTransactionVersion;
 		}
 
 		satelliteInitializationReplies.reserve(recr.satelliteTLogs.size());
@@ -3081,6 +3088,7 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 		                                                                    clusterId,
 		                                                                    configuration,
 		                                                                    recoveryCount,
+		                                                                    recoveryTransactionVersion,
 		                                                                    remoteLocality,
 		                                                                    allTags);
 		if (oldLogSystem->tLogs.size() > 0 && oldLogSystem->tLogs[0]->locality == tagLocalitySpecial) {
diff --git a/fdbserver/TagPartitionedLogSystem.actor.h b/fdbserver/TagPartitionedLogSystem.actor.h
index bee4eda6fa5..df2bf57e42a 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.h
+++ b/fdbserver/TagPartitionedLogSystem.actor.h
@@ -273,6 +273,7 @@ struct TagPartitionedLogSystem final : ILogSystem, ReferenceCounted<TagPartition
 	                                       UID clusterId,
 	                                       DatabaseConfiguration const& config,
 	                                       LogEpoch recoveryCount,
+	                                       Version recoveryTransactionVersion,
 	                                       int8_t primaryLocality,
 	                                       int8_t remoteLocality,
 	                                       std::vector<Tag> const& allTags,
@@ -353,6 +354,7 @@ struct TagPartitionedLogSystem final : ILogSystem, ReferenceCounted<TagPartition
 	                                         UID clusterId,
 	                                         DatabaseConfiguration configuration,
 	                                         LogEpoch recoveryCount,
+	                                         Version recoveryTransactionVersion,
 	                                         int8_t remoteLocality,
 	                                         std::vector<Tag> allTags);
 
@@ -362,6 +364,7 @@ struct TagPartitionedLogSystem final : ILogSystem, ReferenceCounted<TagPartition
 	                                                    UID clusterId,
 	                                                    DatabaseConfiguration configuration,
 	                                                    LogEpoch recoveryCount,
+	                                                    Version recoveryTransactionVersion,
 	                                                    int8_t primaryLocality,
 	                                                    int8_t remoteLocality,
 	                                                    std::vector<Tag> allTags,
diff --git a/fdbserver/WorkerInterface.actor.h b/fdbserver/WorkerInterface.actor.h
index 0fb294b3a62..5ae49317123 100644
--- a/fdbserver/WorkerInterface.actor.h
+++ b/fdbserver/WorkerInterface.actor.h
@@ -570,6 +570,7 @@ struct InitializeTLogRequest {
 	int logRouterTags;
 	int txsTags;
 	UID clusterId;
+	Version recoveryTransactionVersion;
 
 	ReplyPromise<struct TLogInterface> reply;
 
@@ -595,7 +596,8 @@ struct InitializeTLogRequest {
 		           logVersion,
 		           spillType,
 		           txsTags,
-		           clusterId);
+		           clusterId,
+		           recoveryTransactionVersion);
 	}
 };
 

From a69d56aacb8b42ce30adcc60d8d8a12406546595 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 25 May 2022 12:28:57 -0700
Subject: [PATCH 469/740] Fix a storage cache bug that prevents it from peeking

The two event handlers of "onChange", if run in a particular order, will result
in an empty cursor, thus preventing SC from peeking data from TLogs.
---
 fdbserver/StorageCache.actor.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/fdbserver/StorageCache.actor.cpp b/fdbserver/StorageCache.actor.cpp
index a97931a2a8f..8c71eca465c 100644
--- a/fdbserver/StorageCache.actor.cpp
+++ b/fdbserver/StorageCache.actor.cpp
@@ -1839,16 +1839,18 @@ ACTOR Future<Void> pullAsyncData(StorageCacheData* data) {
 	++data->counters.updateBatches;
 
 	loop {
-		loop {
-			choose {
-				when(wait(cursor ? cursor->getMore(TaskPriority::TLogCommit) : Never())) { break; }
-				when(wait(dbInfoChange)) {
+		loop choose {
+			when(wait(cursor ? cursor->getMore(TaskPriority::TLogCommit) : Never())) { break; }
+			when(wait(dbInfoChange)) {
+				dbInfoChange = data->db->onChange();
+				if (data->db->get().recoveryState >= RecoveryState::ACCEPTING_COMMITS) {
+					data->logSystem = ILogSystem::fromServerDBInfo(data->thisServerID, data->db->get());
 					if (data->logSystem) {
 						cursor = data->logSystem->peekSingle(
 						    data->thisServerID, data->peekVersion, cacheTag, std::vector<std::pair<Version, Tag>>());
-					} else
+					} else {
 						cursor = Reference<ILogSystem::IPeekCursor>();
-					dbInfoChange = data->db->onChange();
+					}
 				}
 			}
 		}
@@ -2169,7 +2171,6 @@ ACTOR Future<Void> storageCacheServer(StorageServerInterface ssi,
                                       Reference<AsyncVar<ServerDBInfo> const> db) {
 	state StorageCacheData self(ssi.id(), id, db);
 	state ActorCollection actors(false);
-	state Future<Void> dbInfoChange = Void();
 	state StorageCacheUpdater updater(self.lastVersionWithData);
 	self.updater = &updater;
 
@@ -2201,10 +2202,6 @@ ACTOR Future<Void> storageCacheServer(StorageServerInterface ssi,
 	loop {
 		++self.counters.loops;
 		choose {
-			when(wait(dbInfoChange)) {
-				dbInfoChange = db->onChange();
-				self.logSystem = ILogSystem::fromServerDBInfo(self.thisServerID, self.db->get());
-			}
 			when(GetValueRequest req = waitNext(ssi.getValue.getFuture())) {
 				// TODO do we need to add throttling for cache servers? Probably not
 				// actors.add(self->readGuard(req , getValueQ));

From fbbb169184d3bd18edcaead04651c843d1ff61f5 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 25 May 2022 13:23:43 -0700
Subject: [PATCH 470/740] Disable verbose NormalizeKeySelector event

This type of events can exceed 0.5M in one of tests and cause
SpecialKeySpaceCorrectness.toml fail.
---
 fdbclient/SpecialKeySpace.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index bace6d7b8fd..a5b559a91e0 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -171,7 +171,7 @@ ACTOR Future<Void> moveKeySelectorOverRangeActor(const SpecialKeyRangeReadImpl*
 	// Note : startKey never equals endKey here
 	ASSERT(startKey < endKey);
 
-	TraceEvent(SevDebug, "NormalizeKeySelector")
+	DisabledTraceEvent(SevDebug, "NormalizeKeySelector")
 	    .detail("OriginalKey", ks->getKey())
 	    .detail("OriginalOffset", ks->offset)
 	    .detail("SpecialKeyRangeStart", skrImpl->getKeyRange().begin)
@@ -211,7 +211,7 @@ ACTOR Future<Void> moveKeySelectorOverRangeActor(const SpecialKeyRangeReadImpl*
 			ks->offset -= result.size();
 		}
 	}
-	TraceEvent(SevDebug, "NormalizeKeySelector")
+	DisabledTraceEvent(SevDebug, "NormalizeKeySelector")
 	    .detail("NormalizedKey", ks->getKey())
 	    .detail("NormalizedOffset", ks->offset)
 	    .detail("SpecialKeyRangeStart", skrImpl->getKeyRange().begin)

From 52e649b32828f47945d0867a4efe3e78e44fdaee Mon Sep 17 00:00:00 2001
From: Johannes Scheuermann <johscheuer@users.noreply.github.com>
Date: Mon, 30 May 2022 08:07:48 +0100
Subject: [PATCH 471/740] Backport check exclude (#7268)

* Check if all specific processes are excluded

* Correct variable for for loop to iterate over inprogress exclusions
---
 fdbcli/ExcludeCommand.actor.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/fdbcli/ExcludeCommand.actor.cpp b/fdbcli/ExcludeCommand.actor.cpp
index 9cdeab276ef..db67bd8a6e8 100644
--- a/fdbcli/ExcludeCommand.actor.cpp
+++ b/fdbcli/ExcludeCommand.actor.cpp
@@ -160,6 +160,28 @@ ACTOR Future<std::set<NetworkAddress>> checkForExcludingServers(Reference<IDatab
 			for (const auto& addr : exclusionInProgress)
 				inProgressExclusion.insert(NetworkAddress::parse(
 				    addr.key.removePrefix(fdb_cli::exclusionInProgressSpecialKeyRange.begin).toString()));
+
+			// Check if all of the specified exclusions are done.
+			bool allExcluded = true;
+			for (const auto& inProgressAddr : inProgressExclusion) {
+				if (!allExcluded) {
+					break;
+				}
+
+				for (const auto& exclusion : exclusions) {
+					// We found an exclusion that is still in progress
+					if (exclusion.excludes(inProgressAddr)) {
+						allExcluded = false;
+						break;
+					}
+				}
+			}
+
+			if (allExcluded) {
+				inProgressExclusion.clear();
+				return inProgressExclusion;
+			}
+
 			if (!waitForAllExcluded)
 				break;
 

From 93083ce22248f59658696608b058f278adc55cd9 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 31 May 2022 12:14:13 -0700
Subject: [PATCH 472/740] fix: the peek_using_streaming can cause memory
 corruption

---
 fdbclient/ServerKnobs.cpp     |  5 +++--
 fdbclient/ServerKnobs.h       |  1 +
 fdbserver/fdbserver.actor.cpp | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 1d8aab4194b..41f4d85e329 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -29,6 +29,7 @@ ServerKnobs::ServerKnobs(Randomize randomize, ClientKnobs* clientKnobs, IsSimula
 
 void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSimulated isSimulated) {
 	// clang-format off
+	init( ALLOW_DANGEROUS_KNOBS,                               false ); if (isSimulated) ALLOW_DANGEROUS_KNOBS = true;
 	// Versions
 	init( VERSIONS_PER_SECOND,                                   1e6 );
 	init( MAX_VERSIONS_IN_FLIGHT,                100 * VERSIONS_PER_SECOND );
@@ -71,7 +72,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( TLOG_MESSAGE_BLOCK_BYTES,                             10e6 );
 	init( TLOG_MESSAGE_BLOCK_OVERHEAD_FACTOR,      double(TLOG_MESSAGE_BLOCK_BYTES) / (TLOG_MESSAGE_BLOCK_BYTES - MAX_MESSAGE_SIZE) ); //1.0121466709838096006362758832473
 	init( PEEK_TRACKER_EXPIRATION_TIME,                          600 ); if( randomize && BUGGIFY ) PEEK_TRACKER_EXPIRATION_TIME = 120; // Cannot be buggified lower without changing the following assert in LogSystemPeekCursor.actor.cpp: ASSERT_WE_THINK(e.code() == error_code_operation_obsolete || SERVER_KNOBS->PEEK_TRACKER_EXPIRATION_TIME < 10);
-	init( PEEK_USING_STREAMING,                                 true ); if( randomize && BUGGIFY ) PEEK_USING_STREAMING = false;
+	init( PEEK_USING_STREAMING,                                false ); if( randomize && BUGGIFY ) PEEK_USING_STREAMING = true;
 	init( PARALLEL_GET_MORE_REQUESTS,                             32 ); if( randomize && BUGGIFY ) PARALLEL_GET_MORE_REQUESTS = 2;
 	init( MULTI_CURSOR_PRE_FETCH_LIMIT,                           10 );
 	init( MAX_QUEUE_COMMIT_BYTES,                               15e6 ); if( randomize && BUGGIFY ) MAX_QUEUE_COMMIT_BYTES = 5000;
@@ -670,7 +671,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( FUTURE_VERSION_DELAY,                                  1.0 );
 	init( STORAGE_LIMIT_BYTES,                                500000 );
 	init( BUGGIFY_LIMIT_BYTES,                                  1000 );
-	init( FETCH_USING_STREAMING,                                true ); if( randomize && BUGGIFY ) FETCH_USING_STREAMING = false; //Determines if fetch keys uses streaming reads
+	init( FETCH_USING_STREAMING,                               false ); if( randomize && BUGGIFY ) FETCH_USING_STREAMING = true; //Determines if fetch keys uses streaming reads
 	init( FETCH_BLOCK_BYTES,                                     2e6 );
 	init( FETCH_KEYS_PARALLELISM_BYTES,                          4e6 ); if( randomize && BUGGIFY ) FETCH_KEYS_PARALLELISM_BYTES = 3e6;
 	init( FETCH_KEYS_PARALLELISM,                                  2 );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index cde3eb28d10..4b1154bbdc7 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -31,6 +31,7 @@ static constexpr int _PAGE_SIZE = 4096;
 
 class ServerKnobs : public KnobsImpl<ServerKnobs> {
 public:
+	bool ALLOW_DANGEROUS_KNOBS;
 	// Versions
 	int64_t VERSIONS_PER_SECOND;
 	int64_t MAX_VERSIONS_IN_FLIGHT;
diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp
index d4f07dd157f..5e8c3229b0e 100644
--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@@ -1820,6 +1820,21 @@ int main(int argc, char* argv[]) {
 		// Reinitialize knobs in order to update knobs that are dependent on explicitly set knobs
 		g_knobs.initialize(Randomize::True, role == ServerRole::Simulation ? IsSimulated::True : IsSimulated::False);
 
+		if (!SERVER_KNOBS->ALLOW_DANGEROUS_KNOBS) {
+			if (SERVER_KNOBS->FETCH_USING_STREAMING) {
+				fprintf(stderr,
+				        "ERROR : explicitly setting FETCH_USING_STREAMING is dangerous! set ALLOW_DANGEROUS_KNOBS to "
+				        "proceed anyways\n");
+				flushAndExit(FDB_EXIT_ERROR);
+			}
+			if (SERVER_KNOBS->PEEK_USING_STREAMING) {
+				fprintf(stderr,
+				        "ERROR : explicitly setting PEEK_USING_STREAMING is dangerous! set ALLOW_DANGEROUS_KNOBS to "
+				        "proceed anyways\n");
+				flushAndExit(FDB_EXIT_ERROR);
+			}
+		}
+
 		// evictionPolicyStringToEnum will throw an exception if the string is not recognized as a valid
 		EvictablePageCache::evictionPolicyStringToEnum(FLOW_KNOBS->CACHE_EVICTION_POLICY);
 

From 261708683efbdc3aba801eef0d921401cb9ff6c9 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 31 May 2022 13:34:12 -0700
Subject: [PATCH 473/740] changed how ALLOW_DANGEROUS_KNOBS is initialized

---
 fdbclient/ServerKnobs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 41f4d85e329..13072707c33 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -29,7 +29,7 @@ ServerKnobs::ServerKnobs(Randomize randomize, ClientKnobs* clientKnobs, IsSimula
 
 void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSimulated isSimulated) {
 	// clang-format off
-	init( ALLOW_DANGEROUS_KNOBS,                               false ); if (isSimulated) ALLOW_DANGEROUS_KNOBS = true;
+	init( ALLOW_DANGEROUS_KNOBS,                         isSimulated );
 	// Versions
 	init( VERSIONS_PER_SECOND,                                   1e6 );
 	init( MAX_VERSIONS_IN_FLIGHT,                100 * VERSIONS_PER_SECOND );

From cfb94456a5571a30d5cd9781a07bb9d2d6eb81dc Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Tue, 31 May 2022 15:30:48 -0700
Subject: [PATCH 474/740] only buggify streaming when simulated

---
 fdbclient/ServerKnobs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 13072707c33..9119ca4db9c 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -72,7 +72,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( TLOG_MESSAGE_BLOCK_BYTES,                             10e6 );
 	init( TLOG_MESSAGE_BLOCK_OVERHEAD_FACTOR,      double(TLOG_MESSAGE_BLOCK_BYTES) / (TLOG_MESSAGE_BLOCK_BYTES - MAX_MESSAGE_SIZE) ); //1.0121466709838096006362758832473
 	init( PEEK_TRACKER_EXPIRATION_TIME,                          600 ); if( randomize && BUGGIFY ) PEEK_TRACKER_EXPIRATION_TIME = 120; // Cannot be buggified lower without changing the following assert in LogSystemPeekCursor.actor.cpp: ASSERT_WE_THINK(e.code() == error_code_operation_obsolete || SERVER_KNOBS->PEEK_TRACKER_EXPIRATION_TIME < 10);
-	init( PEEK_USING_STREAMING,                                false ); if( randomize && BUGGIFY ) PEEK_USING_STREAMING = true;
+	init( PEEK_USING_STREAMING,                                false ); if( randomize && isSimulated && BUGGIFY ) PEEK_USING_STREAMING = true;
 	init( PARALLEL_GET_MORE_REQUESTS,                             32 ); if( randomize && BUGGIFY ) PARALLEL_GET_MORE_REQUESTS = 2;
 	init( MULTI_CURSOR_PRE_FETCH_LIMIT,                           10 );
 	init( MAX_QUEUE_COMMIT_BYTES,                               15e6 ); if( randomize && BUGGIFY ) MAX_QUEUE_COMMIT_BYTES = 5000;
@@ -671,7 +671,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( FUTURE_VERSION_DELAY,                                  1.0 );
 	init( STORAGE_LIMIT_BYTES,                                500000 );
 	init( BUGGIFY_LIMIT_BYTES,                                  1000 );
-	init( FETCH_USING_STREAMING,                               false ); if( randomize && BUGGIFY ) FETCH_USING_STREAMING = true; //Determines if fetch keys uses streaming reads
+	init( FETCH_USING_STREAMING,                               false ); if( randomize && isSimulated && BUGGIFY ) FETCH_USING_STREAMING = true; //Determines if fetch keys uses streaming reads
 	init( FETCH_BLOCK_BYTES,                                     2e6 );
 	init( FETCH_KEYS_PARALLELISM_BYTES,                          4e6 ); if( randomize && BUGGIFY ) FETCH_KEYS_PARALLELISM_BYTES = 3e6;
 	init( FETCH_KEYS_PARALLELISM,                                  2 );

From 9ce079d4bee4d8ed79cb140508d39835ab7985fe Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Wed, 1 Jun 2022 15:19:36 -0700
Subject: [PATCH 475/740] Traceevent correction.

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 9c08a29c00c..8154a561426 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -1346,7 +1346,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				TraceEvent(SevWarn, "KVSTimeout")
 				    .detail("Error", "Read value request timedout")
 				    .detail("Method", "ReadValueAction")
-				    .detail("Timeout value", readValueTimeout);
+				    .detail("TimeoutValue", readValueTimeout);
 				a.result.sendError(transaction_too_old());
 				return;
 			}
@@ -1433,7 +1433,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				TraceEvent(SevWarn, "KVSTimeout")
 				    .detail("Error", "Read value prefix request timedout")
 				    .detail("Method", "ReadValuePrefixAction")
-				    .detail("Timeout value", readValuePrefixTimeout);
+				    .detail("TimeoutValue", readValuePrefixTimeout);
 				a.result.sendError(transaction_too_old());
 				return;
 			}
@@ -1508,7 +1508,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				TraceEvent(SevWarn, "KVSTimeout")
 				    .detail("Error", "Read range request timedout")
 				    .detail("Method", "ReadRangeAction")
-				    .detail("Timeout value", readRangeTimeout);
+				    .detail("TimeoutValue", readRangeTimeout);
 				a.result.sendError(transaction_too_old());
 				return;
 			}
@@ -1541,7 +1541,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 						TraceEvent(SevWarn, "KVSTimeout")
 						    .detail("Error", "Read range request timedout")
 						    .detail("Method", "ReadRangeAction")
-						    .detail("Timeout value", readRangeTimeout);
+						    .detail("TimeoutValue", readRangeTimeout);
 						a.result.sendError(transaction_too_old());
 						return;
 					}
@@ -1574,7 +1574,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 						TraceEvent(SevWarn, "KVSTimeout")
 						    .detail("Error", "Read range request timedout")
 						    .detail("Method", "ReadRangeAction")
-						    .detail("Timeout value", readRangeTimeout);
+						    .detail("TimeoutValue", readRangeTimeout);
 						a.result.sendError(transaction_too_old());
 						return;
 					}

From 5ac3a555623782d954fdc7ecb62410da03cb5cce Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Wed, 1 Jun 2022 16:49:25 -0700
Subject: [PATCH 476/740] Cherry pick #7296 to release-7.1

---
 fdbclient/GlobalConfig.actor.cpp    | 23 ++++++++++++++++++++---
 fdbserver/workloads/Cycle.actor.cpp |  4 ++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index 78c42dd4045..a40073a87fc 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -151,6 +151,18 @@ void GlobalConfig::erase(KeyRangeRef range) {
 	}
 }
 
+// Similar to tr.onError(), but doesn't require a DatabaseContext.
+struct Backoff {
+	Future<Void> onError() {
+		double currentBackoff = backoff;
+		backoff = std::min(backoff * CLIENT_KNOBS->BACKOFF_GROWTH_RATE, CLIENT_KNOBS->DEFAULT_MAX_BACKOFF);
+		return delay(currentBackoff * deterministicRandom()->random01());
+	}
+
+private:
+	double backoff = CLIENT_KNOBS->DEFAULT_BACKOFF;
+};
+
 // Older FDB versions used different keys for client profiling data. This
 // function performs a one-time migration of data in these keys to the new
 // global configuration key space.
@@ -158,6 +170,7 @@ ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
 	state Key migratedKey("\xff\x02/fdbClientInfo/migrated/"_sr);
 	state Reference<ReadYourWritesTransaction> tr;
 	try {
+		state Backoff backoff;
 		loop {
 			tr = makeReference<ReadYourWritesTransaction>(Database(Reference<DatabaseContext>::addRef(self->cx)));
 			tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
@@ -197,10 +210,11 @@ ACTOR Future<Void> GlobalConfig::migrate(GlobalConfig* self) {
 				// attempt this migration at the same time, sometimes resulting in
 				// aborts due to conflicts. Purposefully avoid retrying, making this
 				// migration best-effort.
-				TraceEvent(SevInfo, "GlobalConfig_RetryableMigrationError").error(e);
+				TraceEvent(SevInfo, "GlobalConfig_RetryableMigrationError").errorUnsuppressed(e).suppressFor(1.0);
 				wait(tr->onError(e));
 				tr.clear();
-				wait(delay(0));
+				// tr is cleared, so it won't backoff properly. Use custom backoff logic here.
+				wait(backoff.onError());
 			}
 		}
 	} catch (Error& e) {
@@ -216,6 +230,8 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 	// TraceEvent trace(SevInfo, "GlobalConfig_Refresh");
 	self->erase(KeyRangeRef(""_sr, "\xff"_sr));
 
+	state Backoff backoff;
+
 	state Reference<ReadYourWritesTransaction> tr;
 	loop {
 		try {
@@ -231,7 +247,8 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
 			TraceEvent("GlobalConfigRefreshError").errorUnsuppressed(e).suppressFor(1.0);
 			wait(tr->onError(e));
 			tr.clear();
-			wait(delay(0));
+			// tr is cleared, so it won't backoff properly. Use custom backoff logic here.
+			wait(backoff.onError());
 		}
 	}
 	return Void();
diff --git a/fdbserver/workloads/Cycle.actor.cpp b/fdbserver/workloads/Cycle.actor.cpp
index 1863eaf30a9..81227dd477e 100644
--- a/fdbserver/workloads/Cycle.actor.cpp
+++ b/fdbserver/workloads/Cycle.actor.cpp
@@ -49,7 +49,7 @@ struct CycleWorkload : TestWorkload {
 		actorCount = getOption(options, "actorsPerClient"_sr, transactionsPerSecond / 5);
 		nodeCount = getOption(options, "nodeCount"_sr, transactionsPerSecond * clientCount);
 		keyPrefix = unprintable(getOption(options, "keyPrefix"_sr, LiteralStringRef("")).toString());
-		traceParentProbability = getOption(options, "traceParentProbability "_sr, 0.01);
+		traceParentProbability = getOption(options, "traceParentProbability"_sr, 0.01);
 		minExpectedTransactionsPerSecond = transactionsPerSecond * getOption(options, "expectedRate"_sr, 0.7);
 	}
 
@@ -104,7 +104,7 @@ struct CycleWorkload : TestWorkload {
 				state double tstart = now();
 				state int r = deterministicRandom()->randomInt(0, self->nodeCount);
 				state Transaction tr(cx);
-				if (deterministicRandom()->random01() >= self->traceParentProbability) {
+				if (deterministicRandom()->random01() <= self->traceParentProbability) {
 					state Span span("CycleClient"_loc);
 					//TraceEvent("CycleTracingTransaction", span.context).log();
 					tr.setOption(FDBTransactionOptions::SPAN_PARENT,

From 37e14b83d46ebe631ba21d49a586bfe13e5f3770 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Fri, 3 Jun 2022 10:31:33 -0700
Subject: [PATCH 477/740] Add versionstamp support in tuple (#7313)

Tuple in C++ needs to support Versionstamp.
---
 bindings/c/test/unit/unit_tests.cpp   | 71 ++++++++++++++++++++++++++-
 bindings/flow/Tuple.cpp               | 32 ++++++++++++
 bindings/flow/Tuple.h                 |  6 ++-
 bindings/flow/tester/Tester.actor.cpp | 10 ++++
 fdbclient/CMakeLists.txt              |  2 +
 fdbclient/GlobalConfig.actor.cpp      |  2 +
 fdbclient/Tuple.cpp                   | 27 ++++++++++
 fdbclient/Tuple.h                     |  5 +-
 fdbclient/Versionstamp.cpp            | 44 +++++++++++++++++
 fdbclient/Versionstamp.h              | 44 +++++++++++++++++
 flow/error_definitions.h              |  1 +
 11 files changed, 241 insertions(+), 3 deletions(-)
 create mode 100644 fdbclient/Versionstamp.cpp
 create mode 100644 fdbclient/Versionstamp.h

diff --git a/bindings/c/test/unit/unit_tests.cpp b/bindings/c/test/unit/unit_tests.cpp
index 7ca44c1629d..e9c029fc413 100644
--- a/bindings/c/test/unit/unit_tests.cpp
+++ b/bindings/c/test/unit/unit_tests.cpp
@@ -972,6 +972,73 @@ GetMappedRangeResult getMappedIndexEntries(int beginId, int endId, fdb::Transact
 	return getMappedIndexEntries(beginId, endId, tr, mapper);
 }
 
+TEST_CASE("versionstamp_unit_test") {
+	// a random 12 bytes long StringRef as a versionstamp
+	StringRef str = "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12"_sr;
+	Versionstamp vs(str), vs2(str);
+	ASSERT(vs == vs2);
+	ASSERT(vs.begin() != vs2.begin());
+
+	int64_t version = vs.getVersion();
+	int64_t version2 = vs2.getVersion();
+	int64_t versionExpected = ((int64_t)0x01 << 56) + ((int64_t)0x02 << 48) + ((int64_t)0x03 << 40) +
+	                          ((int64_t)0x04 << 32) + (0x05 << 24) + (0x06 << 16) + (0x07 << 8) + 0x08;
+	ASSERT(version == versionExpected);
+	ASSERT(version2 == versionExpected);
+
+	int16_t batch = vs.getBatchNumber();
+	int16_t batch2 = vs2.getBatchNumber();
+	int16_t batchExpected = (0x09 << 8) + 0x10;
+	ASSERT(batch == batchExpected);
+	ASSERT(batch2 == batchExpected);
+
+	int16_t user = vs.getUserVersion();
+	int16_t user2 = vs2.getUserVersion();
+	int16_t userExpected = (0x11 << 8) + 0x12;
+	ASSERT(user == userExpected);
+	ASSERT(user2 == userExpected);
+
+	ASSERT(vs.size() == VERSIONSTAMP_TUPLE_SIZE);
+	ASSERT(vs2.size() == VERSIONSTAMP_TUPLE_SIZE);
+}
+
+TEST_CASE("tuple_support_versionstamp") {
+	// a random 12 bytes long StringRef as a versionstamp
+	StringRef str = "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12"_sr;
+	Versionstamp vs(str);
+	const Tuple t = Tuple().append(prefix).append(RECORD).appendVersionstamp(vs).append("{K[3]}"_sr).append("{...}"_sr);
+	ASSERT(t.getVersionstamp(2) == vs);
+
+	// verify the round-way pack-unpack path for a Tuple containing a versionstamp
+	StringRef result1 = t.pack();
+	Tuple t2 = Tuple::unpack(result1);
+	StringRef result2 = t2.pack();
+	ASSERT(t2.getVersionstamp(2) == vs);
+	ASSERT(result1.toString() == result2.toString());
+}
+
+TEST_CASE("tuple_fail_to_append_truncated_versionstamp") {
+	// a truncated 11 bytes long StringRef as a versionstamp
+	StringRef str = "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11"_sr;
+	try {
+		Versionstamp truncatedVersionstamp(str);
+	} catch (Error& e) {
+		return;
+	}
+	UNREACHABLE();
+}
+
+TEST_CASE("tuple_fail_to_append_longer_versionstamp") {
+	// a longer than expected 13 bytes long StringRef as a versionstamp
+	StringRef str = "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11"_sr;
+	try {
+		Versionstamp longerVersionstamp(str);
+	} catch (Error& e) {
+		return;
+	}
+	UNREACHABLE();
+}
+
 TEST_CASE("fdb_transaction_get_mapped_range") {
 	const int TOTAL_RECORDS = 20;
 	fillInRecords(TOTAL_RECORDS);
@@ -1058,11 +1125,13 @@ void assertNotTuple(std::string str) {
 TEST_CASE("fdb_transaction_get_mapped_range_fail_on_mapper_not_tuple") {
 	// A string that cannot be parsed as tuple.
 	// "\x15:\x152\x15E\x15\x09\x15\x02\x02MySimpleRecord$repeater-version\x00\x15\x013\x00\x00\x00\x00\x1aU\x90\xba\x00\x00\x00\x02\x15\x04"
+	// should fail at \x35
+
 	std::string mapper = {
 		'\x15', ':',    '\x15', '2', '\x15', 'E',    '\x15', '\t',   '\x15', '\x02', '\x02', 'M',
 		'y',    'S',    'i',    'm', 'p',    'l',    'e',    'R',    'e',    'c',    'o',    'r',
 		'd',    '$',    'r',    'e', 'p',    'e',    'a',    't',    'e',    'r',    '-',    'v',
-		'e',    'r',    's',    'i', 'o',    'n',    '\x00', '\x15', '\x01', '3',    '\x00', '\x00',
+		'e',    'r',    's',    'i', 'o',    'n',    '\x00', '\x15', '\x01', '\x35', '\x00', '\x00',
 		'\x00', '\x00', '\x1a', 'U', '\x90', '\xba', '\x00', '\x00', '\x00', '\x02', '\x15', '\x04'
 	};
 	assertNotTuple(mapper);
diff --git a/bindings/flow/Tuple.cpp b/bindings/flow/Tuple.cpp
index fde784f418b..3e4e4a4a98c 100644
--- a/bindings/flow/Tuple.cpp
+++ b/bindings/flow/Tuple.cpp
@@ -26,6 +26,7 @@ static_assert(std::numeric_limits<float>::is_iec559);
 static_assert(std::numeric_limits<double>::is_iec559);
 
 const size_t Uuid::SIZE = 16;
+const size_t VERSIONSTAMP_TUPLE_SIZE = 12;
 
 const uint8_t Tuple::NULL_CODE = 0x00;
 const uint8_t Tuple::BYTES_CODE = 0x01;
@@ -39,6 +40,7 @@ const uint8_t Tuple::DOUBLE_CODE = 0x21;
 const uint8_t Tuple::FALSE_CODE = 0x26;
 const uint8_t Tuple::TRUE_CODE = 0x27;
 const uint8_t Tuple::UUID_CODE = 0x30;
+const uint8_t Tuple::VERSIONSTAMP_96_CODE = 0x33;
 
 static float bigEndianFloat(float orig) {
 	int32_t big = *(int32_t*)&orig;
@@ -117,6 +119,8 @@ Tuple::Tuple(StringRef const& str) {
 		} else if (data[i] == NESTED_CODE) {
 			i += 1;
 			depth += 1;
+		} else if (data[i] == VERSIONSTAMP_96_CODE) {
+			i += 1 + VERSIONSTAMP_TUPLE_SIZE;
 		} else {
 			throw invalid_tuple_data_type();
 		}
@@ -170,6 +174,15 @@ Tuple& Tuple::append(StringRef const& str, bool utf8) {
 	return *this;
 }
 
+Tuple& Tuple::appendVersionstamp(Versionstamp const& vs) {
+	offsets.push_back(data.size());
+
+	data.push_back(data.arena(), VERSIONSTAMP_96_CODE);
+	data.append(data.arena(), vs.begin(), vs.size());
+
+	return *this;
+}
+
 Tuple& Tuple::append(int32_t value) {
 	return append((int64_t)value);
 }
@@ -293,6 +306,8 @@ Tuple::ElementType Tuple::getType(size_t index) const {
 		return ElementType::BOOL;
 	} else if (code == UUID_CODE) {
 		return ElementType::UUID;
+	} else if (code == VERSIONSTAMP_96_CODE) {
+		return ElementType::VERSIONSTAMP;
 	} else {
 		throw invalid_tuple_data_type();
 	}
@@ -425,6 +440,19 @@ double Tuple::getDouble(size_t index) const {
 	return bigEndianDouble(swap);
 }
 
+Versionstamp Tuple::getVersionstamp(size_t index) const {
+	if (index >= offsets.size()) {
+		throw invalid_tuple_index();
+	}
+	ASSERT_LT(offsets[index], data.size());
+	uint8_t code = data[offsets[index]];
+	if (code != VERSIONSTAMP_96_CODE) {
+		throw invalid_tuple_data_type();
+	}
+	size_t versionstampLength = VERSIONSTAMP_TUPLE_SIZE;
+	return Versionstamp(StringRef(data.begin() + offsets[index] + 1, versionstampLength));
+}
+
 Uuid Tuple::getUuid(size_t index) const {
 	if (index >= offsets.size()) {
 		throw invalid_tuple_index();
@@ -507,6 +535,10 @@ Tuple Tuple::getNested(size_t index) const {
 			ASSERT_LE(i + 1 + sizeof(double), next_offset - 1);
 			dest.append(dest.arena(), data.begin() + i + 1, sizeof(double));
 			i += sizeof(double) + 1;
+		} else if (code == VERSIONSTAMP_96_CODE) {
+			ASSERT_LE(i + 1 + VERSIONSTAMP_TUPLE_SIZE, next_offset - 1);
+			dest.append(dest.arena(), data.begin() + i + 1, VERSIONSTAMP_TUPLE_SIZE);
+			i += VERSIONSTAMP_TUPLE_SIZE + 1;
 		} else if (code == NESTED_CODE) {
 			i += 1;
 			depth += 1;
diff --git a/bindings/flow/Tuple.h b/bindings/flow/Tuple.h
index 03c08a6a022..4d903e5bb8d 100644
--- a/bindings/flow/Tuple.h
+++ b/bindings/flow/Tuple.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include "bindings/flow/fdb_flow.h"
+#include "fdbclient/Versionstamp.h"
 
 namespace FDB {
 struct Uuid {
@@ -60,6 +61,7 @@ struct Tuple {
 	Tuple& append(Uuid);
 	Tuple& appendNested(Tuple const&);
 	Tuple& appendNull();
+	Tuple& appendVersionstamp(Versionstamp const&);
 
 	StringRef pack() const { return StringRef(data.begin(), data.size()); }
 
@@ -68,13 +70,14 @@ struct Tuple {
 		return append(t);
 	}
 
-	enum ElementType { NULL_TYPE, INT, BYTES, UTF8, BOOL, FLOAT, DOUBLE, UUID, NESTED };
+	enum ElementType { NULL_TYPE, INT, BYTES, UTF8, BOOL, FLOAT, DOUBLE, UUID, NESTED, VERSIONSTAMP };
 
 	// this is number of elements, not length of data
 	size_t size() const { return offsets.size(); }
 
 	ElementType getType(size_t index) const;
 	Standalone<StringRef> getString(size_t index) const;
+	Versionstamp getVersionstamp(size_t index) const;
 	int64_t getInt(size_t index) const;
 	bool getBool(size_t index) const;
 	float getFloat(size_t index) const;
@@ -107,6 +110,7 @@ struct Tuple {
 	static const uint8_t FALSE_CODE;
 	static const uint8_t TRUE_CODE;
 	static const uint8_t UUID_CODE;
+	static const uint8_t VERSIONSTAMP_96_CODE;
 
 	Tuple(const StringRef& data);
 	Tuple(Standalone<VectorRef<uint8_t>> data, std::vector<size_t> offsets);
diff --git a/bindings/flow/tester/Tester.actor.cpp b/bindings/flow/tester/Tester.actor.cpp
index ee0f499536e..6cd4f5b28d2 100644
--- a/bindings/flow/tester/Tester.actor.cpp
+++ b/bindings/flow/tester/Tester.actor.cpp
@@ -112,6 +112,12 @@ std::string tupleToString(Tuple const& tuple) {
 			str += format("%016llx%016llx", *(uint64_t*)u.getData().begin(), *(uint64_t*)(u.getData().begin() + 8));
 		} else if (type == Tuple::NESTED) {
 			str += tupleToString(tuple.getNested(i));
+		} else if (type == Tuple::VERSIONSTAMP) {
+			Versionstamp versionstamp = tuple.getVersionstamp(i);
+			str += format("Transaction Version: '%ld', BatchNumber: '%hd', UserVersion : '%hd'",
+			              versionstamp.getVersion(),
+			              versionstamp.getBatchNumber(),
+			              versionstamp.getUserVersion());
 		} else {
 			ASSERT(false);
 		}
@@ -1147,6 +1153,8 @@ struct TuplePackFunc : InstructionFunc {
 					tuple << itemTuple.getUuid(0);
 				} else if (type == Tuple::NESTED) {
 					tuple.appendNested(itemTuple.getNested(0));
+				} else if (type == Tuple::VERSIONSTAMP) {
+					tuple.appendVersionstamp(Versionstamp(itemTuple.getString(0)));
 				} else {
 					ASSERT(false);
 				}
@@ -1226,6 +1234,8 @@ struct TupleRangeFunc : InstructionFunc {
 					tuple << itemTuple.getUuid(0);
 				} else if (type == Tuple::NESTED) {
 					tuple.appendNested(itemTuple.getNested(0));
+				} else if (type == Tuple::VERSIONSTAMP) {
+					tuple.appendVersionstamp(Versionstamp(itemTuple.getString(0)));
 				} else {
 					ASSERT(false);
 				}
diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index d6d3c8d9228..f4d390879de 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -150,6 +150,8 @@ set(FDBCLIENT_SRCS
   VersionedMap.actor.h
   VersionedMap.h
   VersionedMap.cpp
+  Versionstamp.cpp
+  Versionstamp.h
   VersionVector.h
   WellKnownEndpoints.h
   WriteMap.h
diff --git a/fdbclient/GlobalConfig.actor.cpp b/fdbclient/GlobalConfig.actor.cpp
index a40073a87fc..c35919c3864 100644
--- a/fdbclient/GlobalConfig.actor.cpp
+++ b/fdbclient/GlobalConfig.actor.cpp
@@ -119,6 +119,8 @@ void GlobalConfig::insert(KeyRef key, ValueRef value) {
 			any = t.getFloat(0);
 		} else if (t.getType(0) == Tuple::ElementType::DOUBLE) {
 			any = t.getDouble(0);
+		} else if (t.getType(0) == Tuple::ElementType::VERSIONSTAMP) {
+			any = t.getVersionstamp(0);
 		} else {
 			ASSERT(false);
 		}
diff --git a/fdbclient/Tuple.cpp b/fdbclient/Tuple.cpp
index 77716b94ee7..729c910252a 100644
--- a/fdbclient/Tuple.cpp
+++ b/fdbclient/Tuple.cpp
@@ -20,6 +20,8 @@
 
 #include "fdbclient/Tuple.h"
 
+const uint8_t VERSIONSTAMP_96_CODE = 0x33;
+
 // TODO: Many functions copied from bindings/flow/Tuple.cpp. Merge at some point.
 static float bigEndianFloat(float orig) {
 	int32_t big = *(int32_t*)&orig;
@@ -75,6 +77,8 @@ Tuple::Tuple(StringRef const& str, bool exclude_incomplete) {
 			i += 1;
 		} else if (data[i] == '\x00') {
 			i += 1;
+		} else if (data[i] == VERSIONSTAMP_96_CODE) {
+			i += VERSIONSTAMP_TUPLE_SIZE + 1;
 		} else {
 			throw invalid_tuple_data_type();
 		}
@@ -99,6 +103,15 @@ Tuple& Tuple::append(Tuple const& tuple) {
 	return *this;
 }
 
+Tuple& Tuple::appendVersionstamp(Versionstamp const& vs) {
+	offsets.push_back(data.size());
+
+	data.push_back(data.arena(), VERSIONSTAMP_96_CODE);
+	data.append(data.arena(), vs.begin(), vs.size());
+
+	return *this;
+}
+
 Tuple& Tuple::append(StringRef const& str, bool utf8) {
 	offsets.push_back(data.size());
 
@@ -213,6 +226,8 @@ Tuple::ElementType Tuple::getType(size_t index) const {
 		return ElementType::DOUBLE;
 	} else if (code == 0x26 || code == 0x27) {
 		return ElementType::BOOL;
+	} else if (code == VERSIONSTAMP_96_CODE) {
+		return ElementType::VERSIONSTAMP;
 	} else {
 		throw invalid_tuple_data_type();
 	}
@@ -361,6 +376,18 @@ double Tuple::getDouble(size_t index) const {
 	return bigEndianDouble(swap);
 }
 
+Versionstamp Tuple::getVersionstamp(size_t index) const {
+	if (index >= offsets.size()) {
+		throw invalid_tuple_index();
+	}
+	ASSERT_LT(offsets[index], data.size());
+	uint8_t code = data[offsets[index]];
+	if (code != VERSIONSTAMP_96_CODE) {
+		throw invalid_tuple_data_type();
+	}
+	return Versionstamp(StringRef(data.begin() + offsets[index] + 1, VERSIONSTAMP_TUPLE_SIZE));
+}
+
 KeyRange Tuple::range(Tuple const& tuple) const {
 	VectorRef<uint8_t> begin;
 	VectorRef<uint8_t> end;
diff --git a/fdbclient/Tuple.h b/fdbclient/Tuple.h
index 9db4d7ba4cf..4c52c1ebc64 100644
--- a/fdbclient/Tuple.h
+++ b/fdbclient/Tuple.h
@@ -25,6 +25,7 @@
 
 #include "flow/flow.h"
 #include "fdbclient/FDBTypes.h"
+#include "fdbclient/Versionstamp.h"
 
 struct Tuple {
 	Tuple() {}
@@ -47,6 +48,7 @@ struct Tuple {
 	Tuple& appendFloat(float);
 	Tuple& appendDouble(double);
 	Tuple& appendNull();
+	Tuple& appendVersionstamp(Versionstamp const&);
 
 	StringRef pack() const { return StringRef(data.begin(), data.size()); }
 
@@ -55,7 +57,7 @@ struct Tuple {
 		return append(t);
 	}
 
-	enum ElementType { NULL_TYPE, INT, BYTES, UTF8, BOOL, FLOAT, DOUBLE };
+	enum ElementType { NULL_TYPE, INT, BYTES, UTF8, BOOL, FLOAT, DOUBLE, VERSIONSTAMP };
 
 	// this is number of elements, not length of data
 	size_t size() const { return offsets.size(); }
@@ -68,6 +70,7 @@ struct Tuple {
 	StringRef subTupleRawString(size_t index) const;
 	ElementType getType(size_t index) const;
 	Standalone<StringRef> getString(size_t index) const;
+	Versionstamp getVersionstamp(size_t index) const;
 	int64_t getInt(size_t index, bool allow_incomplete = false) const;
 	bool getBool(size_t index) const;
 	float getFloat(size_t index) const;
diff --git a/fdbclient/Versionstamp.cpp b/fdbclient/Versionstamp.cpp
new file mode 100644
index 00000000000..7a619360403
--- /dev/null
+++ b/fdbclient/Versionstamp.cpp
@@ -0,0 +1,44 @@
+#include "fdbclient/Versionstamp.h"
+
+Versionstamp::Versionstamp(StringRef str) {
+	if (str.size() != VERSIONSTAMP_TUPLE_SIZE) {
+		throw invalid_versionstamp_size();
+	}
+	data = str;
+}
+
+int16_t Versionstamp::getBatchNumber() const {
+	const uint8_t* begin = data.begin();
+	begin += 8;
+	int16_t batchNumber = *(int16_t*)(begin);
+	batchNumber = bigEndian16(batchNumber);
+	return batchNumber;
+}
+
+int16_t Versionstamp::getUserVersion() const {
+	const uint8_t* begin = data.begin();
+	begin += 10;
+	int16_t userVersion = *(int16_t*)(begin);
+	userVersion = bigEndian16(userVersion);
+	return userVersion;
+}
+
+const uint8_t* Versionstamp::begin() const {
+	return data.begin();
+}
+
+int64_t Versionstamp::getVersion() const {
+	const uint8_t* begin = data.begin();
+	int64_t version = *(int64_t*)begin;
+	version = bigEndian64(version);
+	return version;
+}
+
+size_t Versionstamp::size() const {
+	return VERSIONSTAMP_TUPLE_SIZE;
+}
+
+bool Versionstamp::operator==(const Versionstamp& other) const {
+	return getVersion() == other.getVersion() && getBatchNumber() == other.getBatchNumber() &&
+	       getUserVersion() == other.getUserVersion();
+}
\ No newline at end of file
diff --git a/fdbclient/Versionstamp.h b/fdbclient/Versionstamp.h
new file mode 100644
index 00000000000..b3fd6770c77
--- /dev/null
+++ b/fdbclient/Versionstamp.h
@@ -0,0 +1,44 @@
+/*
+ * Versionstamp.h
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2013-2022 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FDBCLIENT_VERSIONSTAMP_H
+#define FDBCLIENT_VERSIONSTAMP_H
+
+#pragma once
+
+#include "flow/Arena.h"
+
+const size_t VERSIONSTAMP_TUPLE_SIZE = 12;
+
+struct Versionstamp {
+	Versionstamp(StringRef);
+
+	int64_t getVersion() const;
+	int16_t getBatchNumber() const;
+	int16_t getUserVersion() const;
+	size_t size() const;
+	const uint8_t* begin() const;
+	bool operator==(const Versionstamp&) const;
+
+private:
+	Standalone<StringRef> data;
+};
+
+#endif
\ No newline at end of file
diff --git a/flow/error_definitions.h b/flow/error_definitions.h
index 0301d889e87..7d6c09cfdfc 100755
--- a/flow/error_definitions.h
+++ b/flow/error_definitions.h
@@ -251,6 +251,7 @@ ERROR( directory_prefix_in_use, 2265, "Directory layer already has a conflicting
 ERROR( invalid_destination_directory, 2266, "Target directory is invalid" )
 ERROR( cannot_modify_root_directory, 2267, "Root directory cannot be modified" )
 ERROR( invalid_uuid_size, 2268, "UUID is not sixteen bytes");
+ERROR( invalid_versionstamp_size, 2269, "Versionstamp is not exactly twelve bytes");
 
 // 2300 - backup and restore errors
 ERROR( backup_error, 2300, "Backup error")

From 55f320d456bbd0054fbeddfd65851e8069df41c7 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Fri, 3 Jun 2022 11:40:09 -0700
Subject: [PATCH 478/740] Fix versionstamp in Tester (#7315)

---
 bindings/flow/tester/Tester.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bindings/flow/tester/Tester.actor.cpp b/bindings/flow/tester/Tester.actor.cpp
index 6cd4f5b28d2..38a608c8433 100644
--- a/bindings/flow/tester/Tester.actor.cpp
+++ b/bindings/flow/tester/Tester.actor.cpp
@@ -1154,7 +1154,7 @@ struct TuplePackFunc : InstructionFunc {
 				} else if (type == Tuple::NESTED) {
 					tuple.appendNested(itemTuple.getNested(0));
 				} else if (type == Tuple::VERSIONSTAMP) {
-					tuple.appendVersionstamp(Versionstamp(itemTuple.getString(0)));
+					tuple.appendVersionstamp(itemTuple.getVersionstamp(0));
 				} else {
 					ASSERT(false);
 				}
@@ -1235,7 +1235,7 @@ struct TupleRangeFunc : InstructionFunc {
 				} else if (type == Tuple::NESTED) {
 					tuple.appendNested(itemTuple.getNested(0));
 				} else if (type == Tuple::VERSIONSTAMP) {
-					tuple.appendVersionstamp(Versionstamp(itemTuple.getString(0)));
+					tuple.appendVersionstamp(itemTuple.getVersionstamp(0));
 				} else {
 					ASSERT(false);
 				}

From 99371a000bf44df677c3188b4915e8fcf3dada07 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Sat, 7 May 2022 18:58:23 +0100
Subject: [PATCH 479/740] Refactor python sidecar and add unit tests

---
 packaging/docker/sidecar.py      | 209 ++++++++++++++++---------------
 packaging/docker/sidecar_test.py | 111 ++++++++++++++++
 2 files changed, 217 insertions(+), 103 deletions(-)
 create mode 100755 packaging/docker/sidecar_test.py

diff --git a/packaging/docker/sidecar.py b/packaging/docker/sidecar.py
index a9c618c129c..228d99e9b4f 100755
--- a/packaging/docker/sidecar.py
+++ b/packaging/docker/sidecar.py
@@ -35,6 +35,7 @@
 import sys
 import tempfile
 from pathlib import Path
+from functools import partial
 
 from http.server import HTTPServer, ThreadingHTTPServer, BaseHTTPRequestHandler
 
@@ -166,9 +167,7 @@ def __init__(self):
         )
         parser.add_argument(
             "--require-not-empty",
-            help=(
-                "A file that must be present and non-empty " "in the input directory"
-            ),
+            help=("A file that must be present and non-empty in the input directory"),
             action="append",
         )
         args = parser.parse_args()
@@ -346,51 +345,23 @@ class ThreadingHTTPServerV6(ThreadingHTTPServer):
     address_family = socket.AF_INET6
 
 
-class Server(BaseHTTPRequestHandler):
-    ssl_context = None
-
-    @classmethod
-    def start(cls):
-        """
-        This method starts the server.
-        """
-        config = Config.shared()
-        colon_index = config.bind_address.rindex(":")
-        port_index = colon_index + 1
-        address = config.bind_address[:colon_index]
-        port = config.bind_address[port_index:]
-        log.info(f"Listening on {address}:{port}")
-
-        if address.startswith("[") and address.endswith("]"):
-            server = ThreadingHTTPServerV6((address[1:-1], int(port)), cls)
-        else:
-            server = ThreadingHTTPServer((address, int(port)), cls)
-
-        if config.enable_tls:
-            context = Server.load_ssl_context()
-            server.socket = context.wrap_socket(server.socket, server_side=True)
-            observer = Observer()
-            event_handler = CertificateEventHandler()
-            for path in set(
-                [
-                    Path(config.certificate_file).parent.as_posix(),
-                    Path(config.key_file).parent.as_posix(),
-                ]
-            ):
-                observer.schedule(event_handler, path)
-            observer.start()
-
-        server.serve_forever()
-
-    @classmethod
-    def load_ssl_context(cls):
-        config = Config.shared()
-        if not cls.ssl_context:
-            cls.ssl_context = ssl.create_default_context(cafile=config.ca_file)
-            cls.ssl_context.check_hostname = False
-            cls.ssl_context.verify_mode = ssl.CERT_OPTIONAL
-        cls.ssl_context.load_cert_chain(config.certificate_file, config.key_file)
-        return cls.ssl_context
+class SidecarHandler(BaseHTTPRequestHandler):
+    def __init__(self, config, *args, **kwargs):
+        self.config = config
+        self.ssl_context = None
+        # BaseHTTPRequestHandler calls do_GET **inside** __init__ !!!
+        # So we have to call super().__init__ after setting attributes.
+        super().__init__(*args, **kwargs)
+
+    def load_ssl_context(self):
+        if not self.ssl_context:
+            self.ssl_context = ssl.create_default_context(cafile=self.config.ca_file)
+            self.ssl_context.check_hostname = False
+            self.ssl_context.verify_mode = ssl.CERT_OPTIONAL
+        self.ssl_context.load_cert_chain(
+            self.config.certificate_file, self.config.key_file
+        )
+        return self.ssl_context
 
     def send_text(self, text, code=200, content_type="text/plain", add_newline=True):
         """
@@ -407,16 +378,14 @@ def send_text(self, text, code=200, content_type="text/plain", add_newline=True)
         self.wfile.write(response)
 
     def check_request_cert(self, path):
-        config = Config.shared()
-
         if path == "/ready":
             return True
 
-        if not config.enable_tls:
+        if not self.config.enable_tls:
             return True
 
         approved = self.check_cert(
-            self.connection.getpeercert(), config.peer_verification_rules
+            self.connection.getpeercert(), self.config.peer_verification_rules
         )
         if not approved:
             self.send_error(401, "Client certificate was not approved")
@@ -517,32 +486,32 @@ def do_GET(self):
             if not self.check_request_cert(self.path):
                 return
             if self.path.startswith("/check_hash/"):
+                file_path = os.path.relpath(self.path, "/check_hash")
                 try:
                     self.send_text(
-                        check_hash(os.path.relpath(self.path, "/check_hash")), add_newline=False
+                        self.check_hash(file_path),
+                        add_newline=False,
                     )
                 except FileNotFoundError:
-                    self.send_error(404, "Path not found")
-                    self.end_headers()
+                    self.send_error(404, f"{file_path} not found")
             if self.path.startswith("/is_present/"):
-                if is_present(os.path.relpath(self.path, "/is_present")):
+                file_path = os.path.relpath(self.path, "/is_present")
+                if self.is_present(file_path):
                     self.send_text("OK")
                 else:
-                    self.send_error(404, "Path not found")
-                    self.end_headers()
+                    self.send_error(404, f"{file_path} not found")
             elif self.path == "/ready":
                 self.send_text(ready())
             elif self.path == "/substitutions":
-                self.send_text(get_substitutions())
+                self.send_text(self.get_substitutions())
             else:
                 self.send_error(404, "Path not found")
-                self.end_headers()
         except RequestException as e:
             self.send_error(400, e.message)
         except Exception as ex:
+            print(ex)
             log.error(f"Error processing request {ex}", exc_info=True)
             self.send_error(500)
-            self.end_headers()
 
     def do_POST(self):
         """
@@ -552,13 +521,13 @@ def do_POST(self):
             if not self.check_request_cert(self.path):
                 return
             if self.path == "/copy_files":
-                self.send_text(copy_files())
+                self.send_text(copy_files(self.config))
             elif self.path == "/copy_binaries":
-                self.send_text(copy_binaries())
+                self.send_text(copy_binaries(self.config))
             elif self.path == "/copy_libraries":
-                self.send_text(copy_libraries())
+                self.send_text(copy_libraries(self.config))
             elif self.path == "/copy_monitor_conf":
-                self.send_text(copy_monitor_conf())
+                self.send_text(copy_monitor_conf(self.config))
             elif self.path == "/refresh_certs":
                 self.send_text(refresh_certs())
             elif self.path == "/restart":
@@ -579,8 +548,30 @@ def do_POST(self):
     def log_message(self, format, *args):
         log.info(format % args)
 
+    def refresh_certs(self):
+        if not self.config.enable_tls:
+            raise RequestException("Server is not using TLS")
+        self.load_ssl_context()
+        return "OK"
+
+    def get_substitutions(self):
+        return json.dumps(self.config.substitutions)
+
+    def check_hash(self, filename):
+        with open(os.path.join(self.config.output_dir, filename), "rb") as contents:
+            m = hashlib.sha256()
+            m.update(contents.read())
+            return m.hexdigest()
+
+    def is_present(self, filename):
+        return os.path.exists(os.path.join(self.config.output_dir, filename))
+
 
 class CertificateEventHandler(FileSystemEventHandler):
+    def __init__(self, handler):
+        self.handler = handler
+        FileSystemEventHandler.__init__(self)
+
     def on_any_event(self, event):
         if event.is_directory:
             return None
@@ -597,27 +588,15 @@ def on_any_event(self, event):
         )
         time.sleep(10)
         log.info("Reloading certificates")
-        Server.load_ssl_context()
-
-
-def check_hash(filename):
-    with open(os.path.join(Config.shared().output_dir, filename), "rb") as contents:
-        m = hashlib.sha256()
-        m.update(contents.read())
-        return m.hexdigest()
-
-
-def is_present(filename):
-    return os.path.exists(os.path.join(Config.shared().output_dir, filename))
+        self.handler.load_ssl_context()
 
 
-def copy_files():
-    config = Config.shared()
+def copy_files(config):
     if config.require_not_empty:
         for filename in config.require_not_empty:
             path = os.path.join(config.input_dir, filename)
             if not os.path.isfile(path) or os.path.getsize(path) == 0:
-                raise Exception("No contents for file %s" % path)
+                raise Exception(f"No contents for file {path}")
 
     for filename in config.copy_files:
         tmp_file = tempfile.NamedTemporaryFile(
@@ -629,8 +608,7 @@ def copy_files():
     return "OK"
 
 
-def copy_binaries():
-    config = Config.shared()
+def copy_binaries(config):
     if config.main_container_version != config.primary_version:
         for binary in config.copy_binaries:
             path = Path(f"/usr/bin/{binary}")
@@ -650,8 +628,7 @@ def copy_binaries():
     return "OK"
 
 
-def copy_libraries():
-    config = Config.shared()
+def copy_libraries(config):
     for version in config.copy_libraries:
         path = Path(f"/var/fdb/lib/libfdb_c_{version}.so")
         if version == config.copy_libraries[0]:
@@ -670,8 +647,7 @@ def copy_libraries():
     return "OK"
 
 
-def copy_monitor_conf():
-    config = Config.shared()
+def copy_monitor_conf(config):
     if config.input_monitor_conf:
         with open(
             os.path.join(config.input_dir, config.input_monitor_conf)
@@ -695,35 +671,62 @@ def copy_monitor_conf():
     return "OK"
 
 
-def get_substitutions():
-    return json.dumps(Config.shared().substitutions)
-
-
 def ready():
     return "OK"
 
 
-def refresh_certs():
-    if not Config.shared().enable_tls:
-        raise RequestException("Server is not using TLS")
-    Server.load_ssl_context()
-    return "OK"
-
-
 class RequestException(Exception):
     def __init__(self, message):
         super().__init__(message)
         self.message = message
 
 
+def start_sidecar_server(config):
+    """
+    This method starts the HTTP server with the sidecar handler.
+    """
+    colon_index = config.bind_address.rindex(":")
+    port_index = colon_index + 1
+    address = config.bind_address[:colon_index]
+    port = config.bind_address[port_index:]
+    log.info(f"Listening on {address}:{port}")
+
+    handler = partial(
+        SidecarHandler,
+        config,
+    )
+
+    if address.startswith("[") and address.endswith("]"):
+        server = ThreadingHTTPServerV6((address[1:-1], int(port)), handler)
+    else:
+        server = ThreadingHTTPServer((address, int(port)), handler)
+
+    if config.enable_tls:
+        context = handler.load_ssl_context()
+        server.socket = context.wrap_socket(server.socket, server_side=True)
+        observer = Observer()
+        event_handler = CertificateEventHandler(handler)
+        for path in set(
+            [
+                Path(config.certificate_file).parent.as_posix(),
+                Path(config.key_file).parent.as_posix(),
+            ]
+        ):
+            observer.schedule(event_handler, path)
+        observer.start()
+
+    server.serve_forever()
+
+
 if __name__ == "__main__":
     logging.basicConfig(format="%(asctime)-15s %(levelname)s %(message)s")
-    copy_files()
-    copy_binaries()
-    copy_libraries()
-    copy_monitor_conf()
+    config = Config.shared()
+    copy_files(config)
+    copy_binaries(config)
+    copy_libraries(config)
+    copy_monitor_conf(config)
 
-    if Config.shared().init_mode:
+    if config.init_mode:
         sys.exit(0)
 
-    Server.start()
+    start_sidecar_server(config)
diff --git a/packaging/docker/sidecar_test.py b/packaging/docker/sidecar_test.py
new file mode 100755
index 00000000000..098e21e5e7f
--- /dev/null
+++ b/packaging/docker/sidecar_test.py
@@ -0,0 +1,111 @@
+import unittest
+from unittest.mock import MagicMock
+import socket
+from sidecar import SidecarHandler
+from http.server import HTTPServer, BaseHTTPRequestHandler
+import shutil, tempfile
+from functools import partial
+import os
+import requests
+from threading import Thread
+import time
+
+# This test suite starts a real server with a mocked configuration and will do some requests against it.
+class TestSidecar(unittest.TestCase):
+    def setUp(self):
+        super(TestSidecar, self).setUp()
+        self.get_free_port()
+        self.server_url = f"http://localhost:{self.test_server_port}"
+        self.mock_config = MagicMock()
+        # We don't want to use TLS for the local tests for now.
+        self.mock_config.enable_tls = False
+        self.mock_config.output_dir = tempfile.mkdtemp()
+
+        handler = partial(
+            SidecarHandler,
+            self.mock_config,
+        )
+        self.mock_server = HTTPServer(("localhost", self.test_server_port), handler)
+
+        # Start running mock server in a separate thread.
+        # Daemon threads automatically shut down when the main process exits.
+        self.mock_server_thread = Thread(target=self.mock_server.serve_forever)
+        self.mock_server_thread.setDaemon(True)
+        self.mock_server_thread.start()
+        # time.sleep(1)
+
+    def tearDown(self):
+        shutil.rmtree(self.mock_config.output_dir)
+        super(TestSidecar, self).tearDown()
+
+    # Helper method to get a free port
+    def get_free_port(self):
+        s = socket.socket(socket.AF_INET, type=socket.SOCK_STREAM)
+        s.bind(("localhost", 0))
+        __, port = s.getsockname()
+        s.close()
+        self.test_server_port = port
+
+    def test_get_ready(self):
+        r = requests.get(f"{self.server_url }/ready")
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.text, "OK\n")
+
+    def test_get_substitutions(self):
+        expected = {"key": "value"}
+        self.mock_config.substitutions = expected
+        r = requests.get(f"{self.server_url }/substitutions")
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.json(), expected)
+
+    def test_get_check_hash_no_found(self):
+        r = requests.get(f"{self.server_url }/check_hash/foobar")
+        self.assertEqual(r.status_code, 404)
+
+    def test_get_check_hash(self):
+        with open(os.path.join(self.mock_config.output_dir, "foobar"), "w") as f:
+            f.write("hello world")
+        r = requests.get(f"{self.server_url }/check_hash/foobar")
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(
+            r.text, "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9"
+        )
+
+    def test_get_check_hash_nested(self):
+        test_path = os.path.join(self.mock_config.output_dir, "nested/foobar")
+        os.makedirs(os.path.dirname(test_path), exist_ok=True)
+        with open(test_path, "w") as f:
+            f.write("hello world")
+        r = requests.get(f"{self.server_url }/check_hash/nested/foobar")
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(
+            r.text, "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9"
+        )
+
+    def test_get_is_present_no_found(self):
+        r = requests.get(f"{self.server_url }/is_present/foobar")
+        self.assertEqual(r.status_code, 404)
+
+    def test_get_is_present(self):
+        with open(os.path.join(self.mock_config.output_dir, "foobar"), "w") as f:
+            f.write("hello world")
+        r = requests.get(f"{self.server_url }/is_present/foobar")
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.text, "OK\n")
+
+    def test_get_is_present_nested(self):
+        test_path = os.path.join(self.mock_config.output_dir, "nested/foobar")
+        os.makedirs(os.path.dirname(test_path), exist_ok=True)
+        with open(test_path, "w") as f:
+            f.write("hello world")
+        r = requests.get(f"{self.server_url }/is_present/nested/foobar")
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.text, "OK\n")
+
+    # TODO (johscheuer): test case default case.
+
+
+# TODO(johscheuer): Add test cases for post requests
+
+if __name__ == "__main__":
+    unittest.main()

From abf1ed5b90ba6ad0ade16dda9415fdc9aa6f60e7 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Sat, 7 May 2022 19:14:46 +0100
Subject: [PATCH 480/740] Fix issue trying to send error response multiple
 times

---
 packaging/docker/sidecar.py      | 9 +++------
 packaging/docker/sidecar_test.py | 7 ++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packaging/docker/sidecar.py b/packaging/docker/sidecar.py
index 228d99e9b4f..5005c35eb63 100755
--- a/packaging/docker/sidecar.py
+++ b/packaging/docker/sidecar.py
@@ -501,15 +501,16 @@ def do_GET(self):
                 else:
                     self.send_error(404, f"{file_path} not found")
             elif self.path == "/ready":
-                self.send_text(ready())
+                self.send_text("OK")
             elif self.path == "/substitutions":
                 self.send_text(self.get_substitutions())
             else:
                 self.send_error(404, "Path not found")
         except RequestException as e:
             self.send_error(400, e.message)
+        except (ConnectionResetError, BrokenPipeError) as ex:
+            log.error(f"connection was reset {ex}")
         except Exception as ex:
-            print(ex)
             log.error(f"Error processing request {ex}", exc_info=True)
             self.send_error(500)
 
@@ -671,10 +672,6 @@ def copy_monitor_conf(config):
     return "OK"
 
 
-def ready():
-    return "OK"
-
-
 class RequestException(Exception):
     def __init__(self, message):
         super().__init__(message)
diff --git a/packaging/docker/sidecar_test.py b/packaging/docker/sidecar_test.py
index 098e21e5e7f..e9560b641d3 100755
--- a/packaging/docker/sidecar_test.py
+++ b/packaging/docker/sidecar_test.py
@@ -61,6 +61,7 @@ def test_get_substitutions(self):
     def test_get_check_hash_no_found(self):
         r = requests.get(f"{self.server_url }/check_hash/foobar")
         self.assertEqual(r.status_code, 404)
+        self.assertRegex(r.text, "foobar not found")
 
     def test_get_check_hash(self):
         with open(os.path.join(self.mock_config.output_dir, "foobar"), "w") as f:
@@ -85,6 +86,7 @@ def test_get_check_hash_nested(self):
     def test_get_is_present_no_found(self):
         r = requests.get(f"{self.server_url }/is_present/foobar")
         self.assertEqual(r.status_code, 404)
+        self.assertRegex(r.text, "foobar not found")
 
     def test_get_is_present(self):
         with open(os.path.join(self.mock_config.output_dir, "foobar"), "w") as f:
@@ -102,7 +104,10 @@ def test_get_is_present_nested(self):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.text, "OK\n")
 
-    # TODO (johscheuer): test case default case.
+    def test_get_not_found(self):
+        r = requests.get(f"{self.server_url }/foobar")
+        self.assertEqual(r.status_code, 404)
+        self.assertRegex(r.text, "Path not found")
 
 
 # TODO(johscheuer): Add test cases for post requests

From 09ef8a1c7127ca52abd51b99cfb59eef7912cc58 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Thu, 12 May 2022 08:41:44 +0100
Subject: [PATCH 481/740] Fix imports and TLS handling

---
 packaging/docker/sidecar.py      | 67 ++++++++++++++++----------------
 packaging/docker/sidecar_test.py | 45 +++++++++++++++------
 2 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/packaging/docker/sidecar.py b/packaging/docker/sidecar.py
index 5005c35eb63..340346dc3fa 100755
--- a/packaging/docker/sidecar.py
+++ b/packaging/docker/sidecar.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-# entrypoint.py
+# sidecar.py
 #
 # This source file is part of the FoundationDB open source project
 #
-# Copyright 2018-2021 Apple Inc. and the FoundationDB project authors
+# Copyright 2018-2022 Apple Inc. and the FoundationDB project authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,25 +22,21 @@
 import argparse
 import hashlib
 import ipaddress
-import logging
 import json
+import logging
 import os
-import re
 import shutil
 import socket
 import ssl
-import stat
-import time
-import traceback
 import sys
 import tempfile
-from pathlib import Path
+import time
 from functools import partial
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+from pathlib import Path
 
-from http.server import HTTPServer, ThreadingHTTPServer, BaseHTTPRequestHandler
-
-from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
+from watchdog.observers import Observer
 
 log = logging.getLogger(__name__)
 log.setLevel(logging.INFO)
@@ -242,7 +238,7 @@ def __init__(self):
         if self.main_container_version == self.primary_version:
             self.substitutions["BINARY_DIR"] = "/usr/bin"
         else:
-            self.substitutions["BINARY_DIR"] = target_path = str(
+            self.substitutions["BINARY_DIR"] = str(
                 Path("%s/bin/%s" % (args.main_container_conf_dir, self.primary_version))
             )
 
@@ -346,22 +342,25 @@ class ThreadingHTTPServerV6(ThreadingHTTPServer):
 
 
 class SidecarHandler(BaseHTTPRequestHandler):
+    # We don't want to load the ssl context for each request so we hold it as a static variable.
+    ssl_context = None
+
     def __init__(self, config, *args, **kwargs):
         self.config = config
-        self.ssl_context = None
-        # BaseHTTPRequestHandler calls do_GET **inside** __init__ !!!
-        # So we have to call super().__init__ after setting attributes.
+        self.ssl_context = self.__class__.ssl_context
         super().__init__(*args, **kwargs)
 
-    def load_ssl_context(self):
-        if not self.ssl_context:
-            self.ssl_context = ssl.create_default_context(cafile=self.config.ca_file)
-            self.ssl_context.check_hostname = False
-            self.ssl_context.verify_mode = ssl.CERT_OPTIONAL
-        self.ssl_context.load_cert_chain(
-            self.config.certificate_file, self.config.key_file
-        )
-        return self.ssl_context
+    # This method allows to trigger a reload of the ssl context and updates the static variable.
+    @classmethod
+    def load_ssl_context(cls):
+        if not cls.ssl_context:
+            config = Config.shared()
+            cls.ssl_context = ssl.create_default_context(cafile=config.ca_file)
+            cls.ssl_context.check_hostname = False
+            cls.ssl_context.verify_mode = ssl.CERT_OPTIONAL
+        cls.ssl_context.load_cert_chain(config.certificate_file, config.key_file)
+
+        return cls.ssl_context
 
     def send_text(self, text, code=200, content_type="text/plain", add_newline=True):
         """
@@ -530,7 +529,7 @@ def do_POST(self):
             elif self.path == "/copy_monitor_conf":
                 self.send_text(copy_monitor_conf(self.config))
             elif self.path == "/refresh_certs":
-                self.send_text(refresh_certs())
+                self.send_text(self.refresh_certs())
             elif self.path == "/restart":
                 self.send_text("OK")
                 exit(1)
@@ -541,10 +540,11 @@ def do_POST(self):
             raise e
         except RequestException as e:
             self.send_error(400, e.message)
-        except e:
-            log.error("Error processing request", exc_info=True)
+        except (ConnectionResetError, BrokenPipeError) as ex:
+            log.error(f"connection was reset {ex}")
+        except Exception as ex:
+            log.error(f"Error processing request {ex}", exc_info=True)
             self.send_error(500)
-            self.end_headers()
 
     def log_message(self, format, *args):
         log.info(format % args)
@@ -552,7 +552,7 @@ def log_message(self, format, *args):
     def refresh_certs(self):
         if not self.config.enable_tls:
             raise RequestException("Server is not using TLS")
-        self.load_ssl_context()
+        SidecarHandler.load_ssl_context()
         return "OK"
 
     def get_substitutions(self):
@@ -569,8 +569,7 @@ def is_present(self, filename):
 
 
 class CertificateEventHandler(FileSystemEventHandler):
-    def __init__(self, handler):
-        self.handler = handler
+    def __init__(self):
         FileSystemEventHandler.__init__(self)
 
     def on_any_event(self, event):
@@ -589,7 +588,7 @@ def on_any_event(self, event):
         )
         time.sleep(10)
         log.info("Reloading certificates")
-        self.handler.load_ssl_context()
+        SidecarHandler.load_ssl_context()
 
 
 def copy_files(config):
@@ -699,10 +698,10 @@ def start_sidecar_server(config):
         server = ThreadingHTTPServer((address, int(port)), handler)
 
     if config.enable_tls:
-        context = handler.load_ssl_context()
+        context = SidecarHandler.load_ssl_context()
         server.socket = context.wrap_socket(server.socket, server_side=True)
         observer = Observer()
-        event_handler = CertificateEventHandler(handler)
+        event_handler = CertificateEventHandler()
         for path in set(
             [
                 Path(config.certificate_file).parent.as_posix(),
diff --git a/packaging/docker/sidecar_test.py b/packaging/docker/sidecar_test.py
index e9560b641d3..1825c158872 100755
--- a/packaging/docker/sidecar_test.py
+++ b/packaging/docker/sidecar_test.py
@@ -1,14 +1,38 @@
-import unittest
-from unittest.mock import MagicMock
+#!/usr/bin/env python3
+
+# sidecar_test.py
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2018-2022 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import os
+import shutil
 import socket
-from sidecar import SidecarHandler
-from http.server import HTTPServer, BaseHTTPRequestHandler
-import shutil, tempfile
+import tempfile
+import unittest
 from functools import partial
-import os
-import requests
+from http.server import HTTPServer
 from threading import Thread
-import time
+from unittest.mock import MagicMock
+
+import requests
+
+from sidecar import SidecarHandler
+
 
 # This test suite starts a real server with a mocked configuration and will do some requests against it.
 class TestSidecar(unittest.TestCase):
@@ -32,7 +56,6 @@ def setUp(self):
         self.mock_server_thread = Thread(target=self.mock_server.serve_forever)
         self.mock_server_thread.setDaemon(True)
         self.mock_server_thread.start()
-        # time.sleep(1)
 
     def tearDown(self):
         shutil.rmtree(self.mock_config.output_dir)
@@ -110,7 +133,7 @@ def test_get_not_found(self):
         self.assertRegex(r.text, "Path not found")
 
 
-# TODO(johscheuer): Add test cases for post requests
-
+# TODO(johscheuer): Add test cases for post requests.
+# TODO(johscheuer): Add test cases for TLS.
 if __name__ == "__main__":
     unittest.main()

From 467e2affa2e4fc38078a747d437001dd10226a43 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Thu, 12 May 2022 08:51:55 +0100
Subject: [PATCH 482/740] Correct config variable in ssl reload

---
 packaging/docker/sidecar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/docker/sidecar.py b/packaging/docker/sidecar.py
index 340346dc3fa..002b19524f7 100755
--- a/packaging/docker/sidecar.py
+++ b/packaging/docker/sidecar.py
@@ -353,8 +353,8 @@ def __init__(self, config, *args, **kwargs):
     # This method allows to trigger a reload of the ssl context and updates the static variable.
     @classmethod
     def load_ssl_context(cls):
+        config = Config.shared()
         if not cls.ssl_context:
-            config = Config.shared()
             cls.ssl_context = ssl.create_default_context(cafile=config.ca_file)
             cls.ssl_context.check_hostname = False
             cls.ssl_context.verify_mode = ssl.CERT_OPTIONAL

From e5a678f23a8e29f9953bb300d8852a3d60ea41f7 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 9 Jun 2022 09:46:23 -0700
Subject: [PATCH 483/740] Add rss_bytes to process memory and fix
 available_bytes calculation [release-7.1] (#7348)

* Add rss_bytes to process memory and fix available_bytes calculation

Since memory is now limited with RSS size, add RSS size in status json for
reporting. Also change how available_bytes is calculated from:
  (available + virtual memory) * process_limit / machine_limit
to:
  (available memory) * process_limit / machine_limit

* Address AJ's comments
---
 .../sphinx/source/mr-status-json-schemas.rst.inc         | 3 ++-
 fdbclient/Schemas.cpp                                    | 3 ++-
 fdbserver/Status.actor.cpp                               | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index d68f4d82b1b..6047bbc37f6 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -260,7 +260,8 @@
                "available_bytes":0, // an estimate of the process' fair share of the memory available to fdbservers
                "limit_bytes":0, // memory limit per process
                "unused_allocated_memory":0,
-               "used_bytes":0 // virtual memory size of the process
+               "used_bytes":0, // virtual memory size of the process
+               "rss_bytes":0 // resident memory size of the process
             },
             "messages":[
                {
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index fbfd81558fd..519a10c4597 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -287,7 +287,8 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
                "available_bytes":0,
                "limit_bytes":0,
                "unused_allocated_memory":0,
-               "used_bytes":0
+               "used_bytes":0,
+               "rss_bytes":0
             },
             "messages":[
                {
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 5eccecb2f2b..123ea1e48a8 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -413,10 +413,11 @@ static JsonBuilderObject getBounceImpactInfo(int recoveryStatusCode) {
 }
 
 struct MachineMemoryInfo {
-	double memoryUsage;
+	double memoryUsage; // virtual memory usage
+	double rssUsage; // RSS memory usage
 	double aggregateLimit;
 
-	MachineMemoryInfo() : memoryUsage(0), aggregateLimit(0) {}
+	MachineMemoryInfo() : memoryUsage(0), rssUsage(0), aggregateLimit(0) {}
 
 	bool valid() { return memoryUsage >= 0; }
 	void invalidate() { memoryUsage = -1; }
@@ -782,6 +783,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 			if (memInfo->second.valid()) {
 				if (processMetrics.size() > 0 && programStart.size() > 0) {
 					memInfo->second.memoryUsage += processMetrics.getDouble("Memory");
+					memInfo->second.rssUsage += processMetrics.getDouble("ResidentMemory");
 					memInfo->second.aggregateLimit += programStart.getDouble("MemoryLimit");
 				} else
 					memInfo->second.invalidate();
@@ -972,6 +974,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 				statusObj["network"] = networkObj;
 
 				memoryObj.setKeyRawNumber("used_bytes", processMetrics.getValue("Memory"));
+				memoryObj.setKeyRawNumber("rss_bytes", processMetrics.getValue("ResidentMemory"));
 				memoryObj.setKeyRawNumber("unused_allocated_memory", processMetrics.getValue("UnusedAllocatedMemory"));
 			}
 
@@ -1004,7 +1007,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 				if (machineMemInfo.valid() && memoryLimit > 0) {
 					ASSERT(machineMemInfo.aggregateLimit > 0);
 					int64_t memory =
-					    (availableMemory + machineMemInfo.memoryUsage) * memoryLimit / machineMemInfo.aggregateLimit;
+					    (availableMemory + machineMemInfo.rssUsage) * memoryLimit / machineMemInfo.aggregateLimit;
 					memoryObj["available_bytes"] = std::min<int64_t>(std::max<int64_t>(memory, 0), memoryLimit);
 				}
 			}

From aa76e7bc26212690e267a9ee40cfc0104d93678b Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <82616783+sbodagala@users.noreply.github.com>
Date: Wed, 8 Jun 2022 12:18:15 -0400
Subject: [PATCH 484/740] Merge pull request #7318 from sbodagala/main

Introduce a knob that controls the placement of remote storage server commit versions in version vector
---
 fdbclient/ServerKnobs.cpp        | 1 +
 fdbclient/ServerKnobs.h          | 1 +
 fdbclient/VersionVector.h        | 7 +++++--
 fdbserver/masterserver.actor.cpp | 8 +++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 9119ca4db9c..6afc23ee3c4 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -44,6 +44,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	MAX_COMMIT_BATCH_INTERVAL = std::min(MAX_COMMIT_BATCH_INTERVAL, MAX_READ_TRANSACTION_LIFE_VERSIONS/double(2*VERSIONS_PER_SECOND)); // Ensure that the proxy commits 2 times every MAX_READ_TRANSACTION_LIFE_VERSIONS, otherwise the master will not give out versions fast enough
 	init( MAX_VERSION_RATE_MODIFIER,                             0.1 );
 	init( MAX_VERSION_RATE_OFFSET,               VERSIONS_PER_SECOND ); // If the calculated version is more than this amount away from the expected version, it will be clamped to this value. This prevents huge version jumps.
+	init( ENABLE_VERSION_VECTOR_HA_OPTIMIZATION,               false );
 
 	// TLogs
 	init( TLOG_TIMEOUT,                                          0.4 ); //cannot buggify because of availability
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 4b1154bbdc7..e7690b287ab 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -44,6 +44,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	                                  // often, so that versions always advance smoothly
 	double MAX_VERSION_RATE_MODIFIER;
 	int64_t MAX_VERSION_RATE_OFFSET;
+	bool ENABLE_VERSION_VECTOR_HA_OPTIMIZATION;
 
 	// TLogs
 	bool PEEK_USING_STREAMING;
diff --git a/fdbclient/VersionVector.h b/fdbclient/VersionVector.h
index f5db6dafb82..82eeb12ad0a 100644
--- a/fdbclient/VersionVector.h
+++ b/fdbclient/VersionVector.h
@@ -55,11 +55,14 @@ struct VersionVector {
 		maxVersion = version;
 	}
 
-	void setVersion(const std::set<Tag>& tags, Version version) {
+	void setVersion(const std::set<Tag>& tags, Version version, int8_t localityFilter = tagLocalityInvalid) {
 		ASSERT(version > maxVersion);
 		for (auto& tag : tags) {
 			ASSERT(tag != invalidTag);
-			versions[tag] = version;
+			ASSERT(tag.locality > tagLocalityInvalid);
+			if (localityFilter == tagLocalityInvalid || tag.locality == localityFilter) {
+				versions[tag] = version;
+			}
 		}
 		maxVersion = version;
 	}
diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index c555b84e4c8..d90a4c73653 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -66,6 +66,8 @@ struct MasterData : NonCopyable, ReferenceCounted<MasterData> {
 	// up-to-date in the presence of key range splits/merges.
 	VersionVector ssVersionVector;
 
+	int8_t locality; // sequencer locality
+
 	CounterCollection cc;
 	Counter getCommitVersionRequests;
 	Counter getLiveCommittedVersionRequests;
@@ -115,6 +117,8 @@ struct MasterData : NonCopyable, ReferenceCounted<MasterData> {
 			forceRecovery = false;
 		}
 		balancer = resolutionBalancer.resolutionBalancing();
+		locality = myInterface.locality.dcId().present() ? std::stoi(myInterface.locality.dcId().get().toString())
+		                                                 : tagLocalityInvalid;
 	}
 	~MasterData() = default;
 };
@@ -230,7 +234,9 @@ void updateLiveCommittedVersion(Reference<MasterData> self, ReportRawCommittedVe
 	if (req.version > self->liveCommittedVersion.get()) {
 		if (SERVER_KNOBS->ENABLE_VERSION_VECTOR && req.writtenTags.present()) {
 			// TraceEvent("Received ReportRawCommittedVersionRequest").detail("Version",req.version);
-			self->ssVersionVector.setVersion(req.writtenTags.get(), req.version);
+			int8_t primaryLocality =
+			    SERVER_KNOBS->ENABLE_VERSION_VECTOR_HA_OPTIMIZATION ? self->locality : tagLocalityInvalid;
+			self->ssVersionVector.setVersion(req.writtenTags.get(), req.version, primaryLocality);
 			self->versionVectorTagUpdates += req.writtenTags.get().size();
 		}
 		auto curTime = now();

From 1037b13972d3772ff476ad3ce6e948b66660c7bd Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Tue, 7 Jun 2022 17:53:40 -0700
Subject: [PATCH 485/740] Performance bug fix: reactor.react() is called too
 often.

---
 flow/Knobs.cpp      | 2 +-
 flow/Knobs.h        | 2 +-
 flow/Net2.actor.cpp | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index bfbb3edd02f..894b5234bd1 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -179,7 +179,7 @@ void FlowKnobs::initialize(Randomize randomize, IsSimulated isSimulated) {
 	init( MIN_LOGGED_PRIORITY_BUSY_FRACTION,                  0.05 );
 	init( CERT_FILE_MAX_SIZE,                      5 * 1024 * 1024 );
 	init( READY_QUEUE_RESERVED_SIZE,                          8192 );
-	init( ITERATIONS_PER_REACTOR_CHECK,                        100 );
+	init( TASKS_PER_REACTOR_CHECK,                             100 );
 
 	//Network
 	init( PACKET_LIMIT,                                  100LL<<20 );
diff --git a/flow/Knobs.h b/flow/Knobs.h
index cc069e2941a..7075c7c4f4e 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -247,7 +247,7 @@ class FlowKnobs : public KnobsImpl<FlowKnobs> {
 	double MIN_LOGGED_PRIORITY_BUSY_FRACTION;
 	int CERT_FILE_MAX_SIZE;
 	int READY_QUEUE_RESERVED_SIZE;
-	int ITERATIONS_PER_REACTOR_CHECK;
+	int TASKS_PER_REACTOR_CHECK;
 
 	// Network
 	int64_t PACKET_LIMIT;
diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index a711ac84f36..bdb1e5f81a3 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -1432,6 +1432,8 @@ void Net2::run() {
 
 	thread_network = this;
 
+	unsigned int tasksSinceReact = 0;
+
 #ifdef WIN32
 	if (timeBeginPeriod(1) != TIMERR_NOERROR)
 		TraceEvent(SevError, "TimeBeginPeriodError").log();
@@ -1500,6 +1502,7 @@ void Net2::run() {
 		taskBegin = timer_monotonic();
 		trackAtPriority(TaskPriority::ASIOReactor, taskBegin);
 		reactor.react();
+		tasksSinceReact = 0;
 
 		updateNow();
 		double now = this->currentTime;
@@ -1541,6 +1544,7 @@ void Net2::run() {
 			ready.pop();
 
 			try {
+				++tasksSinceReact;
 				(*task)();
 			} catch (Error& e) {
 				TraceEvent(SevError, "TaskError").error(e);
@@ -1554,11 +1558,12 @@ void Net2::run() {
 			}
 
 			// attempt to empty out the IO backlog
-			if (ready.size() % FLOW_KNOBS->ITERATIONS_PER_REACTOR_CHECK == 1) {
+			if (tasksSinceReact >= FLOW_KNOBS->TASKS_PER_REACTOR_CHECK) {
 				if (runFunc) {
 					runFunc();
 				}
 				reactor.react();
+				tasksSinceReact = 0;
 			}
 
 			double tscNow = timestampCounter();

From 7fde69afdee483652a1d85475562083e585f9d95 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Fri, 10 Jun 2022 18:10:15 +0000
Subject: [PATCH 486/740] disable AVX for 7.1.8 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 8321c6f16d70631df921b4edebb50ccc23f389b3 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Fri, 10 Jun 2022 18:12:03 +0000
Subject: [PATCH 487/740] enable AVX and update version for 7.1.9 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad43ceac621..e33ca07c140 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.8
+  VERSION 7.1.9
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 7b8e05aff32b86c117eb7fe1450c7b2f0208f2a5 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 13 Jun 2022 05:56:08 +0000
Subject: [PATCH 488/740] update version after 7.1.9 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e33ca07c140..185b721ebc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.9
+  VERSION 7.1.10
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 5ea06447c93691616346c6557370edc250e32fa0 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Fri, 10 Jun 2022 10:30:11 -0700
Subject: [PATCH 489/740] Add 7.1.8 and 7.1.9 release notes

---
 .../release-notes/release-notes-710.rst       | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index b0dbd7c7147..74e2958cfb6 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,31 @@
 Release Notes
 #############
 
+7.1.9
+=====
+* Same as 7.1.8 release with AVX enabled.
+
+7.1.8
+=====
+* Released with AVX disabled.
+* Fixed a performance regression in network run loop.  `(PR #7342) <https://github.com/apple/foundationdb/pull/7342>`_
+* Added RSS bytes for processes in status json output and corrected available_bytes calculation. `(PR #7348) <https://github.com/apple/foundationdb/pull/7348>`_
+* Added versionstamp support in tuples. `(PR #7313) <https://github.com/apple/foundationdb/pull/7313>`_
+* Fixed some spammy trace events. `(PR #7300) <https://github.com/apple/foundationdb/pull/7300>`_
+* Fixed a memory corruption bug for using streaming peeks. `(PR #7288) <https://github.com/apple/foundationdb/pull/7288>`_
+* Fixed a hang bug in fdbcli exclude command. `(PR #7268) <https://github.com/apple/foundationdb/pull/7268>`_
+* Fixed an issue that a remote TLog blocks peeks. `(PR #7255) <https://github.com/apple/foundationdb/pull/7255>`_
+* Fixed a connection issue using hostnames. `(PR #7264) <https://github.com/apple/foundationdb/pull/7264>`_
+* Added support of the reboot command in go bindings. `(PR #7270) <https://github.com/apple/foundationdb/pull/7270>`_
+* Fixed several issues in profiling special keys using GlobalConfig. `(PR #7120) <https://github.com/apple/foundationdb/pull/7120>`_
+* Fixed a stuck transaction system bug due to inconsistent recovery transaction version. `(PR #7261) <https://github.com/apple/foundationdb/pull/7261>`_
+* Fixed a unknown_error crash due to not resolving hostnames. `(PR #7254) <https://github.com/apple/foundationdb/pull/7254>`_
+* Fixed a heap-use-after-free bug. `(PR #7250) <https://github.com/apple/foundationdb/pull/7250>`_
+* Fixed a performance issue that remote TLogs are sending too many pops to log routers. `(PR #7235) <https://github.com/apple/foundationdb/pull/7235>`_
+* Fixed an issue that SharedTLogs are not displaced and leaking disk space. `(PR #7246) <https://github.com/apple/foundationdb/pull/7246>`_
+* Fixed an issue that coordinatorsKey does not store DNS names. `(PR #7203) <https://github.com/apple/foundationdb/pull/7203>`_
+* Fixed a sequential execution issue for fdbcli kill, suspend, and expensive_data_check commands. `(PR #7211) <https://github.com/apple/foundationdb/pull/7211>`_
+
 7.1.7
 =====
 * Same as 7.1.6 release with AVX enabled.

From 29bbd89c19c490f256e0996ed5f3c2a314de64d2 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Mon, 13 Jun 2022 23:46:27 -0700
Subject: [PATCH 490/740] Fix bug in resolveTCPEndpoint() when hostname
 resolving fails (release-7.1). (#7380)

* Close trace file when error happens in runNetwork().

* Improve the bestCount algorithm in getLeader().

In the current implementation, if the nominees are [0,1], the chosen leader will be 1, which is an exception to other cases and our expectation that if 2 nominees have the same frequency, the one with lower id will be the leader.

* Remove unnecessary new statement.

stream will never be a nullptr.

* Move self->dnsCache out of lambda capture.

Member variables are not capture by default, thus, `host` and `service` are not captured. This somehow successfully compile, but throws std::bad_alloc or basic_string::_S_create exceptions when we call `host+":"+service` in dnsCache.remove().

* Revert unintended change.

* Address comments.

Co-authored-by: Steve Atherton <steve.atherton@snowflake.com>
---
 fdbclient/MonitorLeader.actor.cpp   | 14 +++----
 fdbclient/ThreadSafeTransaction.cpp |  1 +
 fdbrpc/genericactors.actor.h        |  7 +---
 flow/Net2.actor.cpp                 | 60 ++++++++++++++++-------------
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index c6950a9d58a..a23976fb625 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -552,7 +552,7 @@ Optional<std::pair<LeaderInfo, bool>> getLeader(const std::vector<Optional<Leade
 	          maskedNominees.end(),
 	          [](const std::pair<UID, int>& l, const std::pair<UID, int>& r) { return l.first < r.first; });
 
-	int bestCount = 0;
+	int bestCount = 1;
 	int bestIdx = 0;
 	int currentIdx = 0;
 	int curCount = 1;
@@ -560,17 +560,13 @@ Optional<std::pair<LeaderInfo, bool>> getLeader(const std::vector<Optional<Leade
 		if (maskedNominees[currentIdx].first == maskedNominees[i].first) {
 			curCount++;
 		} else {
-			if (curCount > bestCount) {
-				bestIdx = currentIdx;
-				bestCount = curCount;
-			}
 			currentIdx = i;
 			curCount = 1;
 		}
-	}
-	if (curCount > bestCount) {
-		bestIdx = currentIdx;
-		bestCount = curCount;
+		if (curCount > bestCount) {
+			bestIdx = currentIdx;
+			bestCount = curCount;
+		}
 	}
 
 	bool majority = bestCount >= nominees.size() / 2 + 1;
diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index 84ab49504bb..b350f5691dd 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -586,6 +586,7 @@ void ThreadSafeApi::runNetwork() {
 	}
 
 	if (runErr.present()) {
+		closeTraceFile();
 		throw runErr.get();
 	}
 
diff --git a/fdbrpc/genericactors.actor.h b/fdbrpc/genericactors.actor.h
index 0130ae7c37c..2fdf8c5712c 100644
--- a/fdbrpc/genericactors.actor.h
+++ b/fdbrpc/genericactors.actor.h
@@ -78,11 +78,8 @@ Future<Void> tryInitializeRequestStream(RequestStream<Req>* stream, Hostname hos
 	if (!address.present()) {
 		return Void();
 	}
-	if (stream == nullptr) {
-		stream = new RequestStream<Req>(Endpoint::wellKnown({ address.get() }, token));
-	} else {
-		*stream = RequestStream<Req>(Endpoint::wellKnown({ address.get() }, token));
-	}
+	ASSERT(stream != nullptr);
+	*stream = RequestStream<Req>(Endpoint::wellKnown({ address.get() }, token));
 	return Void();
 }
 
diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index bdb1e5f81a3..02e7f23a103 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -1861,36 +1861,42 @@ ACTOR static Future<std::vector<NetworkAddress>> resolveTCPEndpoint_impl(Net2* s
 	Promise<std::vector<NetworkAddress>> promise;
 	state Future<std::vector<NetworkAddress>> result = promise.getFuture();
 
-	tcpResolver.async_resolve(host, service, [=](const boost::system::error_code& ec, tcp::resolver::iterator iter) {
-		if (ec) {
-			self->dnsCache.remove(host, service);
-			promise.sendError(lookup_failed());
-			return;
-		}
-
-		std::vector<NetworkAddress> addrs;
-
-		tcp::resolver::iterator end;
-		while (iter != end) {
-			auto endpoint = iter->endpoint();
-			auto addr = endpoint.address();
-			if (addr.is_v6()) {
-				addrs.emplace_back(IPAddress(addr.to_v6().to_bytes()), endpoint.port());
-			} else {
-				addrs.emplace_back(addr.to_v4().to_ulong(), endpoint.port());
-			}
-			++iter;
-		}
+	tcpResolver.async_resolve(
+	    host, service, [promise](const boost::system::error_code& ec, tcp::resolver::iterator iter) {
+		    if (ec) {
+			    promise.sendError(lookup_failed());
+			    return;
+		    }
+
+		    std::vector<NetworkAddress> addrs;
+
+		    tcp::resolver::iterator end;
+		    while (iter != end) {
+			    auto endpoint = iter->endpoint();
+			    auto addr = endpoint.address();
+			    if (addr.is_v6()) {
+				    addrs.emplace_back(IPAddress(addr.to_v6().to_bytes()), endpoint.port());
+			    } else {
+				    addrs.emplace_back(addr.to_v4().to_ulong(), endpoint.port());
+			    }
+			    ++iter;
+		    }
+
+		    if (addrs.empty()) {
+			    promise.sendError(lookup_failed());
+		    } else {
+			    promise.send(addrs);
+		    }
+	    });
 
-		if (addrs.empty()) {
+	try {
+		wait(ready(result));
+	} catch (Error& e) {
+		if (e.code() == error_code_lookup_failed) {
 			self->dnsCache.remove(host, service);
-			promise.sendError(lookup_failed());
-		} else {
-			promise.send(addrs);
 		}
-	});
-
-	wait(ready(result));
+		throw e;
+	}
 	tcpResolver.cancel();
 	std::vector<NetworkAddress> ret = result.get();
 	self->dnsCache.add(host, service, ret);

From f138c905ce23bb310223bce16ca46518d7900eb2 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Tue, 14 Jun 2022 09:57:13 -0700
Subject: [PATCH 491/740] Safely remove fdb_transaction_get_range_and_flat_map
 (#7314) (#7379)

---
 bindings/c/fdb_c.cpp                          | 22 -------------------
 .../sphinx/source/administration.rst          |  5 +++++
 .../source/api-version-upgrade-guide.rst      |  2 ++
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/bindings/c/fdb_c.cpp b/bindings/c/fdb_c.cpp
index da54845475b..32496f28fe1 100644
--- a/bindings/c/fdb_c.cpp
+++ b/bindings/c/fdb_c.cpp
@@ -672,27 +672,6 @@ extern "C" DLLEXPORT FDBFuture* fdb_transaction_get_mapped_range(FDBTransaction*
 	                    .extractPtr());
 }
 
-FDBFuture* fdb_transaction_get_range_and_flat_map_v709(FDBTransaction* tr,
-                                                       uint8_t const* begin_key_name,
-                                                       int begin_key_name_length,
-                                                       fdb_bool_t begin_or_equal,
-                                                       int begin_offset,
-                                                       uint8_t const* end_key_name,
-                                                       int end_key_name_length,
-                                                       fdb_bool_t end_or_equal,
-                                                       int end_offset,
-                                                       uint8_t const* mapper_name,
-                                                       int mapper_name_length,
-                                                       int limit,
-                                                       int target_bytes,
-                                                       FDBStreamingMode mode,
-                                                       int iteration,
-                                                       fdb_bool_t snapshot,
-                                                       fdb_bool_t reverse) {
-	fprintf(stderr, "GetRangeAndFlatMap is removed from 7.0. Please upgrade to 7.1 and use GetMappedRange\n");
-	abort();
-}
-
 FDBFuture* fdb_transaction_get_range_selector_v13(FDBTransaction* tr,
                                                   uint8_t const* begin_key_name,
                                                   int begin_key_name_length,
@@ -926,7 +905,6 @@ extern "C" DLLEXPORT fdb_error_t fdb_select_api_version_impl(int runtime_version
 	// WARNING: use caution when implementing removed functions by calling public API functions. This can lead to
 	// undesired behavior when using the multi-version API. Instead, it is better to have both the removed and public
 	// functions call an internal implementation function. See fdb_create_database_impl for an example.
-	FDB_API_REMOVED(fdb_transaction_get_range_and_flat_map, 710);
 	FDB_API_REMOVED(fdb_future_get_version, 620);
 	FDB_API_REMOVED(fdb_create_cluster, 610);
 	FDB_API_REMOVED(fdb_cluster_create_database, 610);
diff --git a/documentation/sphinx/source/administration.rst b/documentation/sphinx/source/administration.rst
index 8602f67b363..424d9a6f2a2 100644
--- a/documentation/sphinx/source/administration.rst
+++ b/documentation/sphinx/source/administration.rst
@@ -762,6 +762,11 @@ You can now remove old client library versions from your clients. This is only t
 Version-specific notes on upgrading
 ===================================
 
+Upgrading to 7.1.x
+--------------------
+
+Upgrades to 7.1.0 or later will break any client using ``fdb_transaction_get_range_and_flat_map``, as it is removed in version 7.1.0.
+
 Upgrading from 6.2.x
 --------------------
 
diff --git a/documentation/sphinx/source/api-version-upgrade-guide.rst b/documentation/sphinx/source/api-version-upgrade-guide.rst
index 46e5aa6fcc1..d97a4761aa4 100644
--- a/documentation/sphinx/source/api-version-upgrade-guide.rst
+++ b/documentation/sphinx/source/api-version-upgrade-guide.rst
@@ -17,6 +17,8 @@ API version 710
 General
 -------
 
+* ``fdb_transaction_get_range_and_flat_map`` API is replaced by ``fdb_transaction_get_mapped_range`` in version 710. The function ``fdb_transaction_get_range_and_flat_map`` is not supported in any API version.
+
 .. _api-version-upgrade-guide-700:
 
 API version 700

From a748112f7dd19bb2ca6b3b2ee0a14c4d8efd8f16 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Fri, 10 Jun 2022 16:53:19 -0700
Subject: [PATCH 492/740] Remove unnecessary transaction initialization

`ReadYourWritesTransaction` has memory allocated before being passed to
the main thread. This allows both threads to continue to access the
transaction object. Currently, the transaction gets allocated and
initialized on the foreign thread, and then re-initialized on the main
thread. This causes a bunch of extra, unnecessary work for each
`ReadYourWritesTransaction` where the temporary object gets destructed.

The fix is to only allocate memory for the `ReadYourWritesTransaction`
on the foreign thread, and then initialize it once on the main thread.
---
 fdbclient/ISingleThreadTransaction.cpp |  7 ++++++-
 fdbclient/ThreadSafeTransaction.cpp    | 14 +++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/fdbclient/ISingleThreadTransaction.cpp b/fdbclient/ISingleThreadTransaction.cpp
index e37213c149f..df5fdef79ef 100644
--- a/fdbclient/ISingleThreadTransaction.cpp
+++ b/fdbclient/ISingleThreadTransaction.cpp
@@ -26,9 +26,14 @@
 
 ISingleThreadTransaction* ISingleThreadTransaction::allocateOnForeignThread(Type type) {
 	if (type == Type::RYW) {
-		auto tr = new ReadYourWritesTransaction;
+		// We only want to allocate memory for the transaction, not initialize
+		// the object, so use operator new instead of new. The RYWTransaction
+		// will get initialized on the main thread.
+		auto tr =
+		    (ReadYourWritesTransaction*)ReadYourWritesTransaction::operator new(sizeof(ReadYourWritesTransaction));
 		return tr;
 	} else if (type == Type::SIMPLE_CONFIG) {
+		// Configuration transaction objects expect to be initialized.
 		auto tr = new SimpleConfigTransaction;
 		return tr;
 	} else if (type == Type::PAXOS_CONFIG) {
diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index b350f5691dd..33c8047a393 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -190,12 +190,20 @@ ThreadSafeTransaction::ThreadSafeTransaction(DatabaseContext* cx,
 	auto tr = this->tr = ISingleThreadTransaction::allocateOnForeignThread(type);
 	// No deferred error -- if the construction of the RYW transaction fails, we have no where to put it
 	onMainThreadVoid(
-	    [tr, cx, tenant]() {
+	    [tr, cx, type, tenant]() {
 		    cx->addref();
 		    if (tenant.present()) {
-			    tr->construct(Database(cx), tenant.get());
+			    if (type == ISingleThreadTransaction::Type::RYW) {
+				    new (tr) ReadYourWritesTransaction(Database(cx), tenant.get());
+			    } else {
+				    tr->construct(Database(cx), tenant.get());
+			    }
 		    } else {
-			    tr->construct(Database(cx));
+			    if (type == ISingleThreadTransaction::Type::RYW) {
+				    new (tr) ReadYourWritesTransaction(Database(cx));
+			    } else {
+				    tr->construct(Database(cx));
+			    }
 		    }
 	    },
 	    nullptr);

From f0736ee21a854afcf8f8c1f79df38cd153d139fb Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 15 Jun 2022 13:50:55 -0400
Subject: [PATCH 493/740] Merge pull request #7391 from sbodagala/main

Do not always try to figure out the sequencer locality
---
 fdbserver/masterserver.actor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index d90a4c73653..b099a61c620 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -117,8 +117,9 @@ struct MasterData : NonCopyable, ReferenceCounted<MasterData> {
 			forceRecovery = false;
 		}
 		balancer = resolutionBalancer.resolutionBalancing();
-		locality = myInterface.locality.dcId().present() ? std::stoi(myInterface.locality.dcId().get().toString())
-		                                                 : tagLocalityInvalid;
+		locality = (SERVER_KNOBS->ENABLE_VERSION_VECTOR_HA_OPTIMIZATION && myInterface.locality.dcId().present())
+		               ? std::stoi(myInterface.locality.dcId().get().toString())
+		               : tagLocalityInvalid;
 	}
 	~MasterData() = default;
 };

From 97392cf811705cde6de235c4787039c4e6798f3f Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 15 Jun 2022 20:11:13 +0000
Subject: [PATCH 494/740] disable AVX for 7.1.10 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 382bdcd54821f2058eeadd0a3df9095f8605bc28 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 15 Jun 2022 20:12:40 +0000
Subject: [PATCH 495/740] enable AVX and update version for 7.1.11 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 185b721ebc1..4b41fb8d706 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.10
+  VERSION 7.1.11
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From b3f582795f71a98de6dbb857325c46282d05c7c2 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Thu, 16 Jun 2022 15:36:38 +0000
Subject: [PATCH 496/740] update version after 7.1.11 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b41fb8d706..842706e6435 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.11
+  VERSION 7.1.12
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From fc3fca6668de7e1734a94eb503f314fb0b466c18 Mon Sep 17 00:00:00 2001
From: 1inker <67271937+1inker@users.noreply.github.com>
Date: Mon, 20 Jun 2022 09:21:58 +0300
Subject: [PATCH 497/740] Ow fork 7.1 test (#2)

Added RPMs and DEBs deploy step
---
 .github/workflows/build.yml                | 136 +++++++++++++++++++--
 cmake/InstallLayout.cmake                  |  46 +++----
 packaging/multiversion/clients/postinst    |  20 +--
 packaging/multiversion/clients/prerm       |   2 +-
 packaging/multiversion/server/postinst-deb |   8 +-
 packaging/multiversion/server/postinst-rpm |   8 +-
 packaging/multiversion/server/prerm        |   2 +-
 7 files changed, 170 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2da2eba328d..2f18154afb8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
       id: vers
       shell: bash
       run: |
-        git fetch --prune --unshallow --tags
+        git fetch --prune --unshallow --tags --force
         GIT_VERSION=`git describe --tags`
         PROJECT_VERSION=`echo $GIT_VERSION | cut -d- -f1`
         BUILD_VERSION=`echo $GIT_VERSION | cut -d- -f2-3 --output-delimiter=.`
@@ -93,27 +93,31 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake -D FDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DGENERATE_DEBUG_PACKAGES=OFF -DENABLE_SIMULATION_TESTS=ON -G Ninja ${{github.workspace}}
+      run: cmake -D FDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DGENERATE_DEBUG_PACKAGES=OFF -G Ninja ${{github.workspace}}
 
     - name: Build
       working-directory: ${{github.workspace}}/bld
       shell: bash
       run: ninja -j 1
 
-    - name: Tests
-      working-directory: ${{github.workspace}}/bld
-      shell: bash
-      run: ctest -V
+    #- name: Minimal tests
+    #  working-directory: ${{github.workspace}}/bld
+    #  shell: bash
+    #  run: ctest -V
 
-    - name: Build rpms
+    - name: Build RPMs
       working-directory: ${{github.workspace}}/bld
       shell: bash
-      run: cpack -G RPM
+      run: |
+        cpack -G RPM
+        for fn in packages/*.rpm; do echo "$fn:"; rpm -qpRv $fn; echo; done
 
-    - name: Build deb
+    - name: Build DEBs
       working-directory: ${{github.workspace}}/bld
       shell: bash
-      run: cpack -G DEB
+      run: |
+        cpack -G DEB
+        for fn in packages/*.deb; do echo "$fn:"; dpkg -I $fn; done
 
     #- name: Remove versioned
     #  shell: bash
@@ -123,13 +127,57 @@ jobs:
       uses: nanoufo/action-upload-artifacts-and-release-assets@v1.4
       with:
         path: |
-          ${{github.workspace}}/bld/packages/*${{needs.calc_ver.outputs.full_ver}}.*
+          ${{github.workspace}}/bld/packages/*${{needs.calc_ver.outputs.full_ver}}*
         upload-release-files: ${{ needs.calc_ver.outputs.release_flag }}
         release-upload-url: ${{ needs.calc_ver.outputs.release_upload_url }}
         if-no-files-found: error
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+  test_deploy:
+    needs: [calc_ver, build_linux]
+    runs-on: ubuntu-latest
+    env:
+      RHEL_IMAGE_NAME: "registry.access.redhat.com/ubi8/ubi:latest"
+      UBUNTU_IMAGE_NAME: "ubuntu:21.10"
+
+    steps:
+      - name: Download RPMs and DEBs packages
+        uses: actions/download-artifact@v3
+        id: download_packages
+
+      - name: Echo download path
+        run: echo ${{steps.download_packages.outputs.download-path}}
+
+      - name: Display structure of downloaded files
+        run: ls -R
+        working-directory: ${{github.workspace}}
+
+      - name: Download RHEL and Ubuntu images
+        run: |
+          podman pull ${{ env.RHEL_IMAGE_NAME }}
+          podman pull ${{ env.UBUNTU_IMAGE_NAME }}
+
+      - name: Test RPMs deploy
+        shell: bash
+        run: |
+          MY_ARCH=`uname -m`
+          curr_path="${{ github.workspace }}"
+          server="foundationdb-server-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
+          clients="foundationdb-clients-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
+
+      - name: Test DEBs deploy
+        shell: bash
+        run: |
+          MY_ARCH=`dpkg-architecture -q DEB_BUILD_ARCH`
+          curr_path="${{ github.workspace }}"
+          server="foundationdb-server_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
+          clients="foundationdb-clients_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
+
   release:
     needs: [calc_ver, build_linux]
     if: ${{ needs.calc_ver.outputs.release_flag == 'ON' }}
@@ -141,3 +189,69 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         release_id: ${{ needs.calc_ver.outputs.release_id }}
+
+  tests:
+    needs: [calc_ver, build_linux]
+    runs-on: ubuntu-latest
+    env:
+      JOSHUA_DB_VER: "6.3.15"
+      N_OF_TESTS: 600 # to fit in 360 minutes job run limit
+      JOSHUA_AGENT_URL: "docker.io/osamarin68"
+      JOSHUA_AGENT_TAG: "8.6.3"
+
+    steps:
+      - name: Install dependencies
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y sudo wget crudini git python3 python3-pip
+          sudo pip3 install wheel setuptools python-dateutil lxml
+
+      - name: Install FoundationDb
+        shell: bash
+        run: |
+          mkdir deb
+          pushd deb
+          MY_ARCH=`dpkg-architecture -q DEB_BUILD_ARCH`
+          wget https://github.com/apple/foundationdb/releases/download/${{ env.JOSHUA_DB_VER }}/foundationdb-clients_${{ env.JOSHUA_DB_VER }}-1_${MY_ARCH}.deb https://github.com/apple/foundationdb/releases/download/${{ env.JOSHUA_DB_VER }}/foundationdb-server_${{ env.JOSHUA_DB_VER }}-1_${MY_ARCH}.deb
+          sudo apt-get install -y ./foundationdb-clients_${{ env.JOSHUA_DB_VER }}-1_${MY_ARCH}.deb ./foundationdb-server_${{ env.JOSHUA_DB_VER }}-1_${MY_ARCH}.deb
+          popd
+          sudo systemctl stop foundationdb
+          MY_IP=`hostname -I | awk '{print $1}'`
+          sudo sed -i s/127.0.0.1/$MY_IP/ /etc/foundationdb/fdb.cluster
+          sudo crudini --set /etc/foundationdb/foundationdb.conf fdbserver memory 4GiB
+          sudo systemctl start foundationdb
+          pip3 install 'foundationdb==${{ env.JOSHUA_DB_VER }}'
+
+      - name: Download the correctness package
+        uses: actions/download-artifact@v2
+        id: download_correctness
+        with:
+          name: correctness-${{needs.calc_ver.outputs.full_ver}}.tar.gz
+
+      - name: 'Echo download path'
+        run: echo ${{steps.download_correctness.outputs.download-path}}
+
+      - name: Display structure of downloaded files
+        run: ls -R
+        working-directory: ${{github.workspace}}
+
+      - name: Download joshua
+        shell: bash
+        run: |
+          git clone https://github.com/FoundationDB/fdb-joshua.git
+
+      - name: run joshua-agent
+        shell: bash
+        run: |
+          podman pull ${{ env.JOSHUA_AGENT_URL }}/joshua-agent:${{ env.JOSHUA_AGENT_TAG }}
+          podman create --name joshua-agent -v /etc/foundationdb:/etc/foundationdb -it joshua-agent:${{ env.JOSHUA_AGENT_TAG }}
+          podman start joshua-agent
+
+      - name: run tests
+        shell: bash
+        working-directory: ${{github.workspace}}/fdb-joshua
+        run: |
+          podman ps
+          python3 -m joshua.joshua start --tarball ${{github.workspace}}/correctness-${{needs.calc_ver.outputs.full_ver}}.tar.gz --max-runs ${{ env.N_OF_TESTS }} && \
+            python3 -m joshua.joshua tail
diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index 31c22da5b91..5ca4a20dc34 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -201,13 +201,11 @@ set(CPACK_COMPONENT_SERVER-EL8_DEPENDS clients-el8)
 set(CPACK_COMPONENT_SERVER-DEB_DEPENDS clients-deb)
 set(CPACK_COMPONENT_SERVER-TGZ_DEPENDS clients-tgz)
 set(CPACK_COMPONENT_SERVER-VERSIONED_DEPENDS clients-versioned)
-set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_REQUIRES
-  "foundationdb${FDB_VERSION}-clients")
 
 set(CPACK_COMPONENT_SERVER-EL8_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-DEB_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-TGZ_DISPLAY_NAME "foundationdb-server")
-set(CPACK_COMPONENT_SERVER-VERSIONED_DISPLAY_NAME "foundationdb$-server-${FDB_VERSION}")
+set(CPACK_COMPONENT_SERVER-VERSIONED_DISPLAY_NAME "foundationdb-server-${FDB_VERSION}")
 
 set(CPACK_COMPONENT_CLIENTS-EL8_DISPLAY_NAME "foundationdb-clients")
 set(CPACK_COMPONENT_CLIENTS-DEB_DISPLAY_NAME "foundationdb-clients")
@@ -275,14 +273,14 @@ set(CPACK_RPM_SERVER-EL8_USER_FILELIST                     "%config(noreplace) /
                                                            "%attr(0700,foundationdb,foundationdb) /var/log/foundationdb"
                                                            "%attr(0700,foundationdb,foundationdb) /var/lib/foundationdb")
 
-set(CPACK_RPM_CLIENTS-VERSIONED_PACKAGE_NAME               "${clients_package_basename}${FDB_VERSION}")
+set(CPACK_RPM_CLIENTS-VERSIONED_PACKAGE_NAME               "${clients_package_basename}")
 set(CPACK_RPM_CLIENTS-VERSIONED_FILE_NAME                  "${rpm-clients-filename}.versioned.${CMAKE_SYSTEM_PROCESSOR}.rpm")
-set(CPACK_RPM_CLIENTS-VERSIONED_POST_INSTALL_SCRIPT_FILE   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/postinst-el8)
+set(CPACK_RPM_CLIENTS-VERSIONED_POST_INSTALL_SCRIPT_FILE   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/postinst)
 set(CPACK_RPM_CLIENTS-VERSIONED_PRE_UNINSTALL_SCRIPT_FILE  ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/prerm)
 
-set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_NAME                "${server_package_basename}${FDB_VERSION}")
+set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_NAME                "${server_package_basename}")
 set(CPACK_RPM_SERVER-VERSIONED_FILE_NAME                   "${rpm-server-filename}.versioned.${CMAKE_SYSTEM_PROCESSOR}.rpm")
-set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_REQUIRES            "${CPACK_COMPONENT_CLIENTS-VERSIONED_DISPLAY_NAME}")
+set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_REQUIRES            "${CPACK_RPM_CLIENTS-VERSIONED_PACKAGE_NAME} = ${FDB_VERSION}")
 set(CPACK_RPM_SERVER-VERSIONED_POST_INSTALL_SCRIPT_FILE    ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst-rpm)
 set(CPACK_RPM_SERVER-VERSIONED_PRE_UNINSTALL_SCRIPT_FILE   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/prerm)
 
@@ -310,7 +308,7 @@ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
   "/usr/lib/pkgconfig"
   "/usr/lib/foundationdb"
   "/usr/lib/cmake"
-  "/usr/lib/foundationdb-${FDB_VERSION}${FDB_BUILDTIME_STRING}/etc/foundationdb"
+  "/usr/lib/foundationdb-${FDB_VERSION}/etc/foundationdb"
   )
 set(CPACK_RPM_DEBUGINFO_PACKAGE ${GENERATE_DEBUG_PACKAGES})
 #set(CPACK_RPM_BUILD_SOURCE_FDB_INSTALL_DIRS_PREFIX /usr/src)
@@ -333,33 +331,39 @@ else()
 endif()
 
 set(CPACK_DEB_COMPONENT_INSTALL ON)
+set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
 set(CPACK_DEBIAN_DEBUGINFO_PACKAGE ${GENERATE_DEBUG_PACKAGES})
 set(CPACK_DEBIAN_PACKAGE_SECTION "database")
-set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
 
-set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_NAME "${server_package_basename}")
-set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_NAME "${clients_package_basename}")
-set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_NAME "foundationdb${FDB_VERSION}-server")
-set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_NAME "foundationdb${FDB_VERSION}-clients")
+set(CPACK_DEBIAN_SERVER-PACKAGE_NAME "${server_package_basename}")
+set(CPACK_DEBIAN_CLIENTS-PACKAGE_NAME "${clients_package_basename}")
+
+set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_NAME "${server_package_basename}")
+set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_NAME "${clients_package_basename}")
+
+set(CPACK_DEBIAN-SERVER-PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
+set(CPACK_DEBIAN-SERVER-PACKAGE_RECOMMENDS "python (>= 2.6)")
+set(CPACK_DEBIAN-CLIENTS-PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
+
+set(CPACK_DEBIAN-SERVER_VERSIONED-PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
+set(CPACK_DEBIAN-SERVER_VERSIONED-PACKAGE_RECOMMENDS "python (>= 2.6)")
+set(CPACK_DEBIAN-CLIENTS_VERSIONED-PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 
-set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
-set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_RECOMMENDS "python (>= 2.6)")
-set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.foundationdb.org")
-set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_CONTROL_EXTRA
+set(CPACK_DEBIAN-CLIENTS-PACKAGE_CONTROL_EXTRA
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-clients/postinst)
-set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_CONTROL_EXTRA
+set(CPACK_DEBIAN-SERVER-PACKAGE_CONTROL_EXTRA
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/conffiles
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/preinst
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/postinst
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/prerm
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/postrm)
 
-set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_CONTROL_EXTRA
+set(CPACK_DEBIAN-CLIENTS_VERSIONED-PACKAGE_CONTROL_EXTRA
   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/postinst
   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/prerm)
-set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_CONTROL_EXTRA
-  ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst
+set(CPACK_DEBIAN-SERVER_VERSIONED-PACKAGE_CONTROL_EXTRA
+  ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst-deb
   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/prerm)
 
 ################################################################################
diff --git a/packaging/multiversion/clients/postinst b/packaging/multiversion/clients/postinst
index 52e33d4b1c4..149fdd28653 100644
--- a/packaging/multiversion/clients/postinst
+++ b/packaging/multiversion/clients/postinst
@@ -14,13 +14,13 @@ fi
 
 mkdir -p /usr/lib/foundationdb/backup_agent
 
-update-alternatives --install /usr/bin/fdbcli fdbclients /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/bin/fdbcli @ALTERNATIVES_PRIORITY@ \
-    --slave /usr/bin/fdbbackup fdbbackup /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/bin/fdbbackup \
-    --slave /usr/bin/fdbrestore fdbrestore /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/bin/fdbbackup \
-    --slave /usr/bin/dr_agent dr_agent /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/bin/fdbbackup \
-    --slave /usr/bin/fdbdr fdbdr /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/bin/fdbbackup \
-    --slave /usr/lib/foundationdb/backup_agent/backup_agent backup_agent /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/bin/fdbbackup \
-    --slave /usr/@LIB_DIR@/libfdb_c.so libfdb_c /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/lib/libfdb_c.so \
-    --slave /usr/@LIB_DIR@/pkgconfig/foundationdb-client.pc foundationdb-client.pc /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/lib/pkgconfig/foundationdb-client.pc \
-    --slave /usr/@LIB_DIR@/cmake/FoundationDB-Client FoundationDB-ClientConfig /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/lib/cmake/FoundationDB-Client \
-    --slave /usr/include/foundationdb fdb-client-headers /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/include/foundationdb
+update-alternatives --install /usr/bin/fdbcli fdbclients /usr/lib/foundationdb-@FDB_VERSION@/bin/fdbcli @ALTERNATIVES_PRIORITY@ \
+    --slave /usr/bin/fdbbackup fdbbackup /usr/lib/foundationdb-@FDB_VERSION@/bin/fdbbackup \
+    --slave /usr/bin/fdbrestore fdbrestore /usr/lib/foundationdb-@FDB_VERSION@/bin/fdbbackup \
+    --slave /usr/bin/dr_agent dr_agent /usr/lib/foundationdb-@FDB_VERSION@/bin/fdbbackup \
+    --slave /usr/bin/fdbdr fdbdr /usr/lib/foundationdb-@FDB_VERSION@/bin/fdbbackup \
+    --slave /usr/lib/foundationdb/backup_agent/backup_agent backup_agent /usr/lib/foundationdb-@FDB_VERSION@/bin/fdbbackup \
+    --slave /usr/@LIB_DIR@/libfdb_c.so libfdb_c /usr/lib/foundationdb-@FDB_VERSION@/lib/libfdb_c.so \
+    --slave /usr/@LIB_DIR@/pkgconfig/foundationdb-client.pc foundationdb-client.pc /usr/lib/foundationdb-@FDB_VERSION@/lib/pkgconfig/foundationdb-client.pc \
+    --slave /usr/@LIB_DIR@/cmake/FoundationDB-Client FoundationDB-ClientConfig /usr/lib/foundationdb-@FDB_VERSION@/lib/cmake/FoundationDB-Client \
+    --slave /usr/include/foundationdb fdb-client-headers /usr/lib/foundationdb-@FDB_VERSION@/include/foundationdb
diff --git a/packaging/multiversion/clients/prerm b/packaging/multiversion/clients/prerm
index 0a87f237544..3bdce848a5a 100644
--- a/packaging/multiversion/clients/prerm
+++ b/packaging/multiversion/clients/prerm
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-update-alternatives --remove fdbclients /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/bin/fdbcli
+update-alternatives --remove fdbclients /usr/lib/foundationdb-@FDB_VERSION@/bin/fdbcli
diff --git a/packaging/multiversion/server/postinst-deb b/packaging/multiversion/server/postinst-deb
index 5a9ac5c6426..d4b3c574367 100644
--- a/packaging/multiversion/server/postinst-deb
+++ b/packaging/multiversion/server/postinst-deb
@@ -7,16 +7,16 @@ mkdir -p /var/lib/foundationdb/data /var/log/foundationdb
 chown -R foundationdb:foundationdb /var/lib/foundationdb /var/log/foundationdb
 chmod -R 0750 /var/lib/foundationdb/data /var/log/foundationdb
 
-update-alternatives --install /usr/sbin/fdbserver fdbserver /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/sbin/fdbserver @ALTERNATIVES_PRIORITY@ \
-    --slave /usr/lib/foundationdb/fdbmonitor fdbmonitor /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/sbin/fdbmonitor \
-    --slave /etc/init.d/foundationdb foundationdb.service /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/etc/init.d/foundationdb
+update-alternatives --install /usr/sbin/fdbserver fdbserver /usr/lib/foundationdb-@FDB_VERSION@/sbin/fdbserver @ALTERNATIVES_PRIORITY@ \
+    --slave /usr/lib/foundationdb/fdbmonitor fdbmonitor /usr/lib/foundationdb-@FDB_VERSION@/sbin/fdbmonitor \
+    --slave /etc/init.d/foundationdb foundationdb.service /usr/lib/foundationdb-@FDB_VERSION@/etc/init.d/foundationdb
 
 if mkdir /etc/foundationdb
 then
     description=`LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 8`
     random_str=`LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 8`
     echo $description:$random_str@127.0.0.1:4500 > /etc/foundationdb/fdb.cluster
-    cp /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/etc/foundationdb/foundationdb.conf /etc/foundationdb/foundationdb.conf
+    cp /usr/lib/foundationdb-@FDB_VERSION@/etc/foundationdb/foundationdb.conf /etc/foundationdb/foundationdb.conf
     chown -R foundationdb:foundationdb /etc/foundationdb
     chmod 775 /etc/foundationdb
     chmod 0664 /etc/foundationdb/fdb.cluster
diff --git a/packaging/multiversion/server/postinst-rpm b/packaging/multiversion/server/postinst-rpm
index 797d716fd3e..a6c0a77aec3 100644
--- a/packaging/multiversion/server/postinst-rpm
+++ b/packaging/multiversion/server/postinst-rpm
@@ -8,16 +8,16 @@ chown -R foundationdb:foundationdb /var/lib/foundationdb /var/log/foundationdb
 chmod -R 0750 /var/lib/foundationdb/data /var/log/foundationdb
 
 mkdir -p /usr/lib/foundationdb
-update-alternatives --install /usr/sbin/fdbserver fdbserver /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/sbin/fdbserver @ALTERNATIVES_PRIORITY@ \
-    --slave /usr/lib/foundationdb/fdbmonitor fdbmonitor /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/sbin/fdbmonitor \
-    --slave /lib/systemd/system/foundationdb.service foundationdb.service /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/lib/systemd/system/foundationdb.service
+update-alternatives --install /usr/sbin/fdbserver fdbserver /usr/lib/foundationdb-@FDB_VERSION@/sbin/fdbserver @ALTERNATIVES_PRIORITY@ \
+    --slave /usr/lib/foundationdb/fdbmonitor fdbmonitor /usr/lib/foundationdb-@FDB_VERSION@/sbin/fdbmonitor \
+    --slave /lib/systemd/system/foundationdb.service foundationdb.service /usr/lib/foundationdb-@FDB_VERSION@/lib/systemd/system/foundationdb.service
 
 if mkdir /etc/foundationdb
 then
     description=`LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 8`
     random_str=`LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 8`
     echo $description:$random_str@127.0.0.1:4500 > /etc/foundationdb/fdb.cluster
-    cp /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/etc/foundationdb/foundationdb.conf /etc/foundationdb/foundationdb.conf
+    cp /usr/lib/foundationdb-@FDB_VERSION@/etc/foundationdb/foundationdb.conf /etc/foundationdb/foundationdb.conf
     chown -R foundationdb:foundationdb /etc/foundationdb
     chmod 775 /etc/foundationdb
     chmod 0664 /etc/foundationdb/fdb.cluster
diff --git a/packaging/multiversion/server/prerm b/packaging/multiversion/server/prerm
index 1b6f66bb1e1..3edd30a36d5 100644
--- a/packaging/multiversion/server/prerm
+++ b/packaging/multiversion/server/prerm
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-update-alternatives --remove fdbserver /usr/lib/foundationdb-@FDB_VERSION@@FDB_BUILDTIME_STRING@/sbin/fdbserver
+update-alternatives --remove fdbserver /usr/lib/foundationdb-@FDB_VERSION@/sbin/fdbserver

From 08b065e33dba6a204314bcd89ece8a2f22c75e43 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Tue, 22 Mar 2022 06:10:34 +0000
Subject: [PATCH 498/740] Add openssl for debugging in container image

---
 packaging/docker/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 7f316ff2716..d8de7d5226b 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -43,6 +43,7 @@ RUN yum install -y \
     telnet-0.17-66.el7 \
     traceroute-2.0.22-2.el7 \
     unzip-6.0-22.el7_9 \
+    openssl-1.0.2k-24.el7_9.x86_64 \
     vim-enhanced-7.4.629-8.el7_9 && \
     yum clean all && \
     rm -rf /var/cache/yum

From 223e11d95a67db91fc9f72150f4cfc03e6843292 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Fri, 17 Jun 2022 16:35:17 -0700
Subject: [PATCH 499/740] Fix undefined behavior from accessing field of
 uninitialized object

---
 fdbclient/ThreadSafeTransaction.cpp | 38 +++++++++++++++++------------
 flow/ThreadHelper.actor.h           | 31 ++++++++++++++++++-----
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index 33c8047a393..7fbca4809c9 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -78,7 +78,8 @@ void ThreadSafeDatabase::setOption(FDBDatabaseOptions::Option option, Optional<S
 		    db->checkDeferredError();
 		    db->setOption(option, passValue.contents());
 	    },
-	    &db->deferredError);
+	    db,
+	    &DatabaseContext::deferredError);
 }
 
 ThreadFuture<int64_t> ThreadSafeDatabase::rebootWorker(const StringRef& address, bool check, int duration) {
@@ -228,7 +229,7 @@ void ThreadSafeTransaction::cancel() {
 
 void ThreadSafeTransaction::setVersion(Version v) {
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr, v]() { tr->setVersion(v); }, &tr->deferredError);
+	onMainThreadVoid([tr, v]() { tr->setVersion(v); }, tr, &ISingleThreadTransaction::deferredError);
 }
 
 ThreadFuture<Version> ThreadSafeTransaction::getReadVersion() {
@@ -386,12 +387,12 @@ void ThreadSafeTransaction::addReadConflictRange(const KeyRangeRef& keys) {
 	KeyRange r = keys;
 
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr, r]() { tr->addReadConflictRange(r); }, &tr->deferredError);
+	onMainThreadVoid([tr, r]() { tr->addReadConflictRange(r); }, tr, &ISingleThreadTransaction::deferredError);
 }
 
 void ThreadSafeTransaction::makeSelfConflicting() {
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr]() { tr->makeSelfConflicting(); }, &tr->deferredError);
+	onMainThreadVoid([tr]() { tr->makeSelfConflicting(); }, tr, &ISingleThreadTransaction::deferredError);
 }
 
 void ThreadSafeTransaction::atomicOp(const KeyRef& key, const ValueRef& value, uint32_t operationType) {
@@ -399,7 +400,9 @@ void ThreadSafeTransaction::atomicOp(const KeyRef& key, const ValueRef& value, u
 	Value v = value;
 
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr, k, v, operationType]() { tr->atomicOp(k, v, operationType); }, &tr->deferredError);
+	onMainThreadVoid([tr, k, v, operationType]() { tr->atomicOp(k, v, operationType); },
+	                 tr,
+	                 &ISingleThreadTransaction::deferredError);
 }
 
 void ThreadSafeTransaction::set(const KeyRef& key, const ValueRef& value) {
@@ -407,14 +410,14 @@ void ThreadSafeTransaction::set(const KeyRef& key, const ValueRef& value) {
 	Value v = value;
 
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr, k, v]() { tr->set(k, v); }, &tr->deferredError);
+	onMainThreadVoid([tr, k, v]() { tr->set(k, v); }, tr, &ISingleThreadTransaction::deferredError);
 }
 
 void ThreadSafeTransaction::clear(const KeyRangeRef& range) {
 	KeyRange r = range;
 
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr, r]() { tr->clear(r); }, &tr->deferredError);
+	onMainThreadVoid([tr, r]() { tr->clear(r); }, tr, &ISingleThreadTransaction::deferredError);
 }
 
 void ThreadSafeTransaction::clear(const KeyRef& begin, const KeyRef& end) {
@@ -429,14 +432,15 @@ void ThreadSafeTransaction::clear(const KeyRef& begin, const KeyRef& end) {
 
 		    tr->clear(KeyRangeRef(b, e));
 	    },
-	    &tr->deferredError);
+	    tr,
+	    &ISingleThreadTransaction::deferredError);
 }
 
 void ThreadSafeTransaction::clear(const KeyRef& key) {
 	Key k = key;
 
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr, k]() { tr->clear(k); }, &tr->deferredError);
+	onMainThreadVoid([tr, k]() { tr->clear(k); }, tr, &ISingleThreadTransaction::deferredError);
 }
 
 ThreadFuture<Void> ThreadSafeTransaction::watch(const KeyRef& key) {
@@ -453,7 +457,7 @@ void ThreadSafeTransaction::addWriteConflictRange(const KeyRangeRef& keys) {
 	KeyRange r = keys;
 
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr, r]() { tr->addWriteConflictRange(r); }, &tr->deferredError);
+	onMainThreadVoid([tr, r]() { tr->addWriteConflictRange(r); }, tr, &ISingleThreadTransaction::deferredError);
 }
 
 ThreadFuture<Void> ThreadSafeTransaction::commit() {
@@ -465,16 +469,18 @@ ThreadFuture<Void> ThreadSafeTransaction::commit() {
 }
 
 Version ThreadSafeTransaction::getCommittedVersion() {
-	// This should be thread safe when called legally, but it is fragile
-	return tr->getCommittedVersion();
+	ISingleThreadTransaction* tr = this->tr;
+	return onMainThread([tr]() -> Future<Version> { return tr->getCommittedVersion(); }).get();
 }
 
 VersionVector ThreadSafeTransaction::getVersionVector() {
-	return tr->getVersionVector();
+	ISingleThreadTransaction* tr = this->tr;
+	return onMainThread([tr]() -> Future<VersionVector> { return tr->getVersionVector(); }).get();
 }
 
 UID ThreadSafeTransaction::getSpanID() {
-	return tr->getSpanID();
+	ISingleThreadTransaction* tr = this->tr;
+	return onMainThread([tr]() -> Future<UID> { return tr->getSpanID(); }).get();
 }
 
 ThreadFuture<int64_t> ThreadSafeTransaction::getApproximateSize() {
@@ -497,7 +503,9 @@ void ThreadSafeTransaction::setOption(FDBTransactionOptions::Option option, Opti
 	Standalone<Optional<StringRef>> passValue = value;
 
 	// ThreadSafeTransaction is not allowed to do anything with options except pass them through to RYW.
-	onMainThreadVoid([tr, option, passValue]() { tr->setOption(option, passValue.contents()); }, &tr->deferredError);
+	onMainThreadVoid([tr, option, passValue]() { tr->setOption(option, passValue.contents()); },
+	                 tr,
+	                 &ISingleThreadTransaction::deferredError);
 }
 
 ThreadFuture<Void> ThreadSafeTransaction::checkDeferredError() {
diff --git a/flow/ThreadHelper.actor.h b/flow/ThreadHelper.actor.h
index 7d1f7aa2e90..cb852f7b30d 100644
--- a/flow/ThreadHelper.actor.h
+++ b/flow/ThreadHelper.actor.h
@@ -39,15 +39,24 @@
 namespace internal_thread_helper {
 
 ACTOR template <class F>
-void doOnMainThreadVoid(Future<Void> signal, F f, Error* err) {
+void doOnMainThreadVoid(Future<Void> signal, F f) {
 	wait(signal);
-	if (err && err->code() != invalid_error_code)
+	try {
+		f();
+	} catch (Error& e) {
+	}
+}
+
+ACTOR template <class F, class T>
+void doOnMainThreadVoid(Future<Void> signal, F f, T* t, Error T::*member) {
+	wait(signal);
+	if (t && (t->*member).code() != invalid_error_code)
 		return;
 	try {
 		f();
 	} catch (Error& e) {
-		if (err)
-			*err = e;
+		if (t)
+			t->*member = e;
 	}
 }
 
@@ -63,11 +72,21 @@ void doOnMainThreadVoid(Future<Void> signal, F f, Error* err) {
 // WARNING: The error returned in `err` can only be read on the FDB network thread because there is no way to
 // order the write to `err` with actions on other threads.
 //
+// WARNING: The Error member of `T` is accepted as a pointer to a data member so the caller can avoid dereferencing
+// `T` until it is initialized on the main thread.
+//
 // `onMainThreadVoid` is defined here because of the dependency in `ThreadSingleAssignmentVarBase`.
+template <class F, class T>
+void onMainThreadVoid(F f, T* t, Error T::*member, TaskPriority taskID = TaskPriority::DefaultOnMainThread) {
+	Promise<Void> signal;
+	internal_thread_helper::doOnMainThreadVoid(signal.getFuture(), f, t, member);
+	g_network->onMainThread(std::move(signal), taskID);
+}
+
 template <class F>
-void onMainThreadVoid(F f, Error* err = nullptr, TaskPriority taskID = TaskPriority::DefaultOnMainThread) {
+void onMainThreadVoid(F f, std::nullptr_t = nullptr, TaskPriority taskID = TaskPriority::DefaultOnMainThread) {
 	Promise<Void> signal;
-	internal_thread_helper::doOnMainThreadVoid(signal.getFuture(), f, err);
+	internal_thread_helper::doOnMainThreadVoid(signal.getFuture(), f);
 	g_network->onMainThread(std::move(signal), taskID);
 }
 

From 87594ec4e11e001949249bf8b06ab3626d6b7082 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Fri, 17 Jun 2022 17:56:50 -0700
Subject: [PATCH 500/740] Check initialization status before accessing field

---
 fdbclient/IClientApi.h                      |  4 ++--
 fdbclient/MultiVersionTransaction.actor.cpp |  6 +++---
 fdbclient/MultiVersionTransaction.h         |  8 ++++----
 fdbclient/ThreadSafeTransaction.cpp         | 19 +++++++++++++------
 fdbclient/ThreadSafeTransaction.h           |  5 +++--
 fdbserver/workloads/ApiWorkload.h           | 14 ++++++++------
 6 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/fdbclient/IClientApi.h b/fdbclient/IClientApi.h
index 520d0aab774..a87663e11d8 100644
--- a/fdbclient/IClientApi.h
+++ b/fdbclient/IClientApi.h
@@ -99,8 +99,8 @@ class ITransaction {
 	// @todo This API and the "getSpanID()" API may help with debugging simulation
 	// test failures. (These APIs are not currently invoked anywhere.) Remove them
 	// later if they are not really needed.
-	virtual VersionVector getVersionVector() = 0;
-	virtual UID getSpanID() = 0;
+	virtual ThreadFuture<VersionVector> getVersionVector() = 0;
+	virtual ThreadFuture<UID> getSpanID() = 0;
 	virtual ThreadFuture<int64_t> getApproximateSize() = 0;
 
 	virtual void setOption(FDBTransactionOptions::Option option, Optional<StringRef> value = Optional<StringRef>()) = 0;
diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp
index 20517fc2647..34fd3d7f483 100644
--- a/fdbclient/MultiVersionTransaction.actor.cpp
+++ b/fdbclient/MultiVersionTransaction.actor.cpp
@@ -387,7 +387,7 @@ void DLTransaction::reset() {
 	api->transactionReset(tr);
 }
 
-VersionVector DLTransaction::getVersionVector() {
+ThreadFuture<VersionVector> DLTransaction::getVersionVector() {
 	return VersionVector(); // not implemented
 }
 
@@ -1100,7 +1100,7 @@ Version MultiVersionTransaction::getCommittedVersion() {
 	return invalidVersion;
 }
 
-VersionVector MultiVersionTransaction::getVersionVector() {
+ThreadFuture<VersionVector> MultiVersionTransaction::getVersionVector() {
 	auto tr = getTransaction();
 	if (tr.transaction) {
 		return tr.transaction->getVersionVector();
@@ -1109,7 +1109,7 @@ VersionVector MultiVersionTransaction::getVersionVector() {
 	return VersionVector();
 }
 
-UID MultiVersionTransaction::getSpanID() {
+ThreadFuture<UID> MultiVersionTransaction::getSpanID() {
 	auto tr = getTransaction();
 	if (tr.transaction) {
 		return tr.transaction->getSpanID();
diff --git a/fdbclient/MultiVersionTransaction.h b/fdbclient/MultiVersionTransaction.h
index b13081ebc64..e2b0c7e027c 100644
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@@ -377,8 +377,8 @@ class DLTransaction : public ITransaction, ThreadSafeReferenceCounted<DLTransact
 
 	ThreadFuture<Void> commit() override;
 	Version getCommittedVersion() override;
-	VersionVector getVersionVector() override;
-	UID getSpanID() override { return UID(); };
+	ThreadFuture<VersionVector> getVersionVector() override;
+	ThreadFuture<UID> getSpanID() override { return UID(); };
 	ThreadFuture<int64_t> getApproximateSize() override;
 
 	void setOption(FDBTransactionOptions::Option option, Optional<StringRef> value = Optional<StringRef>()) override;
@@ -566,8 +566,8 @@ class MultiVersionTransaction : public ITransaction, ThreadSafeReferenceCounted<
 
 	ThreadFuture<Void> commit() override;
 	Version getCommittedVersion() override;
-	VersionVector getVersionVector() override;
-	UID getSpanID() override;
+	ThreadFuture<VersionVector> getVersionVector() override;
+	ThreadFuture<UID> getSpanID() override;
 	ThreadFuture<int64_t> getApproximateSize() override;
 
 	void setOption(FDBTransactionOptions::Option option, Optional<StringRef> value = Optional<StringRef>()) override;
diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index 7fbca4809c9..a98d435478a 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -208,6 +208,7 @@ ThreadSafeTransaction::ThreadSafeTransaction(DatabaseContext* cx,
 		    }
 	    },
 	    nullptr);
+	this->initialized = true;
 }
 
 // This constructor is only used while refactoring fdbcli and only called from the main thread
@@ -469,18 +470,24 @@ ThreadFuture<Void> ThreadSafeTransaction::commit() {
 }
 
 Version ThreadSafeTransaction::getCommittedVersion() {
-	ISingleThreadTransaction* tr = this->tr;
-	return onMainThread([tr]() -> Future<Version> { return tr->getCommittedVersion(); }).get();
+	// This should be thread safe when called legally, but it is fragile
+	return tr->getCommittedVersion();
 }
 
-VersionVector ThreadSafeTransaction::getVersionVector() {
+ThreadFuture<VersionVector> ThreadSafeTransaction::getVersionVector() {
+	if (!initialized) {
+		return ::invalidVersionVector;
+	}
 	ISingleThreadTransaction* tr = this->tr;
-	return onMainThread([tr]() -> Future<VersionVector> { return tr->getVersionVector(); }).get();
+	return onMainThread([tr]() -> Future<VersionVector> { return tr->getVersionVector(); });
 }
 
-UID ThreadSafeTransaction::getSpanID() {
+ThreadFuture<UID> ThreadSafeTransaction::getSpanUID() {
+	if (!initialized) {
+		return SpanContext();
+	}
 	ISingleThreadTransaction* tr = this->tr;
-	return onMainThread([tr]() -> Future<UID> { return tr->getSpanID(); }).get();
+	return onMainThread([tr]() -> Future<UID> { return tr->getSpanID(); });
 }
 
 ThreadFuture<int64_t> ThreadSafeTransaction::getApproximateSize() {
diff --git a/fdbclient/ThreadSafeTransaction.h b/fdbclient/ThreadSafeTransaction.h
index 0ace0a2cfe1..a09ff399eb9 100644
--- a/fdbclient/ThreadSafeTransaction.h
+++ b/fdbclient/ThreadSafeTransaction.h
@@ -166,8 +166,8 @@ class ThreadSafeTransaction : public ITransaction, ThreadSafeReferenceCounted<Th
 
 	ThreadFuture<Void> commit() override;
 	Version getCommittedVersion() override;
-	VersionVector getVersionVector() override;
-	UID getSpanID() override;
+	ThreadFuture<VersionVector> getVersionVector() override;
+	ThreadFuture<UID> getSpanID() override;
 	ThreadFuture<int64_t> getApproximateSize() override;
 
 	ThreadFuture<uint64_t> getProtocolVersion();
@@ -192,6 +192,7 @@ class ThreadSafeTransaction : public ITransaction, ThreadSafeReferenceCounted<Th
 private:
 	ISingleThreadTransaction* tr;
 	const Optional<TenantName> tenantName;
+	std::atomic<bool> initialized = false;
 };
 
 // An implementation of IClientApi that serializes operations onto the network thread and interacts with the lower-level
diff --git a/fdbserver/workloads/ApiWorkload.h b/fdbserver/workloads/ApiWorkload.h
index 64836e03b6a..21a5779c99f 100644
--- a/fdbserver/workloads/ApiWorkload.h
+++ b/fdbserver/workloads/ApiWorkload.h
@@ -78,10 +78,10 @@ struct TransactionWrapper : public ReferenceCounted<TransactionWrapper> {
 	virtual Version getCommittedVersion() = 0;
 
 	// Gets the version vector cached in a transaction
-	virtual VersionVector getVersionVector() = 0;
+	virtual Future<VersionVector> getVersionVector() = 0;
 
 	// Gets the spanID of a transaction
-	virtual UID getSpanID() = 0;
+	virtual Future<UID> getSpanID() = 0;
 
 	// Prints debugging messages for a transaction; not implemented for all transaction types
 	virtual void debugTransaction(UID debugId) {}
@@ -159,10 +159,10 @@ struct FlowTransactionWrapper : public TransactionWrapper {
 	Version getCommittedVersion() override { return transaction.getCommittedVersion(); }
 
 	// Gets the version vector cached in a transaction
-	VersionVector getVersionVector() override { return transaction.getVersionVector(); }
+	Future<VersionVector> getVersionVector() override { return transaction.getVersionVector(); }
 
 	// Gets the spanID of a transaction
-	UID getSpanID() override { return transaction.getSpanID(); }
+	Future<UID> getSpanID() override { return transaction.getSpanID(); }
 
 	// Prints debugging messages for a transaction
 	void debugTransaction(UID debugId) override { transaction.debugTransaction(debugId); }
@@ -227,10 +227,12 @@ struct ThreadTransactionWrapper : public TransactionWrapper {
 	Version getCommittedVersion() override { return transaction->getCommittedVersion(); }
 
 	// Gets the version vector cached in a transaction
-	VersionVector getVersionVector() override { return transaction->getVersionVector(); }
+	Future<VersionVector> getVersionVector() override {
+		return unsafeThreadFutureToFuture(transaction->getVersionVector());
+	}
 
 	// Gets the spanID of a transaction
-	UID getSpanID() override { return transaction->getSpanID(); }
+	Future<UID> getSpanID() override { return unsafeThreadFutureToFuture(transaction->getSpanID()); }
 
 	void addReadConflictRange(KeyRangeRef const& keys) override { transaction->addReadConflictRange(keys); }
 };

From 6a7006e6ee7ccebf2405424c46780c201fa78af6 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Fri, 17 Jun 2022 18:04:09 -0700
Subject: [PATCH 501/740] Simplify function call when transaction is null

---
 fdbclient/AsyncTaskThread.h                   |  4 +-
 fdbclient/MultiVersionAssignmentVars.h        |  2 +-
 fdbclient/MultiVersionTransaction.actor.cpp   | 83 +++++++++----------
 fdbclient/ThreadSafeTransaction.cpp           | 68 +++++++--------
 fdbrpc/AsyncFileEIO.actor.h                   |  2 +-
 .../workloads/ExternalWorkload.actor.cpp      | 22 ++---
 fdbserver/workloads/ThreadSafety.actor.cpp    | 14 ++--
 flow/FileTraceLogWriter.cpp                   | 18 ++--
 flow/Net2.actor.cpp                           |  4 +-
 flow/ThreadHelper.actor.h                     |  2 +-
 flow/Trace.cpp                                |  2 +-
 flowbench/flowbench.actor.cpp                 |  2 +-
 12 files changed, 101 insertions(+), 122 deletions(-)

diff --git a/fdbclient/AsyncTaskThread.h b/fdbclient/AsyncTaskThread.h
index 94fbb9f7fe5..8f40a2305a6 100644
--- a/fdbclient/AsyncTaskThread.h
+++ b/fdbclient/AsyncTaskThread.h
@@ -86,10 +86,10 @@ class AsyncTaskThread {
 		addTask([promise, func, priority] {
 			try {
 				auto funcResult = func();
-				onMainThreadVoid([promise, funcResult] { promise.send(funcResult); }, nullptr, priority);
+				onMainThreadVoid([promise, funcResult] { promise.send(funcResult); }, priority);
 			} catch (Error& e) {
 				TraceEvent("ErrorExecutingAsyncTask").error(e);
-				onMainThreadVoid([promise, e] { promise.sendError(e); }, nullptr, priority);
+				onMainThreadVoid([promise, e] { promise.sendError(e); }, priority);
 			}
 		});
 		return promise.getFuture();
diff --git a/fdbclient/MultiVersionAssignmentVars.h b/fdbclient/MultiVersionAssignmentVars.h
index 0cdd67e1be8..265ce0b3fe1 100644
--- a/fdbclient/MultiVersionAssignmentVars.h
+++ b/fdbclient/MultiVersionAssignmentVars.h
@@ -202,7 +202,7 @@ class DLThreadSingleAssignmentVar final : public ThreadSingleAssignmentVar<T> {
 		auto sav = (DLThreadSingleAssignmentVar<T>*)param;
 
 		if (MultiVersionApi::api->callbackOnMainThread) {
-			onMainThreadVoid([sav]() { sav->apply(); }, nullptr);
+			onMainThreadVoid([sav]() { sav->apply(); });
 		} else {
 			sav->apply();
 		}
diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp
index 34fd3d7f483..cdbdbd30d99 100644
--- a/fdbclient/MultiVersionTransaction.actor.cpp
+++ b/fdbclient/MultiVersionTransaction.actor.cpp
@@ -1415,8 +1415,7 @@ MultiVersionDatabase::MultiVersionDatabase(MultiVersionApi* api,
 		});
 
 		Reference<DatabaseState> dbStateRef = dbState;
-		onMainThreadVoid([dbStateRef]() { dbStateRef->protocolVersionMonitor = dbStateRef->monitorProtocolVersion(); },
-		                 nullptr);
+		onMainThreadVoid([dbStateRef]() { dbStateRef->protocolVersionMonitor = dbStateRef->monitorProtocolVersion(); });
 	}
 }
 
@@ -1583,7 +1582,7 @@ ThreadFuture<Void> MultiVersionDatabase::DatabaseState::monitorProtocolVersion()
 
 		ProtocolVersion clusterVersion =
 		    !cv.isError() ? cv.get() : self->dbProtocolVersion.orDefault(currentProtocolVersion);
-		onMainThreadVoid([self, clusterVersion]() { self->protocolVersionChanged(clusterVersion); }, nullptr);
+		onMainThreadVoid([self, clusterVersion]() { self->protocolVersionChanged(clusterVersion); });
 		return ErrorOr<Void>(Void());
 	});
 }
@@ -1647,10 +1646,10 @@ void MultiVersionDatabase::DatabaseState::protocolVersionChanged(ProtocolVersion
 				dbReady = mapThreadFuture<Void, Void>(
 				    newDb.castTo<DLDatabase>()->onReady(), [self, newDb, client](ErrorOr<Void> ready) {
 					    if (!ready.isError()) {
-						    onMainThreadVoid([self, newDb, client]() { self->updateDatabase(newDb, client); }, nullptr);
+						    onMainThreadVoid([self, newDb, client]() { self->updateDatabase(newDb, client); });
 					    } else {
-						    onMainThreadVoid([self, client]() { self->updateDatabase(Reference<IDatabase>(), client); },
-						                     nullptr);
+						    onMainThreadVoid(
+						        [self, client]() { self->updateDatabase(Reference<IDatabase>(), client); });
 					    }
 
 					    return ready;
@@ -1758,19 +1757,17 @@ void MultiVersionDatabase::DatabaseState::startLegacyVersionMonitors() {
 // Cleans up state for the legacy version monitors to break reference cycles
 void MultiVersionDatabase::DatabaseState::close() {
 	Reference<DatabaseState> self = Reference<DatabaseState>::addRef(this);
-	onMainThreadVoid(
-	    [self]() {
-		    self->closed = true;
-		    if (self->protocolVersionMonitor.isValid()) {
-			    self->protocolVersionMonitor.cancel();
-		    }
-		    for (auto monitor : self->legacyVersionMonitors) {
-			    monitor->close();
-		    }
+	onMainThreadVoid([self]() {
+		self->closed = true;
+		if (self->protocolVersionMonitor.isValid()) {
+			self->protocolVersionMonitor.cancel();
+		}
+		for (auto monitor : self->legacyVersionMonitors) {
+			monitor->close();
+		}
 
-		    self->legacyVersionMonitors.clear();
-	    },
-	    nullptr);
+		self->legacyVersionMonitors.clear();
+	});
 }
 
 // Starts the connection monitor by creating a database object at an old version.
@@ -1790,22 +1787,20 @@ void MultiVersionDatabase::LegacyVersionMonitor::startConnectionMonitor(
 		Reference<LegacyVersionMonitor> self = Reference<LegacyVersionMonitor>::addRef(this);
 		versionMonitor =
 		    mapThreadFuture<Void, Void>(db.castTo<DLDatabase>()->onReady(), [self, dbState](ErrorOr<Void> ready) {
-			    onMainThreadVoid(
-			        [self, ready, dbState]() {
-				        if (ready.isError()) {
-					        if (ready.getError().code() != error_code_operation_cancelled) {
-						        TraceEvent(SevError, "FailedToOpenDatabaseOnClient")
-						            .error(ready.getError())
-						            .detail("LibPath", self->client->libPath);
-
-						        self->client->failed = true;
-						        MultiVersionApi::api->updateSupportedVersions();
-					        }
-				        } else {
-					        self->runGrvProbe(dbState);
-				        }
-			        },
-			        nullptr);
+			    onMainThreadVoid([self, ready, dbState]() {
+				    if (ready.isError()) {
+					    if (ready.getError().code() != error_code_operation_cancelled) {
+						    TraceEvent(SevError, "FailedToOpenDatabaseOnClient")
+						        .error(ready.getError())
+						        .detail("LibPath", self->client->libPath);
+
+						    self->client->failed = true;
+						    MultiVersionApi::api->updateSupportedVersions();
+					    }
+				    } else {
+					    self->runGrvProbe(dbState);
+				    }
+			    });
 
 			    return ready;
 		    });
@@ -1820,12 +1815,10 @@ void MultiVersionDatabase::LegacyVersionMonitor::runGrvProbe(Reference<MultiVers
 	versionMonitor = mapThreadFuture<Version, Void>(tr->getReadVersion(), [self, dbState](ErrorOr<Version> v) {
 		// If the version attempt returns an error, we regard that as a connection (except operation_cancelled)
 		if (!v.isError() || v.getError().code() != error_code_operation_cancelled) {
-			onMainThreadVoid(
-			    [self, dbState]() {
-				    self->monitorRunning = false;
-				    dbState->protocolVersionChanged(self->client->protocolVersion);
-			    },
-			    nullptr);
+			onMainThreadVoid([self, dbState]() {
+				self->monitorRunning = false;
+				dbState->protocolVersionChanged(self->client->protocolVersion);
+			});
 		}
 
 		return v.map<Void>([](Version v) { return Void(); });
@@ -2074,11 +2067,9 @@ void MultiVersionApi::setSupportedClientVersions(Standalone<StringRef> versions)
 
 	// This option must be set on the main thread because it modifies structures that can be used concurrently by the
 	// main thread
-	onMainThreadVoid(
-	    [this, versions]() {
-		    localClient->api->setNetworkOption(FDBNetworkOptions::SUPPORTED_CLIENT_VERSIONS, versions);
-	    },
-	    nullptr);
+	onMainThreadVoid([this, versions]() {
+		localClient->api->setNetworkOption(FDBNetworkOptions::SUPPORTED_CLIENT_VERSIONS, versions);
+	});
 
 	if (!bypassMultiClientApi) {
 		runOnExternalClientsAllThreads([versions](Reference<ClientInfo> client) {
@@ -2807,7 +2798,7 @@ THREAD_FUNC runSingleAssignmentVarTest(void* arg) {
 			checkUndestroyed.blockUntilReady();
 		}
 
-		onMainThreadVoid([done]() { *done = true; }, nullptr);
+		onMainThreadVoid([done]() { *done = true; });
 	} catch (Error& e) {
 		printf("Caught error in test: %s\n", e.name());
 		*done = true;
diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index a98d435478a..a4d71edfaee 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -110,7 +110,7 @@ ThreadFuture<DatabaseSharedState*> ThreadSafeDatabase::createSharedState() {
 
 void ThreadSafeDatabase::setSharedState(DatabaseSharedState* p) {
 	DatabaseContext* db = this->db;
-	onMainThreadVoid([db, p]() { db->setSharedState(p); }, nullptr);
+	onMainThreadVoid([db, p]() { db->setSharedState(p); });
 }
 
 // Return the main network thread busyness
@@ -150,24 +150,22 @@ ThreadSafeDatabase::ThreadSafeDatabase(std::string connFilename, int apiVersion)
 	// but run its constructor on the main thread
 	DatabaseContext* db = this->db = DatabaseContext::allocateOnForeignThread();
 
-	onMainThreadVoid(
-	    [db, connFile, apiVersion]() {
-		    try {
-			    Database::createDatabase(
-			        Reference<ClusterConnectionFile>(connFile), apiVersion, IsInternal::False, LocalityData(), db)
-			        .extractPtr();
-		    } catch (Error& e) {
-			    new (db) DatabaseContext(e);
-		    } catch (...) {
-			    new (db) DatabaseContext(unknown_error());
-		    }
-	    },
-	    nullptr);
+	onMainThreadVoid([db, connFile, apiVersion]() {
+		try {
+			Database::createDatabase(
+			    Reference<ClusterConnectionFile>(connFile), apiVersion, IsInternal::False, LocalityData(), db)
+			    .extractPtr();
+		} catch (Error& e) {
+			new (db) DatabaseContext(e);
+		} catch (...) {
+			new (db) DatabaseContext(unknown_error());
+		}
+	});
 }
 
 ThreadSafeDatabase::~ThreadSafeDatabase() {
 	DatabaseContext* db = this->db;
-	onMainThreadVoid([db]() { db->delref(); }, nullptr);
+	onMainThreadVoid([db]() { db->delref(); });
 }
 
 Reference<ITransaction> ThreadSafeTenant::createTransaction() {
@@ -190,24 +188,22 @@ ThreadSafeTransaction::ThreadSafeTransaction(DatabaseContext* cx,
 	// these operations).
 	auto tr = this->tr = ISingleThreadTransaction::allocateOnForeignThread(type);
 	// No deferred error -- if the construction of the RYW transaction fails, we have no where to put it
-	onMainThreadVoid(
-	    [tr, cx, type, tenant]() {
-		    cx->addref();
-		    if (tenant.present()) {
-			    if (type == ISingleThreadTransaction::Type::RYW) {
-				    new (tr) ReadYourWritesTransaction(Database(cx), tenant.get());
-			    } else {
-				    tr->construct(Database(cx), tenant.get());
-			    }
-		    } else {
-			    if (type == ISingleThreadTransaction::Type::RYW) {
-				    new (tr) ReadYourWritesTransaction(Database(cx));
-			    } else {
-				    tr->construct(Database(cx));
-			    }
-		    }
-	    },
-	    nullptr);
+	onMainThreadVoid([tr, cx, type, tenant]() {
+		cx->addref();
+		if (tenant.present()) {
+			if (type == ISingleThreadTransaction::Type::RYW) {
+				new (tr) ReadYourWritesTransaction(Database(cx), tenant.get());
+			} else {
+				tr->construct(Database(cx), tenant.get());
+			}
+		} else {
+			if (type == ISingleThreadTransaction::Type::RYW) {
+				new (tr) ReadYourWritesTransaction(Database(cx));
+			} else {
+				tr->construct(Database(cx));
+			}
+		}
+	});
 	this->initialized = true;
 }
 
@@ -220,12 +216,12 @@ ThreadSafeTransaction::ThreadSafeTransaction(ReadYourWritesTransaction* ryw) : t
 ThreadSafeTransaction::~ThreadSafeTransaction() {
 	ISingleThreadTransaction* tr = this->tr;
 	if (tr)
-		onMainThreadVoid([tr]() { tr->delref(); }, nullptr);
+		onMainThreadVoid([tr]() { tr->delref(); });
 }
 
 void ThreadSafeTransaction::cancel() {
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr]() { tr->cancel(); }, nullptr);
+	onMainThreadVoid([tr]() { tr->cancel(); });
 }
 
 void ThreadSafeTransaction::setVersion(Version v) {
@@ -549,7 +545,7 @@ ThreadSafeTransaction::ThreadSafeTransaction(ThreadSafeTransaction&& r) noexcept
 
 void ThreadSafeTransaction::reset() {
 	ISingleThreadTransaction* tr = this->tr;
-	onMainThreadVoid([tr]() { tr->reset(); }, nullptr);
+	onMainThreadVoid([tr]() { tr->reset(); });
 }
 
 extern const char* getSourceVersion();
diff --git a/fdbrpc/AsyncFileEIO.actor.h b/fdbrpc/AsyncFileEIO.actor.h
index 21360fe7e10..687eceae659 100644
--- a/fdbrpc/AsyncFileEIO.actor.h
+++ b/fdbrpc/AsyncFileEIO.actor.h
@@ -538,7 +538,7 @@ class AsyncFileEIO : public IAsyncFile, public ReferenceCounted<AsyncFileEIO> {
 	static void eio_want_poll() {
 		want_poll = 1;
 		// SOMEDAY: nullptr for deferred error, no analysis of correctness (itp)
-		onMainThreadVoid([]() { poll_eio(); }, nullptr, TaskPriority::PollEIO);
+		onMainThreadVoid([]() { poll_eio(); }, TaskPriority::PollEIO);
 	}
 
 	static int eio_callback(eio_req* req) {
diff --git a/fdbserver/workloads/ExternalWorkload.actor.cpp b/fdbserver/workloads/ExternalWorkload.actor.cpp
index 2c1786e43f8..3e2d823d227 100644
--- a/fdbserver/workloads/ExternalWorkload.actor.cpp
+++ b/fdbserver/workloads/ExternalWorkload.actor.cpp
@@ -38,12 +38,10 @@ struct FDBPromiseImpl : FDBPromise {
 		if (g_network->isOnMainThread()) {
 			impl.send(*reinterpret_cast<T*>(value));
 		} else {
-			onMainThreadVoid(
-			    [impl = impl, val = *reinterpret_cast<T*>(value)]() -> Future<Void> {
-				    impl.send(val);
-				    return Void();
-			    },
-			    nullptr);
+			onMainThreadVoid([impl = impl, val = *reinterpret_cast<T*>(value)]() -> Future<Void> {
+				impl.send(val);
+				return Void();
+			});
 		}
 	}
 };
@@ -93,13 +91,11 @@ struct FDBLoggerImpl : FDBLogger {
 			traceFun();
 			flushTraceFileVoid();
 		} else {
-			onMainThreadVoid(
-			    [traceFun]() -> Future<Void> {
-				    traceFun();
-				    flushTraceFileVoid();
-				    return Void();
-			    },
-			    nullptr);
+			onMainThreadVoid([traceFun]() -> Future<Void> {
+				traceFun();
+				flushTraceFileVoid();
+				return Void();
+			});
 		}
 	}
 };
diff --git a/fdbserver/workloads/ThreadSafety.actor.cpp b/fdbserver/workloads/ThreadSafety.actor.cpp
index eb7cba378d9..b4a8f1e3e89 100644
--- a/fdbserver/workloads/ThreadSafety.actor.cpp
+++ b/fdbserver/workloads/ThreadSafety.actor.cpp
@@ -194,14 +194,12 @@ struct ThreadSafetyWorkload : TestWorkload {
 		info->self->commitBarrier.decrementNumRequired();
 
 		// Signal completion back to the main thread
-		onMainThreadVoid(
-		    [=]() {
-			    if (error.code() != error_code_success)
-				    info->done.sendError(error);
-			    else
-				    info->done.send(Void());
-		    },
-		    nullptr);
+		onMainThreadVoid([=]() {
+			if (error.code() != error_code_success)
+				info->done.sendError(error);
+			else
+				info->done.send(Void());
+		});
 
 		THREAD_RETURN;
 	}
diff --git a/flow/FileTraceLogWriter.cpp b/flow/FileTraceLogWriter.cpp
index 350c9e2e237..998f915f779 100644
--- a/flow/FileTraceLogWriter.cpp
+++ b/flow/FileTraceLogWriter.cpp
@@ -189,19 +189,17 @@ void FileTraceLogWriter::open() {
 			needsResolve = true;
 
 			int errorNum = errno;
-			onMainThreadVoid(
-			    [finalname = finalname, errorNum] {
-				    TraceEvent(SevWarnAlways, "TraceFileOpenError")
-				        .detail("Filename", finalname)
-				        .detail("ErrorCode", errorNum)
-				        .detail("Error", strerror(errorNum))
-				        .trackLatest("TraceFileOpenError");
-			    },
-			    nullptr);
+			onMainThreadVoid([finalname = finalname, errorNum] {
+				TraceEvent(SevWarnAlways, "TraceFileOpenError")
+				    .detail("Filename", finalname)
+				    .detail("ErrorCode", errorNum)
+				    .detail("Error", strerror(errorNum))
+				    .trackLatest("TraceFileOpenError");
+			});
 			threadSleep(FLOW_KNOBS->TRACE_RETRY_OPEN_INTERVAL);
 		}
 	}
-	onMainThreadVoid([] { latestEventCache.clear("TraceFileOpenError"); }, nullptr);
+	onMainThreadVoid([] { latestEventCache.clear("TraceFileOpenError"); });
 	if (needsResolve) {
 		issues->resolveIssue("trace_log_could_not_create_file");
 	}
diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index 02e7f23a103..b2c8c2feb2e 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -193,13 +193,13 @@ class Net2 final : public INetwork, public INetworkConnections {
 		if (thread_network == this)
 			stopImmediately();
 		else
-			onMainThreadVoid([this] { this->stopImmediately(); }, nullptr);
+			onMainThreadVoid([this] { this->stopImmediately(); });
 	}
 	void addStopCallback(std::function<void()> fn) override {
 		if (thread_network == this)
 			stopCallbacks.emplace_back(std::move(fn));
 		else
-			onMainThreadVoid([this, fn] { this->stopCallbacks.emplace_back(std::move(fn)); }, nullptr);
+			onMainThreadVoid([this, fn] { this->stopCallbacks.emplace_back(std::move(fn)); });
 	}
 
 	bool isSimulated() const override { return false; }
diff --git a/flow/ThreadHelper.actor.h b/flow/ThreadHelper.actor.h
index cb852f7b30d..8b3a1be3410 100644
--- a/flow/ThreadHelper.actor.h
+++ b/flow/ThreadHelper.actor.h
@@ -84,7 +84,7 @@ void onMainThreadVoid(F f, T* t, Error T::*member, TaskPriority taskID = TaskPri
 }
 
 template <class F>
-void onMainThreadVoid(F f, std::nullptr_t = nullptr, TaskPriority taskID = TaskPriority::DefaultOnMainThread) {
+void onMainThreadVoid(F f, TaskPriority taskID = TaskPriority::DefaultOnMainThread) {
 	Promise<Void> signal;
 	internal_thread_helper::doOnMainThreadVoid(signal.getFuture(), f);
 	g_network->onMainThread(std::move(signal), taskID);
diff --git a/flow/Trace.cpp b/flow/Trace.cpp
index 390e5941129..63a58fec064 100644
--- a/flow/Trace.cpp
+++ b/flow/Trace.cpp
@@ -1411,7 +1411,7 @@ void TraceBatch::dump() {
 		g_traceLog.writeEvent(buggifyBatch[i].fields, "", false);
 	}
 
-	onMainThreadVoid([]() { g_traceLog.flush(); }, nullptr);
+	onMainThreadVoid([]() { g_traceLog.flush(); });
 	eventBatch.clear();
 	attachBatch.clear();
 	buggifyBatch.clear();
diff --git a/flowbench/flowbench.actor.cpp b/flowbench/flowbench.actor.cpp
index f61583cb1cf..a4d96efe01f 100644
--- a/flowbench/flowbench.actor.cpp
+++ b/flowbench/flowbench.actor.cpp
@@ -45,7 +45,7 @@ int main(int argc, char** argv) {
 	Promise<Void> benchmarksDone;
 	std::thread benchmarkThread([&]() {
 		benchmark::RunSpecifiedBenchmarks();
-		onMainThreadVoid([&]() { benchmarksDone.send(Void()); }, nullptr);
+		onMainThreadVoid([&]() { benchmarksDone.send(Void()); });
 	});
 	auto f = stopNetworkAfter(benchmarksDone.getFuture());
 	runNetwork();

From 02b63934c1d671202ec562478470592c8f4d2ff4 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Tue, 21 Jun 2022 09:25:24 -0700
Subject: [PATCH 502/740] Initialize on main thread

---
 fdbclient/ThreadSafeTransaction.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index a4d71edfaee..aae88c6f078 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -188,7 +188,7 @@ ThreadSafeTransaction::ThreadSafeTransaction(DatabaseContext* cx,
 	// these operations).
 	auto tr = this->tr = ISingleThreadTransaction::allocateOnForeignThread(type);
 	// No deferred error -- if the construction of the RYW transaction fails, we have no where to put it
-	onMainThreadVoid([tr, cx, type, tenant]() {
+	onMainThreadVoid([this, tr, cx, type, tenant]() {
 		cx->addref();
 		if (tenant.present()) {
 			if (type == ISingleThreadTransaction::Type::RYW) {
@@ -203,8 +203,8 @@ ThreadSafeTransaction::ThreadSafeTransaction(DatabaseContext* cx,
 				tr->construct(Database(cx));
 			}
 		}
+		this->initialized = true;
 	});
-	this->initialized = true;
 }
 
 // This constructor is only used while refactoring fdbcli and only called from the main thread
@@ -467,20 +467,20 @@ ThreadFuture<Void> ThreadSafeTransaction::commit() {
 
 Version ThreadSafeTransaction::getCommittedVersion() {
 	// This should be thread safe when called legally, but it is fragile
+	if (!initialized) {
+		return ::invalidVersion;
+	}
 	return tr->getCommittedVersion();
 }
 
 ThreadFuture<VersionVector> ThreadSafeTransaction::getVersionVector() {
-	if (!initialized) {
-		return ::invalidVersionVector;
-	}
 	ISingleThreadTransaction* tr = this->tr;
 	return onMainThread([tr]() -> Future<VersionVector> { return tr->getVersionVector(); });
 }
 
-ThreadFuture<UID> ThreadSafeTransaction::getSpanUID() {
+ThreadFuture<UID> ThreadSafeTransaction::getSpanID() {
 	if (!initialized) {
-		return SpanContext();
+		return UID();
 	}
 	ISingleThreadTransaction* tr = this->tr;
 	return onMainThread([tr]() -> Future<UID> { return tr->getSpanID(); });

From df33ce076a067344850a4e31a822647b7f2a775b Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Tue, 21 Jun 2022 14:15:51 -0700
Subject: [PATCH 503/740] Use shared_ptr to track initialization across threads

---
 fdbclient/ThreadSafeTransaction.cpp | 18 ++++++++++--------
 fdbclient/ThreadSafeTransaction.h   |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index aae88c6f078..52e1d2cfbd6 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -178,7 +178,7 @@ ThreadSafeTenant::~ThreadSafeTenant() {}
 ThreadSafeTransaction::ThreadSafeTransaction(DatabaseContext* cx,
                                              ISingleThreadTransaction::Type type,
                                              Optional<TenantName> tenant)
-  : tenantName(tenant) {
+  : tenantName(tenant), initialized(std::make_shared<std::atomic_bool>(false)) {
 	// Allocate memory for the transaction from this thread (so the pointer is known for subsequent method calls)
 	// but run its constructor on the main thread
 
@@ -187,8 +187,9 @@ ThreadSafeTransaction::ThreadSafeTransaction(DatabaseContext* cx,
 	// immediately after this call, it will defer the DatabaseContext::delref (and onMainThread preserves the order of
 	// these operations).
 	auto tr = this->tr = ISingleThreadTransaction::allocateOnForeignThread(type);
+	auto init = this->initialized;
 	// No deferred error -- if the construction of the RYW transaction fails, we have no where to put it
-	onMainThreadVoid([this, tr, cx, type, tenant]() {
+	onMainThreadVoid([tr, cx, type, tenant, init]() {
 		cx->addref();
 		if (tenant.present()) {
 			if (type == ISingleThreadTransaction::Type::RYW) {
@@ -203,12 +204,13 @@ ThreadSafeTransaction::ThreadSafeTransaction(DatabaseContext* cx,
 				tr->construct(Database(cx));
 			}
 		}
-		this->initialized = true;
+		*init = true;
 	});
 }
 
 // This constructor is only used while refactoring fdbcli and only called from the main thread
-ThreadSafeTransaction::ThreadSafeTransaction(ReadYourWritesTransaction* ryw) : tr(ryw) {
+ThreadSafeTransaction::ThreadSafeTransaction(ReadYourWritesTransaction* ryw)
+  : tr(ryw), initialized(std::make_shared<std::atomic_bool>(true)) {
 	if (tr)
 		tr->addref();
 }
@@ -467,7 +469,7 @@ ThreadFuture<Void> ThreadSafeTransaction::commit() {
 
 Version ThreadSafeTransaction::getCommittedVersion() {
 	// This should be thread safe when called legally, but it is fragile
-	if (!initialized) {
+	if (!initialized || !*initialized) {
 		return ::invalidVersion;
 	}
 	return tr->getCommittedVersion();
@@ -479,9 +481,6 @@ ThreadFuture<VersionVector> ThreadSafeTransaction::getVersionVector() {
 }
 
 ThreadFuture<UID> ThreadSafeTransaction::getSpanID() {
-	if (!initialized) {
-		return UID();
-	}
 	ISingleThreadTransaction* tr = this->tr;
 	return onMainThread([tr]() -> Future<UID> { return tr->getSpanID(); });
 }
@@ -536,11 +535,14 @@ Optional<TenantName> ThreadSafeTransaction::getTenant() {
 void ThreadSafeTransaction::operator=(ThreadSafeTransaction&& r) noexcept {
 	tr = r.tr;
 	r.tr = nullptr;
+	initialized = r.initialized;
+	r.initialized.reset();
 }
 
 ThreadSafeTransaction::ThreadSafeTransaction(ThreadSafeTransaction&& r) noexcept {
 	tr = r.tr;
 	r.tr = nullptr;
+	initialized = std::move(r.initialized);
 }
 
 void ThreadSafeTransaction::reset() {
diff --git a/fdbclient/ThreadSafeTransaction.h b/fdbclient/ThreadSafeTransaction.h
index a09ff399eb9..bdd95223bbc 100644
--- a/fdbclient/ThreadSafeTransaction.h
+++ b/fdbclient/ThreadSafeTransaction.h
@@ -180,7 +180,7 @@ class ThreadSafeTransaction : public ITransaction, ThreadSafeReferenceCounted<Th
 	Optional<TenantName> getTenant() override;
 
 	// These are to permit use as state variables in actors:
-	ThreadSafeTransaction() : tr(nullptr) {}
+	ThreadSafeTransaction() : tr(nullptr), initialized(std::make_shared<std::atomic_bool>(false)) {}
 	void operator=(ThreadSafeTransaction&& r) noexcept;
 	ThreadSafeTransaction(ThreadSafeTransaction&& r) noexcept;
 
@@ -192,7 +192,7 @@ class ThreadSafeTransaction : public ITransaction, ThreadSafeReferenceCounted<Th
 private:
 	ISingleThreadTransaction* tr;
 	const Optional<TenantName> tenantName;
-	std::atomic<bool> initialized = false;
+	std::shared_ptr<std::atomic_bool> initialized;
 };
 
 // An implementation of IClientApi that serializes operations onto the network thread and interacts with the lower-level

From cc9993d5cb47b1a1e0e8bd78839dcf39e2b9c44c Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Wed, 22 Jun 2022 09:47:18 -0700
Subject: [PATCH 504/740] Move shared_ptr to save a reference increment and
 decrement

---
 fdbclient/ThreadSafeTransaction.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index 52e1d2cfbd6..f2afbc5c132 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -535,8 +535,7 @@ Optional<TenantName> ThreadSafeTransaction::getTenant() {
 void ThreadSafeTransaction::operator=(ThreadSafeTransaction&& r) noexcept {
 	tr = r.tr;
 	r.tr = nullptr;
-	initialized = r.initialized;
-	r.initialized.reset();
+	initialized = std::move(r.initialized);
 }
 
 ThreadSafeTransaction::ThreadSafeTransaction(ThreadSafeTransaction&& r) noexcept {

From 57d6727c6c86d0bbb9ab040fa029a41187df6ec2 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Thu, 23 Jun 2022 16:31:45 -0400
Subject: [PATCH 505/740] cherry pick pr 7405 to 71 branch

---
 fdbserver/LogSystemDiskQueueAdapter.actor.cpp | 13 ++++++++++---
 fdbserver/LogSystemDiskQueueAdapter.h         |  6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/fdbserver/LogSystemDiskQueueAdapter.actor.cpp b/fdbserver/LogSystemDiskQueueAdapter.actor.cpp
index 36aedd0d15a..029e551e7aa 100644
--- a/fdbserver/LogSystemDiskQueueAdapter.actor.cpp
+++ b/fdbserver/LogSystemDiskQueueAdapter.actor.cpp
@@ -96,12 +96,19 @@ class LogSystemDiskQueueAdapterImpl {
 				    .detail("HasMessage", self->cursor->hasMessage())
 				    .detail("Version", self->cursor->version().version);
 
-				if (self->cursor->popped() != 0 || (!self->hasDiscardedData && BUGGIFY_WITH_PROB(0.01))) {
+				bool buggify = !self->hasDiscardedData && BUGGIFY_WITH_PROB(0.01);
+				if (self->cursor->popped() != 0 || buggify) {
+					TraceEvent(SevWarnAlways, "DiskQueueAdapterReset")
+					    .detail("Version", self->cursor->popped())
+					    .detail("PeekTypeSwitch", self->peekTypeSwitches % 3);
 					TEST(true); // disk adapter reset
-					TraceEvent(SevWarnAlways, "DiskQueueAdapterReset").detail("Version", self->cursor->popped());
+					if (self->cursor->popped() != 0) {
+						self->recoveryLoc = self->cursor->popped();
+					} else {
+						self->recoveryLoc = self->startLoc;
+					}
 					self->recoveryQueue.clear();
 					self->recoveryQueueDataSize = 0;
-					self->recoveryLoc = self->cursor->popped();
 					self->recoveryQueueLoc = self->recoveryLoc;
 					self->totalRecoveredBytes = 0;
 					if (self->peekTypeSwitches % 3 == 1) {
diff --git a/fdbserver/LogSystemDiskQueueAdapter.h b/fdbserver/LogSystemDiskQueueAdapter.h
index 3a995cba3be..93f5f80ae36 100644
--- a/fdbserver/LogSystemDiskQueueAdapter.h
+++ b/fdbserver/LogSystemDiskQueueAdapter.h
@@ -61,8 +61,8 @@ class LogSystemDiskQueueAdapter final : public IDiskQueue {
 	                          Version txsPoppedVersion,
 	                          bool recover)
 	  : peekLocality(peekLocality), peekTypeSwitches(0), enableRecovery(recover), logSystem(logSystem),
-	    recoveryLoc(txsPoppedVersion), recoveryQueueLoc(txsPoppedVersion), recoveryQueueDataSize(0), poppedUpTo(0),
-	    nextCommit(1), hasDiscardedData(false), totalRecoveredBytes(0) {
+	    startLoc(txsPoppedVersion), recoveryLoc(txsPoppedVersion), recoveryQueueLoc(txsPoppedVersion),
+	    recoveryQueueDataSize(0), poppedUpTo(0), nextCommit(1), hasDiscardedData(false), totalRecoveredBytes(0) {
 		if (enableRecovery) {
 			localityChanged = peekLocality ? peekLocality->onChange() : Never();
 			cursor = logSystem->peekTxs(UID(),
@@ -127,7 +127,7 @@ class LogSystemDiskQueueAdapter final : public IDiskQueue {
 	// Recovery state (used while readNext() is being called repeatedly)
 	bool enableRecovery;
 	Reference<ILogSystem> logSystem;
-	Version recoveryLoc, recoveryQueueLoc;
+	Version startLoc, recoveryLoc, recoveryQueueLoc;
 	std::vector<Standalone<StringRef>> recoveryQueue;
 	int recoveryQueueDataSize;
 

From 279b8ed79e9f98a2171c0f37ae0d4b7cc7c5c5ff Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 27 Jun 2022 10:39:04 -0700
Subject: [PATCH 506/740] Add 7.1.10, 7.1.11 release notes

---
 .../source/release-notes/release-notes-710.rst     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 74e2958cfb6..9ae697fbbeb 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,18 @@
 Release Notes
 #############
 
+7.1.11
+======
+* Same as 7.1.10 release with AVX enabled.
+
+7.1.10
+======
+* Released with AVX disabled.
+* Fixed a sequencer crash when DC ID is a string. `(PR #7393) <https://github.com/apple/foundationdb/pull/7393>`_
+* Fixed a client performance regression by removing unnecessary transaction initialization. `(PR #7365) <https://github.com/apple/foundationdb/pull/7365>`_
+* Safely removed fdb_transaction_get_range_and_flat_map C API. `(PR #7379) <https://github.com/apple/foundationdb/pull/7379>`_
+* Fixed an unknown error bug when hostname resolving fails. `(PR #7380) <https://github.com/apple/foundationdb/pull/7380>`_
+
 7.1.9
 =====
 * Same as 7.1.8 release with AVX enabled.
@@ -15,7 +27,7 @@ Release Notes
 * Added RSS bytes for processes in status json output and corrected available_bytes calculation. `(PR #7348) <https://github.com/apple/foundationdb/pull/7348>`_
 * Added versionstamp support in tuples. `(PR #7313) <https://github.com/apple/foundationdb/pull/7313>`_
 * Fixed some spammy trace events. `(PR #7300) <https://github.com/apple/foundationdb/pull/7300>`_
-* Fixed a memory corruption bug for using streaming peeks. `(PR #7288) <https://github.com/apple/foundationdb/pull/7288>`_
+* Avoided a memory corruption bug by disabling streaming peeks. `(PR #7288) <https://github.com/apple/foundationdb/pull/7288>`_
 * Fixed a hang bug in fdbcli exclude command. `(PR #7268) <https://github.com/apple/foundationdb/pull/7268>`_
 * Fixed an issue that a remote TLog blocks peeks. `(PR #7255) <https://github.com/apple/foundationdb/pull/7255>`_
 * Fixed a connection issue using hostnames. `(PR #7264) <https://github.com/apple/foundationdb/pull/7264>`_

From 7a11cb9db244f9a270c4890f451933cad418d5cf Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Tue, 21 Jun 2022 08:24:22 -0700
Subject: [PATCH 507/740] Remove explicit degraded peer recovery since this may
 be false positive

---
 fdbserver/ClusterController.actor.cpp | 24 +++++++++++++++++++-----
 fdbserver/ClusterController.actor.h   | 22 ----------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 7715c9a8c10..bc4f2b37a9d 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -2745,11 +2745,14 @@ TEST_CASE("/fdbserver/clustercontroller/updateWorkerHealth") {
 		ASSERT(health.degradedPeers.find(badPeer1) != health.degradedPeers.end());
 		ASSERT_EQ(health.degradedPeers[badPeer1].startTime, health.degradedPeers[badPeer1].lastRefreshTime);
 		ASSERT(health.degradedPeers.find(badPeer2) != health.degradedPeers.end());
+		ASSERT_EQ(health.degradedPeers[badPeer2].startTime, health.degradedPeers[badPeer2].lastRefreshTime);
 	}
 
 	// Create a `UpdateWorkerHealthRequest` with two bad peers, one from the previous test and a new one.
 	// The one from the previous test should have lastRefreshTime updated.
-	// The other one from the previous test not included in this test should be removed.
+	// The other one from the previous test not included in this test should not be removed.
+	state double previousStartTime;
+	state double previousRefreshTime;
 	{
 		// Make the time to move so that now() guarantees to return a larger value than before.
 		wait(delay(0.001));
@@ -2760,20 +2763,31 @@ TEST_CASE("/fdbserver/clustercontroller/updateWorkerHealth") {
 		data.updateWorkerHealth(req);
 		ASSERT(data.workerHealth.find(workerAddress) != data.workerHealth.end());
 		auto& health = data.workerHealth[workerAddress];
-		ASSERT_EQ(health.degradedPeers.size(), 2);
+		ASSERT_EQ(health.degradedPeers.size(), 3);
 		ASSERT(health.degradedPeers.find(badPeer1) != health.degradedPeers.end());
 		ASSERT_LT(health.degradedPeers[badPeer1].startTime, health.degradedPeers[badPeer1].lastRefreshTime);
-		ASSERT(health.degradedPeers.find(badPeer2) == health.degradedPeers.end());
+		ASSERT(health.degradedPeers.find(badPeer2) != health.degradedPeers.end());
+		ASSERT_EQ(health.degradedPeers[badPeer2].startTime, health.degradedPeers[badPeer2].lastRefreshTime);
+		ASSERT_EQ(health.degradedPeers[badPeer2].startTime, health.degradedPeers[badPeer1].startTime);
 		ASSERT(health.degradedPeers.find(badPeer3) != health.degradedPeers.end());
+		ASSERT_EQ(health.degradedPeers[badPeer3].startTime, health.degradedPeers[badPeer3].lastRefreshTime);
+		previousStartTime = health.degradedPeers[badPeer3].startTime;
+		previousRefreshTime = health.degradedPeers[badPeer3].lastRefreshTime;
 	}
 
-	// Create a `UpdateWorkerHealthRequest` with empty `degradedPeers`, which should remove the worker from
+	// Create a `UpdateWorkerHealthRequest` with empty `degradedPeers`, which should not remove the worker from
 	// `workerHealth`.
 	{
+		wait(delay(0.001));
 		UpdateWorkerHealthRequest req;
 		req.address = workerAddress;
 		data.updateWorkerHealth(req);
-		ASSERT(data.workerHealth.find(workerAddress) == data.workerHealth.end());
+		ASSERT(data.workerHealth.find(workerAddress) != data.workerHealth.end());
+		auto& health = data.workerHealth[workerAddress];
+		ASSERT_EQ(health.degradedPeers.size(), 3);
+		ASSERT(health.degradedPeers.find(badPeer3) != health.degradedPeers.end());
+		ASSERT_EQ(health.degradedPeers[badPeer3].startTime, previousStartTime);
+		ASSERT_EQ(health.degradedPeers[badPeer3].lastRefreshTime, previousRefreshTime);
 	}
 
 	return Void();
diff --git a/fdbserver/ClusterController.actor.h b/fdbserver/ClusterController.actor.h
index 3d77c6c6033..cb64fa91854 100644
--- a/fdbserver/ClusterController.actor.h
+++ b/fdbserver/ClusterController.actor.h
@@ -2907,13 +2907,6 @@ class ClusterControllerData {
 		    .detail("WorkerAddress", req.address)
 		    .detail("DegradedPeers", degradedPeersString);
 
-		// `req.degradedPeers` contains the latest peer performance view from the worker. Clear the worker if the
-		// requested worker doesn't see any degraded peers.
-		if (req.degradedPeers.empty()) {
-			workerHealth.erase(req.address);
-			return;
-		}
-
 		double currentTime = now();
 
 		// Current `workerHealth` doesn't have any information about the incoming worker. Add the worker into
@@ -2931,21 +2924,6 @@ class ClusterControllerData {
 
 		auto& health = workerHealth[req.address];
 
-		// First, remove any degraded peers recorded in the `workerHealth`, but aren't in the incoming request. These
-		// machines network performance should have recovered.
-		std::unordered_set<NetworkAddress> recoveredPeers;
-		for (const auto& [peer, times] : health.degradedPeers) {
-			recoveredPeers.insert(peer);
-		}
-		for (const auto& peer : req.degradedPeers) {
-			if (recoveredPeers.find(peer) != recoveredPeers.end()) {
-				recoveredPeers.erase(peer);
-			}
-		}
-		for (const auto& peer : recoveredPeers) {
-			health.degradedPeers.erase(peer);
-		}
-
 		// Update the worker's degradedPeers.
 		for (const auto& peer : req.degradedPeers) {
 			auto it = health.degradedPeers.find(peer);

From f320ecddd3a3f52d44938e1429f589b86c188f58 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Mon, 20 Jun 2022 17:34:59 +0100
Subject: [PATCH 508/740] Refactor Docker setup for new binary location

---
 packaging/docker/Dockerfile      | 17 ++++++++-----
 packaging/docker/Dockerfile.eks  | 17 ++++++++-----
 packaging/docker/build-images.sh | 42 ++++++++++++--------------------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index d8de7d5226b..18089d56d39 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -70,7 +70,7 @@ FROM base as foundationdb-base
 WORKDIR /tmp
 ARG FDB_VERSION=6.3.22
 ARG FDB_LIBRARY_VERSIONS="${FDB_VERSION}"
-ARG FDB_WEBSITE=https://www.foundationdb.org
+ARG FDB_WEBSITE=https://github.com/apple/foundationdb/releases/download
 
 RUN mkdir -p /var/fdb/{logs,tmp,lib} && \
     mkdir -p /usr/lib/fdb/multiversion && \
@@ -89,24 +89,29 @@ RUN groupadd --gid 4059 \
 COPY website /tmp/website/
 
 # Install FoundationDB Binaries
-RUN curl -Ls $FDB_WEBSITE/downloads/$FDB_VERSION/linux/fdb_$FDB_VERSION.tar.gz | tar zxf - --strip-components=1 && \
-    for file in fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent fastrestore_tool; do \
+RUN for file in fdbserver fdbbackup fdbcli fdbmonitor; do \
+        curl --fail -Ls ${FDB_WEBSITE}/${FDB_VERSION}/$file.x86_64 -o $file; \
         chmod u+x $file; \
         mv $file /usr/bin; \
     done
 
+# Setup all symlinks for the other binaries that are a copy of fdbbackup
+RUN for file in fdbdr fdbrestore fdbserver backup_agent dr_agent fastrestore_tool; do \
+        ln -s /usr/bin/fdbbackup /usr/bin/$file; \
+    done
+
 # Install additional FoundationDB Client Libraries
 RUN for version in $FDB_LIBRARY_VERSIONS; do \
-    curl -Ls $FDB_WEBSITE/downloads/$version/linux/libfdb_c_$version.so -o /usr/lib/fdb/multiversion/libfdb_c_${version%.*}.so; \
+    curl --fail -Ls ${FDB_WEBSITE}/${version}/libfdb_c.x86_64.so -o /usr/lib/fdb/multiversion/libfdb_c_${version%.*}.so; \
     done
 
 # Install additional FoundationDB Client Libraries (for sidecar)
 RUN mkdir -p /var/fdb/lib && \
     for version in $FDB_LIBRARY_VERSIONS; do \
-    curl -Ls $FDB_WEBSITE/downloads/$version/linux/libfdb_c_$version.so -o /var/fdb/lib/libfdb_c_${version%.*}.so; \
+    curl --fail -Ls ${FDB_WEBSITE}/${version}/libfdb_c.x86_64.so -o /var/fdb/lib/libfdb_c_${version%.*}.so; \
     done
 
-RUN curl -Ls $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib/libfdb_c.so
+RUN curl -Ls $FDB_WEBSITE/$FDB_VERSION/libfdb_c.x86_64.so -o /usr/lib/libfdb_c.so
 
 RUN rm -rf /tmp/*
 WORKDIR /
diff --git a/packaging/docker/Dockerfile.eks b/packaging/docker/Dockerfile.eks
index 165d1425b00..ad04d0404fa 100644
--- a/packaging/docker/Dockerfile.eks
+++ b/packaging/docker/Dockerfile.eks
@@ -78,7 +78,7 @@ FROM base as foundationdb-base
 WORKDIR /tmp
 ARG FDB_VERSION=6.3.22
 ARG FDB_LIBRARY_VERSIONS="${FDB_VERSION}"
-ARG FDB_WEBSITE=https://www.foundationdb.org
+ARG FDB_WEBSITE=https://github.com/apple/foundationdb/releases/download
 
 RUN mkdir -p /var/fdb/{logs,tmp,lib} && \
     mkdir -p /usr/lib/fdb/multiversion && \
@@ -97,24 +97,29 @@ RUN groupadd --gid 4059 \
 COPY website /tmp/website/
 
 # Install FoundationDB Binaries
-RUN curl -Ls $FDB_WEBSITE/downloads/$FDB_VERSION/linux/fdb_$FDB_VERSION.tar.gz | tar zxf - --strip-components=1 && \
-    for file in fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent fastrestore_tool; do \
+RUN for file in fdbserver fdbbackup fdbcli fdbmonitor; do \
+        curl --fail -Ls ${FDB_WEBSITE}/${FDB_VERSION}/$file.x86_64 -o $file; \
         chmod u+x $file; \
         mv $file /usr/bin; \
     done
 
+# Setup all symlinks for the other binaries that are a copy of fdbbackup
+RUN for file in fdbdr fdbrestore fdbserver backup_agent dr_agent fastrestore_tool; do \
+        ln -s /usr/bin/fdbbackup /usr/bin/$file; \
+    done
+
 # Install additional FoundationDB Client Libraries
 RUN for version in $FDB_LIBRARY_VERSIONS; do \
-    curl -Ls $FDB_WEBSITE/downloads/$version/linux/libfdb_c_$version.so -o /usr/lib/fdb/multiversion/libfdb_c_${version%.*}.so; \
+    curl --fail -Ls ${FDB_WEBSITE}/${version}/libfdb_c.x86_64.so -o /usr/lib/fdb/multiversion/libfdb_c_${version%.*}.so; \
     done
 
 # Install additional FoundationDB Client Libraries (for sidecar)
 RUN mkdir -p /var/fdb/lib && \
     for version in $FDB_LIBRARY_VERSIONS; do \
-    curl -Ls $FDB_WEBSITE/downloads/$version/linux/libfdb_c_$version.so -o /var/fdb/lib/libfdb_c_${version%.*}.so; \
+    curl --fail -Ls ${FDB_WEBSITE}/${version}/libfdb_c.x86_64.so -o /var/fdb/lib/libfdb_c_${version%.*}.so; \
     done
 
-RUN curl -Ls $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib/libfdb_c.so
+RUN curl -Ls $FDB_WEBSITE/$FDB_VERSION/libfdb_c.x86_64.so -o /usr/lib/libfdb_c.so
 
 RUN rm -rf /tmp/*
 WORKDIR /
diff --git a/packaging/docker/build-images.sh b/packaging/docker/build-images.sh
index 4d4774b213b..2de136634d1 100755
--- a/packaging/docker/build-images.sh
+++ b/packaging/docker/build-images.sh
@@ -18,12 +18,11 @@ function popd () {
 
 function create_fake_website_directory() {
     fdb_binaries=( 'fdbbackup' 'fdbcli' 'fdbserver' 'fdbmonitor' )
-    fake_fdb_binaries=( 'backup_agent' 'dr_agent' 'fastrestore_tool' 'fdbdr' 'fdbrestore' )
     logg "PREPARING WEBSITE"
     website_directory="${script_dir}/website"
     rm -rf "${website_directory}"
-    mkdir -p "${website_directory}/downloads/${fdb_version}/linux/bin"
-    pushd "${website_directory}/downloads/${fdb_version}/linux/bin" || exit 127
+    mkdir -p "${website_directory}/${fdb_version}"
+    pushd "${website_directory}/${fdb_version}" || exit 127
     ############################################################################
     # there are four intended paths here:
     # 1) fetch the unstripped binaries and client library from artifactory_base_url
@@ -39,43 +38,34 @@ function create_fake_website_directory() {
         "unstripped_artifactory")
             logg "DOWNLOADING BINARIES TAR FILE"
             curl -Ls "${artifactory_base_url}/${fdb_version}/release/api/foundationdb-binaries-${fdb_version}-linux.tar.gz" | tar -xzf -
+            # Add the x86_64 to all binaries
+            for file in "${fdb_binaries[@]}"; do
+                cp -pr "${file}" "${file}.x86_64"
+            done
             ;;
         "stripped_artifactory")
             for file in "${fdb_binaries[@]}"; do
                 logg "DOWNLOADING ${file}"
-                curl -Ls "${artifactory_base_url}/${fdb_version}/release/files/linux/bin/${file}" -o "${file}"
+                curl -Ls "${artifactory_base_url}/${fdb_version}/release/files/linux/bin/${file}" -o "${file}.x86_64"
                 chmod 755 "${file}"
             done
             ;;
         "unstripped_local")
             for file in "${fdb_binaries[@]}"; do
                 logg "COPYING ${file}"
-                cp -pr "${build_output_directory}/bin/${file}" "${file}"
+                cp -pr "${build_output_directory}/bin/${file}" "${file}.x86_64"
                 chmod 755 "${file}"
             done
             ;;
         "stripped_local")
             for file in "${fdb_binaries[@]}"; do
                 logg "COPYING ${file}"
-                cp -pr "${build_output_directory}/packages/bin/${file}" "${file}"
+                cp -pr "${build_output_directory}/packages/bin/${file}" "${file}.x86_64"
                 chmod 755 "${file}"
             done
             ;;
     esac
-    # dont download files that are binary duplicates of fdbbackup, recreate the
-    # symlinks (to fdbbackup in the same directory)
-    logg "CREATING fdbbackup SYMLINKS"
-    for fake in "${fake_fdb_binaries[@]}"; do
-        logg "CREATING ${fake}"
-        ln -sf fdbbackup "${fake}"
-    done
     popd || exit 128
-    # re-create the same file that is present in the downloads path of
-    # foundationdb.org such that it can be copied into the Docker image and
-    # referenced with a file:// url by the container image build
-    logg "CREATING BINARIES TAR FILE"
-    tar -czf "${website_directory}/downloads/${fdb_version}/linux/fdb_${fdb_version}.tar.gz" --directory "${website_directory}/downloads/${fdb_version}/linux/bin" .
-    rm -rf "${website_directory}/downloads/${fdb_version}/linux/bin"
 
     ############################################################################
     # this follows the same logic as the case statement above, they are separate
@@ -87,8 +77,8 @@ function create_fake_website_directory() {
         "unstripped_artifactory")
             for version in "${fdb_library_versions[@]}"; do
                 logg "FETCHING ${version} CLIENT LIBRARY"
-                destination_directory="${website_directory}/downloads/${version}/linux"
-                destination_filename="libfdb_c_${version}.so"
+                destination_directory="${website_directory}/${version}"
+                destination_filename="libfdb_c_${version}.x86_64.so"
                 mkdir -p "${destination_directory}"
                 pushd "${destination_directory}" || exit 127
                 curl -Ls "${artifactory_base_url}/${version}/release/api/fdb-server-${version}-linux.tar.gz" | tar -xzf - ./lib/libfdb_c.so --strip-components 2
@@ -100,8 +90,8 @@ function create_fake_website_directory() {
         "stripped_artifactory")
             for version in "${fdb_library_versions[@]}"; do
                 logg "FETCHING ${version} CLIENT LIBRARY"
-                destination_directory="${website_directory}/downloads/${version}/linux"
-                destination_filename="libfdb_c_${version}.so"
+                destination_directory="${website_directory}/${version}"
+                destination_filename="libfdb_c_${version}.x86_64.so"
                 mkdir -p "${destination_directory}"
                 pushd "${destination_directory}" || exit 127
                 curl -Ls "${artifactory_base_url}/${version}/release/files/linux/lib/libfdb_c.so" -o "${destination_filename}"
@@ -111,11 +101,11 @@ function create_fake_website_directory() {
             ;;
         "unstripped_local")
             logg "COPYING UNSTRIPPED CLIENT LIBRARY"
-            cp -pr "${build_output_directory}/lib/libfdb_c.so" "${website_directory}/downloads/${fdb_version}/linux/libfdb_c_${fdb_version}.so"
+            cp -pr "${build_output_directory}/lib/libfdb_c.so" "${website_directory}/${fdb_version}/libfdb_c_${fdb_version}.x86_64.so"
             ;;
         "stripped_local")
             logg "COPYING STRIPPED CLIENT LIBRARY"
-            cp -pr "${build_output_directory}/packages/lib/libfdb_c.so" "${website_directory}/downloads/${fdb_version}/linux/libfdb_c_${fdb_version}.so"
+            cp -pr "${build_output_directory}/packages/lib/libfdb_c.so" "${website_directory}/${fdb_version}/libfdb_c_${fdb_version}.x86_64.so"
             ;;
     esac
     # override fdb_website variable that is passed to Docker build
@@ -233,7 +223,7 @@ source_code_diretory=$(awk -F= '/foundationdb_SOURCE_DIR:STATIC/{print $2}' "${b
 commit_sha=$(cd "${source_code_diretory}" && git rev-parse --verify HEAD --short=10)
 fdb_version=$(cat "${build_output_directory}/version.txt")
 fdb_library_versions=( '5.1.7' '6.1.13' '6.2.30' '6.3.18' "${fdb_version}" )
-fdb_website="https://www.foundationdb.org"
+fdb_website="https://github.com/apple/foundationdb/releases/download"
 image_list=(
     'base'
     # 'go-build'

From 51d7ea08794dbae7b90edb2e7d68bb6e3faddf42 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Mon, 20 Jun 2022 18:01:39 +0100
Subject: [PATCH 509/740] Correct comment for script

---
 packaging/docker/build-images.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/docker/build-images.sh b/packaging/docker/build-images.sh
index 2de136634d1..50fc0c54fa2 100755
--- a/packaging/docker/build-images.sh
+++ b/packaging/docker/build-images.sh
@@ -197,12 +197,12 @@ logg "STARTING ${0}"
 echo "${blue}################################################################################${reset}"
 
 ################################################################################
-# The intent of this script is to build the set of docker images needed to run
-# FoundationDB in kubernetes from binaries that are not available the website:
-# https://foundationdb.org/downloads
+# The intent of this script is to build the set of Docker images needed to run
+# FoundationDB in Kubernetes from binaries that are not available the website:
+# https://github.com/apple/foundationdb/releases/download
 #
-# The docker file itself will pull released binaries from the foundationdb
-# website. If the intent is to build images for an already released version of
+# The Docker file itself will pull released binaries from GitHub releases.
+# If the intent is to build images for an already released version of
 # FoundationDB, a simple docker build command will work.
 #
 # This script has enough stupid built into it that trying to come up with a set

From 9224b5c4ab669aa0772068658a25011e148bfcec Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Mon, 27 Jun 2022 14:13:35 +0100
Subject: [PATCH 510/740] Correct script for different build setups

---
 packaging/docker/Dockerfile      |  2 +-
 packaging/docker/Dockerfile.eks  |  2 +-
 packaging/docker/build-images.sh | 27 +++++++++++++--------------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 18089d56d39..09525676d79 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -96,7 +96,7 @@ RUN for file in fdbserver fdbbackup fdbcli fdbmonitor; do \
     done
 
 # Setup all symlinks for the other binaries that are a copy of fdbbackup
-RUN for file in fdbdr fdbrestore fdbserver backup_agent dr_agent fastrestore_tool; do \
+RUN for file in fdbdr fdbrestore backup_agent dr_agent fastrestore_tool; do \
         ln -s /usr/bin/fdbbackup /usr/bin/$file; \
     done
 
diff --git a/packaging/docker/Dockerfile.eks b/packaging/docker/Dockerfile.eks
index ad04d0404fa..50da54a3ae8 100644
--- a/packaging/docker/Dockerfile.eks
+++ b/packaging/docker/Dockerfile.eks
@@ -104,7 +104,7 @@ RUN for file in fdbserver fdbbackup fdbcli fdbmonitor; do \
     done
 
 # Setup all symlinks for the other binaries that are a copy of fdbbackup
-RUN for file in fdbdr fdbrestore fdbserver backup_agent dr_agent fastrestore_tool; do \
+RUN for file in fdbdr fdbrestore backup_agent dr_agent fastrestore_tool; do \
         ln -s /usr/bin/fdbbackup /usr/bin/$file; \
     done
 
diff --git a/packaging/docker/build-images.sh b/packaging/docker/build-images.sh
index 50fc0c54fa2..c1cb36adace 100755
--- a/packaging/docker/build-images.sh
+++ b/packaging/docker/build-images.sh
@@ -40,28 +40,28 @@ function create_fake_website_directory() {
             curl -Ls "${artifactory_base_url}/${fdb_version}/release/api/foundationdb-binaries-${fdb_version}-linux.tar.gz" | tar -xzf -
             # Add the x86_64 to all binaries
             for file in "${fdb_binaries[@]}"; do
-                cp -pr "${file}" "${file}.x86_64"
+                mv -pr "${file}" "${file}.x86_64"
             done
             ;;
         "stripped_artifactory")
             for file in "${fdb_binaries[@]}"; do
                 logg "DOWNLOADING ${file}"
                 curl -Ls "${artifactory_base_url}/${fdb_version}/release/files/linux/bin/${file}" -o "${file}.x86_64"
-                chmod 755 "${file}"
+                chmod 755 "${file}.x86_64"
             done
             ;;
         "unstripped_local")
             for file in "${fdb_binaries[@]}"; do
                 logg "COPYING ${file}"
                 cp -pr "${build_output_directory}/bin/${file}" "${file}.x86_64"
-                chmod 755 "${file}"
+                chmod 755 "${file}.x86_64"
             done
             ;;
         "stripped_local")
             for file in "${fdb_binaries[@]}"; do
                 logg "COPYING ${file}"
                 cp -pr "${build_output_directory}/packages/bin/${file}" "${file}.x86_64"
-                chmod 755 "${file}"
+                chmod 755 "${file}.x86_64"
             done
             ;;
     esac
@@ -73,12 +73,13 @@ function create_fake_website_directory() {
     # symlinks and the binaries tarball
     ############################################################################
     logg "FETCHING CLIENT LIBRARY"
+    destination_directory="${website_directory}/${version}"
+    destination_filename="libfdb_c.x86_64.so"
+
     case "${stripped_binaries_and_from_where}" in
         "unstripped_artifactory")
             for version in "${fdb_library_versions[@]}"; do
                 logg "FETCHING ${version} CLIENT LIBRARY"
-                destination_directory="${website_directory}/${version}"
-                destination_filename="libfdb_c_${version}.x86_64.so"
                 mkdir -p "${destination_directory}"
                 pushd "${destination_directory}" || exit 127
                 curl -Ls "${artifactory_base_url}/${version}/release/api/fdb-server-${version}-linux.tar.gz" | tar -xzf - ./lib/libfdb_c.so --strip-components 2
@@ -90,22 +91,18 @@ function create_fake_website_directory() {
         "stripped_artifactory")
             for version in "${fdb_library_versions[@]}"; do
                 logg "FETCHING ${version} CLIENT LIBRARY"
-                destination_directory="${website_directory}/${version}"
-                destination_filename="libfdb_c_${version}.x86_64.so"
                 mkdir -p "${destination_directory}"
-                pushd "${destination_directory}" || exit 127
-                curl -Ls "${artifactory_base_url}/${version}/release/files/linux/lib/libfdb_c.so" -o "${destination_filename}"
-                chmod 755 "${destination_filename}"
-                popd || exit 128
+                curl -Ls "${artifactory_base_url}/${version}/release/files/linux/lib/libfdb_c.so" -o "${destination_directory}/${destination_filename}"
+                chmod 755 "${destination_directory}/${destination_filename}"
             done
             ;;
         "unstripped_local")
             logg "COPYING UNSTRIPPED CLIENT LIBRARY"
-            cp -pr "${build_output_directory}/lib/libfdb_c.so" "${website_directory}/${fdb_version}/libfdb_c_${fdb_version}.x86_64.so"
+            cp -pr "${build_output_directory}/lib/libfdb_c.so" "${destination_directory}/${destination_filename}"
             ;;
         "stripped_local")
             logg "COPYING STRIPPED CLIENT LIBRARY"
-            cp -pr "${build_output_directory}/packages/lib/libfdb_c.so" "${website_directory}/${fdb_version}/libfdb_c_${fdb_version}.x86_64.so"
+            cp -pr "${build_output_directory}/packages/lib/libfdb_c.so" "${destination_directory}/${destination_filename}"
             ;;
     esac
     # override fdb_website variable that is passed to Docker build
@@ -176,6 +173,8 @@ function build_and_push_images(){
             --build-arg FDB_VERSION="${fdb_version}" \
             --build-arg FDB_LIBRARY_VERSIONS="${fdb_library_versions[*]}" \
             --build-arg FDB_WEBSITE="${fdb_website}" \
+            --build-arg HTTPS_PROXY="${HTTPS_PROXY}" \
+            --build-arg HTTP_PROXY="${HTTP_PROXY}" \
             --tag "${image_tag}" \
             --file "${dockerfile_name}" \
             --target "${image}" .

From 6b0c93a3670482b59523f899a5d43907190b4d2f Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Mon, 27 Jun 2022 14:22:06 +0100
Subject: [PATCH 511/740] Revert client lib change back

---
 packaging/docker/build-images.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packaging/docker/build-images.sh b/packaging/docker/build-images.sh
index c1cb36adace..52c4d08dc21 100755
--- a/packaging/docker/build-images.sh
+++ b/packaging/docker/build-images.sh
@@ -73,13 +73,12 @@ function create_fake_website_directory() {
     # symlinks and the binaries tarball
     ############################################################################
     logg "FETCHING CLIENT LIBRARY"
-    destination_directory="${website_directory}/${version}"
-    destination_filename="libfdb_c.x86_64.so"
-
     case "${stripped_binaries_and_from_where}" in
         "unstripped_artifactory")
             for version in "${fdb_library_versions[@]}"; do
                 logg "FETCHING ${version} CLIENT LIBRARY"
+                destination_directory="${website_directory}/${version}"
+                destination_filename="libfdb_c.x86_64.so"
                 mkdir -p "${destination_directory}"
                 pushd "${destination_directory}" || exit 127
                 curl -Ls "${artifactory_base_url}/${version}/release/api/fdb-server-${version}-linux.tar.gz" | tar -xzf - ./lib/libfdb_c.so --strip-components 2
@@ -91,18 +90,22 @@ function create_fake_website_directory() {
         "stripped_artifactory")
             for version in "${fdb_library_versions[@]}"; do
                 logg "FETCHING ${version} CLIENT LIBRARY"
+                destination_directory="${website_directory}/${version}"
+                destination_filename="libfdb_c.x86_64.so"
                 mkdir -p "${destination_directory}"
-                curl -Ls "${artifactory_base_url}/${version}/release/files/linux/lib/libfdb_c.so" -o "${destination_directory}/${destination_filename}"
-                chmod 755 "${destination_directory}/${destination_filename}"
+                pushd "${destination_directory}" || exit 127
+                curl -Ls "${artifactory_base_url}/${version}/release/files/linux/lib/libfdb_c.so" -o "${destination_filename}"
+                chmod 755 "${destination_filename}"
+                popd || exit 128
             done
             ;;
         "unstripped_local")
             logg "COPYING UNSTRIPPED CLIENT LIBRARY"
-            cp -pr "${build_output_directory}/lib/libfdb_c.so" "${destination_directory}/${destination_filename}"
+            cp -pr "${build_output_directory}/lib/libfdb_c.so" "${website_directory}/${fdb_version}/libfdb_c.x86_64.so"
             ;;
         "stripped_local")
             logg "COPYING STRIPPED CLIENT LIBRARY"
-            cp -pr "${build_output_directory}/packages/lib/libfdb_c.so" "${destination_directory}/${destination_filename}"
+            cp -pr "${build_output_directory}/packages/lib/libfdb_c.so" "${website_directory}/${fdb_version}/libfdb_c.x86_64.so"
             ;;
     esac
     # override fdb_website variable that is passed to Docker build

From 64905c9e974f27a8894de5770742ef60f9291c2d Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Mon, 27 Jun 2022 15:07:45 +0100
Subject: [PATCH 512/740] Remove mv flags

---
 packaging/docker/build-images.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/docker/build-images.sh b/packaging/docker/build-images.sh
index 52c4d08dc21..02574515d94 100755
--- a/packaging/docker/build-images.sh
+++ b/packaging/docker/build-images.sh
@@ -40,7 +40,7 @@ function create_fake_website_directory() {
             curl -Ls "${artifactory_base_url}/${fdb_version}/release/api/foundationdb-binaries-${fdb_version}-linux.tar.gz" | tar -xzf -
             # Add the x86_64 to all binaries
             for file in "${fdb_binaries[@]}"; do
-                mv -pr "${file}" "${file}.x86_64"
+                mv "${file}" "${file}.x86_64"
             done
             ;;
         "stripped_artifactory")

From d8ce8aa384c0d589f27a21b47e499309096432a0 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Mon, 27 Jun 2022 18:02:52 -0700
Subject: [PATCH 513/740] Fix a problem caused by missing state.

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 8c54a1d4f17..571889f0ec0 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -6981,7 +6981,7 @@ ACTOR Future<ProtocolVersion> getClusterProtocolImpl(
 		} else {
 			state NetworkAddress coordinatorAddress;
 			if (coordinator->get().get().hostname.present()) {
-				Hostname h = coordinator->get().get().hostname.get();
+				state Hostname h = coordinator->get().get().hostname.get();
 				wait(store(coordinatorAddress, h.resolveWithRetry()));
 			} else {
 				coordinatorAddress = coordinator->get().get().getLeader.getEndpoint().getPrimaryAddress();

From 6e9cf4232f4877746969857e4343e1c9ec6528c2 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Thu, 23 Jun 2022 16:05:16 -0700
Subject: [PATCH 514/740] Adding logId to trace events.

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 98 ++++++++++++------------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 8154a561426..73bd49d2cf6 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -109,9 +109,9 @@ std::string getErrorReason(BackgroundErrorReason reason) {
 // could potentially cause segmentation fault.
 class RocksDBErrorListener : public rocksdb::EventListener {
 public:
-	RocksDBErrorListener(){};
+	RocksDBErrorListener(UID id) : id(id){};
 	void OnBackgroundError(rocksdb::BackgroundErrorReason reason, rocksdb::Status* bg_error) override {
-		TraceEvent(SevError, "RocksDBBGError")
+		TraceEvent(SevError, "RocksDBBGError", id)
 		    .detail("Reason", getErrorReason(reason))
 		    .detail("RocksDBSeverity", bg_error->severity())
 		    .detail("Status", bg_error->ToString());
@@ -144,6 +144,7 @@ class RocksDBErrorListener : public rocksdb::EventListener {
 private:
 	ThreadReturnPromise<Void> errorPromise;
 	std::mutex mutex;
+	UID id;
 };
 using DB = rocksdb::DB*;
 using CF = rocksdb::ColumnFamilyHandle*;
@@ -364,12 +365,11 @@ gets deleted as the ref count becomes 0.
 */
 class ReadIteratorPool {
 public:
-	ReadIteratorPool(DB& db, CF& cf, const std::string& path)
+	ReadIteratorPool(UID id, DB& db, CF& cf)
 	  : db(db), cf(cf), index(0), iteratorsReuseCount(0), readRangeOptions(getReadOptions()) {
 		readRangeOptions.background_purge_on_iterator_cleanup = true;
 		readRangeOptions.auto_prefix_mode = (SERVER_KNOBS->ROCKSDB_PREFIX_LEN > 0);
-		TraceEvent("ReadIteratorPool")
-		    .detail("Path", path)
+		TraceEvent("ReadIteratorPool", id)
 		    .detail("KnobRocksDBReadRangeReuseIterators", SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS)
 		    .detail("KnobRocksDBPrefixLen", SERVER_KNOBS->ROCKSDB_PREFIX_LEN);
 	}
@@ -722,10 +722,10 @@ ACTOR Future<Void> refreshReadIteratorPool(std::shared_ptr<ReadIteratorPool> rea
 	return Void();
 }
 
-ACTOR Future<Void> flowLockLogger(const FlowLock* readLock, const FlowLock* fetchLock) {
+ACTOR Future<Void> flowLockLogger(UID id, const FlowLock* readLock, const FlowLock* fetchLock) {
 	loop {
 		wait(delay(SERVER_KNOBS->ROCKSDB_METRICS_DELAY));
-		TraceEvent e("RocksDBFlowLock");
+		TraceEvent e("RocksDBFlowLock", id);
 		e.detail("ReadAvailable", readLock->available());
 		e.detail("ReadActivePermits", readLock->activePermits());
 		e.detail("ReadWaiters", readLock->waiters());
@@ -735,7 +735,8 @@ ACTOR Future<Void> flowLockLogger(const FlowLock* readLock, const FlowLock* fetc
 	}
 }
 
-ACTOR Future<Void> rocksDBMetricLogger(std::shared_ptr<rocksdb::Statistics> statistics,
+ACTOR Future<Void> rocksDBMetricLogger(UID id,
+                                       std::shared_ptr<rocksdb::Statistics> statistics,
                                        std::shared_ptr<PerfContextMetrics> perfContextMetrics,
                                        rocksdb::DB* db,
                                        std::shared_ptr<ReadIteratorPool> readIterPool,
@@ -812,7 +813,7 @@ ACTOR Future<Void> rocksDBMetricLogger(std::shared_ptr<rocksdb::Statistics> stat
 
 	loop {
 		wait(delay(SERVER_KNOBS->ROCKSDB_METRICS_DELAY));
-		TraceEvent e("RocksDBMetrics");
+		TraceEvent e("RocksDBMetrics", id);
 		uint64_t stat;
 		for (auto& t : tickerStats) {
 			auto& [name, ticker, cum] = t;
@@ -845,9 +846,9 @@ ACTOR Future<Void> rocksDBMetricLogger(std::shared_ptr<rocksdb::Statistics> stat
 	}
 }
 
-void logRocksDBError(const rocksdb::Status& status, const std::string& method) {
+void logRocksDBError(UID id, const rocksdb::Status& status, const std::string& method) {
 	auto level = status.IsTimedOut() ? SevWarn : SevError;
-	TraceEvent e(level, "RocksDBError");
+	TraceEvent e(level, "RocksDBError", id);
 	e.detail("Error", status.ToString()).detail("Method", method).detail("RocksDBSeverity", status.severity());
 	if (status.IsIOError()) {
 		e.detail("SubCode", status.subcode());
@@ -951,7 +952,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			status = rocksdb::DB::Open(options, a.path, descriptors, &handles, &db);
 
 			if (!status.ok()) {
-				logRocksDBError(status, "Open");
+				logRocksDBError(id, status, "Open");
 				a.done.sendError(statusToError(status));
 				return;
 			}
@@ -966,12 +967,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			if (cf == nullptr) {
 				status = db->CreateColumnFamily(cfOptions, SERVER_KNOBS->DEFAULT_FDB_ROCKSDB_COLUMN_FAMILY, &cf);
 				if (!status.ok()) {
-					logRocksDBError(status, "Open");
+					logRocksDBError(id, status, "Open");
 					a.done.sendError(statusToError(status));
 				}
 			}
 
-			TraceEvent(SevInfo, "RocksDB")
+			TraceEvent(SevInfo, "RocksDB", id)
 			    .detail("Path", a.path)
 			    .detail("Method", "Open")
 			    .detail("KnobRocksDBWriteRateLimiterBytesPerSec",
@@ -983,13 +984,13 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				// blockUntilReady() is getting the thread into deadlock state, so directly calling
 				// the metricsLogger.
 				a.metrics =
-				    rocksDBMetricLogger(options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
-				    flowLockLogger(a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
+				    rocksDBMetricLogger(id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
+				    flowLockLogger(id, a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
 			} else {
 				onMainThread([&] {
-					a.metrics =
-					    rocksDBMetricLogger(options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
-					    flowLockLogger(a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
+					a.metrics = rocksDBMetricLogger(
+					                id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
+					            flowLockLogger(id, a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
 					return Future<bool>(true);
 				}).blockUntilReady();
 			}
@@ -1063,7 +1064,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			DeleteVisitor dv(deletes, deletes.arena());
 			rocksdb::Status s = a.batchToCommit->Iterate(&dv);
 			if (!s.ok()) {
-				logRocksDBError(s, "CommitDeleteVisitor");
+				logRocksDBError(id, s, "CommitDeleteVisitor");
 				a.done.sendError(statusToError(s));
 				return;
 			}
@@ -1086,7 +1087,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			}
 
 			if (!s.ok()) {
-				logRocksDBError(s, "Commit");
+				logRocksDBError(id, s, "Commit");
 				a.done.sendError(statusToError(s));
 			} else {
 				a.done.send(Void());
@@ -1130,7 +1131,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			}
 			auto s = db->Close();
 			if (!s.ok()) {
-				logRocksDBError(s, "Close");
+				logRocksDBError(id, s, "Close");
 			}
 			if (a.deleteOnClose) {
 				std::set<std::string> columnFamilies{ "default" };
@@ -1141,12 +1142,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				}
 				s = rocksdb::DestroyDB(a.path, getOptions(), descriptors);
 				if (!s.ok()) {
-					logRocksDBError(s, "Destroy");
+					logRocksDBError(id, s, "Destroy");
 				} else {
-					TraceEvent("RocksDB").detail("Path", a.path).detail("Method", "Destroy");
+					TraceEvent("RocksDB", id).detail("Path", a.path).detail("Method", "Destroy");
 				}
 			}
-			TraceEvent("RocksDB").detail("Path", a.path).detail("Method", "Close");
+			TraceEvent("RocksDB", id).detail("Path", a.path).detail("Method", "Close");
 			a.done.send(Void());
 		}
 
@@ -1169,7 +1170,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			rocksdb::Checkpoint* checkpoint;
 			rocksdb::Status s = rocksdb::Checkpoint::Create(db, &checkpoint);
 			if (!s.ok()) {
-				logRocksDBError(s, "Checkpoint");
+				logRocksDBError(id, s, "Checkpoint");
 				a.reply.sendError(statusToError(s));
 				return;
 			}
@@ -1179,7 +1180,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			s = db->Get(readOptions, cf, toSlice(persistVersion), &value);
 
 			if (!s.ok() && !s.IsNotFound()) {
-				logRocksDBError(s, "Checkpoint");
+				logRocksDBError(id, s, "Checkpoint");
 				a.reply.sendError(statusToError(s));
 				return;
 			}
@@ -1203,7 +1204,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				s = checkpoint->ExportColumnFamily(cf, checkpointDir, &pMetadata);
 
 				if (!s.ok()) {
-					logRocksDBError(s, "Checkpoint");
+					logRocksDBError(id, s, "Checkpoint");
 					a.reply.sendError(statusToError(s));
 					return;
 				}
@@ -1249,7 +1250,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				rocksdb::Status status = rocksdb::DB::Open(options, a.path, &db);
 
 				if (!status.ok()) {
-					logRocksDBError(status, "Restore");
+					logRocksDBError(id, status, "Restore");
 					a.done.sendError(statusToError(status));
 					return;
 				}
@@ -1261,10 +1262,10 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				    getCFOptions(), SERVER_KNOBS->DEFAULT_FDB_ROCKSDB_COLUMN_FAMILY, importOptions, metaData, &cf);
 
 				if (!status.ok()) {
-					logRocksDBError(status, "Restore");
+					logRocksDBError(id, status, "Restore");
 					a.done.sendError(statusToError(status));
 				} else {
-					TraceEvent(SevInfo, "RocksDB").detail("Path", a.path).detail("Method", "Restore");
+					TraceEvent(SevInfo, "RocksDB", id).detail("Path", a.path).detail("Method", "Restore");
 					a.done.send(Void());
 				}
 			} else {
@@ -1274,6 +1275,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	};
 
 	struct Reader : IThreadPoolReceiver {
+		UID id;
 		DB& db;
 		CF& cf;
 		double readValueTimeout;
@@ -1284,12 +1286,13 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		int threadIndex;
 		ThreadReturnPromiseStream<std::tuple<int, std::string, double>> metricPromiseStream;
 
-		explicit Reader(DB& db,
+		explicit Reader(UID id,
+		                DB& db,
 		                CF& cf,
 		                std::shared_ptr<ReadIteratorPool> readIterPool,
 		                std::shared_ptr<PerfContextMetrics> perfContextMetrics,
 		                int threadIndex)
-		  : db(db), cf(cf), readIterPool(readIterPool), perfContextMetrics(perfContextMetrics),
+		  : id(id), db(db), cf(cf), readIterPool(readIterPool), perfContextMetrics(perfContextMetrics),
 		    threadIndex(threadIndex) {
 			if (g_network->isSimulated()) {
 				// In simulation, increasing the read operation timeouts to 5 minutes, as some of the tests have
@@ -1343,7 +1346,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				traceBatch.get().addEvent("GetValueDebug", a.debugID.get().first(), "Reader.Before");
 			}
 			if (readBeginTime - a.startTime > readValueTimeout) {
-				TraceEvent(SevWarn, "KVSTimeout")
+				TraceEvent(SevWarn, "KVSTimeout", id)
 				    .detail("Error", "Read value request timedout")
 				    .detail("Method", "ReadValueAction")
 				    .detail("TimeoutValue", readValueTimeout);
@@ -1361,7 +1364,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			double dbGetBeginTime = a.getHistograms ? timer_monotonic() : 0;
 			auto s = db->Get(options, cf, toSlice(a.key), &value);
 			if (!s.ok() && !s.IsNotFound()) {
-				logRocksDBError(s, "ReadValue");
+				logRocksDBError(id, s, "ReadValue");
 				a.result.sendError(statusToError(s));
 				return;
 			}
@@ -1380,7 +1383,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			} else if (s.IsNotFound()) {
 				a.result.send(Optional<Value>());
 			} else {
-				logRocksDBError(s, "ReadValue");
+				logRocksDBError(id, s, "ReadValue");
 				a.result.sendError(statusToError(s));
 			}
 
@@ -1430,7 +1433,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				                          "Reader.Before"); //.detail("TaskID", g_network->getCurrentTask());
 			}
 			if (readBeginTime - a.startTime > readValuePrefixTimeout) {
-				TraceEvent(SevWarn, "KVSTimeout")
+				TraceEvent(SevWarn, "KVSTimeout", id)
 				    .detail("Error", "Read value prefix request timedout")
 				    .detail("Method", "ReadValuePrefixAction")
 				    .detail("TimeoutValue", readValuePrefixTimeout);
@@ -1464,7 +1467,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			} else if (s.IsNotFound()) {
 				a.result.send(Optional<Value>());
 			} else {
-				logRocksDBError(s, "ReadValuePrefix");
+				logRocksDBError(id, s, "ReadValuePrefix");
 				a.result.sendError(statusToError(s));
 			}
 			if (a.getHistograms) {
@@ -1505,7 +1508,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				    threadIndex, ROCKSDB_READRANGE_QUEUEWAIT_HISTOGRAM.toString(), readBeginTime - a.startTime));
 			}
 			if (readBeginTime - a.startTime > readRangeTimeout) {
-				TraceEvent(SevWarn, "KVSTimeout")
+				TraceEvent(SevWarn, "KVSTimeout", id)
 				    .detail("Error", "Read range request timedout")
 				    .detail("Method", "ReadRangeAction")
 				    .detail("TimeoutValue", readRangeTimeout);
@@ -1538,7 +1541,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 						break;
 					}
 					if (timer_monotonic() - a.startTime > readRangeTimeout) {
-						TraceEvent(SevWarn, "KVSTimeout")
+						TraceEvent(SevWarn, "KVSTimeout", id)
 						    .detail("Error", "Read range request timedout")
 						    .detail("Method", "ReadRangeAction")
 						    .detail("TimeoutValue", readRangeTimeout);
@@ -1571,7 +1574,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 						break;
 					}
 					if (timer_monotonic() - a.startTime > readRangeTimeout) {
-						TraceEvent(SevWarn, "KVSTimeout")
+						TraceEvent(SevWarn, "KVSTimeout", id)
 						    .detail("Error", "Read range request timedout")
 						    .detail("Method", "ReadRangeAction")
 						    .detail("TimeoutValue", readRangeTimeout);
@@ -1585,7 +1588,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			}
 
 			if (!s.ok()) {
-				logRocksDBError(s, "ReadRange");
+				logRocksDBError(id, s, "ReadRange");
 				a.result.sendError(statusToError(s));
 				return;
 			}
@@ -1631,12 +1634,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 
 	explicit RocksDBKeyValueStore(const std::string& path, UID id)
 	  : path(path), id(id), perfContextMetrics(new PerfContextMetrics()),
-	    readIterPool(new ReadIteratorPool(db, defaultFdbCF, path)),
+	    readIterPool(new ReadIteratorPool(id, db, defaultFdbCF)),
 	    readSemaphore(SERVER_KNOBS->ROCKSDB_READ_QUEUE_SOFT_MAX),
 	    fetchSemaphore(SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_SOFT_MAX),
 	    numReadWaiters(SERVER_KNOBS->ROCKSDB_READ_QUEUE_HARD_MAX - SERVER_KNOBS->ROCKSDB_READ_QUEUE_SOFT_MAX),
 	    numFetchWaiters(SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_HARD_MAX - SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_SOFT_MAX),
-	    errorListener(std::make_shared<RocksDBErrorListener>()), errorFuture(errorListener->getFuture()) {
+	    errorListener(std::make_shared<RocksDBErrorListener>(id)), errorFuture(errorListener->getFuture()) {
 		// In simluation, run the reader/writer threads as Coro threads (i.e. in the network thread. The storage engine
 		// is still multi-threaded as background compaction threads are still present. Reads/writes to disk will also
 		// block the network thread in a way that would be unacceptable in production but is a necessary evil here. When
@@ -1660,9 +1663,10 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			actors.push_back(updateHistogram(writer->metricPromiseStream.getFuture()));
 		}
 		writeThread->addThread(writer, "fdb-rocksdb-wr");
-		TraceEvent("RocksDBReadThreads").detail("KnobRocksDBReadParallelism", SERVER_KNOBS->ROCKSDB_READ_PARALLELISM);
+		TraceEvent("RocksDBReadThreads", id)
+		    .detail("KnobRocksDBReadParallelism", SERVER_KNOBS->ROCKSDB_READ_PARALLELISM);
 		for (unsigned i = 0; i < SERVER_KNOBS->ROCKSDB_READ_PARALLELISM; ++i) {
-			struct Reader* reader = new Reader(db, defaultFdbCF, readIterPool, perfContextMetrics, i);
+			struct Reader* reader = new Reader(id, db, defaultFdbCF, readIterPool, perfContextMetrics, i);
 			if (SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE > 0) {
 				actors.push_back(updateHistogram(reader->metricPromiseStream.getFuture()));
 			}
@@ -2008,7 +2012,7 @@ IKeyValueStore* keyValueStoreRocksDB(std::string const& path,
 #ifdef SSD_ROCKSDB_EXPERIMENTAL
 	return new RocksDBKeyValueStore(path, logID);
 #else
-	TraceEvent(SevError, "RocksDBEngineInitFailure").detail("Reason", "Built without RocksDB");
+	TraceEvent(SevError, "RocksDBEngineInitFailure", logID).detail("Reason", "Built without RocksDB");
 	ASSERT(false);
 	return nullptr;
 #endif // SSD_ROCKSDB_EXPERIMENTAL

From f62fb0eb71a3f420937284a04f6abb989afd8929 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 29 Jun 2022 16:56:58 -0700
Subject: [PATCH 515/740] Issue secondary query in parallel for
 GetMappedKeyValues

In case the subquery is a local miss, it becomes a remote call. Then such an
optimization can significantly reduce latency.
---
 fdbserver/storageserver.actor.cpp | 56 +++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 8d5e63edccd..94d06657295 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3714,6 +3714,27 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 	return Void();
 }
 
+// Issues a secondary query (either range and point read) and fills results into "kvm".
+ACTOR Future<Void> mapSubquery(StorageServer* data,
+                               GetKeyValuesReply input,
+                               GetMappedKeyValuesRequest* pOriginalReq,
+                               Arena* pArena,
+                               bool isRangeQuery,
+                               KeyValueRef* it,
+                               MappedKeyValueRef* kvm,
+                               Key mappedKey) {
+	if (isRangeQuery) {
+		// Use the mappedKey as the prefix of the range query.
+		GetRangeReqAndResultRef getRange =
+		    wait(quickGetKeyValues(data, mappedKey, input.version, pArena, pOriginalReq));
+		kvm->reqAndResult = getRange;
+	} else {
+		GetValueReqAndResultRef getValue = wait(quickGetValue(data, mappedKey, input.version, pArena, pOriginalReq));
+		kvm->reqAndResult = getValue;
+	}
+	return Void();
+}
+
 ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
                                                    GetKeyValuesReply input,
                                                    StringRef mapper,
@@ -3737,34 +3758,33 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 		TraceEvent("MapperNotTuple").error(e).detail("Mapper", mapper.printable());
 		throw mapper_not_tuple();
 	}
-	state KeyValueRef* it = input.data.begin();
 	state std::vector<Optional<Tuple>> vt;
 	state bool isRangeQuery = false;
 	preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-	for (; it != input.data.end(); it++) {
-		state MappedKeyValueRef kvm;
-		kvm.key = it->key;
-		kvm.value = it->value;
-
-		state Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
+	state int sz = input.data.size();
+	state int i = 0;
+	state std::vector<MappedKeyValueRef> kvms(sz);
+	state std::vector<Future<Void>> subqueries(sz);
+	for (; i < sz; i++) {
+		KeyValueRef* it = &input.data[i];
+		MappedKeyValueRef* kvm = &kvms[i];
+		kvm->key = it->key;
+		kvm->value = it->value;
+
+		Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
 		// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
 		result.arena.dependsOn(mappedKey.arena());
 
 		//		std::cout << "key:" << printable(kvm.key) << ", value:" << printable(kvm.value)
 		//		          << ", mappedKey:" << printable(mappedKey) << std::endl;
 
-		if (isRangeQuery) {
-			// Use the mappedKey as the prefix of the range query.
-			GetRangeReqAndResultRef getRange =
-			    wait(quickGetKeyValues(data, mappedKey, input.version, &(result.arena), pOriginalReq));
-			kvm.reqAndResult = getRange;
-		} else {
-			GetValueReqAndResultRef getValue =
-			    wait(quickGetValue(data, mappedKey, input.version, &(result.arena), pOriginalReq));
-			kvm.reqAndResult = getValue;
-		}
-		result.data.push_back(result.arena, kvm);
+		subqueries[i] = mapSubquery(
+		    data, input, pOriginalReq, &result.arena, isRangeQuery, it, kvm, mappedKey);
+	}
+	wait(waitForAll(subqueries));
+	for (i = 0; i < sz; i++) {
+		result.data.push_back(result.arena, kvms[i]);
 	}
 	return result;
 }

From cc55e67f8f00ffc8ebcd0a6fa7b62ee9c46878f4 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 29 Jun 2022 21:17:11 -0700
Subject: [PATCH 516/740] Add batching for secondary queries in index prefetch

This is to reduce excessive load being issued concurrently, controlled by knob
MAX_PARALLEL_QUICK_GET_VALUE.
---
 fdbclient/ServerKnobs.cpp         |  2 ++
 fdbclient/ServerKnobs.h           |  1 +
 fdbserver/storageserver.actor.cpp | 49 +++++++++++++++++--------------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 6afc23ee3c4..6024cb2c57f 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -20,6 +20,7 @@
 
 #include "fdbclient/ServerKnobs.h"
 #include "flow/IRandom.h"
+#include "flow/flow.h"
 
 #define init(...) KNOB_FN(__VA_ARGS__, INIT_ATOMIC_KNOB, INIT_KNOB)(__VA_ARGS__)
 
@@ -715,6 +716,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( CHECKPOINT_TRANSFER_BLOCK_BYTES,                      40e6 );
 	init( QUICK_GET_VALUE_FALLBACK,                             true );
 	init( QUICK_GET_KEY_VALUES_FALLBACK,                        true );
+	init( MAX_PARALLEL_QUICK_GET_VALUE,                           50 ); if ( randomize && BUGGIFY ) MAX_PARALLEL_QUICK_GET_VALUE = deterministicRandom()->randomInt(1, 100);
 	init( QUICK_GET_KEY_VALUES_LIMIT,                           2000 );
 	init( QUICK_GET_KEY_VALUES_LIMIT_BYTES,                      1e7 );
 
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index e7690b287ab..28aedbc11ea 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -659,6 +659,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	bool ENABLE_CLEAR_RANGE_EAGER_READS;
 	bool QUICK_GET_VALUE_FALLBACK;
 	bool QUICK_GET_KEY_VALUES_FALLBACK;
+	int MAX_PARALLEL_QUICK_GET_VALUE;
 	int CHECKPOINT_TRANSFER_BLOCK_BYTES;
 	int QUICK_GET_KEY_VALUES_LIMIT;
 	int QUICK_GET_KEY_VALUES_LIMIT_BYTES;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 94d06657295..0f70732509e 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3763,28 +3763,33 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
 	state int sz = input.data.size();
-	state int i = 0;
-	state std::vector<MappedKeyValueRef> kvms(sz);
-	state std::vector<Future<Void>> subqueries(sz);
-	for (; i < sz; i++) {
-		KeyValueRef* it = &input.data[i];
-		MappedKeyValueRef* kvm = &kvms[i];
-		kvm->key = it->key;
-		kvm->value = it->value;
-
-		Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
-		// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
-		result.arena.dependsOn(mappedKey.arena());
-
-		//		std::cout << "key:" << printable(kvm.key) << ", value:" << printable(kvm.value)
-		//		          << ", mappedKey:" << printable(mappedKey) << std::endl;
-
-		subqueries[i] = mapSubquery(
-		    data, input, pOriginalReq, &result.arena, isRangeQuery, it, kvm, mappedKey);
-	}
-	wait(waitForAll(subqueries));
-	for (i = 0; i < sz; i++) {
-		result.data.push_back(result.arena, kvms[i]);
+	int k = std::min(sz, SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE);
+	state std::vector<MappedKeyValueRef> kvms(k);
+	state std::vector<Future<Void>> subqueries;
+	state int offset = 0;
+	for (; offset < sz; offset += SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE) {
+		// Divide into batches of MAX_PARALLEL_QUICK_GET_VALUE subqueries
+		for (int i = 0; i + offset < sz && i < SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE; i++) {
+			KeyValueRef* it = &input.data[i + offset];
+			MappedKeyValueRef* kvm = &kvms[i];
+				kvm->key = it->key;
+				kvm->value = it->value;
+
+			Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
+			// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
+			result.arena.dependsOn(mappedKey.arena());
+
+			std::cout << "key:" << printable(kvm->key) << ", value:" << printable(kvm->value)
+			          << ", mappedKey:" << printable(mappedKey) << std::endl;
+
+			subqueries.push_back(mapSubquery(
+			    data, input, pOriginalReq, &result.arena, isRangeQuery, it, kvm, mappedKey));
+		}
+		wait(waitForAll(subqueries));
+		subqueries.clear();
+		for (int i = 0; i + offset < sz && i < SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE; i++) {
+			result.data.push_back(result.arena, kvms[i]);
+		}
 	}
 	return result;
 }

From 63174e4b23cd9ac35e0f3c370b53da5f7eb69169 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 29 Jun 2022 21:29:41 -0700
Subject: [PATCH 517/740] Code clean-up

---
 fdbserver/storageserver.actor.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 0f70732509e..fb6b2fcbb97 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3716,7 +3716,7 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 
 // Issues a secondary query (either range and point read) and fills results into "kvm".
 ACTOR Future<Void> mapSubquery(StorageServer* data,
-                               GetKeyValuesReply input,
+                               Version version,
                                GetMappedKeyValuesRequest* pOriginalReq,
                                Arena* pArena,
                                bool isRangeQuery,
@@ -3725,11 +3725,10 @@ ACTOR Future<Void> mapSubquery(StorageServer* data,
                                Key mappedKey) {
 	if (isRangeQuery) {
 		// Use the mappedKey as the prefix of the range query.
-		GetRangeReqAndResultRef getRange =
-		    wait(quickGetKeyValues(data, mappedKey, input.version, pArena, pOriginalReq));
+		GetRangeReqAndResultRef getRange = wait(quickGetKeyValues(data, mappedKey, version, pArena, pOriginalReq));
 		kvm->reqAndResult = getRange;
 	} else {
-		GetValueReqAndResultRef getValue = wait(quickGetValue(data, mappedKey, input.version, pArena, pOriginalReq));
+		GetValueReqAndResultRef getValue = wait(quickGetValue(data, mappedKey, version, pArena, pOriginalReq));
 		kvm->reqAndResult = getValue;
 	}
 	return Void();
@@ -3779,11 +3778,11 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 			// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
 			result.arena.dependsOn(mappedKey.arena());
 
-			std::cout << "key:" << printable(kvm->key) << ", value:" << printable(kvm->value)
-			          << ", mappedKey:" << printable(mappedKey) << std::endl;
+			// std::cout << "key:" << printable(kvm->key) << ", value:" << printable(kvm->value)
+			//          << ", mappedKey:" << printable(mappedKey) << std::endl;
 
-			subqueries.push_back(mapSubquery(
-			    data, input, pOriginalReq, &result.arena, isRangeQuery, it, kvm, mappedKey));
+			subqueries.push_back(
+			    mapSubquery(data, input.version, pOriginalReq, &result.arena, isRangeQuery, it, kvm, mappedKey));
 		}
 		wait(waitForAll(subqueries));
 		subqueries.clear();

From ef77a76ec5609975192e20be956f4292d1385c5f Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 30 Jun 2022 09:11:49 -0700
Subject: [PATCH 518/740] Remove semicolons

---
 fdbserver/storageserver.actor.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index fb6b2fcbb97..4d5b344eb3c 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -109,7 +109,7 @@ bool canReplyWith(Error e) {
 		return true;
 	default:
 		return false;
-	};
+	}
 }
 } // namespace
 
@@ -1658,7 +1658,7 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 	}
 
 	return Void();
-};
+}
 
 // Pessimistic estimate the number of overhead bytes used by each
 // watch. Watch key references are stored in an AsyncMap<Key,bool>, and actors
@@ -2851,7 +2851,7 @@ ACTOR Future<GetValueReqAndResultRef> quickGetValue(StorageServer* data,
 	} else {
 		throw quick_get_value_miss();
 	}
-};
+}
 
 // If limit>=0, it returns the first rows in the range (sorted ascending), otherwise the last rows (sorted descending).
 // readRange has O(|result|) + O(log |data|) cost
@@ -3465,7 +3465,7 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 	} else {
 		throw quick_get_key_values_miss();
 	}
-};
+}
 
 void unpackKeyTuple(Tuple** referenceTuple, Optional<Tuple>& keyTuple, KeyValueRef* keyValue) {
 	if (!keyTuple.present()) {
@@ -3762,7 +3762,7 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
 	state int sz = input.data.size();
-	int k = std::min(sz, SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE);
+	const int k = std::min(sz, SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE);
 	state std::vector<MappedKeyValueRef> kvms(k);
 	state std::vector<Future<Void>> subqueries;
 	state int offset = 0;
@@ -6046,7 +6046,7 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 	}
 
 	return Void();
-};
+}
 
 AddingShard::AddingShard(StorageServer* server, KeyRangeRef const& keys)
   : keys(keys), server(server), transferredVersion(invalidVersion), fetchVersion(invalidVersion), phase(WaitPrevious) {

From c7d0cea90854b9bce15e532efd0f785187d2535b Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 30 Jun 2022 10:06:03 -0700
Subject: [PATCH 519/740] Fix format

---
 fdbserver/storageserver.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 4d5b344eb3c..bd3fb5c8d61 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3771,8 +3771,8 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 		for (int i = 0; i + offset < sz && i < SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE; i++) {
 			KeyValueRef* it = &input.data[i + offset];
 			MappedKeyValueRef* kvm = &kvms[i];
-				kvm->key = it->key;
-				kvm->value = it->value;
+			kvm->key = it->key;
+			kvm->value = it->value;
 
 			Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
 			// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.

From 690c302ad907b3ceaa84eca9c5bccbca9308ad84 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Fri, 1 Jul 2022 12:20:41 -0400
Subject: [PATCH 520/740] cherry pick pr7499 (#7508)

---
 fdbserver/ClusterRecovery.actor.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
index b5747c0a3f6..d9afb545268 100644
--- a/fdbserver/ClusterRecovery.actor.cpp
+++ b/fdbserver/ClusterRecovery.actor.cpp
@@ -1012,11 +1012,6 @@ ACTOR Future<Void> updateLocalityForDcId(Optional<Key> dcId,
 		if (ver == invalidVersion) {
 			ver = oldLogSystem->getKnownCommittedVersion();
 		}
-		if (SERVER_KNOBS->ENABLE_VERSION_VECTOR_TLOG_UNICAST) {
-			// Do not try to split peeks between data centers in peekTxns() to recover mem kvstore.
-			// This recovery optimization won't work in UNICAST mode.
-			loc.first = -1;
-		}
 
 		locality->set(PeekTxsInfo(loc.first, loc.second, ver));
 		TraceEvent("UpdatedLocalityForDcId")

From 8a699d0d2386e4cd3462b4b1b3c838c93104479e Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Tue, 5 Jul 2022 12:14:44 -0400
Subject: [PATCH 521/740] Cherry pick PR 7462 (#7518)

---
 fdbserver/CommitProxyServer.actor.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index ef28a3b0b6d..86ed60d3223 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -2307,7 +2307,6 @@ ACTOR Future<Void> commitProxyServerCore(CommitProxyInterface proxy,
 
 	state PromiseStream<Future<Void>> addActor;
 	state Future<Void> onError = transformError(actorCollection(addActor.getFuture()), broken_promise(), tlog_failed());
-	state double lastCommit = 0;
 
 	state GetHealthMetricsReply healthMetricsReply;
 	state GetHealthMetricsReply detailedHealthMetricsReply;
@@ -2407,9 +2406,7 @@ ACTOR Future<Void> commitProxyServerCore(CommitProxyInterface proxy,
 			//TraceEvent("CommitProxyCTR", proxy.id()).detail("CommitTransactions", trs.size()).detail("TransactionRate", transactionRate).detail("TransactionQueue", transactionQueue.size()).detail("ReleasedTransactionCount", transactionCount);
 			//TraceEvent("CommitProxyCore", commitData.dbgid).detail("TxSize", trs.size()).detail("MasterLifetime", masterLifetime.toString()).detail("DbMasterLifetime", commitData.db->get().masterLifetime.toString()).detail("RecoveryState", commitData.db->get().recoveryState).detail("CCInf", commitData.db->get().clusterInterface.id().toString());
 			if (trs.size() || (commitData.db->get().recoveryState >= RecoveryState::ACCEPTING_COMMITS &&
-			                   masterLifetime.isEqual(commitData.db->get().masterLifetime) &&
-			                   now() - lastCommit >= SERVER_KNOBS->MAX_COMMIT_BATCH_INTERVAL)) {
-				lastCommit = now();
+			                   masterLifetime.isEqual(commitData.db->get().masterLifetime))) {
 
 				if (trs.size() || lastCommitComplete.isReady()) {
 					lastCommitComplete = transformError(

From a5afe17f28f5a01539faecb4d6ee6fa7d1fc51fe Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <jscheuermann@apple.com>
Date: Mon, 4 Jul 2022 17:18:36 +0100
Subject: [PATCH 522/740] Fix permission in Dockerfile

---
 packaging/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 09525676d79..d0adc045d4e 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -91,7 +91,7 @@ COPY website /tmp/website/
 # Install FoundationDB Binaries
 RUN for file in fdbserver fdbbackup fdbcli fdbmonitor; do \
         curl --fail -Ls ${FDB_WEBSITE}/${FDB_VERSION}/$file.x86_64 -o $file; \
-        chmod u+x $file; \
+        chmod +x $file; \
         mv $file /usr/bin; \
     done
 

From 3f1b658fd3e5f1408809d3c83a5ab4eb41b18df0 Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <82616783+sbodagala@users.noreply.github.com>
Date: Fri, 1 Jul 2022 11:28:59 +0530
Subject: [PATCH 523/740] Merge pull request #7482 from sbodagala/main

Optimize out the version vector specific code (on the client) when the feature is disabled
---
 fdbclient/DatabaseContext.h   |  8 +++++++
 fdbclient/NativeAPI.actor.cpp | 44 ++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index 097f22d37dc..6eed163162f 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -607,6 +607,14 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	// Cache of the latest commit versions of storage servers.
 	VersionVector ssVersionVectorCache;
 
+	// Introduced mainly to optimize out the version vector related code (on the client side)
+	// when the version vector feature is disabled (on the server side).
+	// @param ssVersionVectorDelta version vector changes sent by GRV proxy
+	inline bool versionVectorCacheActive(const VersionVector& ssVersionVectorDelta) {
+		return (ssVersionVectorCache.getMaxVersion() != invalidVersion ||
+		        ssVersionVectorDelta.getMaxVersion() != invalidVersion);
+	}
+
 	// Adds or updates the specified (SS, TSS) pair in the TSS mapping (if not already present).
 	// Requests to the storage server will be duplicated to the TSS.
 	void addTssMapping(StorageServerInterface const& ssi, StorageServerInterface const& tssi);
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 571889f0ec0..e11249f8c67 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -236,6 +236,10 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 		return;
 	}
 
+	if (ssVersionVectorCache.getMaxVersion() == invalidVersion) {
+		return;
+	}
+
 	if (ssVersionVectorCache.getMaxVersion() != invalidVersion && readVersion > ssVersionVectorCache.getMaxVersion()) {
 		if (!CLIENT_KNOBS->FORCE_GRV_CACHE_OFF && !info->options.skipGrvCache && info->options.useGrvCache) {
 			return;
@@ -3462,10 +3466,12 @@ ACTOR Future<Version> waitForCommittedVersion(Database cx, Version version, Span
 					cx->minAcceptableReadVersion = std::min(cx->minAcceptableReadVersion, v.version);
 					if (v.midShardSize > 0)
 						cx->smoothMidShardSize.setTotal(v.midShardSize);
-					if (cx->isCurrentGrvProxy(v.proxyId)) {
-						cx->ssVersionVectorCache.applyDelta(v.ssVersionVectorDelta);
-					} else {
-						cx->ssVersionVectorCache.clear();
+					if (cx->versionVectorCacheActive(v.ssVersionVectorDelta)) {
+						if (cx->isCurrentGrvProxy(v.proxyId)) {
+							cx->ssVersionVectorCache.applyDelta(v.ssVersionVectorDelta);
+						} else {
+							cx->ssVersionVectorCache.clear();
+						}
 					}
 					if (v.version >= version)
 						return v.version;
@@ -3494,10 +3500,12 @@ ACTOR Future<Version> getRawVersion(Reference<TransactionState> trState) {
 			                                                     TransactionPriority::IMMEDIATE,
 			                                                     trState->cx->ssVersionVectorCache.getMaxVersion()),
 			                               trState->cx->taskID))) {
-				if (trState->cx->isCurrentGrvProxy(v.proxyId)) {
-					trState->cx->ssVersionVectorCache.applyDelta(v.ssVersionVectorDelta);
-				} else {
-					trState->cx->ssVersionVectorCache.clear();
+				if (trState->cx->versionVectorCacheActive(v.ssVersionVectorDelta)) {
+					if (trState->cx->isCurrentGrvProxy(v.proxyId)) {
+						trState->cx->ssVersionVectorCache.applyDelta(v.ssVersionVectorDelta);
+					} else {
+						trState->cx->ssVersionVectorCache.clear();
+					}
 				}
 				return v.version;
 			}
@@ -6606,10 +6614,12 @@ ACTOR Future<GetReadVersionReply> getConsistentReadVersion(SpanID parentSpan,
 						    "TransactionDebug", debugID.get().first(), "NativeAPI.getConsistentReadVersion.After");
 					ASSERT(v.version > 0);
 					cx->minAcceptableReadVersion = std::min(cx->minAcceptableReadVersion, v.version);
-					if (cx->isCurrentGrvProxy(v.proxyId)) {
-						cx->ssVersionVectorCache.applyDelta(v.ssVersionVectorDelta);
-					} else {
-						continue; // stale GRV reply, retry
+					if (cx->versionVectorCacheActive(v.ssVersionVectorDelta)) {
+						if (cx->isCurrentGrvProxy(v.proxyId)) {
+							cx->ssVersionVectorCache.applyDelta(v.ssVersionVectorDelta);
+						} else {
+							continue; // stale GRV reply, retry
+						}
 					}
 					return v;
 				}
@@ -6796,10 +6806,12 @@ ACTOR Future<Version> extractReadVersion(Reference<TransactionState> trState,
 	}
 
 	metadataVersion.send(rep.metadataVersion);
-	if (trState->cx->isCurrentGrvProxy(rep.proxyId)) {
-		trState->cx->ssVersionVectorCache.applyDelta(rep.ssVersionVectorDelta);
-	} else {
-		trState->cx->ssVersionVectorCache.clear();
+	if (trState->cx->versionVectorCacheActive(rep.ssVersionVectorDelta)) {
+		if (trState->cx->isCurrentGrvProxy(rep.proxyId)) {
+			trState->cx->ssVersionVectorCache.applyDelta(rep.ssVersionVectorDelta);
+		} else {
+			trState->cx->ssVersionVectorCache.clear();
+		}
 	}
 	return rep.version;
 }

From c84eb7520f7244d4f0b48d8bc0c27f7c89f67762 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Thu, 7 Jul 2022 09:36:10 -0400
Subject: [PATCH 524/740] Change VersionVectorTagUpdates to LatencySample
 (cherry pick 7531)

---
 fdbserver/masterserver.actor.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index b099a61c620..b6ca1944c91 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -74,7 +74,7 @@ struct MasterData : NonCopyable, ReferenceCounted<MasterData> {
 	Counter reportLiveCommittedVersionRequests;
 	// This counter gives an estimate of the number of non-empty peeks that storage servers
 	// should do from tlogs (in the worst case, ignoring blocking peek timeouts).
-	Counter versionVectorTagUpdates;
+	LatencySample versionVectorTagUpdates;
 	Counter waitForPrevCommitRequests;
 	Counter nonWaitForPrevCommitRequests;
 	LatencySample versionVectorSizeOnCVReply;
@@ -99,7 +99,10 @@ struct MasterData : NonCopyable, ReferenceCounted<MasterData> {
 	    getCommitVersionRequests("GetCommitVersionRequests", cc),
 	    getLiveCommittedVersionRequests("GetLiveCommittedVersionRequests", cc),
 	    reportLiveCommittedVersionRequests("ReportLiveCommittedVersionRequests", cc),
-	    versionVectorTagUpdates("VersionVectorTagUpdates", cc),
+	    versionVectorTagUpdates("VersionVectorTagUpdates",
+                                    dbgid,
+                                    SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+                                    SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 	    waitForPrevCommitRequests("WaitForPrevCommitRequests", cc),
 	    nonWaitForPrevCommitRequests("NonWaitForPrevCommitRequests", cc),
 	    versionVectorSizeOnCVReply("VersionVectorSizeOnCVReply",
@@ -238,7 +241,7 @@ void updateLiveCommittedVersion(Reference<MasterData> self, ReportRawCommittedVe
 			int8_t primaryLocality =
 			    SERVER_KNOBS->ENABLE_VERSION_VECTOR_HA_OPTIMIZATION ? self->locality : tagLocalityInvalid;
 			self->ssVersionVector.setVersion(req.writtenTags.get(), req.version, primaryLocality);
-			self->versionVectorTagUpdates += req.writtenTags.get().size();
+			self->versionVectorTagUpdates.addMeasurement(req.writtenTags.get().size());
 		}
 		auto curTime = now();
 		// add debug here to change liveCommittedVersion to time bound of now()

From 568fcc11ee73079cd095912dd6b031560c6c3aa7 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Thu, 7 Jul 2022 11:27:09 -0400
Subject: [PATCH 525/740] updated per code review

---
 fdbserver/masterserver.actor.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index b6ca1944c91..8d61c780520 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -72,8 +72,6 @@ struct MasterData : NonCopyable, ReferenceCounted<MasterData> {
 	Counter getCommitVersionRequests;
 	Counter getLiveCommittedVersionRequests;
 	Counter reportLiveCommittedVersionRequests;
-	// This counter gives an estimate of the number of non-empty peeks that storage servers
-	// should do from tlogs (in the worst case, ignoring blocking peek timeouts).
 	LatencySample versionVectorTagUpdates;
 	Counter waitForPrevCommitRequests;
 	Counter nonWaitForPrevCommitRequests;
@@ -100,9 +98,9 @@ struct MasterData : NonCopyable, ReferenceCounted<MasterData> {
 	    getLiveCommittedVersionRequests("GetLiveCommittedVersionRequests", cc),
 	    reportLiveCommittedVersionRequests("ReportLiveCommittedVersionRequests", cc),
 	    versionVectorTagUpdates("VersionVectorTagUpdates",
-                                    dbgid,
-                                    SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-                                    SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+	                            dbgid,
+	                            SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+	                            SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 	    waitForPrevCommitRequests("WaitForPrevCommitRequests", cc),
 	    nonWaitForPrevCommitRequests("NonWaitForPrevCommitRequests", cc),
 	    versionVectorSizeOnCVReply("VersionVectorSizeOnCVReply",

From 4aa103dcad88af3cd6f7e8fc55775fd38258e14b Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Thu, 7 Jul 2022 20:27:12 +0000
Subject: [PATCH 526/740] disable AVX for 7.1.12 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 851fd2788b06060606d1dc14060a6bd7786899c7 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Thu, 7 Jul 2022 20:30:06 +0000
Subject: [PATCH 527/740] enable AVX and update version for 7.1.13 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 842706e6435..9091278284b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.12
+  VERSION 7.1.13
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From be35ecfaaa4b189d506a0e109adf476678033016 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 7 Jul 2022 13:21:41 -0700
Subject: [PATCH 528/740] Add 7.1.12, 7.1.13 release notes

---
 .../source/release-notes/release-notes-710.rst     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 9ae697fbbeb..54729502907 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,20 @@
 Release Notes
 #############
 
+7.1.13
+======
+* Same as 7.1.12 release with AVX enabled.
+
+7.1.12
+======
+* Released with AVX disabled.
+* Optimized out the version vector specific code on the client when version vector is disabled. `(PR #7528) <https://github.com/apple/foundationdb/pull/7528>`_
+* Added pipelining for secondary queries in index prefetch. `(PR #7507) <https://github.com/apple/foundationdb/pull/7507>`_
+* Fixed a connection failure bug when using DNS names. `(PR #7478) <https://github.com/apple/foundationdb/pull/7478>`_
+* Fixed delays in version advancement that can be larger than knob MAX_COMMIT_BATCH_INTERVAL. `(PR #7518) <https://github.com/apple/foundationdb/pull/7518>`_
+* Removed explicit degraded peer recovery in gray failure detection since this may be false positive. `(PR #7466) <https://github.com/apple/foundationdb/pull/7466>`_
+* Fixed undefined behavior from accessing field of uninitialized object. `(PR #7430) <https://github.com/apple/foundationdb/pull/7430>`_
+
 7.1.11
 ======
 * Same as 7.1.10 release with AVX enabled.

From 4bd2c281daa07f647b9bfe7700007ce588e6dceb Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Fri, 8 Jul 2022 06:58:47 +0000
Subject: [PATCH 529/740] update version after 7.1.13 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9091278284b..3642bb8d892 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.13
+  VERSION 7.1.14
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 5632e10b54f43e62c6d9c652f40256ca2ec96efb Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 7 Jul 2022 21:55:52 -0700
Subject: [PATCH 530/740] Fix a performance bug in Resolver

The erased bytes from recent state transactions was accidently set to 0 and
cause anyPopped to be always false. Thus, when totalStateBytes will never
decrease and can cause high latency between "Resolver.resolveBatch.Before" and
"Resolver.resolveBatch.AfterQueueSizeCheck", in hundreds of milliseconds. This
will cause high server side commit latency.
---
 fdbserver/Resolver.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/Resolver.actor.cpp b/fdbserver/Resolver.actor.cpp
index 87a4e5244c6..6b6b3d39ab9 100644
--- a/fdbserver/Resolver.actor.cpp
+++ b/fdbserver/Resolver.actor.cpp
@@ -409,7 +409,7 @@ ACTOR Future<Void> resolveBatch(Reference<Resolver> self, ResolveTransactionBatc
 			TEST(true); // Deleting old state transactions
 			int64_t erasedBytes = self->recentStateTransactionsInfo.eraseUpTo(oldestProxyVersion);
 			self->debugMinRecentStateVersion = oldestProxyVersion + 1;
-			anyPopped = erasedBytes = 0;
+			anyPopped = erasedBytes > 0;
 			stateBytes -= erasedBytes;
 		}
 

From b599f00ee80ca3c001e7bceecaabd38d00fe59ba Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <82616783+sbodagala@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:00:10 +0530
Subject: [PATCH 531/740] Merge pull request #7529 from sbodagala/main

Make sequencer aware of the locality of the primary region
---
 fdbserver/ClusterRecovery.actor.cpp |  3 ++-
 fdbserver/MasterInterface.h         | 16 +++++++++++++---
 fdbserver/masterserver.actor.cpp    |  9 +++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
index d9afb545268..723c0afec68 100644
--- a/fdbserver/ClusterRecovery.actor.cpp
+++ b/fdbserver/ClusterRecovery.actor.cpp
@@ -998,7 +998,8 @@ ACTOR Future<std::vector<Standalone<CommitTransactionRef>>> recruitEverything(
 	                                                                                self->lastEpochEnd,
 	                                                                                self->commitProxies,
 	                                                                                self->resolvers,
-	                                                                                self->versionEpoch))));
+	                                                                                self->versionEpoch,
+	                                                                                self->primaryLocality))));
 
 	return confChanges;
 }
diff --git a/fdbserver/MasterInterface.h b/fdbserver/MasterInterface.h
index 73fc6ef1141..f7f3b989768 100644
--- a/fdbserver/MasterInterface.h
+++ b/fdbserver/MasterInterface.h
@@ -170,19 +170,29 @@ struct UpdateRecoveryDataRequest {
 	std::vector<ResolverInterface> resolvers;
 	Optional<int64_t> versionEpoch;
 	ReplyPromise<Void> reply;
+	int8_t primaryLocality;
 
 	UpdateRecoveryDataRequest() = default;
 	UpdateRecoveryDataRequest(Version recoveryTransactionVersion,
 	                          Version lastEpochEnd,
 	                          const std::vector<CommitProxyInterface>& commitProxies,
 	                          const std::vector<ResolverInterface>& resolvers,
-	                          Optional<int64_t> versionEpoch)
+	                          Optional<int64_t> versionEpoch,
+	                          int8_t primaryLocality)
 	  : recoveryTransactionVersion(recoveryTransactionVersion), lastEpochEnd(lastEpochEnd),
-	    commitProxies(commitProxies), resolvers(resolvers), versionEpoch(versionEpoch) {}
+	    commitProxies(commitProxies), resolvers(resolvers), versionEpoch(versionEpoch),
+	    primaryLocality(primaryLocality) {}
 
 	template <class Ar>
 	void serialize(Ar& ar) {
-		serializer(ar, recoveryTransactionVersion, lastEpochEnd, commitProxies, resolvers, versionEpoch, reply);
+		serializer(ar,
+		           recoveryTransactionVersion,
+		           lastEpochEnd,
+		           commitProxies,
+		           resolvers,
+		           versionEpoch,
+		           reply,
+		           primaryLocality);
 	}
 };
 
diff --git a/fdbserver/masterserver.actor.cpp b/fdbserver/masterserver.actor.cpp
index 8d61c780520..685eaabbad6 100644
--- a/fdbserver/masterserver.actor.cpp
+++ b/fdbserver/masterserver.actor.cpp
@@ -118,9 +118,7 @@ struct MasterData : NonCopyable, ReferenceCounted<MasterData> {
 			forceRecovery = false;
 		}
 		balancer = resolutionBalancer.resolutionBalancing();
-		locality = (SERVER_KNOBS->ENABLE_VERSION_VECTOR_HA_OPTIMIZATION && myInterface.locality.dcId().present())
-		               ? std::stoi(myInterface.locality.dcId().get().toString())
-		               : tagLocalityInvalid;
+		locality = tagLocalityInvalid;
 	}
 	~MasterData() = default;
 };
@@ -314,7 +312,8 @@ ACTOR Future<Void> updateRecoveryData(Reference<MasterData> self) {
 		    .detail("CurrentRecoveryTxnVersion", self->recoveryTransactionVersion)
 		    .detail("CurrentLastEpochEnd", self->lastEpochEnd)
 		    .detail("NumCommitProxies", req.commitProxies.size())
-		    .detail("VersionEpoch", req.versionEpoch);
+		    .detail("VersionEpoch", req.versionEpoch)
+		    .detail("PrimaryLocality", req.primaryLocality);
 
 		self->recoveryTransactionVersion = req.recoveryTransactionVersion;
 		self->lastEpochEnd = req.lastEpochEnd;
@@ -340,6 +339,8 @@ ACTOR Future<Void> updateRecoveryData(Reference<MasterData> self) {
 		self->resolutionBalancer.setCommitProxies(req.commitProxies);
 		self->resolutionBalancer.setResolvers(req.resolvers);
 
+		self->locality = req.primaryLocality;
+
 		req.reply.send(Void());
 	}
 }

From a8d0717f37c827feef9abc5f7e981639495f6675 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Thu, 7 Jul 2022 16:26:43 -0700
Subject: [PATCH 532/740] Add StorageEngine type to StorageMetrics trace events
 (cherry-pick #7534)

---
 fdbclient/FDBTypes.h              | 10 +++++++++-
 fdbserver/storageserver.actor.cpp |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
index b5d6e553553..447124e3e1f 100644
--- a/fdbclient/FDBTypes.h
+++ b/fdbclient/FDBTypes.h
@@ -845,7 +845,15 @@ struct KeyValueStoreType {
 	// These enumerated values are stored in the database configuration, so should NEVER be changed.
 	// Only add new ones just before END.
 	// SS storeType is END before the storageServerInterface is initialized.
-	enum StoreType { SSD_BTREE_V1, MEMORY, SSD_BTREE_V2, SSD_REDWOOD_V1, MEMORY_RADIXTREE, SSD_ROCKSDB_V1, END };
+	enum StoreType {
+		SSD_BTREE_V1 = 0,
+		MEMORY = 1,
+		SSD_BTREE_V2 = 2,
+		SSD_REDWOOD_V1 = 3,
+		MEMORY_RADIXTREE = 4,
+		SSD_ROCKSDB_V1 = 5,
+		END
+	};
 
 	KeyValueStoreType() : type(END) {}
 	KeyValueStoreType(StoreType type) : type(type) {
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index bd3fb5c8d61..991410f6ad7 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -8333,6 +8333,7 @@ ACTOR Future<Void> metricsCore(StorageServer* self, StorageServerInterface ssi)
 	                               &self->counters.cc,
 	                               self->thisServerID.toString() + "/StorageMetrics",
 	                               [self = self](TraceEvent& te) {
+		                               te.detail("StorageEngine", self->storage.getKeyValueStoreType().toString());
 		                               te.detail("Tag", self->tag.toString());
 		                               StorageBytes sb = self->storage.getStorageBytes();
 		                               te.detail("KvstoreBytesUsed", sb.used);

From 4c7890a877a44fb53a9eb988a0dfd1123ffaf1aa Mon Sep 17 00:00:00 2001
From: john_leach <jleach4@gmail.com>
Date: Fri, 8 Jul 2022 12:50:51 -0700
Subject: [PATCH 533/740] Changing hasIncompleteVersionstamp to use iteration
 rather than stream processing #7543

---
 .../com/apple/foundationdb/tuple/Tuple.java   | 13 ++++++++++--
 .../apple/foundationdb/tuple/TupleUtil.java   | 20 ++++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java b/bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java
index 115b15c428e..2f66bd21160 100644
--- a/bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java
+++ b/bindings/java/src/main/com/apple/foundationdb/tuple/Tuple.java
@@ -86,7 +86,7 @@ private Tuple(Tuple original, Object newItem, boolean itemHasIncompleteVersionst
 
 	private Tuple(List<Object> elements) {
 		this.elements = elements;
-		incompleteVersionstamp = TupleUtil.hasIncompleteVersionstamp(elements.stream());
+		incompleteVersionstamp = TupleUtil.hasIncompleteVersionstamp(elements);
 	}
 
 	/**
@@ -265,7 +265,7 @@ public Tuple add(Versionstamp v) {
 	 * @return a newly created {@code Tuple}
 	 */
 	public Tuple add(List<?> l) {
-		return new Tuple(this, l, TupleUtil.hasIncompleteVersionstamp(l.stream()));
+		return new Tuple(this, l, TupleUtil.hasIncompleteVersionstamp(l));
 	}
 
 	/**
@@ -483,6 +483,15 @@ public List<Object> getItems() {
 		return new ArrayList<>(elements);
 	}
 
+	/**
+	 * Gets the unserialized contents of this {@code Tuple} without copying into a new list.
+	 *
+	 * @return the elements that make up this {@code Tuple}.
+	 */
+	List<Object> getRawItems() {
+		return elements;
+	}
+
 	/**
 	 * Gets a {@link Stream} of the unserialized contents of this {@code Tuple}.
 	 *
diff --git a/bindings/java/src/main/com/apple/foundationdb/tuple/TupleUtil.java b/bindings/java/src/main/com/apple/foundationdb/tuple/TupleUtil.java
index 1953368f0d7..0896a7a24e2 100644
--- a/bindings/java/src/main/com/apple/foundationdb/tuple/TupleUtil.java
+++ b/bindings/java/src/main/com/apple/foundationdb/tuple/TupleUtil.java
@@ -776,24 +776,26 @@ else if(item instanceof Tuple)
 		return packedSize;
 	}
 
-	static boolean hasIncompleteVersionstamp(Stream<?> items) {
-		return items.anyMatch(item -> {
+	static boolean hasIncompleteVersionstamp(Collection<?> items) {
+		boolean hasIncompleteVersionstamp = false;
+		for (Object item: items) {
 			if(item == null) {
-				return false;
+				continue;
 			}
 			else if(item instanceof Versionstamp) {
-				return !((Versionstamp) item).isComplete();
+				hasIncompleteVersionstamp = !((Versionstamp) item).isComplete();
 			}
 			else if(item instanceof Tuple) {
-				return hasIncompleteVersionstamp(((Tuple) item).stream());
+				hasIncompleteVersionstamp = hasIncompleteVersionstamp(((Tuple) item).getRawItems());
 			}
 			else if(item instanceof Collection<?>) {
-				return hasIncompleteVersionstamp(((Collection<?>) item).stream());
+				hasIncompleteVersionstamp = hasIncompleteVersionstamp( (Collection<?>) item);
 			}
-			else {
-				return false;
+			if (hasIncompleteVersionstamp) {
+				return hasIncompleteVersionstamp;
 			}
-		});
+		};
+		return hasIncompleteVersionstamp;
 	}
 
 	public static void main(String[] args) {

From 09fa37f14ea4cbe3bbd335c1566664d651215c54 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 11 Jul 2022 03:33:32 +0000
Subject: [PATCH 534/740] disable AVX for 7.1.14 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From dfe8dacba348815b4b2d4746ffa056303c72259d Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 11 Jul 2022 03:37:14 +0000
Subject: [PATCH 535/740] enable AVX and update version for 7.1.15 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3642bb8d892..67d8270651b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.14
+  VERSION 7.1.15
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 106db9be28ce7a4d8f28f87ce7ea6fac3d6346af Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 11 Jul 2022 09:01:59 +0000
Subject: [PATCH 536/740] update version after 7.1.15 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67d8270651b..508bdb478a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.15
+  VERSION 7.1.16
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From b5e7ff308e0d44a191e29f75267cf554b59598c0 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 11 Jul 2022 10:28:34 -0700
Subject: [PATCH 537/740] Add 7.1.14 and 7.1.15 release notes

---
 .../source/release-notes/release-notes-710.rst       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 54729502907..091bc410543 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,18 @@
 Release Notes
 #############
 
+7.1.15
+======
+* Same as 7.1.14 release with AVX enabled.
+
+7.1.14
+======
+* Released with AVX disabled.
+* Fixed a high commit latency bug when there are data movement. `(PR #7548) <https://github.com/apple/foundationdb/pull/7548>`_
+* Fixed the primary locality on the sequencer by obtaining it from cluster controller. `(PR #7535) <https://github.com/apple/foundationdb/pull/7535>`_
+* Added StorageEngine type to StorageMetrics trace events. `(PR #7546) <https://github.com/apple/foundationdb/pull/7546>`_
+* Improved hasIncompleteVersionstamp performance in Java binding to use iteration rather than stream processing. `(PR #7559) <https://github.com/apple/foundationdb/pull/7559>`_
+
 7.1.13
 ======
 * Same as 7.1.12 release with AVX enabled.

From e96343d106f3da8693bff68e0ba62773c019bd84 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Thu, 7 Jul 2022 14:44:11 -0700
Subject: [PATCH 538/740] Adding rocksdb compression and data size stats.

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 48 +++++++++++++++++++-----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 73bd49d2cf6..b3cfa7d7f8f 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -740,7 +740,8 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
                                        std::shared_ptr<PerfContextMetrics> perfContextMetrics,
                                        rocksdb::DB* db,
                                        std::shared_ptr<ReadIteratorPool> readIterPool,
-                                       Counters* counters) {
+                                       Counters* counters,
+                                       CF cf) {
 	state std::vector<std::tuple<const char*, uint32_t, uint64_t>> tickerStats = {
 		{ "StallMicros", rocksdb::STALL_MICROS, 0 },
 		{ "BytesRead", rocksdb::BYTES_READ, 0 },
@@ -778,7 +779,7 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
 		{ "CountIterSkippedKeys", rocksdb::NUMBER_ITER_SKIP, 0 },
 
 	};
-	state std::vector<std::pair<const char*, std::string>> propertyStats = {
+	state std::vector<std::pair<const char*, std::string>> intPropertyStats = {
 		{ "NumImmutableMemtables", rocksdb::DB::Properties::kNumImmutableMemTable },
 		{ "NumImmutableMemtablesFlushed", rocksdb::DB::Properties::kNumImmutableMemTableFlushed },
 		{ "IsMemtableFlushPending", rocksdb::DB::Properties::kMemTableFlushPending },
@@ -806,6 +807,14 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
 		{ "LiveSstFilesSize", rocksdb::DB::Properties::kLiveSstFilesSize },
 	};
 
+	state std::vector<std::pair<const char*, std::string>> strPropertyStats = {
+		{ "LevelStats", rocksdb::DB::Properties::kLevelStats },
+	};
+
+	state std::vector<std::pair<const char*, std::string>> levelStrPropertyStats = {
+		{ "CompressionRatioAtLevel", rocksdb::DB::Properties::kCompressionRatioAtLevelPrefix },
+	};
+
 	state std::unordered_map<std::string, uint64_t> readIteratorPoolStats = {
 		{ "NumReadIteratorsCreated", 0 },
 		{ "NumTimesReadIteratorsReused", 0 },
@@ -815,21 +824,40 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
 		wait(delay(SERVER_KNOBS->ROCKSDB_METRICS_DELAY));
 		TraceEvent e("RocksDBMetrics", id);
 		uint64_t stat;
-		for (auto& t : tickerStats) {
-			auto& [name, ticker, cum] = t;
+		for (auto& [name, ticker, cum] : tickerStats) {
 			stat = statistics->getTickerCount(ticker);
 			e.detail(name, stat - cum);
 			cum = stat;
 		}
 
-		for (auto& p : propertyStats) {
-			auto& [name, property] = p;
+		for (const auto& [name, property] : intPropertyStats) {
 			stat = 0;
 			// GetAggregatedIntProperty gets the aggregated int property from all column families.
 			ASSERT(db->GetAggregatedIntProperty(property, &stat));
 			e.detail(name, stat);
 		}
 
+		std::string propValue;
+		for (const auto& [name, property] : strPropertyStats) {
+			propValue = "";
+			ASSERT(db->GetProperty(cf, property, &propValue));
+			e.detail(name, propValue);
+		}
+
+		rocksdb::ColumnFamilyMetaData cf_meta_data;
+		db->GetColumnFamilyMetaData(cf, &cf_meta_data);
+		int numLevels = static_cast<int>(cf_meta_data.levels.size());
+		std::string levelProp;
+		for (const auto& [name, property] : levelStrPropertyStats) {
+			levelProp = "";
+			for (int level = 0; level < numLevels; level++) {
+				propValue = "";
+				ASSERT(db->GetProperty(cf, property + std::to_string(level), &propValue));
+				levelProp += std::to_string(level) + ":" + propValue + (level == numLevels - 1 ? "" : ",");
+			}
+			e.detail(name, levelProp);
+		}
+
 		stat = readIterPool->numReadIteratorsCreated();
 		e.detail("NumReadIteratorsCreated", stat - readIteratorPoolStats["NumReadIteratorsCreated"]);
 		readIteratorPoolStats["NumReadIteratorsCreated"] = stat;
@@ -983,13 +1011,13 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				// The current thread and main thread are same when the code runs in simulation.
 				// blockUntilReady() is getting the thread into deadlock state, so directly calling
 				// the metricsLogger.
-				a.metrics =
-				    rocksDBMetricLogger(id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
-				    flowLockLogger(id, a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
+				a.metrics = rocksDBMetricLogger(
+				                id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters, cf) &&
+				            flowLockLogger(id, a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
 			} else {
 				onMainThread([&] {
 					a.metrics = rocksDBMetricLogger(
-					                id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
+					                id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters, cf) &&
 					            flowLockLogger(id, a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
 					return Future<bool>(true);
 				}).blockUntilReady();

From e98b32fa778fbbbfb6587b7687d41550c2d149bc Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Mon, 18 Jul 2022 13:47:08 -0700
Subject: [PATCH 539/740] Fix processDiskReadSeconds and
 processDiskWriteSeconds. (#7609)

---
 flow/Platform.actor.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/flow/Platform.actor.cpp b/flow/Platform.actor.cpp
index c07ff01bca6..486025e5877 100644
--- a/flow/Platform.actor.cpp
+++ b/flow/Platform.actor.cpp
@@ -1734,15 +1734,10 @@ SystemStatistics getSystemStatistics(std::string const& dataFolder,
 			    0,
 			    returnStats.elapsed -
 			        std::min<double>(returnStats.elapsed, (nowIOMilliSecs - (*statState)->lastIOMilliSecs) / 1000.0));
-			returnStats.processDiskReadSeconds = std::max<double>(
-			    0,
-			    returnStats.elapsed - std::min<double>(returnStats.elapsed,
-			                                           (nowReadMilliSecs - (*statState)->lastReadMilliSecs) / 1000.0));
+			returnStats.processDiskReadSeconds =
+			    std::min<double>(returnStats.elapsed, (nowReadMilliSecs - (*statState)->lastReadMilliSecs) / 1000.0);
 			returnStats.processDiskWriteSeconds =
-			    std::max<double>(0,
-			                     returnStats.elapsed -
-			                         std::min<double>(returnStats.elapsed,
-			                                          (nowWriteMilliSecs - (*statState)->lastWriteMilliSecs) / 1000.0));
+			    std::min<double>(returnStats.elapsed, (nowWriteMilliSecs - (*statState)->lastWriteMilliSecs) / 1000.0);
 			returnStats.processDiskRead = (nowReads - (*statState)->lastReads);
 			returnStats.processDiskWrite = (nowWrites - (*statState)->lastWrites);
 			returnStats.processDiskWriteSectors = (nowWriteSectors - (*statState)->lastWriteSectors);

From 7f9ee8cbf2b22415878e0d8ca941f5ee11b03199 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Tue, 19 Jul 2022 12:54:39 -0400
Subject: [PATCH 540/740] cherry pick 7613 - update tag client cache on
 getKeyLocation (#7616)

---
 fdbclient/NativeAPI.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index e11249f8c67..844dabae3d8 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2834,6 +2834,7 @@ ACTOR Future<KeyRangeLocationInfo> getKeyLocation_internal(Database cx,
 					auto locationInfo =
 					    cx->setCachedLocation(tenant, rep.tenantEntry, rep.results[0].first, rep.results[0].second);
 					updateTssMappings(cx, rep);
+					updateTagMappings(cx, rep);
 
 					return KeyRangeLocationInfo(
 					    rep.tenantEntry,

From 9819054ea75f00d4bbb8214da86d1b80a4beb892 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 19 Jul 2022 22:27:29 -0700
Subject: [PATCH 541/740] Fix ScopeEventFieldTypeMismatch error for TLogMetrics

Backport changes made to TLogServer in #4616 back to old TLog implementations.
Old implementations were using SpecialCounter, which is string. The new type
is int64_t. Without the change, we can have many events like:

<Event Severity="30" Time="1658165532.958152" DateTime="2022-07-18T17:32:12Z" Type="ScopeEventFieldTypeMismatch" ID="0000000000000000" EventType="TraceEvent.TLogMetrics" FieldName="QueueDiskBytesUsed" OldType="Int64" NewType="String" ThreadID="2451559325190099131" Machine="10.242.248.26:4703" LogGroup="xxxx" Roles="TL" />
---
 fdbserver/OldTLogServer_4_6.actor.cpp | 36 +++++++++++++--------------
 fdbserver/OldTLogServer_6_0.actor.cpp | 36 +++++++++++++--------------
 fdbserver/OldTLogServer_6_2.actor.cpp | 36 +++++++++++++--------------
 3 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/fdbserver/OldTLogServer_4_6.actor.cpp b/fdbserver/OldTLogServer_4_6.actor.cpp
index 7fa6573a533..b523212f49c 100644
--- a/fdbserver/OldTLogServer_4_6.actor.cpp
+++ b/fdbserver/OldTLogServer_4_6.actor.cpp
@@ -458,24 +458,6 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 		specialCounter(cc, "Version", [this]() { return this->version.get(); });
 		specialCounter(cc, "SharedBytesInput", [tLogData]() { return tLogData->bytesInput; });
 		specialCounter(cc, "SharedBytesDurable", [tLogData]() { return tLogData->bytesDurable; });
-		specialCounter(
-		    cc, "KvstoreBytesUsed", [tLogData]() { return tLogData->persistentData->getStorageBytes().used; });
-		specialCounter(
-		    cc, "KvstoreBytesFree", [tLogData]() { return tLogData->persistentData->getStorageBytes().free; });
-		specialCounter(cc, "KvstoreBytesAvailable", [tLogData]() {
-			return tLogData->persistentData->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "KvstoreBytesTotal", [tLogData]() { return tLogData->persistentData->getStorageBytes().total; });
-		specialCounter(
-		    cc, "QueueDiskBytesUsed", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().used; });
-		specialCounter(
-		    cc, "QueueDiskBytesFree", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().free; });
-		specialCounter(cc, "QueueDiskBytesAvailable", [tLogData]() {
-			return tLogData->rawPersistentQueue->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "QueueDiskBytesTotal", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().total; });
 		specialCounter(cc, "ActivePeekStreams", [tLogData]() { return tLogData->activePeekStreams; });
 	}
 
@@ -1424,7 +1406,23 @@ ACTOR Future<Void> tLogCore(TLogData* self, Reference<LogData> logData) {
 	                                     logData->logId,
 	                                     SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                                     &logData->cc,
-	                                     logData->logId.toString() + "/TLogMetrics"));
+	                                     logData->logId.toString() + "/TLogMetrics",
+	                                     [self = self](TraceEvent& te) {
+		                                     StorageBytes sbTlog = self->persistentData->getStorageBytes();
+		                                     te.detail("KvstoreBytesUsed", sbTlog.used);
+		                                     te.detail("KvstoreBytesFree", sbTlog.free);
+		                                     te.detail("KvstoreBytesAvailable", sbTlog.available);
+		                                     te.detail("KvstoreBytesTotal", sbTlog.total);
+		                                     te.detail("KvstoreBytesTemp", sbTlog.temp);
+
+		                                     StorageBytes sbQueue = self->rawPersistentQueue->getStorageBytes();
+		                                     te.detail("QueueDiskBytesUsed", sbQueue.used);
+		                                     te.detail("QueueDiskBytesFree", sbQueue.free);
+		                                     te.detail("QueueDiskBytesAvailable", sbQueue.available);
+		                                     te.detail("QueueDiskBytesTotal", sbQueue.total);
+		                                     te.detail("QueueDiskBytesTemp", sbQueue.temp);
+	                                     }));
+
 	logData->addActor.send(serveTLogInterface(self, logData->tli, logData, warningCollectorInput));
 
 	try {
diff --git a/fdbserver/OldTLogServer_6_0.actor.cpp b/fdbserver/OldTLogServer_6_0.actor.cpp
index 2d016d4a6a5..61ed31fc057 100644
--- a/fdbserver/OldTLogServer_6_0.actor.cpp
+++ b/fdbserver/OldTLogServer_6_0.actor.cpp
@@ -554,24 +554,6 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 		specialCounter(cc, "SharedBytesDurable", [tLogData]() { return tLogData->bytesDurable; });
 		specialCounter(cc, "SharedOverheadBytesInput", [tLogData]() { return tLogData->overheadBytesInput; });
 		specialCounter(cc, "SharedOverheadBytesDurable", [tLogData]() { return tLogData->overheadBytesDurable; });
-		specialCounter(
-		    cc, "KvstoreBytesUsed", [tLogData]() { return tLogData->persistentData->getStorageBytes().used; });
-		specialCounter(
-		    cc, "KvstoreBytesFree", [tLogData]() { return tLogData->persistentData->getStorageBytes().free; });
-		specialCounter(cc, "KvstoreBytesAvailable", [tLogData]() {
-			return tLogData->persistentData->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "KvstoreBytesTotal", [tLogData]() { return tLogData->persistentData->getStorageBytes().total; });
-		specialCounter(
-		    cc, "QueueDiskBytesUsed", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().used; });
-		specialCounter(
-		    cc, "QueueDiskBytesFree", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().free; });
-		specialCounter(cc, "QueueDiskBytesAvailable", [tLogData]() {
-			return tLogData->rawPersistentQueue->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "QueueDiskBytesTotal", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().total; });
 		specialCounter(cc, "ActivePeekStreams", [tLogData]() { return tLogData->activePeekStreams; });
 	}
 
@@ -2241,7 +2223,23 @@ ACTOR Future<Void> tLogCore(TLogData* self,
 	                                     logData->logId,
 	                                     SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                                     &logData->cc,
-	                                     logData->logId.toString() + "/TLogMetrics"));
+	                                     logData->logId.toString() + "/TLogMetrics",
+	                                     [self = self](TraceEvent& te) {
+		                                     StorageBytes sbTlog = self->persistentData->getStorageBytes();
+		                                     te.detail("KvstoreBytesUsed", sbTlog.used);
+		                                     te.detail("KvstoreBytesFree", sbTlog.free);
+		                                     te.detail("KvstoreBytesAvailable", sbTlog.available);
+		                                     te.detail("KvstoreBytesTotal", sbTlog.total);
+		                                     te.detail("KvstoreBytesTemp", sbTlog.temp);
+
+		                                     StorageBytes sbQueue = self->rawPersistentQueue->getStorageBytes();
+		                                     te.detail("QueueDiskBytesUsed", sbQueue.used);
+		                                     te.detail("QueueDiskBytesFree", sbQueue.free);
+		                                     te.detail("QueueDiskBytesAvailable", sbQueue.available);
+		                                     te.detail("QueueDiskBytesTotal", sbQueue.total);
+		                                     te.detail("QueueDiskBytesTemp", sbQueue.temp);
+	                                     }));
+
 	logData->addActor.send(serveTLogInterface(self, tli, logData, warningCollectorInput));
 	logData->addActor.send(cleanupPeekTrackers(logData.getPtr()));
 	logData->addActor.send(logPeekTrackers(logData.getPtr()));
diff --git a/fdbserver/OldTLogServer_6_2.actor.cpp b/fdbserver/OldTLogServer_6_2.actor.cpp
index ffb449aff58..55498be35b5 100644
--- a/fdbserver/OldTLogServer_6_2.actor.cpp
+++ b/fdbserver/OldTLogServer_6_2.actor.cpp
@@ -641,24 +641,6 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 		specialCounter(cc, "SharedBytesDurable", [tLogData]() { return tLogData->bytesDurable; });
 		specialCounter(cc, "SharedOverheadBytesInput", [tLogData]() { return tLogData->overheadBytesInput; });
 		specialCounter(cc, "SharedOverheadBytesDurable", [tLogData]() { return tLogData->overheadBytesDurable; });
-		specialCounter(
-		    cc, "KvstoreBytesUsed", [tLogData]() { return tLogData->persistentData->getStorageBytes().used; });
-		specialCounter(
-		    cc, "KvstoreBytesFree", [tLogData]() { return tLogData->persistentData->getStorageBytes().free; });
-		specialCounter(cc, "KvstoreBytesAvailable", [tLogData]() {
-			return tLogData->persistentData->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "KvstoreBytesTotal", [tLogData]() { return tLogData->persistentData->getStorageBytes().total; });
-		specialCounter(
-		    cc, "QueueDiskBytesUsed", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().used; });
-		specialCounter(
-		    cc, "QueueDiskBytesFree", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().free; });
-		specialCounter(cc, "QueueDiskBytesAvailable", [tLogData]() {
-			return tLogData->rawPersistentQueue->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "QueueDiskBytesTotal", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().total; });
 		specialCounter(cc, "PeekMemoryReserved", [tLogData]() { return tLogData->peekMemoryLimiter.activePermits(); });
 		specialCounter(cc, "PeekMemoryRequestsStalled", [tLogData]() { return tLogData->peekMemoryLimiter.waiters(); });
 		specialCounter(cc, "ActivePeekStreams", [tLogData]() { return tLogData->activePeekStreams; });
@@ -2701,7 +2683,23 @@ ACTOR Future<Void> tLogCore(TLogData* self,
 	                                     logData->logId,
 	                                     SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                                     &logData->cc,
-	                                     logData->logId.toString() + "/TLogMetrics"));
+	                                     logData->logId.toString() + "/TLogMetrics",
+	                                     [self = self](TraceEvent& te) {
+		                                     StorageBytes sbTlog = self->persistentData->getStorageBytes();
+		                                     te.detail("KvstoreBytesUsed", sbTlog.used);
+		                                     te.detail("KvstoreBytesFree", sbTlog.free);
+		                                     te.detail("KvstoreBytesAvailable", sbTlog.available);
+		                                     te.detail("KvstoreBytesTotal", sbTlog.total);
+		                                     te.detail("KvstoreBytesTemp", sbTlog.temp);
+
+		                                     StorageBytes sbQueue = self->rawPersistentQueue->getStorageBytes();
+		                                     te.detail("QueueDiskBytesUsed", sbQueue.used);
+		                                     te.detail("QueueDiskBytesFree", sbQueue.free);
+		                                     te.detail("QueueDiskBytesAvailable", sbQueue.available);
+		                                     te.detail("QueueDiskBytesTotal", sbQueue.total);
+		                                     te.detail("QueueDiskBytesTemp", sbQueue.temp);
+	                                     }));
+
 	logData->addActor.send(serveTLogInterface(self, tli, logData, warningCollectorInput));
 	logData->addActor.send(cleanupPeekTrackers(logData.getPtr()));
 	logData->addActor.send(logPeekTrackers(logData.getPtr()));

From ef06bc475dca7f87e8821881dd95b5da7940f0ff Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 19 Jul 2022 16:30:44 -0700
Subject: [PATCH 542/740] Add getMappedRange latency metrics

---
 fdbserver/storageserver.actor.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 991410f6ad7..3cd60ef61db 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -940,6 +940,9 @@ struct StorageServer {
 
 		LatencySample readLatencySample;
 		LatencyBands readLatencyBands;
+		LatencySample mappedRangeSample; // Samples getMappedRange latency
+		LatencySample mappedRangeRemoteSample; // Samples getMappedRange remote subquery latency
+		LatencySample mappedRangeLocalSample; // Samples getMappedRange local subquery latency
 
 		Counters(StorageServer* self)
 		  : cc("StorageServer", self->thisServerID.toString()), allQueries("QueryQueue", cc),
@@ -971,7 +974,19 @@ struct StorageServer {
 		                      self->thisServerID,
 		                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
-		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
+		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY),
+		    mappedRangeSample("GetMappedRangeMetrics",
+		                      self->thisServerID,
+		                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    mappedRangeRemoteSample("GetMappedRangeRemoteMetrics",
+		                            self->thisServerID,
+		                            SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                            SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    mappedRangeLocalSample("GetMappedRangeLocalMetrics",
+		                           self->thisServerID,
+		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE) {
 			specialCounter(cc, "LastTLogVersion", [self]() { return self->lastTLogVersion; });
 			specialCounter(cc, "Version", [self]() { return self->version.get(); });
 			specialCounter(cc, "StorageVersion", [self]() { return self->storageVersion(); });
@@ -2808,6 +2823,7 @@ ACTOR Future<GetValueReqAndResultRef> quickGetValue(StorageServer* data,
                                                     // To provide span context, tags, debug ID to underlying lookups.
                                                     GetMappedKeyValuesRequest* pOriginalReq) {
 	state GetValueReqAndResultRef getValue;
+	state double getValueStart = g_network->timer();
 	getValue.key = key;
 
 	if (data->shards[key]->isReadable()) {
@@ -2828,6 +2844,8 @@ ACTOR Future<GetValueReqAndResultRef> quickGetValue(StorageServer* data,
 			if (!reply.error.present()) {
 				++data->counters.quickGetValueHit;
 				copyOptionalValue(a, getValue, reply.value);
+				const double duration = g_network->timer() - getValueStart;
+				data->counters.mappedRangeLocalSample.addMeasurement(duration);
 				return getValue;
 			}
 			// Otherwise fallback.
@@ -2847,6 +2865,8 @@ ACTOR Future<GetValueReqAndResultRef> quickGetValue(StorageServer* data,
 		// TODO: async in case it needs to read from other servers.
 		Optional<Value> valueOption = wait(valueFuture);
 		copyOptionalValue(a, getValue, valueOption);
+		const double duration = g_network->timer() - getValueStart;
+		data->counters.mappedRangeRemoteSample.addMeasurement(duration);
 		return getValue;
 	} else {
 		throw quick_get_value_miss();
@@ -3412,6 +3432,7 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
     // To provide span context, tags, debug ID to underlying lookups.
     GetMappedKeyValuesRequest* pOriginalReq) {
 	state GetRangeReqAndResultRef getRange;
+	state double getValuesStart = g_network->timer();
 	getRange.begin = firstGreaterOrEqual(KeyRef(*a, prefix));
 	getRange.end = firstGreaterOrEqual(strinc(prefix, *a));
 	try {
@@ -3442,6 +3463,8 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 			// Convert GetKeyValuesReply to RangeResult.
 			a->dependsOn(reply.arena);
 			getRange.result = RangeResultRef(reply.data, reply.more);
+			const double duration = g_network->timer() - getValuesStart;
+			data->counters.mappedRangeLocalSample.addMeasurement(duration);
 			return getRange;
 		}
 		// Otherwise fallback.
@@ -3461,6 +3484,8 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 		RangeResult rangeResult = wait(rangeResultFuture);
 		a->dependsOn(rangeResult.arena());
 		getRange.result = rangeResult;
+		const double duration = g_network->timer() - getValuesStart;
+		data->counters.mappedRangeRemoteSample.addMeasurement(duration);
 		return getRange;
 	} else {
 		throw quick_get_key_values_miss();
@@ -3995,6 +4020,7 @@ ACTOR Future<Void> getMappedKeyValuesQ(StorageServer* data, GetMappedKeyValuesRe
 
 	double duration = g_network->timer() - req.requestTime();
 	data->counters.readLatencySample.addMeasurement(duration);
+	data->counters.mappedRangeSample.addMeasurement(duration);
 	if (data->latencyBandConfig.present()) {
 		int maxReadBytes =
 		    data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());

From c4fbc0b508611297034e3c86f5861f99a401c0df Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Wed, 20 Jul 2022 11:54:32 -0700
Subject: [PATCH 543/740] Increase AllTags field length in TLogReady

---
 fdbserver/OldTLogServer_6_0.actor.cpp | 6 ++++--
 fdbserver/OldTLogServer_6_2.actor.cpp | 6 ++++--
 fdbserver/TLogServer.actor.cpp        | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fdbserver/OldTLogServer_6_0.actor.cpp b/fdbserver/OldTLogServer_6_0.actor.cpp
index 61ed31fc057..1502dbaa2b0 100644
--- a/fdbserver/OldTLogServer_6_0.actor.cpp
+++ b/fdbserver/OldTLogServer_6_0.actor.cpp
@@ -2768,8 +2768,10 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	req.reply.send(recruited);
 
 	TraceEvent("TLogReady", logData->logId)
-	    .detail("AllTags", describe(req.allTags))
-	    .detail("Locality", logData->locality);
+	    .detail("Locality", logData->locality)
+	    .setMaxEventLength(11000)
+	    .setMaxFieldLength(10000)
+	    .detail("AllTags", describe(req.allTags));
 
 	updater = Void();
 	wait(tLogCore(self, logData, recruited, pulledRecoveryVersions));
diff --git a/fdbserver/OldTLogServer_6_2.actor.cpp b/fdbserver/OldTLogServer_6_2.actor.cpp
index 55498be35b5..ce9b4e5c407 100644
--- a/fdbserver/OldTLogServer_6_2.actor.cpp
+++ b/fdbserver/OldTLogServer_6_2.actor.cpp
@@ -3259,8 +3259,10 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	req.reply.send(recruited);
 
 	TraceEvent("TLogReady", logData->logId)
-	    .detail("AllTags", describe(req.allTags))
-	    .detail("Locality", logData->locality);
+	    .detail("Locality", logData->locality)
+	    .setMaxEventLength(11000)
+	    .setMaxFieldLength(10000)
+	    .detail("AllTags", describe(req.allTags));
 
 	updater = Void();
 	wait(tLogCore(self, logData, recruited, pulledRecoveryVersions));
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 755bacf9aeb..546c72be222 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -3532,8 +3532,10 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	req.reply.send(recruited);
 
 	TraceEvent("TLogReady", logData->logId)
-	    .detail("AllTags", describe(req.allTags))
-	    .detail("Locality", logData->locality);
+	    .detail("Locality", logData->locality)
+	    .setMaxEventLength(11000)
+	    .setMaxFieldLength(10000)
+	    .detail("AllTags", describe(req.allTags));
 
 	updater = Void();
 	wait(tLogCore(self, logData, recruited, pulledRecoveryVersions));

From 5891f8be05dec560523d09aa4711b06181041d5e Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Wed, 20 Jul 2022 15:05:10 -0700
Subject: [PATCH 544/740] Log tlog initialization

---
 fdbserver/TagPartitionedLogSystem.actor.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp
index 30b6ddf4cbf..755ff7a1147 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.cpp
+++ b/fdbserver/TagPartitionedLogSystem.actor.cpp
@@ -2614,6 +2614,8 @@ ACTOR Future<Void> TagPartitionedLogSystem::newRemoteEpoch(TagPartitionedLogSyst
 		req.tLogLocalities = localities;
 		req.tLogPolicy = logSet->tLogPolicy;
 		req.locality = remoteLocality;
+		TraceEvent("RemoteTLogRouterReplies", self->dbgid)
+		    .detail("WorkerID", remoteWorkers.logRouters[i % remoteWorkers.logRouters.size()].id());
 		logRouterInitializationReplies.push_back(transformErrors(
 		    throwErrorOr(
 		        remoteWorkers.logRouters[i % remoteWorkers.logRouters.size()].logRouter.getReplyUnlessFailedFor(
@@ -2693,11 +2695,13 @@ ACTOR Future<Void> TagPartitionedLogSystem::newRemoteEpoch(TagPartitionedLogSyst
 	}
 
 	remoteTLogInitializationReplies.reserve(remoteWorkers.remoteTLogs.size());
-	for (int i = 0; i < remoteWorkers.remoteTLogs.size(); i++)
+	for (int i = 0; i < remoteWorkers.remoteTLogs.size(); i++) {
+		TraceEvent("RemoteTLogReplies", self->dbgid).detail("WorkerID", remoteWorkers.remoteTLogs[i].id());
 		remoteTLogInitializationReplies.push_back(transformErrors(
 		    throwErrorOr(remoteWorkers.remoteTLogs[i].tLog.getReplyUnlessFailedFor(
 		        remoteTLogReqs[i], SERVER_KNOBS->TLOG_TIMEOUT, SERVER_KNOBS->MASTER_FAILURE_SLOPE_DURING_RECOVERY)),
 		    cluster_recovery_failed()));
+	}
 
 	TraceEvent("RemoteLogRecruitment_InitializingRemoteLogs")
 	    .detail("StartVersion", logSet->startVersion)
@@ -2966,11 +2970,13 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 	}
 
 	initializationReplies.reserve(recr.tLogs.size());
-	for (int i = 0; i < recr.tLogs.size(); i++)
+	for (int i = 0; i < recr.tLogs.size(); i++) {
+		TraceEvent("PrimaryTLogReplies", logSystem->getDebugID()).detail("WorkerID", recr.tLogs[i].id());
 		initializationReplies.push_back(transformErrors(
 		    throwErrorOr(recr.tLogs[i].tLog.getReplyUnlessFailedFor(
 		        reqs[i], SERVER_KNOBS->TLOG_TIMEOUT, SERVER_KNOBS->MASTER_FAILURE_SLOPE_DURING_RECOVERY)),
 		    cluster_recovery_failed()));
+	}
 
 	state std::vector<Future<Void>> recoveryComplete;
 
@@ -3034,11 +3040,14 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 		}
 
 		satelliteInitializationReplies.reserve(recr.satelliteTLogs.size());
-		for (int i = 0; i < recr.satelliteTLogs.size(); i++)
+		for (int i = 0; i < recr.satelliteTLogs.size(); i++) {
+			TraceEvent("PrimarySatelliteTLogReplies", logSystem->getDebugID())
+			    .detail("WorkerID", recr.satelliteTLogs[i].id());
 			satelliteInitializationReplies.push_back(transformErrors(
 			    throwErrorOr(recr.satelliteTLogs[i].tLog.getReplyUnlessFailedFor(
 			        sreqs[i], SERVER_KNOBS->TLOG_TIMEOUT, SERVER_KNOBS->MASTER_FAILURE_SLOPE_DURING_RECOVERY)),
 			    cluster_recovery_failed()));
+		}
 
 		wait(waitForAll(satelliteInitializationReplies) || oldRouterRecruitment);
 

From ea95420823fad9f41474fb7600be082a0d5c21f2 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Fri, 22 Jul 2022 11:00:36 -0400
Subject: [PATCH 545/740] cherry pick 7653 - Track when version not found in
 version vector.

---
 fdbclient/DatabaseContext.h   |  1 +
 fdbclient/NativeAPI.actor.cpp | 43 +++++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index 6eed163162f..470e3488386 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -528,6 +528,7 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	Counter transactionsExpensiveClearCostEstCount;
 	Counter transactionGrvFullBatches;
 	Counter transactionGrvTimedOutBatches;
+	Counter transactionCommitVersionNotFoundForSS;
 
 	ContinuousSample<double> latencies, readLatencies, commitLatencies, GRVLatencies, mutationsPerCommit,
 	    bytesPerCommit, bgLatencies, bgGranulesPerRequest;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 844dabae3d8..3fe9f4456f5 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -240,7 +240,7 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 		return;
 	}
 
-	if (ssVersionVectorCache.getMaxVersion() != invalidVersion && readVersion > ssVersionVectorCache.getMaxVersion()) {
+	if (readVersion > ssVersionVectorCache.getMaxVersion()) {
 		if (!CLIENT_KNOBS->FORCE_GRV_CACHE_OFF && !info->options.skipGrvCache && info->options.useGrvCache) {
 			return;
 		} else {
@@ -253,16 +253,30 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 
 	std::map<Version, std::set<Tag>> versionMap; // order the versions to be returned
 	for (int i = 0; i < locationInfo->locations()->size(); i++) {
-		UID uid = locationInfo->locations()->getId(i);
-		if (ssidTagMapping.find(uid) != ssidTagMapping.end()) {
-			Tag tag = ssidTagMapping[uid];
+		bool updatedVersionMap = false;
+		Version commitVersion = invalidVersion;
+		Tag tag = invalidTag;
+		auto iter = ssidTagMapping.find(locationInfo->locations()->getId(i));
+		if (iter != ssidTagMapping.end()) {
+			tag = iter->second;
 			if (ssVersionVectorCache.hasVersion(tag)) {
-				Version commitVersion = ssVersionVectorCache.getVersion(tag); // latest commit version
+				commitVersion = ssVersionVectorCache.getVersion(tag); // latest commit version
 				if (commitVersion < readVersion) {
+					updatedVersionMap = true;
 					versionMap[commitVersion].insert(tag);
 				}
 			}
 		}
+		if (!updatedVersionMap) {
+			// This can have a performance impact if vv is enabled, so provide some diags
+			TraceEvent(SevDebug, "CommitVersionNotFoundForSS")
+			    .detail("InSSIDMap", iter != ssidTagMapping.end() ? 1 : 0)
+			    .detail("Tag", tag)
+			    .detail("CommitVersion", commitVersion)
+			    .detail("ReadVersion", readVersion)
+			    .detail("VersionVector", ssVersionVectorCache.toString());
+			++transactionCommitVersionNotFoundForSS;
+		}
 	}
 
 	// insert the commit versions in the version vector.
@@ -1445,13 +1459,13 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
     transactionsProcessBehind("ProcessBehind", cc), transactionsThrottled("Throttled", cc),
     transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc),
     transactionGrvFullBatches("NumGrvFullBatches", cc), transactionGrvTimedOutBatches("NumGrvTimedOutBatches", cc),
-    latencies(1000), readLatencies(1000), commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000),
-    bytesPerCommit(1000), bgLatencies(1000), bgGranulesPerRequest(1000), outstandingWatches(0), sharedStatePtr(nullptr),
-    lastGrvTime(0.0), cachedReadVersion(0), lastRkBatchThrottleTime(0.0), lastRkDefaultThrottleTime(0.0),
-    lastProxyRequestTime(0.0), transactionTracingSample(false), taskID(taskID), clientInfo(clientInfo),
-    clientInfoMonitor(clientInfoMonitor), coordinator(coordinator), apiVersion(apiVersion), mvCacheInsertLocation(0),
-    healthMetricsLastUpdated(0), detailedHealthMetricsLastUpdated(0),
-    smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
+    transactionCommitVersionNotFoundForSS("CommitVersionNotFoundForSS", cc), latencies(1000), readLatencies(1000),
+    commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000), bgLatencies(1000),
+    bgGranulesPerRequest(1000), outstandingWatches(0), sharedStatePtr(nullptr), lastGrvTime(0.0), cachedReadVersion(0),
+    lastRkBatchThrottleTime(0.0), lastRkDefaultThrottleTime(0.0), lastProxyRequestTime(0.0),
+    transactionTracingSample(false), taskID(taskID), clientInfo(clientInfo), clientInfoMonitor(clientInfoMonitor),
+    coordinator(coordinator), apiVersion(apiVersion), mvCacheInsertLocation(0), healthMetricsLastUpdated(0),
+    detailedHealthMetricsLastUpdated(0), smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
     specialKeySpace(std::make_unique<SpecialKeySpace>(specialKeys.begin, specialKeys.end, /* test */ false)),
     connectToDatabaseEventCacheHolder(format("ConnectToDatabase/%s", dbId.toString().c_str())) {
 	dbId = deterministicRandom()->randomUniqueID();
@@ -1719,8 +1733,9 @@ DatabaseContext::DatabaseContext(const Error& err)
     transactionsProcessBehind("ProcessBehind", cc), transactionsThrottled("Throttled", cc),
     transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc),
     transactionGrvFullBatches("NumGrvFullBatches", cc), transactionGrvTimedOutBatches("NumGrvTimedOutBatches", cc),
-    latencies(1000), readLatencies(1000), commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000),
-    bytesPerCommit(1000), bgLatencies(1000), bgGranulesPerRequest(1000), transactionTracingSample(false),
+    transactionCommitVersionNotFoundForSS("CommitVersionNotFoundForSS", cc), latencies(1000), readLatencies(1000),
+    commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000), bgLatencies(1000),
+    bgGranulesPerRequest(1000), transactionTracingSample(false),
     smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
     connectToDatabaseEventCacheHolder(format("ConnectToDatabase/%s", dbId.toString().c_str())) {}
 

From f7a6c1d64041a684681d9df8ea46bc0eeb1bd0aa Mon Sep 17 00:00:00 2001
From: Xiaoge Su <magichp@gmail.com>
Date: Thu, 21 Jul 2022 19:38:59 -0700
Subject: [PATCH 546/740] Add TraceEvent to the construction/destruction of
 DatabaseContext

This is to figure out why huge databaseLogger related TraceEvents
generated after 7.1 released.
---
 fdbclient/NativeAPI.actor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 844dabae3d8..3a2cab5db65 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1454,6 +1454,9 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
     smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
     specialKeySpace(std::make_unique<SpecialKeySpace>(specialKeys.begin, specialKeys.end, /* test */ false)),
     connectToDatabaseEventCacheHolder(format("ConnectToDatabase/%s", dbId.toString().c_str())) {
+
+	TraceEvent("DatabaseContextCreated").backtrace();
+
 	dbId = deterministicRandom()->randomUniqueID();
 	connected = (clientInfo->get().commitProxies.size() && clientInfo->get().grvProxies.size())
 	                ? Void()
@@ -1762,6 +1765,8 @@ DatabaseContext::~DatabaseContext() {
 		it->second->notifyContextDestroyed();
 	ASSERT_ABORT(server_interf.empty());
 	locationCache.insert(allKeys, Reference<LocationInfo>());
+
+	TraceEvent("DatabaseContextDestructed").backtrace();
 }
 
 Optional<KeyRangeLocationInfo> DatabaseContext::getCachedLocation(const Optional<TenantName>& tenantName,

From dd1a145a1ca34e373900ac1ac54e164a3d7bf83a Mon Sep 17 00:00:00 2001
From: Xiaoge Su <magichp@gmail.com>
Date: Thu, 21 Jul 2022 23:11:33 -0700
Subject: [PATCH 547/740] fixup! Update code per comments

---
 fdbclient/NativeAPI.actor.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 3a2cab5db65..794e56d151f 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1455,9 +1455,10 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
     specialKeySpace(std::make_unique<SpecialKeySpace>(specialKeys.begin, specialKeys.end, /* test */ false)),
     connectToDatabaseEventCacheHolder(format("ConnectToDatabase/%s", dbId.toString().c_str())) {
 
-	TraceEvent("DatabaseContextCreated").backtrace();
-
 	dbId = deterministicRandom()->randomUniqueID();
+
+	TraceEvent("DatabaseContextCreated", dbId).backtrace();
+
 	connected = (clientInfo->get().commitProxies.size() && clientInfo->get().grvProxies.size())
 	                ? Void()
 	                : clientInfo->onChange();
@@ -1766,7 +1767,7 @@ DatabaseContext::~DatabaseContext() {
 	ASSERT_ABORT(server_interf.empty());
 	locationCache.insert(allKeys, Reference<LocationInfo>());
 
-	TraceEvent("DatabaseContextDestructed").backtrace();
+	TraceEvent("DatabaseContextDestructed", dbId).backtrace();
 }
 
 Optional<KeyRangeLocationInfo> DatabaseContext::getCachedLocation(const Optional<TenantName>& tenantName,

From d04976d1aa0332ebe1c4b7e32c9e73b1e7645367 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Thu, 21 Jul 2022 15:00:00 -0700
Subject: [PATCH 548/740] Add CommitDebug event after Commit Proxy reporting
 committed version to master

---
 fdbserver/CommitProxyServer.actor.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 86ed60d3223..1918a575a06 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1465,7 +1465,7 @@ ACTOR Future<Void> reply(CommitBatchContext* self) {
 	state ProxyCommitData* const pProxyCommitData = self->pProxyCommitData;
 	state Span span("MP:reply"_loc, self->span.context);
 
-	const Optional<UID>& debugID = self->debugID;
+	state const Optional<UID>& debugID = self->debugID;
 
 	if (self->prevVersion && self->commitVersion - self->prevVersion < SERVER_KNOBS->MAX_VERSIONS_IN_FLIGHT / 2) {
 		//TraceEvent("CPAdvanceMinVersion", self->pProxyCommitData->dbgid).detail("PrvVersion", self->prevVersion).detail("CommitVersion", self->commitVersion).detail("Master", self->pProxyCommitData->master.id().toString()).detail("TxSize", self->trs.size());
@@ -1506,6 +1506,12 @@ ACTOR Future<Void> reply(CommitBatchContext* self) {
 		                                     writtenTags),
 		    TaskPriority::ProxyMasterVersionReply));
 	}
+
+	if (debugID.present()) {
+		g_traceBatch.addEvent(
+		    "CommitDebug", debugID.get().first(), "CommitProxyServer.commitBatch.AfterReportRawCommittedVersion");
+	}
+
 	if (self->commitVersion > pProxyCommitData->committedVersion.get()) {
 		pProxyCommitData->locked = self->lockedAfter;
 		pProxyCommitData->metadataVersion = self->metadataVersionAfter;

From eee02bfd66d3bdcd07201f66b17624cfe02b1aa3 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Mon, 25 Jul 2022 11:35:18 -0400
Subject: [PATCH 549/740] Respond to review comments.

---
 fdbclient/NativeAPI.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 3fe9f4456f5..7ef8f9a313b 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -267,7 +267,7 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 				}
 			}
 		}
-		if (!updatedVersionMap) {
+		if (!updatedVersionMap && commitVersion != readVersion) {
 			// This can have a performance impact if vv is enabled, so provide some diags
 			TraceEvent(SevDebug, "CommitVersionNotFoundForSS")
 			    .detail("InSSIDMap", iter != ssidTagMapping.end() ? 1 : 0)

From bd94146331ea823c470c51a7a37f29df5d071011 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Sun, 24 Jul 2022 16:51:18 -0700
Subject: [PATCH 550/740] Error in FetchKey GRV shouldn't fail storageserver

---
 fdbserver/storageserver.actor.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 3cd60ef61db..7cfb72262cc 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -5728,11 +5728,18 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 			// At iteration 1, dest SS selects GRV as fetchVersion and (suppose) can read the data from src SS.
 			// Then dest SS waits its version catch up with this GRV version and write the data to disk.
 			// Note that dest SS waits outside the fetchKeysParallelismLock.
+			fetchVersion = std::max(shard->fetchVersion, data->version.get());
 			if (lastError.code() == error_code_transaction_too_old) {
-				Version grvVersion = wait(tr.getRawReadVersion());
-				fetchVersion = std::max(grvVersion, data->version.get());
-			} else {
-				fetchVersion = std::max(shard->fetchVersion, data->version.get());
+				try {
+					Version grvVersion = wait(tr.getRawReadVersion());
+					fetchVersion = std::max(grvVersion, fetchVersion);
+				} catch (Error& e) {
+					// Note that error in getting GRV doesn't affect any storage server state. Therefore, we catch all
+					// errors here without failing the storage server. When error happens, fetchVersion fall back to
+					// the above computed fetchVersion.
+					TraceEvent(SevWarn, "FetchKeyGRVError", data->thisServerID).error(e);
+					lastError = e;
+				}
 			}
 			ASSERT(fetchVersion >= shard->fetchVersion); // at this point, shard->fetchVersion is the last fetchVersion
 			shard->fetchVersion = fetchVersion;

From 3da627b4ce6009448dbd2d999ca226d753bd343e Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Sun, 24 Jul 2022 17:20:49 -0700
Subject: [PATCH 551/740] Add testing mechanism

---
 fdbserver/storageserver.actor.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 7cfb72262cc..7f87fd0b4d4 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -5729,11 +5729,23 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 			// Then dest SS waits its version catch up with this GRV version and write the data to disk.
 			// Note that dest SS waits outside the fetchKeysParallelismLock.
 			fetchVersion = std::max(shard->fetchVersion, data->version.get());
+			if (g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01)) {
+				// Test using GRV version for fetchKey.
+				lastError = transaction_too_old();
+			}
 			if (lastError.code() == error_code_transaction_too_old) {
 				try {
 					Version grvVersion = wait(tr.getRawReadVersion());
+					if (g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01)) {
+						// Test failed GRV request.
+						throw proxy_memory_limit_exceeded();
+					}
 					fetchVersion = std::max(grvVersion, fetchVersion);
 				} catch (Error& e) {
+					if (e.code() == error_code_actor_cancelled) {
+						throw e;
+					}
+
 					// Note that error in getting GRV doesn't affect any storage server state. Therefore, we catch all
 					// errors here without failing the storage server. When error happens, fetchVersion fall back to
 					// the above computed fetchVersion.

From 7fb2146c0c69d51759d07db5d480116eefde885b Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Sun, 24 Jul 2022 13:38:06 -0700
Subject: [PATCH 552/740] Add timeout to places during Status generation

Otherwise, the status generation becomes a blocking call, which is undesirable,
because many operational tools require a timely response, even if it is in-
complete.
---
 fdbserver/Status.actor.cpp | 43 +++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 123ea1e48a8..d4b52bb47eb 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -832,7 +832,8 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 		}
 	}
 
-	std::vector<NetworkAddress> addressVec = wait(coordinators.ccr->getConnectionString().tryResolveHostnames());
+	std::vector<NetworkAddress> addressVec =
+	    wait(timeoutError(coordinators.ccr->getConnectionString().tryResolveHostnames(), 5.0));
 	for (const auto& coordinator : addressVec) {
 		roles.addCoordinatorRole(coordinator);
 	}
@@ -1928,7 +1929,7 @@ ACTOR static Future<std::vector<std::pair<StorageServerInterface, EventMap>>> ge
 	                            std::vector<std::string>{
 	                                "StorageMetrics", "ReadLatencyMetrics", "ReadLatencyBands", "BusiestReadTag" })) &&
 	     store(busiestWriteTags, getServerBusiestWriteTags(servers, address_workers, rkWorker)) &&
-	     store(metadata, getServerMetadata(servers, cx, true)));
+	     store(metadata, timeoutError(getServerMetadata(servers, cx, true), 5.0)));
 
 	ASSERT(busiestWriteTags.size() == results.size() && metadata.size() == results.size());
 	for (int i = 0; i < results.size(); ++i) {
@@ -2757,18 +2758,29 @@ ACTOR Future<JsonBuilderObject> storageWigglerStatsFetcher(DatabaseConfiguration
 	state Reference<ReadYourWritesTransaction> tr(new ReadYourWritesTransaction(cx));
 	state Optional<Value> primaryV;
 	state Optional<Value> remoteV;
-	loop {
-		try {
-			if (use_system_priority) {
-				tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+	state Future<Void> readTimeout = delay(5); // avoid looping forever
+	try {
+		loop {
+			try {
+				if (readTimeout.isReady()) {
+					throw timed_out();
+				}
+
+				if (use_system_priority) {
+					tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+				}
+				int64_t timeout_ms = 5000;
+				tr->setOption(FDBTransactionOptions::TIMEOUT, StringRef((uint8_t*)&timeout_ms, sizeof(int64_t)));
+				wait(store(primaryV, StorageWiggleMetrics::runGetTransaction(tr, true)) &&
+				     store(remoteV, StorageWiggleMetrics::runGetTransaction(tr, false)));
+				wait(tr->commit());
+				break;
+			} catch (Error& e) {
+				wait(tr->onError(e));
 			}
-			wait(store(primaryV, StorageWiggleMetrics::runGetTransaction(tr, true)) &&
-			     store(remoteV, StorageWiggleMetrics::runGetTransaction(tr, false)));
-			wait(tr->commit());
-			break;
-		} catch (Error& e) {
-			wait(tr->onError(e));
 		}
+	} catch (Error& e) {
+		TraceEvent(SevWarn, "StorageWigglerStatsError").error(e);
 	}
 
 	JsonBuilderObject res;
@@ -3009,9 +3021,10 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			if (configuration.get().perpetualStorageWiggleSpeed > 0) {
 				state Future<std::vector<std::pair<UID, StorageWiggleValue>>> primaryWiggleValues;
 				state Future<std::vector<std::pair<UID, StorageWiggleValue>>> remoteWiggleValues;
+				double timeout = g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01) ? 0.0 : 2.0;
 
-				primaryWiggleValues = readStorageWiggleValues(cx, true, true);
-				remoteWiggleValues = readStorageWiggleValues(cx, false, true);
+				primaryWiggleValues = timeoutError(readStorageWiggleValues(cx, true, true), timeout);
+				remoteWiggleValues = timeoutError(readStorageWiggleValues(cx, false, true), timeout);
 				wait(store(storageWiggler, storageWigglerStatsFetcher(configuration.get(), cx, true)) &&
 				     success(primaryWiggleValues) && success(remoteWiggleValues));
 
@@ -3025,7 +3038,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			wait(success(primaryDCFO));
 
 			std::vector<NetworkAddress> coordinatorAddresses =
-			    wait(coordinators.ccr->getConnectionString().tryResolveHostnames());
+			    wait(timeoutError(coordinators.ccr->getConnectionString().tryResolveHostnames(), 5.0));
 
 			int logFaultTolerance = 100;
 			if (db->get().recoveryState >= RecoveryState::ACCEPTING_COMMITS) {

From 1a83855a70dc4614001ddb440a3da1fdf635e23b Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Sun, 24 Jul 2022 14:30:42 -0700
Subject: [PATCH 553/740] Fix test failure when getting wiggle value timed out

---
 .../source/mr-status-json-schemas.rst.inc     |  3 +-
 fdbclient/Schemas.cpp                         |  3 +-
 fdbserver/Status.actor.cpp                    | 29 +++++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index 6047bbc37f6..ac9ed77da39 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -523,7 +523,8 @@
                   "duplicate_mutation_streams",
                   "duplicate_mutation_fetch_timeout",
                   "primary_dc_missing",
-                  "fetch_primary_dc_timeout"
+                  "fetch_primary_dc_timeout",
+                  "fetch_storage_wiggler_stats_timeout"
                ]
             },
             "issues":[
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 519a10c4597..9b8ff098dc7 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -554,7 +554,8 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
                   "duplicate_mutation_streams",
                   "duplicate_mutation_fetch_timeout",
                   "primary_dc_missing",
-                  "fetch_primary_dc_timeout"
+                  "fetch_primary_dc_timeout",
+                  "fetch_storage_wiggler_stats_timeout"
                ]
             },
             "issues":[
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index d4b52bb47eb..de8cdade44c 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -3023,15 +3023,26 @@ ACTOR Future<StatusReply> clusterGetStatus(
 				state Future<std::vector<std::pair<UID, StorageWiggleValue>>> remoteWiggleValues;
 				double timeout = g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01) ? 0.0 : 2.0;
 
-				primaryWiggleValues = timeoutError(readStorageWiggleValues(cx, true, true), timeout);
-				remoteWiggleValues = timeoutError(readStorageWiggleValues(cx, false, true), timeout);
-				wait(store(storageWiggler, storageWigglerStatsFetcher(configuration.get(), cx, true)) &&
-				     success(primaryWiggleValues) && success(remoteWiggleValues));
-
-				for (auto& p : primaryWiggleValues.get())
-					wiggleServers.insert(p.first);
-				for (auto& p : remoteWiggleValues.get())
-					wiggleServers.insert(p.first);
+				try {
+					primaryWiggleValues = timeoutError(readStorageWiggleValues(cx, true, true), timeout);
+					remoteWiggleValues = timeoutError(readStorageWiggleValues(cx, false, true), timeout);
+					wait(store(storageWiggler, storageWigglerStatsFetcher(configuration.get(), cx, true)) &&
+					     success(primaryWiggleValues) && success(remoteWiggleValues));
+
+					for (auto& p : primaryWiggleValues.get())
+						wiggleServers.insert(p.first);
+					for (auto& p : remoteWiggleValues.get())
+						wiggleServers.insert(p.first);
+				} catch (Error& e) {
+					if (!primaryWiggleValues.canGet())
+						messages.push_back(
+						    JsonString::makeMessage("fetch_storage_wiggler_stats_timeout",
+						                            "Fetching wiggling servers in the primary region timed out."));
+					if (!remoteWiggleValues.canGet())
+						messages.push_back(
+						    JsonString::makeMessage("fetch_storage_wiggler_stats_timeout",
+						                            "Fetching wiggling servers in the remote region timed out."));
+				}
 			}
 
 			state std::vector<JsonBuilderObject> workerStatuses = wait(getAll(futures2));

From cbd11a24afd54c1e93a6afb48b3d59ec250f122c Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Sun, 24 Jul 2022 14:51:49 -0700
Subject: [PATCH 554/740] Reduce a DNS lookup in Status generation

---
 fdbserver/Status.actor.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index de8cdade44c..8a4f29a5314 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -735,6 +735,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
     std::vector<std::pair<GrvProxyInterface, EventMap>> grvProxies,
     std::vector<BlobWorkerInterface> blobWorkers,
     ServerCoordinators coordinators,
+    std::vector<NetworkAddress> coordinatorAddresses,
     Database cx,
     Optional<DatabaseConfiguration> configuration,
     Optional<Key> healthyZone,
@@ -832,9 +833,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 		}
 	}
 
-	std::vector<NetworkAddress> addressVec =
-	    wait(timeoutError(coordinators.ccr->getConnectionString().tryResolveHostnames(), 5.0));
-	for (const auto& coordinator : addressVec) {
+	for (const auto& coordinator : coordinatorAddresses) {
 		roles.addCoordinatorRole(coordinator);
 	}
 
@@ -2964,6 +2963,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 
 		statusObj["machines"] = machineStatusFetcher(mMetrics, workers, configuration, &status_incomplete_reasons);
 
+		state std::vector<NetworkAddress> coordinatorAddresses;
 		if (configuration.present()) {
 			// Do the latency probe by itself to avoid interference from other status activities
 			state bool isAvailable = true;
@@ -3048,8 +3048,9 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			state std::vector<JsonBuilderObject> workerStatuses = wait(getAll(futures2));
 			wait(success(primaryDCFO));
 
-			std::vector<NetworkAddress> coordinatorAddresses =
+			std::vector<NetworkAddress> addresses =
 			    wait(timeoutError(coordinators.ccr->getConnectionString().tryResolveHostnames(), 5.0));
+			coordinatorAddresses = std::move(addresses);
 
 			int logFaultTolerance = 100;
 			if (db->get().recoveryState >= RecoveryState::ACCEPTING_COMMITS) {
@@ -3190,6 +3191,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 		                              grvProxies,
 		                              blobWorkers,
 		                              coordinators,
+		                              coordinatorAddresses,
 		                              cx,
 		                              configuration,
 		                              loadResult.present() ? loadResult.get().healthyZone : Optional<Key>(),

From ed6e29b8d4ee1b2cd40fd18598b0019492247a18 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Sun, 24 Jul 2022 21:51:10 -0700
Subject: [PATCH 555/740] TLog track unpopped recovery tag

---
 fdbserver/TLogServer.actor.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 546c72be222..d2fc0a9def9 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -518,7 +518,8 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 
 	Deque<std::pair<Version, Standalone<VectorRef<uint8_t>>>> messageBlocks;
 	std::vector<std::vector<Reference<TagData>>> tag_data; // tag.locality | tag.id
-	int unpoppedRecoveredTags;
+	int unpoppedRecoveredTagCount;
+	std::set<Tag> unpoppedRecoveredTags;
 	std::map<Tag, Promise<Void>> waitingTags;
 
 	Reference<TagData> getTagData(Tag tag) {
@@ -642,7 +643,7 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	                 std::string context)
 	  : stopped(false), initialized(false), queueCommittingVersion(0), knownCommittedVersion(0),
 	    durableKnownCommittedVersion(0), minKnownCommittedVersion(0), queuePoppedVersion(0), minPoppedTagVersion(0),
-	    minPoppedTag(invalidTag), unpoppedRecoveredTags(0), cc("TLog", interf.id().toString()),
+	    minPoppedTag(invalidTag), unpoppedRecoveredTagCount(0), cc("TLog", interf.id().toString()),
 	    bytesInput("BytesInput", cc), bytesDurable("BytesDurable", cc), blockingPeeks("BlockingPeeks", cc),
 	    blockingPeekTimeouts("BlockingPeekTimeouts", cc), emptyPeeks("EmptyPeeks", cc),
 	    nonEmptyPeeks("NonEmptyPeeks", cc), logId(interf.id()), protocolVersion(protocolVersion),
@@ -1196,14 +1197,20 @@ ACTOR Future<Void> tLogPopCore(TLogData* self, Tag inputTag, Version to, Referen
 
 		if (tagData->unpoppedRecovered && upTo > logData->recoveredAt) {
 			tagData->unpoppedRecovered = false;
-			logData->unpoppedRecoveredTags--;
+			logData->unpoppedRecoveredTagCount--;
+			logData->unpoppedRecoveredTags.erase(tag);
 			TraceEvent("TLogPoppedTag", logData->logId)
-			    .detail("Tags", logData->unpoppedRecoveredTags)
+			    .detail("Tags", logData->unpoppedRecoveredTagCount)
 			    .detail("Tag", tag.toString())
 			    .detail("DurableKCVer", logData->durableKnownCommittedVersion)
-			    .detail("RecoveredAt", logData->recoveredAt);
-			if (logData->unpoppedRecoveredTags == 0 && logData->durableKnownCommittedVersion >= logData->recoveredAt &&
-			    logData->recoveryComplete.canBeSet()) {
+			    .detail("RecoveredAt", logData->recoveredAt)
+			    .detail("UnpoppedTags", describe(logData->unpoppedRecoveredTags));
+			if (logData->unpoppedRecoveredTagCount == 0 &&
+			    logData->durableKnownCommittedVersion >= logData->recoveredAt && logData->recoveryComplete.canBeSet()) {
+				TraceEvent("TLogRecoveryComplete", logData->logId)
+				    .detail("Tags", logData->unpoppedRecoveredTagCount)
+				    .detail("DurableKCVer", logData->durableKnownCommittedVersion)
+				    .detail("RecoveredAt", logData->recoveredAt);
 				logData->recoveryComplete.send(Void());
 			}
 		}
@@ -2148,10 +2155,10 @@ ACTOR Future<Void> doQueueCommit(TLogData* self,
 	ASSERT(ver > logData->queueCommittedVersion.get());
 
 	logData->durableKnownCommittedVersion = knownCommittedVersion;
-	if (logData->unpoppedRecoveredTags == 0 && knownCommittedVersion >= logData->recoveredAt &&
+	if (logData->unpoppedRecoveredTagCount == 0 && knownCommittedVersion >= logData->recoveredAt &&
 	    logData->recoveryComplete.canBeSet()) {
 		TraceEvent("TLogRecoveryComplete", logData->logId)
-		    .detail("Tags", logData->unpoppedRecoveredTags)
+		    .detail("Tags", logData->unpoppedRecoveredTagCount)
 		    .detail("DurableKCVer", logData->durableKnownCommittedVersion)
 		    .detail("RecoveredAt", logData->recoveredAt);
 		logData->recoveryComplete.send(Void());
@@ -3438,7 +3445,8 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 			logData->queueCommittedVersion.set(logData->unrecoveredBefore - 1);
 			logData->version.set(logData->unrecoveredBefore - 1);
 
-			logData->unpoppedRecoveredTags = req.allTags.size();
+			logData->unpoppedRecoveredTagCount = req.allTags.size();
+			logData->unpoppedRecoveredTags = std::set<Tag>(req.allTags.begin(), req.allTags.end());
 			wait(initPersistentState(self, logData) || logData->removed);
 
 			TraceEvent("TLogRecover", self->dbgid)

From be054596a076872249660a275fedf5efbdcab674 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 26 Jul 2022 11:00:11 -0700
Subject: [PATCH 556/740] Fix a crash bug during CC shutdown process

actor_cancel should be thrown, otherwise the rest code can access invalid
memory.
---
 fdbserver/Status.actor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 8a4f29a5314..8b0d938ecb9 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -2708,6 +2708,9 @@ ACTOR Future<JsonBuilderObject> lockedStatusFetcher(Reference<AsyncVar<ServerDBI
 			try {
 				wait(tr.onError(e));
 			} catch (Error& e) {
+				if (e.code() == error_code_actor_cancelled)
+					throw;
+
 				incomplete_reasons->insert(format("Unable to determine if database is locked (%s).", e.what()));
 				break;
 			}

From 65cc17087405dbf8dbe0621154dea450c02fd9a3 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 26 Jul 2022 21:52:29 +0000
Subject: [PATCH 557/740] disable AVX for 7.1.16 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From adc3f0b0341cd3ea26e858dfee432701690fb83d Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 26 Jul 2022 22:05:31 +0000
Subject: [PATCH 558/740] enable AVX and update version for 7.1.17 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 508bdb478a0..91e4f314ae1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.16
+  VERSION 7.1.17
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 9914e7ced16a0ea3c747e91ee50b8aa2300cbd54 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 27 Jul 2022 09:51:34 -0700
Subject: [PATCH 559/740] Add 7.1.16, 7.1.17 release notes

---
 .../source/release-notes/release-notes-710.rst   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 091bc410543..7847ea457f7 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,22 @@
 Release Notes
 #############
 
+7.1.17
+======
+* Same as 7.1.16 release with AVX enabled.
+
+7.1.16
+======
+* Released with AVX disabled.
+* Fixed a crash bug when cluster controller shuts down. `(PR #7706) <https://github.com/apple/foundationdb/pull/7706>`_
+* Fixed a storage server failure when getReadVersion returns an error. `(PR #7688) <https://github.com/apple/foundationdb/pull/7688>`_
+* Fixed unbounded status json generation. `(PR #7680) <https://github.com/apple/foundationdb/pull/7680>`_
+* Fixed ScopeEventFieldTypeMismatch error for TLogMetrics. `(PR #7640) <https://github.com/apple/foundationdb/pull/7640>`_
+* Added getMappedRange latency metrics. `(PR #7632) <https://github.com/apple/foundationdb/pull/7632>`_
+* Fixed a version vector performance bug due to not updating client side tag cache. `(PR #7616) <https://github.com/apple/foundationdb/pull/7616>`_
+* Fixed DiskReadSeconds and DiskWriteSeconds calculaion in ProcessMetrics. `(PR #7609) <https://github.com/apple/foundationdb/pull/7609>`_
+* Added Rocksdb compression and data size stats. `(PR #7596) <https://github.com/apple/foundationdb/pull/7596>`_
+
 7.1.15
 ======
 * Same as 7.1.14 release with AVX enabled.

From 988a2b79de56c3797f3c629feb8daf6b63cc501b Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin@openintegration.inc>
Date: Thu, 28 Jul 2022 11:32:11 +0300
Subject: [PATCH 560/740] Added netbeans ide project

---
 .gitignore                                    |      2 +-
 .../Netbeans12/nbproject/configurations.xml   | 162763 +++++++++++++++
 ide-projects/Netbeans12/nbproject/project.xml |     26 +
 3 files changed, 162790 insertions(+), 1 deletion(-)
 create mode 100644 ide-projects/Netbeans12/nbproject/configurations.xml
 create mode 100644 ide-projects/Netbeans12/nbproject/project.xml

diff --git a/.gitignore b/.gitignore
index 0e7d64a72ac..9e51b15f8e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,7 +96,7 @@ flow/coveragetool/obj
 
 # Openway fork build
 /bld/
-/nbproject/private/
+/ide-projects/*/nbproject/private/
 /Testing/Temporary/
 
 # Temporary and user configuration files
diff --git a/ide-projects/Netbeans12/nbproject/configurations.xml b/ide-projects/Netbeans12/nbproject/configurations.xml
new file mode 100644
index 00000000000..e2c4561f8f0
--- /dev/null
+++ b/ide-projects/Netbeans12/nbproject/configurations.xml
@@ -0,0 +1,162763 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="100">
+  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
+    <df root="../.." name="0">
+      <df name="bindings">
+        <df name="c">
+          <df name="test">
+            <df name="apitester">
+              <in>TesterApiWorkload.cpp</in>
+              <in>TesterApiWrapper.cpp</in>
+              <in>TesterCancelTransactionWorkload.cpp</in>
+              <in>TesterCorrectnessWorkload.cpp</in>
+              <in>TesterKeyValueStore.cpp</in>
+              <in>TesterScheduler.cpp</in>
+              <in>TesterTestSpec.cpp</in>
+              <in>TesterTransactionExecutor.cpp</in>
+              <in>TesterUtil.cpp</in>
+              <in>TesterWorkload.cpp</in>
+              <in>fdb_c_api_tester.cpp</in>
+            </df>
+            <df name="mako">
+              <in>mako.c</in>
+              <in>utils.c</in>
+            </df>
+            <df name="unit">
+              <in>disconnected_timeout_tests.cpp</in>
+              <in>fdb_api.cpp</in>
+              <in>setup_tests.cpp</in>
+              <in>trace_partial_file_suffix_test.cpp</in>
+              <in>unit_tests.cpp</in>
+              <in>unit_tests_version_510.cpp</in>
+            </df>
+            <df name="workloads">
+              <in>SimpleWorkload.cpp</in>
+              <in>workloads.cpp</in>
+            </df>
+            <in>client_memory_test.cpp</in>
+            <in>fdb_c90_test.c</in>
+            <in>performance_test.c</in>
+            <in>ryw_benchmark.c</in>
+            <in>txn_size_test.c</in>
+          </df>
+          <in>fdb_c.cpp</in>
+        </df>
+        <df name="flow">
+          <df name="tester">
+            <in>DirectoryTester.actor.cpp</in>
+            <in>Tester.actor.cpp</in>
+          </df>
+          <in>DirectoryLayer.actor.cpp</in>
+          <in>DirectorySubspace.cpp</in>
+          <in>HighContentionAllocator.actor.cpp</in>
+          <in>Node.actor.cpp</in>
+          <in>Subspace.cpp</in>
+          <in>Tuple.cpp</in>
+          <in>fdb_flow.actor.cpp</in>
+        </df>
+        <df name="java">
+          <in>JavaWorkload.cpp</in>
+          <in>fdbJNI.cpp</in>
+        </df>
+      </df>
+      <df name="bld">
+        <df name="bindings">
+          <df name="flow">
+            <df name="tester">
+              <in>DirectoryTester.actor.g.cpp</in>
+              <in>Tester.actor.g.cpp</in>
+            </df>
+            <in>DirectoryLayer.actor.g.cpp</in>
+            <in>HighContentionAllocator.actor.g.cpp</in>
+            <in>Node.actor.g.cpp</in>
+            <in>fdb_flow.actor.g.cpp</in>
+          </df>
+        </df>
+        <df name="bindingtester">
+          <df name="tests">
+            <df name="c">
+              <df name="test">
+                <df name="mako">
+                  <in>mako.c</in>
+                  <in>utils.c</in>
+                </df>
+                <df name="unit">
+                  <in>disconnected_timeout_tests.cpp</in>
+                  <in>fdb_api.cpp</in>
+                  <in>trace_partial_file_suffix_test.cpp</in>
+                </df>
+                <df name="workloads">
+                  <in>SimpleWorkload.cpp</in>
+                  <in>workloads.cpp</in>
+                </df>
+                <in>performance_test.c</in>
+                <in>ryw_benchmark.c</in>
+                <in>txn_size_test.c</in>
+              </df>
+              <in>ThreadCleanup.cpp</in>
+              <in>fdb_c.cpp</in>
+            </df>
+            <df name="flow">
+              <df name="tester">
+                <in>DirectoryTester.actor.cpp</in>
+                <in>Tester.actor.cpp</in>
+              </df>
+              <in>DirectoryLayer.actor.cpp</in>
+              <in>DirectorySubspace.cpp</in>
+              <in>HighContentionAllocator.actor.cpp</in>
+              <in>Node.actor.cpp</in>
+              <in>Subspace.cpp</in>
+              <in>Tuple.cpp</in>
+              <in>fdb_flow.actor.cpp</in>
+            </df>
+            <df name="java">
+              <in>JavaWorkload.cpp</in>
+              <in>fdbJNI.cpp</in>
+            </df>
+          </df>
+        </df>
+        <df name="boost_targetProject-prefix">
+          <df name="src">
+            <df name="boost_targetProject">
+              <df name="libs">
+                <df name="config">
+                  <df name="checks">
+                    <df name="architecture">
+                      <in>32.cpp</in>
+                      <in>64.cpp</in>
+                      <in>arm.cpp</in>
+                      <in>mips1.cpp</in>
+                      <in>power.cpp</in>
+                      <in>riscv.cpp</in>
+                      <in>s390x.cpp</in>
+                      <in>sparc.cpp</in>
+                      <in>x86.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="context">
+                  <df name="src">
+                    <df name="posix">
+                      <in>stack_traits.cpp</in>
+                    </df>
+                  </df>
+                </df>
+              </df>
+              <df name="tools">
+                <df name="build">
+                  <df name="src">
+                    <df name="engine">
+                      <df name="modules">
+                        <in>order.cpp</in>
+                        <in>path.cpp</in>
+                        <in>property-set.cpp</in>
+                        <in>regex.cpp</in>
+                        <in>sequence.cpp</in>
+                        <in>set.cpp</in>
+                      </df>
+                      <in>builtins.cpp</in>
+                      <in>check_clib.cpp</in>
+                      <in>check_cxx11.cpp</in>
+                      <in>class.cpp</in>
+                      <in>command.cpp</in>
+                      <in>compile.cpp</in>
+                      <in>constants.cpp</in>
+                      <in>cwd.cpp</in>
+                      <in>debug.cpp</in>
+                      <in>debugger.cpp</in>
+                      <in>execcmd.cpp</in>
+                      <in>execnt.cpp</in>
+                      <in>execunix.cpp</in>
+                      <in>filent.cpp</in>
+                      <in>filesys.cpp</in>
+                      <in>fileunix.cpp</in>
+                      <in>frames.cpp</in>
+                      <in>function.cpp</in>
+                      <in>glob.cpp</in>
+                      <in>hash.cpp</in>
+                      <in>hcache.cpp</in>
+                      <in>hdrmacro.cpp</in>
+                      <in>headers.cpp</in>
+                      <in>jam.cpp</in>
+                      <in>jam_strings.cpp</in>
+                      <in>jamgram.cpp</in>
+                      <in>lists.cpp</in>
+                      <in>make.cpp</in>
+                      <in>make1.cpp</in>
+                      <in>md5.cpp</in>
+                      <in>mem.cpp</in>
+                      <in>modules.cpp</in>
+                      <in>native.cpp</in>
+                      <in>object.cpp</in>
+                      <in>option.cpp</in>
+                      <in>output.cpp</in>
+                      <in>parse.cpp</in>
+                      <in>pathnt.cpp</in>
+                      <in>pathsys.cpp</in>
+                      <in>pathunix.cpp</in>
+                      <in>regexp.cpp</in>
+                      <in>rules.cpp</in>
+                      <in>scan.cpp</in>
+                      <in>search.cpp</in>
+                      <in>startup.cpp</in>
+                      <in>subst.cpp</in>
+                      <in>sysinfo.cpp</in>
+                      <in>timestamp.cpp</in>
+                      <in>variable.cpp</in>
+                      <in>w32_getreg.cpp</in>
+                    </df>
+                  </df>
+                </df>
+              </df>
+            </df>
+          </df>
+        </df>
+        <df name="boostProject-prefix">
+          <df name="src">
+            <df name="boostProject">
+              <df name="doc">
+                <df name="html">
+                  <df name="boost_asio">
+                    <df name="example">
+                      <df name="cpp03">
+                        <df name="allocation">
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="buffers">
+                          <in>reference_counted.cpp</in>
+                        </df>
+                        <df name="chat">
+                          <in>chat_client.cpp</in>
+                          <in>chat_server.cpp</in>
+                          <in>posix_chat_client.cpp</in>
+                        </df>
+                        <df name="echo">
+                          <in>async_tcp_echo_server.cpp</in>
+                          <in>async_udp_echo_server.cpp</in>
+                          <in>blocking_tcp_echo_client.cpp</in>
+                          <in>blocking_tcp_echo_server.cpp</in>
+                          <in>blocking_udp_echo_client.cpp</in>
+                          <in>blocking_udp_echo_server.cpp</in>
+                        </df>
+                        <df name="fork">
+                          <in>daemon.cpp</in>
+                          <in>process_per_connection.cpp</in>
+                        </df>
+                        <df name="http">
+                          <df name="client">
+                            <in>async_client.cpp</in>
+                            <in>sync_client.cpp</in>
+                          </df>
+                          <df name="server">
+                            <in>connection.cpp</in>
+                            <in>connection_manager.cpp</in>
+                            <in>main.cpp</in>
+                            <in>mime_types.cpp</in>
+                            <in>reply.cpp</in>
+                            <in>request_handler.cpp</in>
+                            <in>request_parser.cpp</in>
+                            <in>server.cpp</in>
+                          </df>
+                          <df name="server2">
+                            <in>connection.cpp</in>
+                            <in>io_context_pool.cpp</in>
+                            <in>main.cpp</in>
+                            <in>mime_types.cpp</in>
+                            <in>reply.cpp</in>
+                            <in>request_handler.cpp</in>
+                            <in>request_parser.cpp</in>
+                            <in>server.cpp</in>
+                          </df>
+                          <df name="server3">
+                            <in>connection.cpp</in>
+                            <in>main.cpp</in>
+                            <in>mime_types.cpp</in>
+                            <in>reply.cpp</in>
+                            <in>request_handler.cpp</in>
+                            <in>request_parser.cpp</in>
+                            <in>server.cpp</in>
+                          </df>
+                          <df name="server4">
+                            <in>file_handler.cpp</in>
+                            <in>main.cpp</in>
+                            <in>mime_types.cpp</in>
+                            <in>reply.cpp</in>
+                            <in>request_parser.cpp</in>
+                            <in>server.cpp</in>
+                          </df>
+                        </df>
+                        <df name="icmp">
+                          <in>ping.cpp</in>
+                        </df>
+                        <df name="invocation">
+                          <in>prioritised_handlers.cpp</in>
+                        </df>
+                        <df name="iostreams">
+                          <in>daytime_client.cpp</in>
+                          <in>daytime_server.cpp</in>
+                          <in>http_client.cpp</in>
+                        </df>
+                        <df name="local">
+                          <in>connect_pair.cpp</in>
+                          <in>iostream_client.cpp</in>
+                          <in>stream_client.cpp</in>
+                          <in>stream_server.cpp</in>
+                        </df>
+                        <df name="multicast">
+                          <in>receiver.cpp</in>
+                          <in>sender.cpp</in>
+                        </df>
+                        <df name="nonblocking">
+                          <in>third_party_lib.cpp</in>
+                        </df>
+                        <df name="porthopper">
+                          <in>client.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="serialization">
+                          <in>client.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="services">
+                          <in>daytime_client.cpp</in>
+                          <in>logger_service.cpp</in>
+                        </df>
+                        <df name="socks4">
+                          <in>sync_client.cpp</in>
+                        </df>
+                        <df name="spawn">
+                          <in>echo_server.cpp</in>
+                          <in>parallel_grep.cpp</in>
+                        </df>
+                        <df name="ssl">
+                          <in>client.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="timeouts">
+                          <in>async_tcp_client.cpp</in>
+                          <in>blocking_tcp_client.cpp</in>
+                          <in>blocking_token_tcp_client.cpp</in>
+                          <in>blocking_udp_client.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="timers">
+                          <in>time_t_timer.cpp</in>
+                        </df>
+                        <df name="windows">
+                          <in>transmit_file.cpp</in>
+                        </df>
+                      </df>
+                      <df name="cpp11">
+                        <df name="allocation">
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="buffers">
+                          <in>reference_counted.cpp</in>
+                        </df>
+                        <df name="chat">
+                          <in>chat_client.cpp</in>
+                          <in>chat_server.cpp</in>
+                        </df>
+                        <df name="echo">
+                          <in>async_tcp_echo_server.cpp</in>
+                          <in>async_udp_echo_server.cpp</in>
+                          <in>blocking_tcp_echo_client.cpp</in>
+                          <in>blocking_tcp_echo_server.cpp</in>
+                          <in>blocking_udp_echo_client.cpp</in>
+                          <in>blocking_udp_echo_server.cpp</in>
+                        </df>
+                        <df name="executors">
+                          <in>actor.cpp</in>
+                          <in>bank_account_1.cpp</in>
+                          <in>bank_account_2.cpp</in>
+                          <in>fork_join.cpp</in>
+                          <in>pipeline.cpp</in>
+                          <in>priority_scheduler.cpp</in>
+                        </df>
+                        <df name="fork">
+                          <in>daemon.cpp</in>
+                          <in>process_per_connection.cpp</in>
+                        </df>
+                        <df name="futures">
+                          <in>daytime_client.cpp</in>
+                        </df>
+                        <df name="handler_tracking">
+                          <in>async_tcp_echo_server.cpp</in>
+                        </df>
+                        <df name="http">
+                          <df name="server">
+                            <in>connection.cpp</in>
+                            <in>connection_manager.cpp</in>
+                            <in>main.cpp</in>
+                            <in>mime_types.cpp</in>
+                            <in>reply.cpp</in>
+                            <in>request_handler.cpp</in>
+                            <in>request_parser.cpp</in>
+                            <in>server.cpp</in>
+                          </df>
+                        </df>
+                        <df name="invocation">
+                          <in>prioritised_handlers.cpp</in>
+                        </df>
+                        <df name="local">
+                          <in>connect_pair.cpp</in>
+                          <in>iostream_client.cpp</in>
+                          <in>stream_client.cpp</in>
+                          <in>stream_server.cpp</in>
+                        </df>
+                        <df name="multicast">
+                          <in>receiver.cpp</in>
+                          <in>sender.cpp</in>
+                        </df>
+                        <df name="nonblocking">
+                          <in>third_party_lib.cpp</in>
+                        </df>
+                        <df name="operations">
+                          <in>composed_1.cpp</in>
+                          <in>composed_2.cpp</in>
+                          <in>composed_3.cpp</in>
+                          <in>composed_4.cpp</in>
+                          <in>composed_5.cpp</in>
+                          <in>composed_6.cpp</in>
+                          <in>composed_7.cpp</in>
+                          <in>composed_8.cpp</in>
+                        </df>
+                        <df name="socks4">
+                          <in>sync_client.cpp</in>
+                        </df>
+                        <df name="spawn">
+                          <in>echo_server.cpp</in>
+                          <in>parallel_grep.cpp</in>
+                        </df>
+                        <df name="ssl">
+                          <in>client.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="timeouts">
+                          <in>async_tcp_client.cpp</in>
+                          <in>blocking_tcp_client.cpp</in>
+                          <in>blocking_token_tcp_client.cpp</in>
+                          <in>blocking_udp_client.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="timers">
+                          <in>time_t_timer.cpp</in>
+                        </df>
+                      </df>
+                      <df name="cpp14">
+                        <df name="deferred">
+                          <in>deferred_1.cpp</in>
+                          <in>deferred_2.cpp</in>
+                          <in>deferred_3.cpp</in>
+                          <in>deferred_4.cpp</in>
+                          <in>deferred_5.cpp</in>
+                          <in>deferred_6.cpp</in>
+                          <in>deferred_7.cpp</in>
+                        </df>
+                        <df name="executors">
+                          <in>actor.cpp</in>
+                          <in>async_1.cpp</in>
+                          <in>async_2.cpp</in>
+                          <in>bank_account_1.cpp</in>
+                          <in>bank_account_2.cpp</in>
+                          <in>fork_join.cpp</in>
+                          <in>pipeline.cpp</in>
+                          <in>priority_scheduler.cpp</in>
+                        </df>
+                        <df name="iostreams">
+                          <in>http_client.cpp</in>
+                        </df>
+                        <df name="operations">
+                          <in>composed_1.cpp</in>
+                          <in>composed_2.cpp</in>
+                          <in>composed_3.cpp</in>
+                          <in>composed_4.cpp</in>
+                          <in>composed_5.cpp</in>
+                          <in>composed_6.cpp</in>
+                          <in>composed_7.cpp</in>
+                          <in>composed_8.cpp</in>
+                        </df>
+                        <df name="parallel_group">
+                          <in>parallel_sort.cpp</in>
+                          <in>wait_for_all.cpp</in>
+                          <in>wait_for_one.cpp</in>
+                          <in>wait_for_one_error.cpp</in>
+                          <in>wait_for_one_success.cpp</in>
+                        </df>
+                      </df>
+                      <df name="cpp17">
+                        <df name="coroutines_ts">
+                          <in>chat_server.cpp</in>
+                          <in>echo_server.cpp</in>
+                          <in>echo_server_with_as_single_default.cpp</in>
+                          <in>echo_server_with_as_tuple_default.cpp</in>
+                          <in>echo_server_with_default.cpp</in>
+                          <in>range_based_for.cpp</in>
+                          <in>refactored_echo_server.cpp</in>
+                        </df>
+                      </df>
+                      <df name="cpp20">
+                        <df name="channels">
+                          <in>throttling_proxy.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                  </df>
+                </df>
+                <df name="test">
+                  <in>stub.cpp</in>
+                </df>
+              </df>
+              <df name="libs">
+                <df name="accumulators">
+                  <df name="example">
+                    <in>main.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>count.cpp</in>
+                    <in>covariance.cpp</in>
+                    <in>droppable.cpp</in>
+                    <in>error_of.cpp</in>
+                    <in>extended_p_square.cpp</in>
+                    <in>extended_p_square_quantile.cpp</in>
+                    <in>external_accumulator.cpp</in>
+                    <in>external_weights.cpp</in>
+                    <in>kurtosis.cpp</in>
+                    <in>max.cpp</in>
+                    <in>mean.cpp</in>
+                    <in>median.cpp</in>
+                    <in>min.cpp</in>
+                    <in>moment.cpp</in>
+                    <in>p_square_cumul_dist.cpp</in>
+                    <in>p_square_quantile.cpp</in>
+                    <in>p_square_quantile_extended.cpp</in>
+                    <in>pot_quantile.cpp</in>
+                    <in>reference.cpp</in>
+                    <in>rolling_count.cpp</in>
+                    <in>rolling_mean.cpp</in>
+                    <in>rolling_moment.cpp</in>
+                    <in>rolling_sum.cpp</in>
+                    <in>rolling_variance.cpp</in>
+                    <in>skewness.cpp</in>
+                    <in>sum.cpp</in>
+                    <in>sum_kahan.cpp</in>
+                    <in>tail.cpp</in>
+                    <in>tail_mean.cpp</in>
+                    <in>tail_quantile.cpp</in>
+                    <in>tail_variate_means.cpp</in>
+                    <in>valarray.cpp</in>
+                    <in>value.cpp</in>
+                    <in>variance.cpp</in>
+                    <in>vector.cpp</in>
+                    <in>weighted_covariance.cpp</in>
+                    <in>weighted_extended_p_square.cpp</in>
+                    <in>weighted_kurtosis.cpp</in>
+                    <in>weighted_mean.cpp</in>
+                    <in>weighted_median.cpp</in>
+                    <in>weighted_moment.cpp</in>
+                    <in>weighted_p_square_cumul_dist.cpp</in>
+                    <in>weighted_p_square_quantile.cpp</in>
+                    <in>weighted_pot_quantile.cpp</in>
+                    <in>weighted_skewness.cpp</in>
+                    <in>weighted_sum.cpp</in>
+                    <in>weighted_sum_kahan.cpp</in>
+                    <in>weighted_tail_mean.cpp</in>
+                    <in>weighted_tail_quantile.cpp</in>
+                    <in>weighted_tail_variate_means.cpp</in>
+                    <in>weighted_variance.cpp</in>
+                  </df>
+                </df>
+                <df name="algorithm">
+                  <df name="example">
+                    <in>apply_permutation_example.cpp</in>
+                    <in>clamp_example.cpp</in>
+                    <in>is_palindrome_example.cpp</in>
+                    <in>is_partitioned_until_example.cpp</in>
+                    <in>search_example.cpp</in>
+                  </df>
+                  <df name="minmax">
+                    <df name="example">
+                      <in>minmax_ex.cpp</in>
+                      <in>minmax_timer.cpp</in>
+                    </df>
+                    <df name="fuzzing">
+                      <in>minmax_element.fuzz.cpp</in>
+                      <in>minmax_element_variants.fuzz.cpp</in>
+                    </df>
+                    <df name="test">
+                      <in>minmax_element_test.cpp</in>
+                      <in>minmax_test.cpp</in>
+                    </df>
+                  </df>
+                  <df name="string">
+                    <df name="example">
+                      <in>conv_example.cpp</in>
+                      <in>find_example.cpp</in>
+                      <in>predicate_example.cpp</in>
+                      <in>regex_example.cpp</in>
+                      <in>replace_example.cpp</in>
+                      <in>rle_example.cpp</in>
+                      <in>split_example.cpp</in>
+                      <in>trim_example.cpp</in>
+                    </df>
+                    <df name="test">
+                      <in>conv_test.cpp</in>
+                      <in>find_format_test.cpp</in>
+                      <in>find_test.cpp</in>
+                      <in>join_test.cpp</in>
+                      <in>predicate_test.cpp</in>
+                      <in>regex_test.cpp</in>
+                      <in>replace_test.cpp</in>
+                      <in>split_test.cpp</in>
+                      <in>trim_test.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>all_of_test.cpp</in>
+                    <in>any_of_test.cpp</in>
+                    <in>apply_permutation_test.cpp</in>
+                    <in>clamp_test.cpp</in>
+                    <in>copy_if_test1.cpp</in>
+                    <in>copy_n_test1.cpp</in>
+                    <in>empty_search_test.cpp</in>
+                    <in>equal_test.cpp</in>
+                    <in>exclusive_scan_test.cpp</in>
+                    <in>find_backward_test.cpp</in>
+                    <in>find_if_not_test1.cpp</in>
+                    <in>find_not_test.cpp</in>
+                    <in>for_each_n_test.cpp</in>
+                    <in>gather_fail1.cpp</in>
+                    <in>gather_test1.cpp</in>
+                    <in>hex_fail1.cpp</in>
+                    <in>hex_test1.cpp</in>
+                    <in>hex_test2.cpp</in>
+                    <in>hex_test3.cpp</in>
+                    <in>hex_test4.cpp</in>
+                    <in>inclusive_scan_test.cpp</in>
+                    <in>iota_test1.cpp</in>
+                    <in>is_palindrome_test.cpp</in>
+                    <in>is_partitioned_test1.cpp</in>
+                    <in>is_partitioned_until_test.cpp</in>
+                    <in>is_permutation_test1.cpp</in>
+                    <in>mismatch_test.cpp</in>
+                    <in>none_of_test.cpp</in>
+                    <in>one_of_test.cpp</in>
+                    <in>ordered_test.cpp</in>
+                    <in>partition_copy_test1.cpp</in>
+                    <in>partition_point_test1.cpp</in>
+                    <in>partition_subrange_test.cpp</in>
+                    <in>power_fail1.cpp</in>
+                    <in>power_test.cpp</in>
+                    <in>reduce_test.cpp</in>
+                    <in>search_fail1.cpp</in>
+                    <in>search_fail2.cpp</in>
+                    <in>search_fail3.cpp</in>
+                    <in>search_test1.cpp</in>
+                    <in>search_test2.cpp</in>
+                    <in>search_test3.cpp</in>
+                    <in>search_test4.cpp</in>
+                    <in>sort_subrange_test.cpp</in>
+                    <in>transform_exclusive_scan_test.cpp</in>
+                    <in>transform_inclusive_scan_test.cpp</in>
+                    <in>transform_reduce_test.cpp</in>
+                  </df>
+                </df>
+                <df name="align">
+                  <df name="test">
+                    <in>align_down_integral_test.cpp</in>
+                    <in>align_down_test.cpp</in>
+                    <in>align_overflow_test.cpp</in>
+                    <in>align_test.cpp</in>
+                    <in>align_up_integral_test.cpp</in>
+                    <in>align_up_test.cpp</in>
+                    <in>aligned_alloc_test.cpp</in>
+                    <in>aligned_allocator_adaptor_incomplete_test.cpp</in>
+                    <in>aligned_allocator_adaptor_test.cpp</in>
+                    <in>aligned_allocator_incomplete_test.cpp</in>
+                    <in>aligned_allocator_test.cpp</in>
+                    <in>aligned_delete_test.cpp</in>
+                    <in>alignment_of_test.cpp</in>
+                    <in>assume_aligned_test.cpp</in>
+                    <in>is_aligned_integral_test.cpp</in>
+                    <in>is_aligned_test.cpp</in>
+                  </df>
+                </df>
+                <df name="any">
+                  <df name="test">
+                    <in>any_cast_cv_failed.cpp</in>
+                    <in>any_from_basic_any.cpp</in>
+                    <in>any_from_basic_any_rv.cpp</in>
+                    <in>any_test.cpp</in>
+                    <in>any_test_cv_to_rv_failed.cpp</in>
+                    <in>any_test_mplif.cpp</in>
+                    <in>any_test_rv.cpp</in>
+                    <in>any_test_temporary_to_ref_failed.cpp</in>
+                    <in>any_to_basic_any.cpp</in>
+                    <in>any_to_basic_any_rv.cpp</in>
+                    <in>basic_any_cast_cv_failed.cpp</in>
+                    <in>basic_any_from_any.cpp</in>
+                    <in>basic_any_from_any_rv.cpp</in>
+                    <in>basic_any_from_basic_any.cpp</in>
+                    <in>basic_any_from_basic_any_rv.cpp</in>
+                    <in>basic_any_test.cpp</in>
+                    <in>basic_any_test_alignment_power_of_two_failed.cpp</in>
+                    <in>basic_any_test_cv_to_rv_failed.cpp</in>
+                    <in>basic_any_test_large_object.cpp</in>
+                    <in>basic_any_test_mplif.cpp</in>
+                    <in>basic_any_test_multiply_size_failed.cpp</in>
+                    <in>basic_any_test_rv.cpp</in>
+                    <in>basic_any_test_size_alignment_zero_failed.cpp</in>
+                    <in>basic_any_test_size_less_alignment_failed.cpp</in>
+                    <in>basic_any_test_small_object.cpp</in>
+                    <in>basic_any_test_temporary_to_ref_failed.cpp</in>
+                    <in>basic_any_to_any.cpp</in>
+                    <in>basic_any_to_any_rv.cpp</in>
+                    <in>basic_any_to_basic_any.cpp</in>
+                    <in>basic_any_to_basic_any_rv.cpp</in>
+                  </df>
+                </df>
+                <df name="array">
+                  <df name="test">
+                    <df name="test_cmake">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>array0.cpp</in>
+                    <in>array1.cpp</in>
+                    <in>array2.cpp</in>
+                    <in>array3.cpp</in>
+                    <in>array4.cpp</in>
+                    <in>array5.cpp</in>
+                    <in>array6.cpp</in>
+                    <in>array7.cpp</in>
+                    <in>array_constexpr.cpp</in>
+                    <in>array_getfail1.cpp</in>
+                    <in>array_getfail2.cpp</in>
+                    <in>array_hash.cpp</in>
+                  </df>
+                </df>
+                <df name="asio">
+                  <df name="example">
+                    <df name="cpp03">
+                      <df name="allocation">
+                        <in>server.cpp</in>
+                      </df>
+                      <df name="buffers">
+                        <in>reference_counted.cpp</in>
+                      </df>
+                      <df name="chat">
+                        <in>chat_client.cpp</in>
+                        <in>chat_server.cpp</in>
+                        <in>posix_chat_client.cpp</in>
+                      </df>
+                      <df name="echo">
+                        <in>async_tcp_echo_server.cpp</in>
+                        <in>async_udp_echo_server.cpp</in>
+                        <in>blocking_tcp_echo_client.cpp</in>
+                        <in>blocking_tcp_echo_server.cpp</in>
+                        <in>blocking_udp_echo_client.cpp</in>
+                        <in>blocking_udp_echo_server.cpp</in>
+                      </df>
+                      <df name="fork">
+                        <in>daemon.cpp</in>
+                        <in>process_per_connection.cpp</in>
+                      </df>
+                      <df name="http">
+                        <df name="client">
+                          <in>async_client.cpp</in>
+                          <in>sync_client.cpp</in>
+                        </df>
+                        <df name="server">
+                          <in>connection.cpp</in>
+                          <in>connection_manager.cpp</in>
+                          <in>main.cpp</in>
+                          <in>mime_types.cpp</in>
+                          <in>reply.cpp</in>
+                          <in>request_handler.cpp</in>
+                          <in>request_parser.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="server2">
+                          <in>connection.cpp</in>
+                          <in>io_context_pool.cpp</in>
+                          <in>main.cpp</in>
+                          <in>mime_types.cpp</in>
+                          <in>reply.cpp</in>
+                          <in>request_handler.cpp</in>
+                          <in>request_parser.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="server3">
+                          <in>connection.cpp</in>
+                          <in>main.cpp</in>
+                          <in>mime_types.cpp</in>
+                          <in>reply.cpp</in>
+                          <in>request_handler.cpp</in>
+                          <in>request_parser.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="server4">
+                          <in>file_handler.cpp</in>
+                          <in>main.cpp</in>
+                          <in>mime_types.cpp</in>
+                          <in>reply.cpp</in>
+                          <in>request_parser.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                      </df>
+                      <df name="icmp">
+                        <in>ping.cpp</in>
+                      </df>
+                      <df name="invocation">
+                        <in>prioritised_handlers.cpp</in>
+                      </df>
+                      <df name="iostreams">
+                        <in>daytime_client.cpp</in>
+                        <in>daytime_server.cpp</in>
+                        <in>http_client.cpp</in>
+                      </df>
+                      <df name="local">
+                        <in>connect_pair.cpp</in>
+                        <in>iostream_client.cpp</in>
+                        <in>stream_client.cpp</in>
+                        <in>stream_server.cpp</in>
+                      </df>
+                      <df name="multicast">
+                        <in>receiver.cpp</in>
+                        <in>sender.cpp</in>
+                      </df>
+                      <df name="nonblocking">
+                        <in>third_party_lib.cpp</in>
+                      </df>
+                      <df name="porthopper">
+                        <in>client.cpp</in>
+                        <in>server.cpp</in>
+                      </df>
+                      <df name="serialization">
+                        <in>client.cpp</in>
+                        <in>server.cpp</in>
+                      </df>
+                      <df name="services">
+                        <in>daytime_client.cpp</in>
+                        <in>logger_service.cpp</in>
+                      </df>
+                      <df name="socks4">
+                        <in>sync_client.cpp</in>
+                      </df>
+                      <df name="spawn">
+                        <in>echo_server.cpp</in>
+                        <in>parallel_grep.cpp</in>
+                      </df>
+                      <df name="ssl">
+                        <in>client.cpp</in>
+                        <in>server.cpp</in>
+                      </df>
+                      <df name="timeouts">
+                        <in>async_tcp_client.cpp</in>
+                        <in>blocking_tcp_client.cpp</in>
+                        <in>blocking_token_tcp_client.cpp</in>
+                        <in>blocking_udp_client.cpp</in>
+                        <in>server.cpp</in>
+                      </df>
+                      <df name="timers">
+                        <in>time_t_timer.cpp</in>
+                      </df>
+                      <df name="tutorial">
+                        <df name="daytime1">
+                          <in>client.cpp</in>
+                        </df>
+                        <df name="daytime2">
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="daytime3">
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="daytime4">
+                          <in>client.cpp</in>
+                        </df>
+                        <df name="daytime5">
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="daytime6">
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="daytime7">
+                          <in>server.cpp</in>
+                        </df>
+                        <df name="timer1">
+                          <in>timer.cpp</in>
+                        </df>
+                        <df name="timer2">
+                          <in>timer.cpp</in>
+                        </df>
+                        <df name="timer3">
+                          <in>timer.cpp</in>
+                        </df>
+                        <df name="timer4">
+                          <in>timer.cpp</in>
+                        </df>
+                        <df name="timer5">
+                          <in>timer.cpp</in>
+                        </df>
+                      </df>
+                      <df name="windows">
+                        <in>transmit_file.cpp</in>
+                      </df>
+                    </df>
+                    <df name="cpp11">
+                      <df name="allocation">
+                        <in>server.cpp</in>
+                      </df>
+                      <df name="buffers">
+                        <in>reference_counted.cpp</in>
+                      </df>
+                      <df name="chat">
+                        <in>chat_client.cpp</in>
+                        <in>chat_server.cpp</in>
+                      </df>
+                      <df name="echo">
+                        <in>async_tcp_echo_server.cpp</in>
+                        <in>async_udp_echo_server.cpp</in>
+                        <in>blocking_tcp_echo_client.cpp</in>
+                        <in>blocking_tcp_echo_server.cpp</in>
+                        <in>blocking_udp_echo_client.cpp</in>
+                        <in>blocking_udp_echo_server.cpp</in>
+                      </df>
+                      <df name="executors">
+                        <in>actor.cpp</in>
+                        <in>bank_account_1.cpp</in>
+                        <in>bank_account_2.cpp</in>
+                        <in>fork_join.cpp</in>
+                        <in>pipeline.cpp</in>
+                        <in>priority_scheduler.cpp</in>
+                      </df>
+                      <df name="files">
+                        <in>async_file_copy.cpp</in>
+                        <in>blocking_file_copy.cpp</in>
+                      </df>
+                      <df name="fork">
+                        <in>daemon.cpp</in>
+                        <in>process_per_connection.cpp</in>
+                      </df>
+                      <df name="futures">
+                        <in>daytime_client.cpp</in>
+                      </df>
+                      <df name="handler_tracking">
+                        <in>async_tcp_echo_server.cpp</in>
+                      </df>
+                      <df name="http">
+                        <df name="server">
+                          <in>connection.cpp</in>
+                          <in>connection_manager.cpp</in>
+                          <in>main.cpp</in>
+                          <in>mime_types.cpp</in>
+                          <in>reply.cpp</in>
+                          <in>request_handler.cpp</in>
+                          <in>request_parser.cpp</in>
+                          <in>server.cpp</in>
+                        </df>
+                      </df>
+                      <df name="invocation">
+                        <in>prioritised_handlers.cpp</in>
+                      </df>
+                      <df name="iostreams">
+                        <in>http_client.cpp</in>
+                      </df>
+                      <df name="local">
+                        <in>connect_pair.cpp</in>
+                        <in>iostream_client.cpp</in>
+                        <in>stream_client.cpp</in>
+                        <in>stream_server.cpp</in>
+                      </df>
+                      <df name="multicast">
+                        <in>receiver.cpp</in>
+                        <in>sender.cpp</in>
+                      </df>
+                      <df name="nonblocking">
+                        <in>third_party_lib.cpp</in>
+                      </df>
+                      <df name="operations">
+                        <in>composed_1.cpp</in>
+                        <in>composed_2.cpp</in>
+                        <in>composed_3.cpp</in>
+                        <in>composed_4.cpp</in>
+                        <in>composed_5.cpp</in>
+                        <in>composed_6.cpp</in>
+                        <in>composed_7.cpp</in>
+                        <in>composed_8.cpp</in>
+                      </df>
+                      <df name="socks4">
+                        <in>sync_client.cpp</in>
+                      </df>
+                      <df name="spawn">
+                        <in>echo_server.cpp</in>
+                        <in>parallel_grep.cpp</in>
+                      </df>
+                      <df name="ssl">
+                        <in>client.cpp</in>
+                        <in>server.cpp</in>
+                      </df>
+                      <df name="timeouts">
+                        <in>async_tcp_client.cpp</in>
+                        <in>blocking_tcp_client.cpp</in>
+                        <in>blocking_token_tcp_client.cpp</in>
+                        <in>blocking_udp_client.cpp</in>
+                        <in>server.cpp</in>
+                      </df>
+                      <df name="timers">
+                        <in>time_t_timer.cpp</in>
+                      </df>
+                    </df>
+                    <df name="cpp14">
+                      <df name="deferred">
+                        <in>deferred_1.cpp</in>
+                        <in>deferred_2.cpp</in>
+                        <in>deferred_3.cpp</in>
+                        <in>deferred_4.cpp</in>
+                        <in>deferred_5.cpp</in>
+                        <in>deferred_6.cpp</in>
+                        <in>deferred_7.cpp</in>
+                      </df>
+                      <df name="executors">
+                        <in>actor.cpp</in>
+                        <in>async_1.cpp</in>
+                        <in>async_2.cpp</in>
+                        <in>bank_account_1.cpp</in>
+                        <in>bank_account_2.cpp</in>
+                        <in>fork_join.cpp</in>
+                        <in>pipeline.cpp</in>
+                        <in>priority_scheduler.cpp</in>
+                      </df>
+                      <df name="iostreams">
+                        <in>http_client.cpp</in>
+                      </df>
+                      <df name="operations">
+                        <in>composed_1.cpp</in>
+                        <in>composed_2.cpp</in>
+                        <in>composed_3.cpp</in>
+                        <in>composed_4.cpp</in>
+                        <in>composed_5.cpp</in>
+                        <in>composed_6.cpp</in>
+                        <in>composed_7.cpp</in>
+                        <in>composed_8.cpp</in>
+                      </df>
+                      <df name="parallel_group">
+                        <in>parallel_sort.cpp</in>
+                        <in>wait_for_all.cpp</in>
+                        <in>wait_for_one.cpp</in>
+                        <in>wait_for_one_error.cpp</in>
+                        <in>wait_for_one_success.cpp</in>
+                      </df>
+                    </df>
+                    <df name="cpp17">
+                      <df name="coroutines_ts">
+                        <in>chat_server.cpp</in>
+                        <in>echo_server.cpp</in>
+                        <in>echo_server_with_as_single_default.cpp</in>
+                        <in>echo_server_with_as_tuple_default.cpp</in>
+                        <in>echo_server_with_default.cpp</in>
+                        <in>range_based_for.cpp</in>
+                        <in>refactored_echo_server.cpp</in>
+                      </df>
+                    </df>
+                    <df name="cpp20">
+                      <df name="channels">
+                        <in>throttling_proxy.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="execution">
+                      <in>any_executor.cpp</in>
+                      <in>blocking.cpp</in>
+                      <in>blocking_adaptation.cpp</in>
+                      <in>bulk_execute.cpp</in>
+                      <in>bulk_guarantee.cpp</in>
+                      <in>connect.cpp</in>
+                      <in>context_as.cpp</in>
+                      <in>execute.cpp</in>
+                      <in>executor.cpp</in>
+                      <in>invocable_archetype.cpp</in>
+                      <in>mapping.cpp</in>
+                      <in>operation_state.cpp</in>
+                      <in>outstanding_work.cpp</in>
+                      <in>prefer_only.cpp</in>
+                      <in>receiver.cpp</in>
+                      <in>relationship.cpp</in>
+                      <in>schedule.cpp</in>
+                      <in>scheduler.cpp</in>
+                      <in>sender.cpp</in>
+                      <in>set_done.cpp</in>
+                      <in>set_error.cpp</in>
+                      <in>set_value.cpp</in>
+                      <in>start.cpp</in>
+                      <in>submit.cpp</in>
+                    </df>
+                    <df name="experimental">
+                      <df name="coro">
+                        <in>cancel.cpp</in>
+                        <in>co_spawn.cpp</in>
+                        <in>exception.cpp</in>
+                        <in>executor.cpp</in>
+                        <in>partial.cpp</in>
+                        <in>simple_test.cpp</in>
+                        <in>stack_test.cpp</in>
+                        <in>use_coro.cpp</in>
+                      </df>
+                      <in>awaitable_operators.cpp</in>
+                      <in>basic_channel.cpp</in>
+                      <in>basic_concurrent_channel.cpp</in>
+                      <in>channel.cpp</in>
+                      <in>channel_traits.cpp</in>
+                      <in>concurrent_channel.cpp</in>
+                      <in>deferred.cpp</in>
+                      <in>promise.cpp</in>
+                    </df>
+                    <df name="generic">
+                      <in>basic_endpoint.cpp</in>
+                      <in>datagram_protocol.cpp</in>
+                      <in>raw_protocol.cpp</in>
+                      <in>seq_packet_protocol.cpp</in>
+                      <in>stream_protocol.cpp</in>
+                    </df>
+                    <df name="ip">
+                      <in>address.cpp</in>
+                      <in>address_v4.cpp</in>
+                      <in>address_v4_iterator.cpp</in>
+                      <in>address_v4_range.cpp</in>
+                      <in>address_v6.cpp</in>
+                      <in>address_v6_iterator.cpp</in>
+                      <in>address_v6_range.cpp</in>
+                      <in>basic_endpoint.cpp</in>
+                      <in>basic_resolver.cpp</in>
+                      <in>basic_resolver_entry.cpp</in>
+                      <in>basic_resolver_iterator.cpp</in>
+                      <in>basic_resolver_query.cpp</in>
+                      <in>host_name.cpp</in>
+                      <in>icmp.cpp</in>
+                      <in>multicast.cpp</in>
+                      <in>network_v4.cpp</in>
+                      <in>network_v6.cpp</in>
+                      <in>resolver_query_base.cpp</in>
+                      <in>tcp.cpp</in>
+                      <in>udp.cpp</in>
+                      <in>unicast.cpp</in>
+                      <in>v6_only.cpp</in>
+                    </df>
+                    <df name="latency">
+                      <in>tcp_client.cpp</in>
+                      <in>tcp_server.cpp</in>
+                      <in>udp_client.cpp</in>
+                      <in>udp_server.cpp</in>
+                    </df>
+                    <df name="local">
+                      <in>basic_endpoint.cpp</in>
+                      <in>connect_pair.cpp</in>
+                      <in>datagram_protocol.cpp</in>
+                      <in>stream_protocol.cpp</in>
+                    </df>
+                    <df name="posix">
+                      <in>basic_descriptor.cpp</in>
+                      <in>basic_stream_descriptor.cpp</in>
+                      <in>descriptor.cpp</in>
+                      <in>descriptor_base.cpp</in>
+                      <in>stream_descriptor.cpp</in>
+                    </df>
+                    <df name="properties">
+                      <df name="cpp03">
+                        <in>can_prefer_free_prefer.cpp</in>
+                        <in>can_prefer_free_require.cpp</in>
+                        <in>can_prefer_member_prefer.cpp</in>
+                        <in>can_prefer_member_require.cpp</in>
+                        <in>can_prefer_not_applicable_free_prefer.cpp</in>
+                        <in>can_prefer_not_applicable_free_require.cpp</in>
+                        <in>can_prefer_not_applicable_member_prefer.cpp</in>
+                        <in>can_prefer_not_applicable_member_require.cpp</in>
+                        <in>can_prefer_not_applicable_static.cpp</in>
+                        <in>can_prefer_not_applicable_unsupported.cpp</in>
+                        <in>can_prefer_not_preferable_free_prefer.cpp</in>
+                        <in>can_prefer_not_preferable_free_require.cpp</in>
+                        <in>can_prefer_not_preferable_member_prefer.cpp</in>
+                        <in>can_prefer_not_preferable_member_require.cpp</in>
+                        <in>can_prefer_not_preferable_static.cpp</in>
+                        <in>can_prefer_not_preferable_unsupported.cpp</in>
+                        <in>can_prefer_static.cpp</in>
+                        <in>can_prefer_unsupported.cpp</in>
+                        <in>can_query_free.cpp</in>
+                        <in>can_query_member.cpp</in>
+                        <in>can_query_not_applicable_free.cpp</in>
+                        <in>can_query_not_applicable_member.cpp</in>
+                        <in>can_query_not_applicable_static.cpp</in>
+                        <in>can_query_not_applicable_unsupported.cpp</in>
+                        <in>can_query_static.cpp</in>
+                        <in>can_query_unsupported.cpp</in>
+                        <in>can_require_concept_free.cpp</in>
+                        <in>can_require_concept_member.cpp</in>
+                        <in>can_require_concept_not_applicable_free.cpp</in>
+                        <in>can_require_concept_not_applicable_member.cpp</in>
+                        <in>can_require_concept_not_applicable_static.cpp</in>
+                        <in>can_require_concept_not_applicable_unsupported.cpp</in>
+                        <in>can_require_concept_static.cpp</in>
+                        <in>can_require_concept_unsupported.cpp</in>
+                        <in>can_require_free.cpp</in>
+                        <in>can_require_member.cpp</in>
+                        <in>can_require_not_applicable_free.cpp</in>
+                        <in>can_require_not_applicable_member.cpp</in>
+                        <in>can_require_not_applicable_static.cpp</in>
+                        <in>can_require_not_applicable_unsupported.cpp</in>
+                        <in>can_require_static.cpp</in>
+                        <in>can_require_unsupported.cpp</in>
+                        <in>prefer_free_prefer.cpp</in>
+                        <in>prefer_free_require.cpp</in>
+                        <in>prefer_member_prefer.cpp</in>
+                        <in>prefer_member_require.cpp</in>
+                        <in>prefer_static.cpp</in>
+                        <in>prefer_unsupported.cpp</in>
+                        <in>query_free.cpp</in>
+                        <in>query_member.cpp</in>
+                        <in>query_static.cpp</in>
+                        <in>require_concept_free.cpp</in>
+                        <in>require_concept_member.cpp</in>
+                        <in>require_concept_static.cpp</in>
+                        <in>require_free.cpp</in>
+                        <in>require_member.cpp</in>
+                        <in>require_static.cpp</in>
+                      </df>
+                      <df name="cpp11">
+                        <in>can_prefer_free_prefer.cpp</in>
+                        <in>can_prefer_free_require.cpp</in>
+                        <in>can_prefer_member_prefer.cpp</in>
+                        <in>can_prefer_member_require.cpp</in>
+                        <in>can_prefer_not_applicable_free_prefer.cpp</in>
+                        <in>can_prefer_not_applicable_free_require.cpp</in>
+                        <in>can_prefer_not_applicable_member_prefer.cpp</in>
+                        <in>can_prefer_not_applicable_member_require.cpp</in>
+                        <in>can_prefer_not_applicable_static.cpp</in>
+                        <in>can_prefer_not_applicable_unsupported.cpp</in>
+                        <in>can_prefer_not_preferable_free_prefer.cpp</in>
+                        <in>can_prefer_not_preferable_free_require.cpp</in>
+                        <in>can_prefer_not_preferable_member_prefer.cpp</in>
+                        <in>can_prefer_not_preferable_member_require.cpp</in>
+                        <in>can_prefer_not_preferable_static.cpp</in>
+                        <in>can_prefer_not_preferable_unsupported.cpp</in>
+                        <in>can_prefer_static.cpp</in>
+                        <in>can_prefer_unsupported.cpp</in>
+                        <in>can_query_free.cpp</in>
+                        <in>can_query_member.cpp</in>
+                        <in>can_query_not_applicable_free.cpp</in>
+                        <in>can_query_not_applicable_member.cpp</in>
+                        <in>can_query_not_applicable_static.cpp</in>
+                        <in>can_query_not_applicable_unsupported.cpp</in>
+                        <in>can_query_static.cpp</in>
+                        <in>can_query_unsupported.cpp</in>
+                        <in>can_require_concept_free.cpp</in>
+                        <in>can_require_concept_member.cpp</in>
+                        <in>can_require_concept_not_applicable_free.cpp</in>
+                        <in>can_require_concept_not_applicable_member.cpp</in>
+                        <in>can_require_concept_not_applicable_static.cpp</in>
+                        <in>can_require_concept_not_applicable_unsupported.cpp</in>
+                        <in>can_require_concept_static.cpp</in>
+                        <in>can_require_concept_unsupported.cpp</in>
+                        <in>can_require_free.cpp</in>
+                        <in>can_require_member.cpp</in>
+                        <in>can_require_not_applicable_free.cpp</in>
+                        <in>can_require_not_applicable_member.cpp</in>
+                        <in>can_require_not_applicable_static.cpp</in>
+                        <in>can_require_not_applicable_unsupported.cpp</in>
+                        <in>can_require_static.cpp</in>
+                        <in>can_require_unsupported.cpp</in>
+                        <in>prefer_free_prefer.cpp</in>
+                        <in>prefer_free_require.cpp</in>
+                        <in>prefer_member_prefer.cpp</in>
+                        <in>prefer_member_require.cpp</in>
+                        <in>prefer_static.cpp</in>
+                        <in>prefer_unsupported.cpp</in>
+                        <in>query_free.cpp</in>
+                        <in>query_member.cpp</in>
+                        <in>query_static.cpp</in>
+                        <in>require_concept_free.cpp</in>
+                        <in>require_concept_member.cpp</in>
+                        <in>require_concept_static.cpp</in>
+                        <in>require_free.cpp</in>
+                        <in>require_member.cpp</in>
+                        <in>require_static.cpp</in>
+                      </df>
+                      <df name="cpp14">
+                        <in>can_prefer_free_prefer.cpp</in>
+                        <in>can_prefer_free_require.cpp</in>
+                        <in>can_prefer_member_prefer.cpp</in>
+                        <in>can_prefer_member_require.cpp</in>
+                        <in>can_prefer_not_applicable_free_prefer.cpp</in>
+                        <in>can_prefer_not_applicable_free_require.cpp</in>
+                        <in>can_prefer_not_applicable_member_prefer.cpp</in>
+                        <in>can_prefer_not_applicable_member_require.cpp</in>
+                        <in>can_prefer_not_applicable_static.cpp</in>
+                        <in>can_prefer_not_applicable_unsupported.cpp</in>
+                        <in>can_prefer_not_preferable_free_prefer.cpp</in>
+                        <in>can_prefer_not_preferable_free_require.cpp</in>
+                        <in>can_prefer_not_preferable_member_prefer.cpp</in>
+                        <in>can_prefer_not_preferable_member_require.cpp</in>
+                        <in>can_prefer_not_preferable_static.cpp</in>
+                        <in>can_prefer_not_preferable_unsupported.cpp</in>
+                        <in>can_prefer_static.cpp</in>
+                        <in>can_prefer_unsupported.cpp</in>
+                        <in>can_query_free.cpp</in>
+                        <in>can_query_member.cpp</in>
+                        <in>can_query_not_applicable_free.cpp</in>
+                        <in>can_query_not_applicable_member.cpp</in>
+                        <in>can_query_not_applicable_static.cpp</in>
+                        <in>can_query_not_applicable_unsupported.cpp</in>
+                        <in>can_query_static.cpp</in>
+                        <in>can_query_unsupported.cpp</in>
+                        <in>can_require_concept_free.cpp</in>
+                        <in>can_require_concept_member.cpp</in>
+                        <in>can_require_concept_not_applicable_free.cpp</in>
+                        <in>can_require_concept_not_applicable_member.cpp</in>
+                        <in>can_require_concept_not_applicable_static.cpp</in>
+                        <in>can_require_concept_not_applicable_unsupported.cpp</in>
+                        <in>can_require_concept_static.cpp</in>
+                        <in>can_require_concept_unsupported.cpp</in>
+                        <in>can_require_free.cpp</in>
+                        <in>can_require_member.cpp</in>
+                        <in>can_require_not_applicable_free.cpp</in>
+                        <in>can_require_not_applicable_member.cpp</in>
+                        <in>can_require_not_applicable_static.cpp</in>
+                        <in>can_require_not_applicable_unsupported.cpp</in>
+                        <in>can_require_static.cpp</in>
+                        <in>can_require_unsupported.cpp</in>
+                        <in>prefer_free_prefer.cpp</in>
+                        <in>prefer_free_require.cpp</in>
+                        <in>prefer_member_prefer.cpp</in>
+                        <in>prefer_member_require.cpp</in>
+                        <in>prefer_static.cpp</in>
+                        <in>prefer_unsupported.cpp</in>
+                        <in>query_free.cpp</in>
+                        <in>query_member.cpp</in>
+                        <in>query_static.cpp</in>
+                        <in>require_concept_free.cpp</in>
+                        <in>require_concept_member.cpp</in>
+                        <in>require_concept_static.cpp</in>
+                        <in>require_free.cpp</in>
+                        <in>require_member.cpp</in>
+                        <in>require_static.cpp</in>
+                      </df>
+                    </df>
+                    <df name="ssl">
+                      <in>context.cpp</in>
+                      <in>context_base.cpp</in>
+                      <in>error.cpp</in>
+                      <in>host_name_verification.cpp</in>
+                      <in>rfc2818_verification.cpp</in>
+                      <in>stream.cpp</in>
+                      <in>stream_base.cpp</in>
+                    </df>
+                    <df name="ts">
+                      <in>buffer.cpp</in>
+                      <in>executor.cpp</in>
+                      <in>internet.cpp</in>
+                      <in>io_context.cpp</in>
+                      <in>net.cpp</in>
+                      <in>netfwd.cpp</in>
+                      <in>socket.cpp</in>
+                      <in>timer.cpp</in>
+                    </df>
+                    <df name="windows">
+                      <in>basic_object_handle.cpp</in>
+                      <in>basic_overlapped_handle.cpp</in>
+                      <in>basic_random_access_handle.cpp</in>
+                      <in>basic_stream_handle.cpp</in>
+                      <in>object_handle.cpp</in>
+                      <in>overlapped_handle.cpp</in>
+                      <in>overlapped_ptr.cpp</in>
+                      <in>random_access_handle.cpp</in>
+                      <in>stream_handle.cpp</in>
+                    </df>
+                    <in>associated_allocator.cpp</in>
+                    <in>associated_cancellation_slot.cpp</in>
+                    <in>associated_executor.cpp</in>
+                    <in>associator.cpp</in>
+                    <in>async_result.cpp</in>
+                    <in>awaitable.cpp</in>
+                    <in>basic_datagram_socket.cpp</in>
+                    <in>basic_deadline_timer.cpp</in>
+                    <in>basic_file.cpp</in>
+                    <in>basic_random_access_file.cpp</in>
+                    <in>basic_raw_socket.cpp</in>
+                    <in>basic_readable_pipe.cpp</in>
+                    <in>basic_seq_packet_socket.cpp</in>
+                    <in>basic_serial_port.cpp</in>
+                    <in>basic_signal_set.cpp</in>
+                    <in>basic_socket.cpp</in>
+                    <in>basic_socket_acceptor.cpp</in>
+                    <in>basic_stream_file.cpp</in>
+                    <in>basic_stream_socket.cpp</in>
+                    <in>basic_streambuf.cpp</in>
+                    <in>basic_waitable_timer.cpp</in>
+                    <in>basic_writable_pipe.cpp</in>
+                    <in>bind_cancellation_slot.cpp</in>
+                    <in>bind_executor.cpp</in>
+                    <in>buffer.cpp</in>
+                    <in>buffer_registration.cpp</in>
+                    <in>buffered_read_stream.cpp</in>
+                    <in>buffered_stream.cpp</in>
+                    <in>buffered_write_stream.cpp</in>
+                    <in>buffers_iterator.cpp</in>
+                    <in>cancellation_signal.cpp</in>
+                    <in>cancellation_state.cpp</in>
+                    <in>cancellation_type.cpp</in>
+                    <in>co_spawn.cpp</in>
+                    <in>completion_condition.cpp</in>
+                    <in>compose.cpp</in>
+                    <in>connect.cpp</in>
+                    <in>connect_pipe.cpp</in>
+                    <in>coroutine.cpp</in>
+                    <in>deadline_timer.cpp</in>
+                    <in>defer.cpp</in>
+                    <in>detached.cpp</in>
+                    <in>dispatch.cpp</in>
+                    <in>error.cpp</in>
+                    <in>execution_context.cpp</in>
+                    <in>executor.cpp</in>
+                    <in>executor_work_guard.cpp</in>
+                    <in>file_base.cpp</in>
+                    <in>high_resolution_timer.cpp</in>
+                    <in>io_context.cpp</in>
+                    <in>io_context_strand.cpp</in>
+                    <in>is_read_buffered.cpp</in>
+                    <in>is_write_buffered.cpp</in>
+                    <in>packaged_task.cpp</in>
+                    <in>placeholders.cpp</in>
+                    <in>post.cpp</in>
+                    <in>random_access_file.cpp</in>
+                    <in>read.cpp</in>
+                    <in>read_at.cpp</in>
+                    <in>read_until.cpp</in>
+                    <in>readable_pipe.cpp</in>
+                    <in>redirect_error.cpp</in>
+                    <in>registered_buffer.cpp</in>
+                    <in>serial_port.cpp</in>
+                    <in>serial_port_base.cpp</in>
+                    <in>signal_set.cpp</in>
+                    <in>socket_base.cpp</in>
+                    <in>static_thread_pool.cpp</in>
+                    <in>steady_timer.cpp</in>
+                    <in>strand.cpp</in>
+                    <in>stream_file.cpp</in>
+                    <in>streambuf.cpp</in>
+                    <in>system_context.cpp</in>
+                    <in>system_executor.cpp</in>
+                    <in>system_timer.cpp</in>
+                    <in>this_coro.cpp</in>
+                    <in>thread_pool.cpp</in>
+                    <in>time_traits.cpp</in>
+                    <in>use_awaitable.cpp</in>
+                    <in>use_future.cpp</in>
+                    <in>uses_executor.cpp</in>
+                    <in>wait_traits.cpp</in>
+                    <in>writable_pipe.cpp</in>
+                    <in>write.cpp</in>
+                    <in>write_at.cpp</in>
+                  </df>
+                </df>
+                <df name="assert">
+                  <df name="test">
+                    <df name="cmake_install_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="cmake_subdir_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="exp">
+                      <in>assert_exp_test.cpp</in>
+                      <in>assert_msg_exp_test.cpp</in>
+                      <in>verify_exp_test.cpp</in>
+                      <in>verify_msg_exp_test.cpp</in>
+                    </df>
+                    <in>assert_is_void_test.cpp</in>
+                    <in>assert_msg_test2.cpp</in>
+                    <in>assert_test.cpp</in>
+                    <in>assert_test2.cpp</in>
+                    <in>check_cmake_version.cpp</in>
+                    <in>current_function_test.cpp</in>
+                    <in>current_function_test2.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>source_location_test.cpp</in>
+                    <in>source_location_test2.cpp</in>
+                    <in>source_location_test3.cpp</in>
+                    <in>verify_test.cpp</in>
+                  </df>
+                </df>
+                <df name="assign">
+                  <df name="test">
+                    <df name="compile">
+                      <in>decl_header.cpp</in>
+                    </df>
+                    <in>array.cpp</in>
+                    <in>basic.cpp</in>
+                    <in>email_example.cpp</in>
+                    <in>list_inserter.cpp</in>
+                    <in>list_of.cpp</in>
+                    <in>list_of_workaround.cpp</in>
+                    <in>multi_index_container.cpp</in>
+                    <in>my_vector_example.cpp</in>
+                    <in>ptr_list_inserter.cpp</in>
+                    <in>ptr_list_of.cpp</in>
+                    <in>ptr_map_inserter.cpp</in>
+                    <in>static_list_of.cpp</in>
+                    <in>std.cpp</in>
+                    <in>tuple_list_of.cpp</in>
+                  </df>
+                </df>
+                <df name="atomic">
+                  <df name="config">
+                    <in>has_sse2.cpp</in>
+                    <in>has_sse41.cpp</in>
+                    <in>has_synchronization_lib.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>find_address_sse2.cpp</in>
+                    <in>find_address_sse41.cpp</in>
+                    <in>lock_pool.cpp</in>
+                    <in>wait_on_address.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="test_cmake">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>atomic_api.cpp</in>
+                    <in>atomic_ref_api.cpp</in>
+                    <in>atomicity.cpp</in>
+                    <in>atomicity_ref.cpp</in>
+                    <in>c_implicit_ctor.cpp</in>
+                    <in>cf_arith_func_ptr.cpp</in>
+                    <in>cf_arith_mem_ptr.cpp</in>
+                    <in>cf_arith_void_ptr.cpp</in>
+                    <in>ipc_atomic_api.cpp</in>
+                    <in>ipc_atomic_ref_api.cpp</in>
+                    <in>ipc_wait_api.cpp</in>
+                    <in>ipc_wait_ref_api.cpp</in>
+                    <in>lockfree.cpp</in>
+                    <in>ordering.cpp</in>
+                    <in>ordering_ref.cpp</in>
+                    <in>wait_api.cpp</in>
+                    <in>wait_fuzz.cpp</in>
+                    <in>wait_ref_api.cpp</in>
+                  </df>
+                </df>
+                <df name="beast">
+                  <df name="example">
+                    <df name="advanced">
+                      <df name="server">
+                        <in>advanced_server.cpp</in>
+                      </df>
+                      <df name="server-flex">
+                        <in>advanced_server_flex.cpp</in>
+                      </df>
+                    </df>
+                    <df name="echo-op">
+                      <in>echo_op.cpp</in>
+                    </df>
+                    <df name="http">
+                      <df name="client">
+                        <df name="async">
+                          <in>http_client_async.cpp</in>
+                        </df>
+                        <df name="async-ssl">
+                          <in>http_client_async_ssl.cpp</in>
+                        </df>
+                        <df name="async-ssl-system-executor">
+                          <in>http_client_async_ssl_system_executor.cpp</in>
+                        </df>
+                        <df name="coro">
+                          <in>http_client_coro.cpp</in>
+                        </df>
+                        <df name="coro-ssl">
+                          <in>http_client_coro_ssl.cpp</in>
+                        </df>
+                        <df name="crawl">
+                          <in>http_crawl.cpp</in>
+                          <in>urls_large_data.cpp</in>
+                        </df>
+                        <df name="sync">
+                          <in>http_client_sync.cpp</in>
+                        </df>
+                        <df name="sync-ssl">
+                          <in>http_client_sync_ssl.cpp</in>
+                        </df>
+                      </df>
+                      <df name="server">
+                        <df name="async">
+                          <in>http_server_async.cpp</in>
+                        </df>
+                        <df name="async-ssl">
+                          <in>http_server_async_ssl.cpp</in>
+                        </df>
+                        <df name="coro">
+                          <in>http_server_coro.cpp</in>
+                        </df>
+                        <df name="coro-ssl">
+                          <in>http_server_coro_ssl.cpp</in>
+                        </df>
+                        <df name="fast">
+                          <in>http_server_fast.cpp</in>
+                        </df>
+                        <df name="flex">
+                          <in>http_server_flex.cpp</in>
+                        </df>
+                        <df name="small">
+                          <in>http_server_small.cpp</in>
+                        </df>
+                        <df name="stackless">
+                          <in>http_server_stackless.cpp</in>
+                        </df>
+                        <df name="stackless-ssl">
+                          <in>http_server_stackless_ssl.cpp</in>
+                        </df>
+                        <df name="sync">
+                          <in>http_server_sync.cpp</in>
+                        </df>
+                        <df name="sync-ssl">
+                          <in>http_server_sync_ssl.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="websocket">
+                      <df name="client">
+                        <df name="async">
+                          <in>websocket_client_async.cpp</in>
+                        </df>
+                        <df name="async-ssl">
+                          <in>websocket_client_async_ssl.cpp</in>
+                        </df>
+                        <df name="async-ssl-system-executor">
+                          <in>websocket_client_async_ssl_system_executor.cpp</in>
+                        </df>
+                        <df name="coro">
+                          <in>websocket_client_coro.cpp</in>
+                        </df>
+                        <df name="coro-ssl">
+                          <in>websocket_client_coro_ssl.cpp</in>
+                        </df>
+                        <df name="sync">
+                          <in>websocket_client_sync.cpp</in>
+                        </df>
+                        <df name="sync-ssl">
+                          <in>websocket_client_sync_ssl.cpp</in>
+                        </df>
+                      </df>
+                      <df name="server">
+                        <df name="async">
+                          <in>websocket_server_async.cpp</in>
+                        </df>
+                        <df name="async-ssl">
+                          <in>websocket_server_async_ssl.cpp</in>
+                        </df>
+                        <df name="chat-multi">
+                          <in>http_session.cpp</in>
+                          <in>listener.cpp</in>
+                          <in>main.cpp</in>
+                          <in>shared_state.cpp</in>
+                          <in>websocket_session.cpp</in>
+                        </df>
+                        <df name="coro">
+                          <in>websocket_server_coro.cpp</in>
+                        </df>
+                        <df name="coro-ssl">
+                          <in>websocket_server_coro_ssl.cpp</in>
+                        </df>
+                        <df name="fast">
+                          <in>websocket_server_fast.cpp</in>
+                        </df>
+                        <df name="stackless">
+                          <in>websocket_server_stackless.cpp</in>
+                        </df>
+                        <df name="stackless-ssl">
+                          <in>websocket_server_stackless_ssl.cpp</in>
+                        </df>
+                        <df name="sync">
+                          <in>websocket_server_sync.cpp</in>
+                        </df>
+                        <df name="sync-ssl">
+                          <in>websocket_server_sync_ssl.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="beast">
+                      <df name="_experimental">
+                        <in>_test_detail_stream_state.cpp</in>
+                        <in>error.cpp</in>
+                        <in>icy_stream.cpp</in>
+                        <in>stream.cpp</in>
+                      </df>
+                      <df name="core">
+                        <in>_detail_base64.cpp</in>
+                        <in>_detail_bind_continuation.cpp</in>
+                        <in>_detail_buffer.cpp</in>
+                        <in>_detail_clamp.cpp</in>
+                        <in>_detail_get_io_context.cpp</in>
+                        <in>_detail_is_invocable.cpp</in>
+                        <in>_detail_read.cpp</in>
+                        <in>_detail_sha1.cpp</in>
+                        <in>_detail_static_const.cpp</in>
+                        <in>_detail_tuple.cpp</in>
+                        <in>_detail_variant.cpp</in>
+                        <in>_detail_varint.cpp</in>
+                        <in>async_base.cpp</in>
+                        <in>basic_stream.cpp</in>
+                        <in>bind_handler.cpp</in>
+                        <in>buffer_traits.cpp</in>
+                        <in>buffered_read_stream.cpp</in>
+                        <in>buffers_adaptor.cpp</in>
+                        <in>buffers_cat.cpp</in>
+                        <in>buffers_prefix.cpp</in>
+                        <in>buffers_range.cpp</in>
+                        <in>buffers_suffix.cpp</in>
+                        <in>buffers_to_string.cpp</in>
+                        <in>close_socket.cpp</in>
+                        <in>detect_ssl.cpp</in>
+                        <in>error.cpp</in>
+                        <in>file.cpp</in>
+                        <in>file_base.cpp</in>
+                        <in>file_posix.cpp</in>
+                        <in>file_stdio.cpp</in>
+                        <in>file_win32.cpp</in>
+                        <in>flat_buffer.cpp</in>
+                        <in>flat_static_buffer.cpp</in>
+                        <in>flat_stream.cpp</in>
+                        <in>make_printable.cpp</in>
+                        <in>make_strand.cpp</in>
+                        <in>multi_buffer.cpp</in>
+                        <in>ostream.cpp</in>
+                        <in>prepare_buffers.cpp</in>
+                        <in>rate_policy.cpp</in>
+                        <in>read_size.cpp</in>
+                        <in>role.cpp</in>
+                        <in>saved_handler.cpp</in>
+                        <in>span.cpp</in>
+                        <in>static_buffer.cpp</in>
+                        <in>static_string.cpp</in>
+                        <in>stream_traits.cpp</in>
+                        <in>string.cpp</in>
+                        <in>tcp_stream.cpp</in>
+                        <in>zlib.cpp</in>
+                      </df>
+                      <df name="http">
+                        <in>basic_dynamic_body.cpp</in>
+                        <in>basic_file_body.cpp</in>
+                        <in>basic_parser.cpp</in>
+                        <in>buffer_body.cpp</in>
+                        <in>chunk_encode.cpp</in>
+                        <in>dynamic_body.cpp</in>
+                        <in>empty_body.cpp</in>
+                        <in>error.cpp</in>
+                        <in>field.cpp</in>
+                        <in>field_compiles.cpp</in>
+                        <in>fields.cpp</in>
+                        <in>file_body.cpp</in>
+                        <in>message.cpp</in>
+                        <in>parser.cpp</in>
+                        <in>read.cpp</in>
+                        <in>rfc7230.cpp</in>
+                        <in>serializer.cpp</in>
+                        <in>span_body.cpp</in>
+                        <in>status.cpp</in>
+                        <in>string_body.cpp</in>
+                        <in>type_traits.cpp</in>
+                        <in>vector_body.cpp</in>
+                        <in>verb.cpp</in>
+                        <in>write.cpp</in>
+                      </df>
+                      <df name="ssl">
+                        <in>ssl_stream.cpp</in>
+                      </df>
+                      <df name="websocket">
+                        <in>_detail_decorator.cpp</in>
+                        <in>_detail_impl_base.cpp</in>
+                        <in>_detail_prng.cpp</in>
+                        <in>accept.cpp</in>
+                        <in>close.cpp</in>
+                        <in>doc_snippets.cpp</in>
+                        <in>error.cpp</in>
+                        <in>frame.cpp</in>
+                        <in>handshake.cpp</in>
+                        <in>option.cpp</in>
+                        <in>ping.cpp</in>
+                        <in>read1.cpp</in>
+                        <in>read2.cpp</in>
+                        <in>read3.cpp</in>
+                        <in>rfc6455.cpp</in>
+                        <in>ssl.cpp</in>
+                        <in>stream.cpp</in>
+                        <in>stream_base.cpp</in>
+                        <in>stream_explicit.cpp</in>
+                        <in>stream_fwd.cpp</in>
+                        <in>teardown.cpp</in>
+                        <in>timer.cpp</in>
+                        <in>utf8_checker.cpp</in>
+                        <in>write.cpp</in>
+                      </df>
+                      <df name="zlib">
+                        <in>deflate_stream.cpp</in>
+                        <in>error.cpp</in>
+                        <in>inflate_stream.cpp</in>
+                        <in>zlib.cpp</in>
+                      </df>
+                      <in>core.cpp</in>
+                      <in>http.cpp</in>
+                      <in>ssl.cpp</in>
+                      <in>version.cpp</in>
+                      <in>websocket.cpp</in>
+                      <in>zlib.cpp</in>
+                    </df>
+                    <df name="bench">
+                      <df name="buffers">
+                        <in>bench_buffers.cpp</in>
+                      </df>
+                      <df name="parser">
+                        <df name="nodejs-parser">
+                          <in>http_parser.c</in>
+                        </df>
+                        <in>bench_parser.cpp</in>
+                        <in>nodejs_parser.cpp</in>
+                      </df>
+                      <df name="utf8_checker">
+                        <in>bench_utf8_checker.cpp</in>
+                      </df>
+                      <df name="wsload">
+                        <in>wsload.cpp</in>
+                      </df>
+                      <df name="zlib">
+                        <in>deflate_stream.cpp</in>
+                        <in>inflate_stream.cpp</in>
+                      </df>
+                    </df>
+                    <df name="doc">
+                      <in>core_1_refresher.cpp</in>
+                      <in>core_3_timeouts.cpp</in>
+                      <in>core_4_layers.cpp</in>
+                      <in>core_snippets.cpp</in>
+                      <in>exemplars.cpp</in>
+                      <in>http_10_custom_parser.cpp</in>
+                      <in>http_examples.cpp</in>
+                      <in>http_snippets.cpp</in>
+                      <in>websocket.cpp</in>
+                      <in>websocket_1_connecting.cpp</in>
+                      <in>websocket_2_handshaking.cpp</in>
+                      <in>websocket_3_decorator.cpp</in>
+                      <in>websocket_4_messages.cpp</in>
+                      <in>websocket_5_control_frames.cpp</in>
+                      <in>websocket_6_timeouts.cpp</in>
+                      <in>websocket_7_teardown.cpp</in>
+                      <in>websocket_8_notes.cpp</in>
+                    </df>
+                    <df name="example">
+                      <df name="common">
+                        <in>root_certificates.cpp</in>
+                        <in>server_certificate.cpp</in>
+                      </df>
+                    </df>
+                    <df name="extern">
+                      <df name="zlib-1.2.11">
+                        <df name="contrib">
+                          <df name="blast">
+                            <in>blast.c</in>
+                          </df>
+                          <df name="infback9">
+                            <in>infback9.c</in>
+                            <in>inftree9.c</in>
+                          </df>
+                          <df name="inflate86">
+                            <in>inffas86.c</in>
+                          </df>
+                          <df name="iostream">
+                            <in>test.cpp</in>
+                            <in>zfstream.cpp</in>
+                          </df>
+                          <df name="iostream2">
+                            <in>zstream_test.cpp</in>
+                          </df>
+                          <df name="iostream3">
+                            <in>test.cc</in>
+                            <in>zfstream.cc</in>
+                          </df>
+                          <df name="masmx64">
+                            <in>inffas8664.c</in>
+                          </df>
+                          <df name="minizip">
+                            <in>ioapi.c</in>
+                            <in>iowin32.c</in>
+                            <in>miniunz.c</in>
+                            <in>minizip.c</in>
+                            <in>mztools.c</in>
+                            <in>unzip.c</in>
+                            <in>zip.c</in>
+                          </df>
+                          <df name="puff">
+                            <in>puff.c</in>
+                            <in>pufftest.c</in>
+                          </df>
+                          <df name="testzlib">
+                            <in>testzlib.c</in>
+                          </df>
+                          <df name="untgz">
+                            <in>untgz.c</in>
+                          </df>
+                        </df>
+                        <df name="examples">
+                          <in>enough.c</in>
+                          <in>fitblk.c</in>
+                          <in>gun.c</in>
+                          <in>gzappend.c</in>
+                          <in>gzjoin.c</in>
+                          <in>gzlog.c</in>
+                          <in>zpipe.c</in>
+                          <in>zran.c</in>
+                        </df>
+                        <df name="test">
+                          <in>example.c</in>
+                          <in>infcover.c</in>
+                          <in>minigzip.c</in>
+                        </df>
+                        <in>adler32.c</in>
+                        <in>compress.c</in>
+                        <in>crc32.c</in>
+                        <in>deflate.c</in>
+                        <in>gzclose.c</in>
+                        <in>gzlib.c</in>
+                        <in>gzread.c</in>
+                        <in>gzwrite.c</in>
+                        <in>infback.c</in>
+                        <in>inffast.c</in>
+                        <in>inflate.c</in>
+                        <in>inftrees.c</in>
+                        <in>trees.c</in>
+                        <in>uncompr.c</in>
+                        <in>zutil.c</in>
+                      </df>
+                    </df>
+                    <in>lib_asio.cpp</in>
+                    <in>lib_asio_ssl.cpp</in>
+                    <in>lib_beast.cpp</in>
+                    <in>lib_test.cpp</in>
+                  </df>
+                </df>
+                <df name="bimap">
+                  <df name="example">
+                    <df name="bimap_and_boost">
+                      <in>assign.cpp</in>
+                      <in>foreach.cpp</in>
+                      <in>lambda.cpp</in>
+                      <in>property_map.cpp</in>
+                      <in>range.cpp</in>
+                      <in>serialization.cpp</in>
+                      <in>typeof.cpp</in>
+                      <in>xpressive.cpp</in>
+                    </df>
+                    <df name="mi_to_b_path">
+                      <in>bidirectional_map.cpp</in>
+                      <in>hashed_indices.cpp</in>
+                      <in>mi_bidirectional_map.cpp</in>
+                      <in>mi_hashed_indices.cpp</in>
+                      <in>tagged_bidirectional_map.cpp</in>
+                    </df>
+                    <in>at_function_examples.cpp</in>
+                    <in>mighty_bimap.cpp</in>
+                    <in>population_bimap.cpp</in>
+                    <in>projection.cpp</in>
+                    <in>repetitions_counter.cpp</in>
+                    <in>simple_bimap.cpp</in>
+                    <in>standard_map_comparison.cpp</in>
+                    <in>step_by_step.cpp</in>
+                    <in>tagged_simple_bimap.cpp</in>
+                    <in>tutorial_info_hook.cpp</in>
+                    <in>tutorial_modify_and_replace.cpp</in>
+                    <in>tutorial_range.cpp</in>
+                    <in>unconstrained_collection.cpp</in>
+                    <in>user_defined_names.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="compile_fail">
+                      <in>test_bimap_info_1.cpp</in>
+                      <in>test_bimap_info_2.cpp</in>
+                      <in>test_bimap_info_3.cpp</in>
+                      <in>test_bimap_mutable_1.cpp</in>
+                      <in>test_bimap_mutable_2.cpp</in>
+                      <in>test_bimap_mutable_3.cpp</in>
+                    </df>
+                    <in>test_bimap_assign.cpp</in>
+                    <in>test_bimap_convenience_header.cpp</in>
+                    <in>test_bimap_extra.cpp</in>
+                    <in>test_bimap_info.cpp</in>
+                    <in>test_bimap_lambda.cpp</in>
+                    <in>test_bimap_list_of.cpp</in>
+                    <in>test_bimap_modify.cpp</in>
+                    <in>test_bimap_multiset_of.cpp</in>
+                    <in>test_bimap_mutable.cpp</in>
+                    <in>test_bimap_operator_bracket.cpp</in>
+                    <in>test_bimap_ordered.cpp</in>
+                    <in>test_bimap_project.cpp</in>
+                    <in>test_bimap_property_map.cpp</in>
+                    <in>test_bimap_range.cpp</in>
+                    <in>test_bimap_sequenced.cpp</in>
+                    <in>test_bimap_serialization.cpp</in>
+                    <in>test_bimap_set_of.cpp</in>
+                    <in>test_bimap_unconstrained.cpp</in>
+                    <in>test_bimap_unordered.cpp</in>
+                    <in>test_bimap_unordered_multiset_of.cpp</in>
+                    <in>test_bimap_unordered_set_of.cpp</in>
+                    <in>test_bimap_vector_of.cpp</in>
+                    <in>test_mutant.cpp</in>
+                    <in>test_mutant_relation.cpp</in>
+                    <in>test_structured_pair.cpp</in>
+                    <in>test_tagged.cpp</in>
+                  </df>
+                </df>
+                <df name="bind">
+                  <df name="test">
+                    <in>apply_rv_test.cpp</in>
+                    <in>apply_rv_test2.cpp</in>
+                    <in>apply_test.cpp</in>
+                    <in>apply_test2.cpp</in>
+                    <in>arg_copy_fail.cpp</in>
+                    <in>arg_copy_test.cpp</in>
+                    <in>bind_and_or_test.cpp</in>
+                    <in>bind_cdecl_mf_test.cpp</in>
+                    <in>bind_const_test.cpp</in>
+                    <in>bind_cpp20_test.cpp</in>
+                    <in>bind_cv_test.cpp</in>
+                    <in>bind_dm2_test.cpp</in>
+                    <in>bind_dm3_test.cpp</in>
+                    <in>bind_dm_test.cpp</in>
+                    <in>bind_eq2_test.cpp</in>
+                    <in>bind_eq3_test.cpp</in>
+                    <in>bind_eq_test.cpp</in>
+                    <in>bind_fastcall_mf_test.cpp</in>
+                    <in>bind_fastcall_test.cpp</in>
+                    <in>bind_fn2_test.cpp</in>
+                    <in>bind_fnobj2_test.cpp</in>
+                    <in>bind_function2_test.cpp</in>
+                    <in>bind_function_ap_test.cpp</in>
+                    <in>bind_function_test.cpp</in>
+                    <in>bind_fwd2_test.cpp</in>
+                    <in>bind_fwd_test.cpp</in>
+                    <in>bind_lookup_problem_test.cpp</in>
+                    <in>bind_mf2_test.cpp</in>
+                    <in>bind_nested_rv_test.cpp</in>
+                    <in>bind_no_placeholders_test.cpp</in>
+                    <in>bind_noexcept_mf2_test.cpp</in>
+                    <in>bind_noexcept_mf_test.cpp</in>
+                    <in>bind_noexcept_test.cpp</in>
+                    <in>bind_not_test.cpp</in>
+                    <in>bind_placeholder_test.cpp</in>
+                    <in>bind_ref_test.cpp</in>
+                    <in>bind_rel_test.cpp</in>
+                    <in>bind_rv_sp_test.cpp</in>
+                    <in>bind_rvalue_test.cpp</in>
+                    <in>bind_stateful_test.cpp</in>
+                    <in>bind_stdcall_mf_test.cpp</in>
+                    <in>bind_stdcall_test.cpp</in>
+                    <in>bind_test.cpp</in>
+                    <in>bind_type_test.cpp</in>
+                    <in>bind_unary_addr.cpp</in>
+                    <in>bind_unique_ptr_test.cpp</in>
+                    <in>bind_visit_test.cpp</in>
+                    <in>bind_void_dm_test.cpp</in>
+                    <in>bind_void_mf_test.cpp</in>
+                    <in>bind_void_test.cpp</in>
+                    <in>global_placeholders.cpp</in>
+                    <in>mem_fn_cdecl_test.cpp</in>
+                    <in>mem_fn_derived_test.cpp</in>
+                    <in>mem_fn_dm_test.cpp</in>
+                    <in>mem_fn_eq_test.cpp</in>
+                    <in>mem_fn_fastcall_test.cpp</in>
+                    <in>mem_fn_noexcept_test.cpp</in>
+                    <in>mem_fn_ref_test.cpp</in>
+                    <in>mem_fn_rv_test.cpp</in>
+                    <in>mem_fn_stdcall_test.cpp</in>
+                    <in>mem_fn_test.cpp</in>
+                    <in>mem_fn_unary_addr_test.cpp</in>
+                    <in>mem_fn_void_test.cpp</in>
+                    <in>placeholder_const_ref_test.cpp</in>
+                    <in>placeholder_std_bind_test.cpp</in>
+                    <in>protect_cpp20_test.cpp</in>
+                    <in>protect_test.cpp</in>
+                    <in>protect_test2.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>ref_fn_test.cpp</in>
+                    <in>std_placeholders_test.cpp</in>
+                  </df>
+                  <in>bind_as_compose.cpp</in>
+                  <in>bind_visitor.cpp</in>
+                </df>
+                <df name="callable_traits">
+                  <df name="doc">
+                    <in>hideous_template.snippet.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>add_member_const.cpp</in>
+                    <in>add_member_cv.cpp</in>
+                    <in>add_member_lvalue_reference.cpp</in>
+                    <in>add_member_rvalue_reference.cpp</in>
+                    <in>add_member_volatile.cpp</in>
+                    <in>add_noexcept.cpp</in>
+                    <in>add_transaction_safe.cpp</in>
+                    <in>add_varargs.cpp</in>
+                    <in>apply_member_pointer.cpp</in>
+                    <in>args.cpp</in>
+                    <in>class_of.cpp</in>
+                    <in>function_type.cpp</in>
+                    <in>function_types_remove_const_comparison.cpp</in>
+                    <in>has_member_qualifiers.cpp</in>
+                    <in>has_varargs.cpp</in>
+                    <in>has_void_return.cpp</in>
+                    <in>intro.cpp</in>
+                    <in>is_const_member.cpp</in>
+                    <in>is_cv_member.cpp</in>
+                    <in>is_invocable.cpp</in>
+                    <in>is_lvalue_reference_member.cpp</in>
+                    <in>is_noexcept.cpp</in>
+                    <in>is_reference_member.cpp</in>
+                    <in>is_rvalue_reference_member.cpp</in>
+                    <in>is_transaction_safe.cpp</in>
+                    <in>is_volatile_member.cpp</in>
+                    <in>overview.cpp</in>
+                    <in>qualified_class_of.cpp</in>
+                    <in>remove_member_const.cpp</in>
+                    <in>remove_member_cv.cpp</in>
+                    <in>remove_member_reference.cpp</in>
+                    <in>remove_member_volatile.cpp</in>
+                    <in>remove_noexcept.cpp</in>
+                    <in>remove_transaction_safe.cpp</in>
+                    <in>remove_varargs.cpp</in>
+                    <in>return_type.cpp</in>
+                    <in>void.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>add_member_const.cpp</in>
+                    <in>add_member_cv.cpp</in>
+                    <in>add_member_lvalue_reference.cpp</in>
+                    <in>add_member_rvalue_reference.cpp</in>
+                    <in>add_member_volatile.cpp</in>
+                    <in>add_noexcept.cpp</in>
+                    <in>add_noexcept_constraints.cpp</in>
+                    <in>add_transaction_safe.cpp</in>
+                    <in>add_transaction_safe_constraints.cpp</in>
+                    <in>add_varargs.cpp</in>
+                    <in>add_varargs_constraints.cpp</in>
+                    <in>apply_member_pointer_constraints.cpp</in>
+                    <in>apply_member_pointer_function.cpp</in>
+                    <in>apply_member_pointer_pmd.cpp</in>
+                    <in>apply_member_pointer_pmf.cpp</in>
+                    <in>args.cpp</in>
+                    <in>args_constraints.cpp</in>
+                    <in>class_of.cpp</in>
+                    <in>class_of_constraints.cpp</in>
+                    <in>collapse_flags.cpp</in>
+                    <in>function_type.cpp</in>
+                    <in>function_type_constraints.cpp</in>
+                    <in>has_member_qualifiers.cpp</in>
+                    <in>has_member_qualifiers_simple.cpp</in>
+                    <in>has_varargs.cpp</in>
+                    <in>has_void_return.cpp</in>
+                    <in>is_const_member.cpp</in>
+                    <in>is_cv_member.cpp</in>
+                    <in>is_invocable.cpp</in>
+                    <in>is_invocable_r.cpp</in>
+                    <in>is_lvalue_reference_member.cpp</in>
+                    <in>is_noexcept.cpp</in>
+                    <in>is_rvalue_reference_member.cpp</in>
+                    <in>is_transaction_safe.cpp</in>
+                    <in>is_volatile_member.cpp</in>
+                    <in>qualified_class_of.cpp</in>
+                    <in>qualified_class_of_constraints.cpp</in>
+                    <in>qualifier_metafunction_constraints.cpp</in>
+                    <in>remove_member_const.cpp</in>
+                    <in>remove_member_reference.cpp</in>
+                    <in>remove_member_volatile.cpp</in>
+                    <in>remove_noexcept.cpp</in>
+                    <in>remove_noexcept_constraints.cpp</in>
+                    <in>remove_transaction_safe.cpp</in>
+                    <in>remove_transaction_safe_constraints.cpp</in>
+                    <in>remove_varargs.cpp</in>
+                    <in>return_type.cpp</in>
+                  </df>
+                </df>
+                <df name="chrono">
+                  <df name="example">
+                    <in>await_keystroke.cpp</in>
+                    <in>chrono_unit_test.cpp</in>
+                    <in>clock_name.cpp</in>
+                    <in>cycle_count.cpp</in>
+                    <in>explore_limits.cpp</in>
+                    <in>french.cpp</in>
+                    <in>i_dont_like_the_default_duration_behavior.cpp</in>
+                    <in>io_ex1.cpp</in>
+                    <in>io_ex2.cpp</in>
+                    <in>io_ex3.cpp</in>
+                    <in>io_ex4.cpp</in>
+                    <in>io_ex5.cpp</in>
+                    <in>manipulate_clock_object.cpp</in>
+                    <in>min_time_point.cpp</in>
+                    <in>miscellaneous.cpp</in>
+                    <in>rounding.cpp</in>
+                    <in>run_timer_example.cpp</in>
+                    <in>run_timer_example2.cpp</in>
+                    <in>runtime_resolution.cpp</in>
+                    <in>saturating.cpp</in>
+                    <in>simulated_thread_interface_demo.cpp</in>
+                    <in>test_clock.cpp</in>
+                    <in>test_clock2.cpp</in>
+                    <in>test_duration.cpp</in>
+                    <in>test_minmax.cpp</in>
+                    <in>test_special_values.cpp</in>
+                    <in>test_thread_clock.cpp</in>
+                    <in>time2_demo.cpp</in>
+                    <in>timeval_demo.cpp</in>
+                    <in>xtime.cpp</in>
+                  </df>
+                  <df name="perf">
+                    <in>store_now_in_vector.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>chrono.cpp</in>
+                    <in>process_cpu_clocks.cpp</in>
+                    <in>thread_clock.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="clock">
+                      <in>clock_pass.cpp</in>
+                    </df>
+                    <df name="duration">
+                      <df name="cons">
+                        <in>convert_float_to_int_fail.cpp</in>
+                        <in>convert_inexact_fail.cpp</in>
+                        <in>implicit_constructot_fail.cpp</in>
+                        <in>non_implicit_convertible_rep_fail.cpp</in>
+                        <in>treat_as_floating_point_Rep2_true_fail.cpp</in>
+                      </df>
+                      <df name="nonmember">
+                        <in>divide_rep2_fail.cpp</in>
+                        <in>modulus_rep2_fail.cpp</in>
+                        <in>times_rep2_lhs_fail.cpp</in>
+                        <in>times_rep2_rhs_fail.cpp</in>
+                      </df>
+                      <in>arithmetic_pass.cpp</in>
+                      <in>comparisons_pass.cpp</in>
+                      <in>constructor_pass.cpp</in>
+                      <in>default_ratio_pass.cpp</in>
+                      <in>duration_cast_int_fail.cpp</in>
+                      <in>duration_cast_pass.cpp</in>
+                      <in>duration_duration_fail.cpp</in>
+                      <in>duration_values_pass.cpp</in>
+                      <in>positive_num_fail.cpp</in>
+                      <in>ratio_alias_pass.cpp</in>
+                      <in>ratio_fail.cpp</in>
+                      <in>rounding_pass.cpp</in>
+                      <in>typedefs_pass.cpp</in>
+                      <in>types_pass.cpp</in>
+                    </df>
+                    <df name="io">
+                      <in>duration_input.cpp</in>
+                      <in>duration_output.cpp</in>
+                      <in>time_point_input.cpp</in>
+                      <in>time_point_output.cpp</in>
+                    </df>
+                    <df name="time_point">
+                      <df name="comparisons">
+                        <in>equal_fail.cpp</in>
+                        <in>less_fail.cpp</in>
+                      </df>
+                      <df name="cons">
+                        <in>implicit_fail.cpp</in>
+                        <in>non_implicit_convertible_duration_fail.cpp</in>
+                      </df>
+                      <in>arithmetic_ext_pass.cpp</in>
+                      <in>arithmetic_pass.cpp</in>
+                      <in>comparisons_pass.cpp</in>
+                      <in>constructor_pass.cpp</in>
+                      <in>default_duration.pass.cpp</in>
+                      <in>default_duration_pass.cpp</in>
+                      <in>duration.fail.cpp</in>
+                      <in>min_max_pass.cpp</in>
+                      <in>not_duration_fail.cpp</in>
+                      <in>time_point_cast_int_fail.cpp</in>
+                      <in>time_point_cast_pass.cpp</in>
+                    </df>
+                    <df name="traits">
+                      <in>common_type_duration_pass.cpp</in>
+                      <in>common_type_time_point_pass.cpp</in>
+                      <in>duration_values_pass.cpp</in>
+                      <in>treat_as_floating_point_pass.cpp</in>
+                    </df>
+                    <in>another_obj.cpp</in>
+                    <in>intmax_c.cpp</in>
+                    <in>one_obj.cpp</in>
+                    <in>run_timer_test.cpp</in>
+                    <in>test_10631.cpp</in>
+                    <in>test_10778.cpp</in>
+                    <in>test_11006.cpp</in>
+                    <in>test_11012.cpp</in>
+                    <in>test_12176.cpp</in>
+                    <in>test_7868.cpp</in>
+                    <in>test_9337.cpp</in>
+                    <in>win32_test.cpp</in>
+                  </df>
+                </df>
+                <df name="circular_buffer">
+                  <df name="example">
+                    <in>bounded_buffer_comparison.cpp</in>
+                    <in>circular_buffer_bound_example.cpp</in>
+                    <in>circular_buffer_example.cpp</in>
+                    <in>circular_buffer_iter_example.cpp</in>
+                    <in>circular_buffer_sum_example.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>base_test.cpp</in>
+                    <in>bounded_buffer_comparison.cpp</in>
+                    <in>constant_erase_test.cpp</in>
+                    <in>soft_iterator_invalidation.cpp</in>
+                    <in>space_optimized_test.cpp</in>
+                  </df>
+                </df>
+                <df name="compute">
+                  <df name="example">
+                    <in>amd_cpp_kernel.cpp</in>
+                    <in>batched_determinant.cpp</in>
+                    <in>black_scholes.cpp</in>
+                    <in>copy_data.cpp</in>
+                    <in>fizz_buzz.cpp</in>
+                    <in>hello_world.cpp</in>
+                    <in>host_sort.cpp</in>
+                    <in>inline_ptx.cpp</in>
+                    <in>k_means.cpp</in>
+                    <in>list_devices.cpp</in>
+                    <in>longest_vector.cpp</in>
+                    <in>mandelbrot.cpp</in>
+                    <in>mapped_view.cpp</in>
+                    <in>matrix_transpose.cpp</in>
+                    <in>memory_limits.cpp</in>
+                    <in>monte_carlo.cpp</in>
+                    <in>nbody.cpp</in>
+                    <in>opencl_test.cpp</in>
+                    <in>opencv_convolution.cpp</in>
+                    <in>opencv_flip.cpp</in>
+                    <in>opencv_histogram.cpp</in>
+                    <in>opencv_optical_flow.cpp</in>
+                    <in>opencv_sobel_filter.cpp</in>
+                    <in>opengl_sphere.cpp</in>
+                    <in>point_centroid.cpp</in>
+                    <in>price_cross.cpp</in>
+                    <in>print_vector.cpp</in>
+                    <in>qimage_blur.cpp</in>
+                    <in>random_walk.cpp</in>
+                    <in>resize_image.cpp</in>
+                    <in>simple_kernel.cpp</in>
+                    <in>simple_moving_average.cpp</in>
+                    <in>sort_vector.cpp</in>
+                    <in>threefry_engine.cpp</in>
+                    <in>time_copy.cpp</in>
+                    <in>transform_sqrt.cpp</in>
+                    <in>vector_addition.cpp</in>
+                  </df>
+                  <df name="perf">
+                    <in>perf_accumulate.cpp</in>
+                    <in>perf_bernoulli_distribution.cpp</in>
+                    <in>perf_binary_find.cpp</in>
+                    <in>perf_bolt_accumulate.cpp</in>
+                    <in>perf_bolt_count.cpp</in>
+                    <in>perf_bolt_exclusive_scan.cpp</in>
+                    <in>perf_bolt_fill.cpp</in>
+                    <in>perf_bolt_inner_product.cpp</in>
+                    <in>perf_bolt_max_element.cpp</in>
+                    <in>perf_bolt_merge.cpp</in>
+                    <in>perf_bolt_partial_sum.cpp</in>
+                    <in>perf_bolt_reduce_by_key.cpp</in>
+                    <in>perf_bolt_saxpy.cpp</in>
+                    <in>perf_bolt_sort.cpp</in>
+                    <in>perf_cart_to_polar.cpp</in>
+                    <in>perf_comparison_sort.cpp</in>
+                    <in>perf_copy_if.cpp</in>
+                    <in>perf_copy_to_device.cpp</in>
+                    <in>perf_count.cpp</in>
+                    <in>perf_discrete_distribution.cpp</in>
+                    <in>perf_erase_remove.cpp</in>
+                    <in>perf_exclusive_scan.cpp</in>
+                    <in>perf_fill.cpp</in>
+                    <in>perf_find.cpp</in>
+                    <in>perf_find_end.cpp</in>
+                    <in>perf_host_sort.cpp</in>
+                    <in>perf_includes.cpp</in>
+                    <in>perf_inner_product.cpp</in>
+                    <in>perf_is_permutation.cpp</in>
+                    <in>perf_is_sorted.cpp</in>
+                    <in>perf_max_element.cpp</in>
+                    <in>perf_merge.cpp</in>
+                    <in>perf_next_permutation.cpp</in>
+                    <in>perf_nth_element.cpp</in>
+                    <in>perf_partial_sum.cpp</in>
+                    <in>perf_partition.cpp</in>
+                    <in>perf_partition_point.cpp</in>
+                    <in>perf_prev_permutation.cpp</in>
+                    <in>perf_random_number_engine.cpp</in>
+                    <in>perf_reduce_by_key.cpp</in>
+                    <in>perf_reverse.cpp</in>
+                    <in>perf_reverse_copy.cpp</in>
+                    <in>perf_rotate.cpp</in>
+                    <in>perf_rotate_copy.cpp</in>
+                    <in>perf_saxpy.cpp</in>
+                    <in>perf_search.cpp</in>
+                    <in>perf_search_n.cpp</in>
+                    <in>perf_set_difference.cpp</in>
+                    <in>perf_set_intersection.cpp</in>
+                    <in>perf_set_symmetric_difference.cpp</in>
+                    <in>perf_set_union.cpp</in>
+                    <in>perf_sort.cpp</in>
+                    <in>perf_sort_by_key.cpp</in>
+                    <in>perf_sort_float.cpp</in>
+                    <in>perf_stable_partition.cpp</in>
+                    <in>perf_stl_accumulate.cpp</in>
+                    <in>perf_stl_count.cpp</in>
+                    <in>perf_stl_find.cpp</in>
+                    <in>perf_stl_find_end.cpp</in>
+                    <in>perf_stl_includes.cpp</in>
+                    <in>perf_stl_inner_product.cpp</in>
+                    <in>perf_stl_is_permutation.cpp</in>
+                    <in>perf_stl_max_element.cpp</in>
+                    <in>perf_stl_merge.cpp</in>
+                    <in>perf_stl_next_permutation.cpp</in>
+                    <in>perf_stl_partial_sum.cpp</in>
+                    <in>perf_stl_partition.cpp</in>
+                    <in>perf_stl_partition_point.cpp</in>
+                    <in>perf_stl_prev_permutation.cpp</in>
+                    <in>perf_stl_reverse.cpp</in>
+                    <in>perf_stl_reverse_copy.cpp</in>
+                    <in>perf_stl_rotate.cpp</in>
+                    <in>perf_stl_rotate_copy.cpp</in>
+                    <in>perf_stl_saxpy.cpp</in>
+                    <in>perf_stl_search.cpp</in>
+                    <in>perf_stl_search_n.cpp</in>
+                    <in>perf_stl_set_difference.cpp</in>
+                    <in>perf_stl_set_intersection.cpp</in>
+                    <in>perf_stl_set_symmetric_difference.cpp</in>
+                    <in>perf_stl_set_union.cpp</in>
+                    <in>perf_stl_sort.cpp</in>
+                    <in>perf_stl_stable_partition.cpp</in>
+                    <in>perf_stl_unique.cpp</in>
+                    <in>perf_stl_unique_copy.cpp</in>
+                    <in>perf_tbb_accumulate.cpp</in>
+                    <in>perf_tbb_merge.cpp</in>
+                    <in>perf_tbb_sort.cpp</in>
+                    <in>perf_uniform_int_distribution.cpp</in>
+                    <in>perf_unique.cpp</in>
+                    <in>perf_unique_copy.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="check">
+                      <in>has_opencl.cpp</in>
+                    </df>
+                    <df name="extra">
+                      <in>test_interop_eigen.cpp</in>
+                      <in>test_interop_opencv.cpp</in>
+                      <in>test_interop_opengl.cpp</in>
+                      <in>test_interop_qt.cpp</in>
+                      <in>test_interop_vtk.cpp</in>
+                      <in>test_multiple_objects1.cpp</in>
+                      <in>test_multiple_objects2.cpp</in>
+                    </df>
+                    <in>test_accumulate.cpp</in>
+                    <in>test_adjacent_difference.cpp</in>
+                    <in>test_adjacent_find.cpp</in>
+                    <in>test_amd_cpp_kernel_language.cpp</in>
+                    <in>test_any_all_none_of.cpp</in>
+                    <in>test_array.cpp</in>
+                    <in>test_async_wait.cpp</in>
+                    <in>test_async_wait_guard.cpp</in>
+                    <in>test_bernoulli_distribution.cpp</in>
+                    <in>test_binary_search.cpp</in>
+                    <in>test_buffer.cpp</in>
+                    <in>test_buffer_allocator.cpp</in>
+                    <in>test_buffer_iterator.cpp</in>
+                    <in>test_clamp_range.cpp</in>
+                    <in>test_closure.cpp</in>
+                    <in>test_command_queue.cpp</in>
+                    <in>test_complex.cpp</in>
+                    <in>test_constant_iterator.cpp</in>
+                    <in>test_context.cpp</in>
+                    <in>test_context_error.cpp</in>
+                    <in>test_copy.cpp</in>
+                    <in>test_copy_if.cpp</in>
+                    <in>test_copy_type_mismatch.cpp</in>
+                    <in>test_count.cpp</in>
+                    <in>test_counting_iterator.cpp</in>
+                    <in>test_device.cpp</in>
+                    <in>test_discard_iterator.cpp</in>
+                    <in>test_discrete_distribution.cpp</in>
+                    <in>test_dynamic_bitset.cpp</in>
+                    <in>test_equal.cpp</in>
+                    <in>test_equal_range.cpp</in>
+                    <in>test_event.cpp</in>
+                    <in>test_extents.cpp</in>
+                    <in>test_extrema.cpp</in>
+                    <in>test_fill.cpp</in>
+                    <in>test_find.cpp</in>
+                    <in>test_find_end.cpp</in>
+                    <in>test_flat_map.cpp</in>
+                    <in>test_flat_set.cpp</in>
+                    <in>test_for_each.cpp</in>
+                    <in>test_function.cpp</in>
+                    <in>test_function_input_iterator.cpp</in>
+                    <in>test_functional_as.cpp</in>
+                    <in>test_functional_bind.cpp</in>
+                    <in>test_functional_convert.cpp</in>
+                    <in>test_functional_get.cpp</in>
+                    <in>test_functional_hash.cpp</in>
+                    <in>test_functional_identity.cpp</in>
+                    <in>test_functional_popcount.cpp</in>
+                    <in>test_functional_unpack.cpp</in>
+                    <in>test_gather.cpp</in>
+                    <in>test_generate.cpp</in>
+                    <in>test_image1d.cpp</in>
+                    <in>test_image2d.cpp</in>
+                    <in>test_image3d.cpp</in>
+                    <in>test_image_sampler.cpp</in>
+                    <in>test_includes.cpp</in>
+                    <in>test_inner_product.cpp</in>
+                    <in>test_inplace_merge.cpp</in>
+                    <in>test_inplace_reduce.cpp</in>
+                    <in>test_insertion_sort.cpp</in>
+                    <in>test_invoke.cpp</in>
+                    <in>test_iota.cpp</in>
+                    <in>test_is_permutation.cpp</in>
+                    <in>test_is_sorted.cpp</in>
+                    <in>test_kernel.cpp</in>
+                    <in>test_lambda.cpp</in>
+                    <in>test_lexicographical_compare.cpp</in>
+                    <in>test_linear_congruential_engine.cpp</in>
+                    <in>test_literal_conversion.cpp</in>
+                    <in>test_local_buffer.cpp</in>
+                    <in>test_malloc.cpp</in>
+                    <in>test_mapped_view.cpp</in>
+                    <in>test_merge.cpp</in>
+                    <in>test_merge_sort_gpu.cpp</in>
+                    <in>test_mersenne_twister_engine.cpp</in>
+                    <in>test_mismatch.cpp</in>
+                    <in>test_next_permutation.cpp</in>
+                    <in>test_no_device_found.cpp</in>
+                    <in>test_normal_distribution.cpp</in>
+                    <in>test_nth_element.cpp</in>
+                    <in>test_opencl_error.cpp</in>
+                    <in>test_pair.cpp</in>
+                    <in>test_partial_sum.cpp</in>
+                    <in>test_partition.cpp</in>
+                    <in>test_partition_point.cpp</in>
+                    <in>test_permutation_iterator.cpp</in>
+                    <in>test_pinned_allocator.cpp</in>
+                    <in>test_pipe.cpp</in>
+                    <in>test_platform.cpp</in>
+                    <in>test_prev_permutation.cpp</in>
+                    <in>test_program.cpp</in>
+                    <in>test_program_cache.cpp</in>
+                    <in>test_radix_sort.cpp</in>
+                    <in>test_radix_sort_by_key.cpp</in>
+                    <in>test_random_fill.cpp</in>
+                    <in>test_random_shuffle.cpp</in>
+                    <in>test_reduce.cpp</in>
+                    <in>test_reduce_by_key.cpp</in>
+                    <in>test_remove.cpp</in>
+                    <in>test_replace.cpp</in>
+                    <in>test_result_of.cpp</in>
+                    <in>test_reverse.cpp</in>
+                    <in>test_rotate.cpp</in>
+                    <in>test_rotate_copy.cpp</in>
+                    <in>test_scan.cpp</in>
+                    <in>test_scatter.cpp</in>
+                    <in>test_scatter_if.cpp</in>
+                    <in>test_search.cpp</in>
+                    <in>test_search_n.cpp</in>
+                    <in>test_set_difference.cpp</in>
+                    <in>test_set_intersection.cpp</in>
+                    <in>test_set_symmetric_difference.cpp</in>
+                    <in>test_set_union.cpp</in>
+                    <in>test_sort.cpp</in>
+                    <in>test_sort_by_key.cpp</in>
+                    <in>test_sort_by_transform.cpp</in>
+                    <in>test_stable_partition.cpp</in>
+                    <in>test_stable_sort.cpp</in>
+                    <in>test_stable_sort_by_key.cpp</in>
+                    <in>test_stack.cpp</in>
+                    <in>test_strided_iterator.cpp</in>
+                    <in>test_string.cpp</in>
+                    <in>test_struct.cpp</in>
+                    <in>test_svm_ptr.cpp</in>
+                    <in>test_system.cpp</in>
+                    <in>test_tabulate.cpp</in>
+                    <in>test_threefry_engine.cpp</in>
+                    <in>test_transform.cpp</in>
+                    <in>test_transform_if.cpp</in>
+                    <in>test_transform_iterator.cpp</in>
+                    <in>test_transform_reduce.cpp</in>
+                    <in>test_tuple.cpp</in>
+                    <in>test_type_traits.cpp</in>
+                    <in>test_types.cpp</in>
+                    <in>test_uniform_int_distribution.cpp</in>
+                    <in>test_uniform_real_distribution.cpp</in>
+                    <in>test_unique.cpp</in>
+                    <in>test_unique_copy.cpp</in>
+                    <in>test_unsupported_extension.cpp</in>
+                    <in>test_user_defined_types.cpp</in>
+                    <in>test_user_event.cpp</in>
+                    <in>test_valarray.cpp</in>
+                    <in>test_vector.cpp</in>
+                    <in>test_wait_list.cpp</in>
+                    <in>test_zip_iterator.cpp</in>
+                  </df>
+                </df>
+                <df name="concept_check">
+                  <df name="test">
+                    <in>class_concept_check_test.cpp</in>
+                    <in>class_concept_fail_expected.cpp</in>
+                    <in>concept_check_fail_expected.cpp</in>
+                    <in>concept_check_test.cpp</in>
+                    <in>function_requires_fail.cpp</in>
+                    <in>old_concept_class_fail.cpp</in>
+                    <in>old_concept_function_fail.cpp</in>
+                    <in>old_concept_pass.cpp</in>
+                    <in>stl_concept_check.cpp</in>
+                    <in>stl_concept_covering.cpp</in>
+                    <in>usage_fail.cpp</in>
+                    <in>where.cpp</in>
+                    <in>where_fail.cpp</in>
+                  </df>
+                  <in>bad_error_eg.cpp</in>
+                </df>
+                <df name="config">
+                  <df name="checks">
+                    <df name="architecture">
+                      <in>32.cpp</in>
+                      <in>64.cpp</in>
+                      <in>arm.cpp</in>
+                      <in>combined.cpp</in>
+                      <in>mips1.cpp</in>
+                      <in>power.cpp</in>
+                      <in>riscv.cpp</in>
+                      <in>s390x.cpp</in>
+                      <in>sparc.cpp</in>
+                      <in>x86.cpp</in>
+                    </df>
+                    <df name="std">
+                      <in>cpp_aggregate_bases_17.cpp</in>
+                      <in>cpp_aggregate_nsdmi_14.cpp</in>
+                      <in>cpp_alias_templates_11.cpp</in>
+                      <in>cpp_aligned_new_17.cpp</in>
+                      <in>cpp_attributes_11.cpp</in>
+                      <in>cpp_binary_literals_14.cpp</in>
+                      <in>cpp_capture_star_this_17.cpp</in>
+                      <in>cpp_char8_t_20.cpp</in>
+                      <in>cpp_conditional_explicit_20.cpp</in>
+                      <in>cpp_constexpr_11.cpp</in>
+                      <in>cpp_constexpr_14.cpp</in>
+                      <in>cpp_constexpr_17.cpp</in>
+                      <in>cpp_decltype_11.cpp</in>
+                      <in>cpp_decltype_auto_14.cpp</in>
+                      <in>cpp_deduction_guides_17.cpp</in>
+                      <in>cpp_delegating_constructors_11.cpp</in>
+                      <in>cpp_enumerator_attributes_17.cpp</in>
+                      <in>cpp_exceptions_03.cpp</in>
+                      <in>cpp_explicit_conversion_11.cpp</in>
+                      <in>cpp_fold_expressions_17.cpp</in>
+                      <in>cpp_generic_lambdas_14.cpp</in>
+                      <in>cpp_guaranteed_copy_elision_17.cpp</in>
+                      <in>cpp_hex_float_17.cpp</in>
+                      <in>cpp_if_constexpr_17.cpp</in>
+                      <in>cpp_impl_destroying_delete_20.cpp</in>
+                      <in>cpp_impl_three_way_comparison_20.cpp</in>
+                      <in>cpp_inheriting_constructors_11.cpp</in>
+                      <in>cpp_inheriting_constructors_17.cpp</in>
+                      <in>cpp_init_captures_14.cpp</in>
+                      <in>cpp_initializer_lists_11.cpp</in>
+                      <in>cpp_inline_variables_17.cpp</in>
+                      <in>cpp_lambdas_11.cpp</in>
+                      <in>cpp_lib_addressof_constexpr_17.cpp</in>
+                      <in>cpp_lib_allocator_traits_is_always_equal_17.cpp</in>
+                      <in>cpp_lib_any_17.cpp</in>
+                      <in>cpp_lib_apply_17.cpp</in>
+                      <in>cpp_lib_array_constexpr_17.cpp</in>
+                      <in>cpp_lib_as_const_17.cpp</in>
+                      <in>cpp_lib_atomic_is_always_lock_free_17.cpp</in>
+                      <in>cpp_lib_atomic_ref_20.cpp</in>
+                      <in>cpp_lib_bind_front_20.cpp</in>
+                      <in>cpp_lib_bit_cast_20.cpp</in>
+                      <in>cpp_lib_bool_constant_17.cpp</in>
+                      <in>cpp_lib_boyer_moore_searcher_17.cpp</in>
+                      <in>cpp_lib_byte_17.cpp</in>
+                      <in>cpp_lib_char8_t_20.cpp</in>
+                      <in>cpp_lib_chrono_17.cpp</in>
+                      <in>cpp_lib_chrono_udls_14.cpp</in>
+                      <in>cpp_lib_clamp_17.cpp</in>
+                      <in>cpp_lib_complex_udls_14.cpp</in>
+                      <in>cpp_lib_concepts_20.cpp</in>
+                      <in>cpp_lib_constexpr_misc_20.cpp</in>
+                      <in>cpp_lib_constexpr_swap_algorithms_20.cpp</in>
+                      <in>cpp_lib_destroying_delete_20.cpp</in>
+                      <in>cpp_lib_enable_shared_from_this_17.cpp</in>
+                      <in>cpp_lib_erase_if_20.cpp</in>
+                      <in>cpp_lib_exchange_function_14.cpp</in>
+                      <in>cpp_lib_execution_17.cpp</in>
+                      <in>cpp_lib_filesystem_17.cpp</in>
+                      <in>cpp_lib_gcd_lcm_17.cpp</in>
+                      <in>cpp_lib_generic_associative_lookup_14.cpp</in>
+                      <in>cpp_lib_generic_unordered_lookup_20.cpp</in>
+                      <in>cpp_lib_hardware_interference_size_17.cpp</in>
+                      <in>cpp_lib_has_unique_object_representations_17.cpp</in>
+                      <in>cpp_lib_hypot_17.cpp</in>
+                      <in>cpp_lib_incomplete_container_elements_17.cpp</in>
+                      <in>cpp_lib_integer_sequence_14.cpp</in>
+                      <in>cpp_lib_integral_constant_callable_14.cpp</in>
+                      <in>cpp_lib_invoke_17.cpp</in>
+                      <in>cpp_lib_is_aggregate_17.cpp</in>
+                      <in>cpp_lib_is_constant_evaluated_20.cpp</in>
+                      <in>cpp_lib_is_final_14.cpp</in>
+                      <in>cpp_lib_is_invocable_17.cpp</in>
+                      <in>cpp_lib_is_null_pointer_14.cpp</in>
+                      <in>cpp_lib_is_swappable_17.cpp</in>
+                      <in>cpp_lib_launder_17.cpp</in>
+                      <in>cpp_lib_list_remove_return_type_20.cpp</in>
+                      <in>cpp_lib_logical_traits_17.cpp</in>
+                      <in>cpp_lib_make_from_tuple_17.cpp</in>
+                      <in>cpp_lib_make_reverse_iterator_14.cpp</in>
+                      <in>cpp_lib_make_unique_14.cpp</in>
+                      <in>cpp_lib_map_try_emplace_17.cpp</in>
+                      <in>cpp_lib_math_special_functions_17.cpp</in>
+                      <in>cpp_lib_memory_resource_17.cpp</in>
+                      <in>cpp_lib_node_extract_17.cpp</in>
+                      <in>cpp_lib_nonmember_container_access_17.cpp</in>
+                      <in>cpp_lib_not_fn_17.cpp</in>
+                      <in>cpp_lib_null_iterators_14.cpp</in>
+                      <in>cpp_lib_optional_17.cpp</in>
+                      <in>cpp_lib_parallel_algorithm_17.cpp</in>
+                      <in>cpp_lib_quoted_string_io_14.cpp</in>
+                      <in>cpp_lib_ranges_20.cpp</in>
+                      <in>cpp_lib_raw_memory_algorithms_17.cpp</in>
+                      <in>cpp_lib_result_of_sfinae_14.cpp</in>
+                      <in>cpp_lib_robust_nonmodifying_seq_ops_14.cpp</in>
+                      <in>cpp_lib_sample_17.cpp</in>
+                      <in>cpp_lib_scoped_lock_17.cpp</in>
+                      <in>cpp_lib_shared_mutex_17.cpp</in>
+                      <in>cpp_lib_shared_ptr_arrays_17.cpp</in>
+                      <in>cpp_lib_shared_ptr_weak_type_17.cpp</in>
+                      <in>cpp_lib_shared_timed_mutex_14.cpp</in>
+                      <in>cpp_lib_string_udls_14.cpp</in>
+                      <in>cpp_lib_string_view_17.cpp</in>
+                      <in>cpp_lib_three_way_comparison_20.cpp</in>
+                      <in>cpp_lib_to_chars_17.cpp</in>
+                      <in>cpp_lib_transformation_trait_aliases_14.cpp</in>
+                      <in>cpp_lib_transparent_operators_14.cpp</in>
+                      <in>cpp_lib_transparent_operators_17.cpp</in>
+                      <in>cpp_lib_tuple_element_t_14.cpp</in>
+                      <in>cpp_lib_tuples_by_type_14.cpp</in>
+                      <in>cpp_lib_type_trait_variable_templates_17.cpp</in>
+                      <in>cpp_lib_uncaught_exceptions_17.cpp</in>
+                      <in>cpp_lib_unordered_map_try_emplace_17.cpp</in>
+                      <in>cpp_lib_variant_17.cpp</in>
+                      <in>cpp_lib_void_t_17.cpp</in>
+                      <in>cpp_namespace_attributes_17.cpp</in>
+                      <in>cpp_noexcept_function_type_17.cpp</in>
+                      <in>cpp_nontype_template_args_17.cpp</in>
+                      <in>cpp_nontype_template_parameter_auto_17.cpp</in>
+                      <in>cpp_nontype_template_parameter_class_20.cpp</in>
+                      <in>cpp_nsdmi_11.cpp</in>
+                      <in>cpp_range_based_for_11.cpp</in>
+                      <in>cpp_range_based_for_17.cpp</in>
+                      <in>cpp_raw_strings_11.cpp</in>
+                      <in>cpp_ref_qualifiers_11.cpp</in>
+                      <in>cpp_return_type_deduction_14.cpp</in>
+                      <in>cpp_rtti_03.cpp</in>
+                      <in>cpp_rvalue_references_11.cpp</in>
+                      <in>cpp_sized_deallocation_14.cpp</in>
+                      <in>cpp_static_assert_11.cpp</in>
+                      <in>cpp_static_assert_17.cpp</in>
+                      <in>cpp_structured_bindings_17.cpp</in>
+                      <in>cpp_template_template_args_17.cpp</in>
+                      <in>cpp_threadsafe_static_init_11.cpp</in>
+                      <in>cpp_unicode_characters_11.cpp</in>
+                      <in>cpp_unicode_literals_11.cpp</in>
+                      <in>cpp_user_defined_literals_11.cpp</in>
+                      <in>cpp_variable_templates_14.cpp</in>
+                      <in>cpp_variadic_templates_11.cpp</in>
+                      <in>cpp_variadic_using_17.cpp</in>
+                    </df>
+                    <in>test_case.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="abi">
+                      <in>abi_test.cpp</in>
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="link">
+                      <in>link_test.cpp</in>
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="threads">
+                      <in>test_thread_fail1.cpp</in>
+                      <in>test_thread_fail2.cpp</in>
+                    </df>
+                    <in>boost_fallthrough_test.cpp</in>
+                    <in>boost_override_test.cpp</in>
+                    <in>check_memory.cpp</in>
+                    <in>cmd_line_check.cpp</in>
+                    <in>config_build_check.cpp</in>
+                    <in>config_info.cpp</in>
+                    <in>config_test.cpp</in>
+                    <in>config_test_c.c</in>
+                    <in>cstdint_include_test.cpp</in>
+                    <in>cstdint_test.cpp</in>
+                    <in>cstdint_test2.cpp</in>
+                    <in>has_2arg_use_facet_fail.cpp</in>
+                    <in>has_2arg_use_facet_pass.cpp</in>
+                    <in>has_bethreads_fail.cpp</in>
+                    <in>has_bethreads_pass.cpp</in>
+                    <in>has_clock_gettime_fail.cpp</in>
+                    <in>has_clock_gettime_pass.cpp</in>
+                    <in>has_detect_mismatch_fail.cpp</in>
+                    <in>has_detect_mismatch_pass.cpp</in>
+                    <in>has_dirent_h_fail.cpp</in>
+                    <in>has_dirent_h_pass.cpp</in>
+                    <in>has_expm1_fail.cpp</in>
+                    <in>has_expm1_pass.cpp</in>
+                    <in>has_float128_fail.cpp</in>
+                    <in>has_float128_pass.cpp</in>
+                    <in>has_ftime_fail.cpp</in>
+                    <in>has_ftime_pass.cpp</in>
+                    <in>has_getsystemtimeasfiletime_fail.cpp</in>
+                    <in>has_getsystemtimeasfiletime_pass.cpp</in>
+                    <in>has_gettimeofday_fail.cpp</in>
+                    <in>has_gettimeofday_pass.cpp</in>
+                    <in>has_hash_fail.cpp</in>
+                    <in>has_hash_pass.cpp</in>
+                    <in>has_int128_fail.cpp</in>
+                    <in>has_int128_pass.cpp</in>
+                    <in>has_log1p_fail.cpp</in>
+                    <in>has_log1p_pass.cpp</in>
+                    <in>has_long_long_fail.cpp</in>
+                    <in>has_long_long_pass.cpp</in>
+                    <in>has_macro_use_facet_fail.cpp</in>
+                    <in>has_macro_use_facet_pass.cpp</in>
+                    <in>has_ms_int64_fail.cpp</in>
+                    <in>has_ms_int64_pass.cpp</in>
+                    <in>has_nanosleep_fail.cpp</in>
+                    <in>has_nanosleep_pass.cpp</in>
+                    <in>has_nl_types_h_fail.cpp</in>
+                    <in>has_nl_types_h_pass.cpp</in>
+                    <in>has_nrvo_fail.cpp</in>
+                    <in>has_nrvo_pass.cpp</in>
+                    <in>has_part_alloc_fail.cpp</in>
+                    <in>has_part_alloc_pass.cpp</in>
+                    <in>has_pthread_delay_np_fail.cpp</in>
+                    <in>has_pthread_delay_np_pass.cpp</in>
+                    <in>has_pthread_ma_st_fail.cpp</in>
+                    <in>has_pthread_ma_st_pass.cpp</in>
+                    <in>has_pthread_yield_fail.cpp</in>
+                    <in>has_pthread_yield_pass.cpp</in>
+                    <in>has_pthreads_fail.cpp</in>
+                    <in>has_pthreads_pass.cpp</in>
+                    <in>has_rvalue_refs_fail.cpp</in>
+                    <in>has_rvalue_refs_pass.cpp</in>
+                    <in>has_sched_yield_fail.cpp</in>
+                    <in>has_sched_yield_pass.cpp</in>
+                    <in>has_sgi_type_traits_fail.cpp</in>
+                    <in>has_sgi_type_traits_pass.cpp</in>
+                    <in>has_sigaction_fail.cpp</in>
+                    <in>has_sigaction_pass.cpp</in>
+                    <in>has_slist_fail.cpp</in>
+                    <in>has_slist_pass.cpp</in>
+                    <in>has_static_assert_fail.cpp</in>
+                    <in>has_static_assert_pass.cpp</in>
+                    <in>has_stdint_h_fail.cpp</in>
+                    <in>has_stdint_h_pass.cpp</in>
+                    <in>has_stlp_use_facet_fail.cpp</in>
+                    <in>has_stlp_use_facet_pass.cpp</in>
+                    <in>has_unistd_h_fail.cpp</in>
+                    <in>has_unistd_h_pass.cpp</in>
+                    <in>has_variadic_tmpl_fail.cpp</in>
+                    <in>has_variadic_tmpl_pass.cpp</in>
+                    <in>has_vc6_mem_templ_fail.cpp</in>
+                    <in>has_vc6_mem_templ_pass.cpp</in>
+                    <in>has_vc_iterator_fail.cpp</in>
+                    <in>has_vc_iterator_pass.cpp</in>
+                    <in>has_winthreads_fail.cpp</in>
+                    <in>has_winthreads_pass.cpp</in>
+                    <in>header_deprecated_test.cpp</in>
+                    <in>helper_macro_test.cpp</in>
+                    <in>helper_macros_test.cpp</in>
+                    <in>limits_test.cpp</in>
+                    <in>math_info.cpp</in>
+                    <in>no_adl_barrier_fail.cpp</in>
+                    <in>no_adl_barrier_pass.cpp</in>
+                    <in>no_arg_dep_lookup_fail.cpp</in>
+                    <in>no_arg_dep_lookup_pass.cpp</in>
+                    <in>no_array_type_spec_fail.cpp</in>
+                    <in>no_array_type_spec_pass.cpp</in>
+                    <in>no_auto_declarations_fail.cpp</in>
+                    <in>no_auto_declarations_pass.cpp</in>
+                    <in>no_auto_multidecl_fail.cpp</in>
+                    <in>no_auto_multidecl_pass.cpp</in>
+                    <in>no_auto_ptr_fail.cpp</in>
+                    <in>no_auto_ptr_pass.cpp</in>
+                    <in>no_bcb_partial_spec_fail.cpp</in>
+                    <in>no_bcb_partial_spec_pass.cpp</in>
+                    <in>no_char16_t_fail.cpp</in>
+                    <in>no_char16_t_pass.cpp</in>
+                    <in>no_char32_t_fail.cpp</in>
+                    <in>no_char32_t_pass.cpp</in>
+                    <in>no_com_value_init_fail.cpp</in>
+                    <in>no_com_value_init_pass.cpp</in>
+                    <in>no_constexpr_fail.cpp</in>
+                    <in>no_constexpr_pass.cpp</in>
+                    <in>no_ctype_functions_fail.cpp</in>
+                    <in>no_ctype_functions_pass.cpp</in>
+                    <in>no_cv_spec_fail.cpp</in>
+                    <in>no_cv_spec_pass.cpp</in>
+                    <in>no_cv_void_spec_fail.cpp</in>
+                    <in>no_cv_void_spec_pass.cpp</in>
+                    <in>no_cwchar_fail.cpp</in>
+                    <in>no_cwchar_pass.cpp</in>
+                    <in>no_cwctype_fail.cpp</in>
+                    <in>no_cwctype_pass.cpp</in>
+                    <in>no_cxx03_fail.cpp</in>
+                    <in>no_cxx03_pass.cpp</in>
+                    <in>no_cxx11_addressof_fail.cpp</in>
+                    <in>no_cxx11_addressof_pass.cpp</in>
+                    <in>no_cxx11_alignas_fail.cpp</in>
+                    <in>no_cxx11_alignas_pass.cpp</in>
+                    <in>no_cxx11_allocator_fail.cpp</in>
+                    <in>no_cxx11_allocator_pass.cpp</in>
+                    <in>no_cxx11_atomic_sp_fail.cpp</in>
+                    <in>no_cxx11_atomic_sp_pass.cpp</in>
+                    <in>no_cxx11_defaulted_moves_fail.cpp</in>
+                    <in>no_cxx11_defaulted_moves_pass.cpp</in>
+                    <in>no_cxx11_exception_fail.cpp</in>
+                    <in>no_cxx11_exception_pass.cpp</in>
+                    <in>no_cxx11_fail.cpp</in>
+                    <in>no_cxx11_final_fail.cpp</in>
+                    <in>no_cxx11_final_pass.cpp</in>
+                    <in>no_cxx11_hdr_array_fail.cpp</in>
+                    <in>no_cxx11_hdr_array_pass.cpp</in>
+                    <in>no_cxx11_hdr_atomic_fail.cpp</in>
+                    <in>no_cxx11_hdr_atomic_pass.cpp</in>
+                    <in>no_cxx11_hdr_chrono_fail.cpp</in>
+                    <in>no_cxx11_hdr_chrono_pass.cpp</in>
+                    <in>no_cxx11_hdr_codecvt_fail.cpp</in>
+                    <in>no_cxx11_hdr_codecvt_pass.cpp</in>
+                    <in>no_cxx11_hdr_condition_variable_fail.cpp</in>
+                    <in>no_cxx11_hdr_condition_variable_pass.cpp</in>
+                    <in>no_cxx11_hdr_forward_list_fail.cpp</in>
+                    <in>no_cxx11_hdr_forward_list_pass.cpp</in>
+                    <in>no_cxx11_hdr_future_fail.cpp</in>
+                    <in>no_cxx11_hdr_future_pass.cpp</in>
+                    <in>no_cxx11_hdr_initializer_list_fail.cpp</in>
+                    <in>no_cxx11_hdr_initializer_list_pass.cpp</in>
+                    <in>no_cxx11_hdr_mutex_fail.cpp</in>
+                    <in>no_cxx11_hdr_mutex_pass.cpp</in>
+                    <in>no_cxx11_hdr_random_fail.cpp</in>
+                    <in>no_cxx11_hdr_random_pass.cpp</in>
+                    <in>no_cxx11_hdr_ratio_fail.cpp</in>
+                    <in>no_cxx11_hdr_ratio_pass.cpp</in>
+                    <in>no_cxx11_hdr_regex_fail.cpp</in>
+                    <in>no_cxx11_hdr_regex_pass.cpp</in>
+                    <in>no_cxx11_hdr_system_error_fail.cpp</in>
+                    <in>no_cxx11_hdr_system_error_pass.cpp</in>
+                    <in>no_cxx11_hdr_thread_fail.cpp</in>
+                    <in>no_cxx11_hdr_thread_pass.cpp</in>
+                    <in>no_cxx11_hdr_tuple_fail.cpp</in>
+                    <in>no_cxx11_hdr_tuple_pass.cpp</in>
+                    <in>no_cxx11_hdr_type_traits_fail.cpp</in>
+                    <in>no_cxx11_hdr_type_traits_pass.cpp</in>
+                    <in>no_cxx11_hdr_typeindex_fail.cpp</in>
+                    <in>no_cxx11_hdr_typeindex_pass.cpp</in>
+                    <in>no_cxx11_hdr_unordered_map_fail.cpp</in>
+                    <in>no_cxx11_hdr_unordered_map_pass.cpp</in>
+                    <in>no_cxx11_hdr_unordered_set_fail.cpp</in>
+                    <in>no_cxx11_hdr_unordered_set_pass.cpp</in>
+                    <in>no_cxx11_inline_namespaces_fail.cpp</in>
+                    <in>no_cxx11_inline_namespaces_pass.cpp</in>
+                    <in>no_cxx11_non_pub_def_fun_fail.cpp</in>
+                    <in>no_cxx11_non_pub_def_fun_pass.cpp</in>
+                    <in>no_cxx11_numeric_limits_fail.cpp</in>
+                    <in>no_cxx11_numeric_limits_pass.cpp</in>
+                    <in>no_cxx11_override_fail.cpp</in>
+                    <in>no_cxx11_override_pass.cpp</in>
+                    <in>no_cxx11_pass.cpp</in>
+                    <in>no_cxx11_pointer_traits_fail.cpp</in>
+                    <in>no_cxx11_pointer_traits_pass.cpp</in>
+                    <in>no_cxx11_ref_qualifiers_fail.cpp</in>
+                    <in>no_cxx11_ref_qualifiers_pass.cpp</in>
+                    <in>no_cxx11_sfinae_expr_fail.cpp</in>
+                    <in>no_cxx11_sfinae_expr_pass.cpp</in>
+                    <in>no_cxx11_smart_ptr_fail.cpp</in>
+                    <in>no_cxx11_smart_ptr_pass.cpp</in>
+                    <in>no_cxx11_std_align_fail.cpp</in>
+                    <in>no_cxx11_std_align_pass.cpp</in>
+                    <in>no_cxx11_thread_local_fail.cpp</in>
+                    <in>no_cxx11_thread_local_pass.cpp</in>
+                    <in>no_cxx11_trailing_result_types_fail.cpp</in>
+                    <in>no_cxx11_trailing_result_types_pass.cpp</in>
+                    <in>no_cxx11_unrestricted_union_fail.cpp</in>
+                    <in>no_cxx11_unrestricted_union_pass.cpp</in>
+                    <in>no_cxx11_user_lit_fail.cpp</in>
+                    <in>no_cxx11_user_lit_pass.cpp</in>
+                    <in>no_cxx14_binary_literals_fail.cpp</in>
+                    <in>no_cxx14_binary_literals_pass.cpp</in>
+                    <in>no_cxx14_constexpr_fail.cpp</in>
+                    <in>no_cxx14_constexpr_pass.cpp</in>
+                    <in>no_cxx14_decltype_auto_fail.cpp</in>
+                    <in>no_cxx14_decltype_auto_pass.cpp</in>
+                    <in>no_cxx14_digit_separator_fail.cpp</in>
+                    <in>no_cxx14_digit_separator_pass.cpp</in>
+                    <in>no_cxx14_fail.cpp</in>
+                    <in>no_cxx14_generic_lambda_fail.cpp</in>
+                    <in>no_cxx14_generic_lambda_pass.cpp</in>
+                    <in>no_cxx14_hdr_shared_mutex_fail.cpp</in>
+                    <in>no_cxx14_hdr_shared_mutex_pass.cpp</in>
+                    <in>no_cxx14_lambda_capture_fail.cpp</in>
+                    <in>no_cxx14_lambda_capture_pass.cpp</in>
+                    <in>no_cxx14_member_init_fail.cpp</in>
+                    <in>no_cxx14_member_init_pass.cpp</in>
+                    <in>no_cxx14_pass.cpp</in>
+                    <in>no_cxx14_return_type_ded_fail.cpp</in>
+                    <in>no_cxx14_return_type_ded_pass.cpp</in>
+                    <in>no_cxx14_std_exchange_fail.cpp</in>
+                    <in>no_cxx14_std_exchange_pass.cpp</in>
+                    <in>no_cxx14_var_templ_fail.cpp</in>
+                    <in>no_cxx14_var_templ_pass.cpp</in>
+                    <in>no_cxx17_fail.cpp</in>
+                    <in>no_cxx17_fold_expressions_fail.cpp</in>
+                    <in>no_cxx17_fold_expressions_pass.cpp</in>
+                    <in>no_cxx17_hdr_any_fail.cpp</in>
+                    <in>no_cxx17_hdr_any_pass.cpp</in>
+                    <in>no_cxx17_hdr_char_conv_fail.cpp</in>
+                    <in>no_cxx17_hdr_char_conv_pass.cpp</in>
+                    <in>no_cxx17_hdr_charconv_fail.cpp</in>
+                    <in>no_cxx17_hdr_charconv_pass.cpp</in>
+                    <in>no_cxx17_hdr_execution_fail.cpp</in>
+                    <in>no_cxx17_hdr_execution_pass.cpp</in>
+                    <in>no_cxx17_hdr_filesystem_fail.cpp</in>
+                    <in>no_cxx17_hdr_filesystem_pass.cpp</in>
+                    <in>no_cxx17_hdr_memory_resource_fail.cpp</in>
+                    <in>no_cxx17_hdr_memory_resource_pass.cpp</in>
+                    <in>no_cxx17_hdr_optional_fail.cpp</in>
+                    <in>no_cxx17_hdr_optional_pass.cpp</in>
+                    <in>no_cxx17_hdr_string_view_fail.cpp</in>
+                    <in>no_cxx17_hdr_string_view_pass.cpp</in>
+                    <in>no_cxx17_hdr_variant_fail.cpp</in>
+                    <in>no_cxx17_hdr_variant_pass.cpp</in>
+                    <in>no_cxx17_if_constexpr_fail.cpp</in>
+                    <in>no_cxx17_if_constexpr_pass.cpp</in>
+                    <in>no_cxx17_inline_variables_fail.cpp</in>
+                    <in>no_cxx17_inline_variables_pass.cpp</in>
+                    <in>no_cxx17_iterator_traits_fail.cpp</in>
+                    <in>no_cxx17_iterator_traits_pass.cpp</in>
+                    <in>no_cxx17_pass.cpp</in>
+                    <in>no_cxx17_std_apply_fail.cpp</in>
+                    <in>no_cxx17_std_apply_pass.cpp</in>
+                    <in>no_cxx17_std_invoke_fail.cpp</in>
+                    <in>no_cxx17_std_invoke_pass.cpp</in>
+                    <in>no_cxx17_structured_bindings_fail.cpp</in>
+                    <in>no_cxx17_structured_bindings_pass.cpp</in>
+                    <in>no_cxx20_hdr_barrier_fail.cpp</in>
+                    <in>no_cxx20_hdr_barrier_pass.cpp</in>
+                    <in>no_cxx20_hdr_bit_fail.cpp</in>
+                    <in>no_cxx20_hdr_bit_pass.cpp</in>
+                    <in>no_cxx20_hdr_compare_fail.cpp</in>
+                    <in>no_cxx20_hdr_compare_pass.cpp</in>
+                    <in>no_cxx20_hdr_concepts_fail.cpp</in>
+                    <in>no_cxx20_hdr_concepts_pass.cpp</in>
+                    <in>no_cxx20_hdr_coroutine_fail.cpp</in>
+                    <in>no_cxx20_hdr_coroutine_pass.cpp</in>
+                    <in>no_cxx20_hdr_format_fail.cpp</in>
+                    <in>no_cxx20_hdr_format_pass.cpp</in>
+                    <in>no_cxx20_hdr_latch_fail.cpp</in>
+                    <in>no_cxx20_hdr_latch_pass.cpp</in>
+                    <in>no_cxx20_hdr_numbers_fail.cpp</in>
+                    <in>no_cxx20_hdr_numbers_pass.cpp</in>
+                    <in>no_cxx20_hdr_ranges_fail.cpp</in>
+                    <in>no_cxx20_hdr_ranges_pass.cpp</in>
+                    <in>no_cxx20_hdr_semaphore_fail.cpp</in>
+                    <in>no_cxx20_hdr_semaphore_pass.cpp</in>
+                    <in>no_cxx20_hdr_source_location_fail.cpp</in>
+                    <in>no_cxx20_hdr_source_location_pass.cpp</in>
+                    <in>no_cxx20_hdr_span_fail.cpp</in>
+                    <in>no_cxx20_hdr_span_pass.cpp</in>
+                    <in>no_cxx20_hdr_stop_token_fail.cpp</in>
+                    <in>no_cxx20_hdr_stop_token_pass.cpp</in>
+                    <in>no_cxx20_hdr_syncstream_fail.cpp</in>
+                    <in>no_cxx20_hdr_syncstream_pass.cpp</in>
+                    <in>no_cxx98_binders_fail.cpp</in>
+                    <in>no_cxx98_binders_pass.cpp</in>
+                    <in>no_cxx98_function_base_fail.cpp</in>
+                    <in>no_cxx98_function_base_pass.cpp</in>
+                    <in>no_cxx98_random_shuffle_fail.cpp</in>
+                    <in>no_cxx98_random_shuffle_pass.cpp</in>
+                    <in>no_cxx_hdr_functional_fail.cpp</in>
+                    <in>no_cxx_hdr_functional_pass.cpp</in>
+                    <in>no_decltype_fail.cpp</in>
+                    <in>no_decltype_n3276_fail.cpp</in>
+                    <in>no_decltype_n3276_pass.cpp</in>
+                    <in>no_decltype_pass.cpp</in>
+                    <in>no_ded_typename_fail.cpp</in>
+                    <in>no_ded_typename_pass.cpp</in>
+                    <in>no_defaulted_functions_fail.cpp</in>
+                    <in>no_defaulted_functions_pass.cpp</in>
+                    <in>no_deleted_functions_fail.cpp</in>
+                    <in>no_deleted_functions_pass.cpp</in>
+                    <in>no_dep_nested_class_fail.cpp</in>
+                    <in>no_dep_nested_class_pass.cpp</in>
+                    <in>no_dep_val_param_fail.cpp</in>
+                    <in>no_dep_val_param_pass.cpp</in>
+                    <in>no_excep_std_fail.cpp</in>
+                    <in>no_excep_std_pass.cpp</in>
+                    <in>no_exceptions_fail.cpp</in>
+                    <in>no_exceptions_pass.cpp</in>
+                    <in>no_exp_func_tem_arg_fail.cpp</in>
+                    <in>no_exp_func_tem_arg_pass.cpp</in>
+                    <in>no_explicit_cvt_ops_fail.cpp</in>
+                    <in>no_explicit_cvt_ops_pass.cpp</in>
+                    <in>no_extern_template_fail.cpp</in>
+                    <in>no_extern_template_pass.cpp</in>
+                    <in>no_fenv_h_fail.cpp</in>
+                    <in>no_fenv_h_pass.cpp</in>
+                    <in>no_fixed_len_variadic_templates_fail.cpp</in>
+                    <in>no_fixed_len_variadic_templates_pass.cpp</in>
+                    <in>no_func_tmp_order_fail.cpp</in>
+                    <in>no_func_tmp_order_pass.cpp</in>
+                    <in>no_function_template_default_args_fail.cpp</in>
+                    <in>no_function_template_default_args_pass.cpp</in>
+                    <in>no_function_type_spec_fail.cpp</in>
+                    <in>no_function_type_spec_pass.cpp</in>
+                    <in>no_i64_limits_fail.cpp</in>
+                    <in>no_i64_limits_pass.cpp</in>
+                    <in>no_inline_memb_init_fail.cpp</in>
+                    <in>no_inline_memb_init_pass.cpp</in>
+                    <in>no_integral_int64_t_fail.cpp</in>
+                    <in>no_integral_int64_t_pass.cpp</in>
+                    <in>no_iosfwd_fail.cpp</in>
+                    <in>no_iosfwd_pass.cpp</in>
+                    <in>no_iostream_fail.cpp</in>
+                    <in>no_iostream_pass.cpp</in>
+                    <in>no_is_abstract_fail.cpp</in>
+                    <in>no_is_abstract_pass.cpp</in>
+                    <in>no_iter_construct_fail.cpp</in>
+                    <in>no_iter_construct_pass.cpp</in>
+                    <in>no_lambdas_fail.cpp</in>
+                    <in>no_lambdas_pass.cpp</in>
+                    <in>no_limits_const_exp_fail.cpp</in>
+                    <in>no_limits_const_exp_pass.cpp</in>
+                    <in>no_limits_fail.cpp</in>
+                    <in>no_limits_pass.cpp</in>
+                    <in>no_ll_limits_fail.cpp</in>
+                    <in>no_ll_limits_pass.cpp</in>
+                    <in>no_long_long_fail.cpp</in>
+                    <in>no_long_long_pass.cpp</in>
+                    <in>no_mem_func_spec_fail.cpp</in>
+                    <in>no_mem_func_spec_pass.cpp</in>
+                    <in>no_mem_tem_keyword_fail.cpp</in>
+                    <in>no_mem_tem_keyword_pass.cpp</in>
+                    <in>no_mem_tem_pnts_fail.cpp</in>
+                    <in>no_mem_tem_pnts_pass.cpp</in>
+                    <in>no_mem_templ_frnds_fail.cpp</in>
+                    <in>no_mem_templ_frnds_pass.cpp</in>
+                    <in>no_mem_templates_fail.cpp</in>
+                    <in>no_mem_templates_pass.cpp</in>
+                    <in>no_nested_friendship_fail.cpp</in>
+                    <in>no_nested_friendship_pass.cpp</in>
+                    <in>no_noexcept_fail.cpp</in>
+                    <in>no_noexcept_pass.cpp</in>
+                    <in>no_nullptr_fail.cpp</in>
+                    <in>no_nullptr_pass.cpp</in>
+                    <in>no_ops_in_namespace_fail.cpp</in>
+                    <in>no_ops_in_namespace_pass.cpp</in>
+                    <in>no_part_spec_def_args_fail.cpp</in>
+                    <in>no_part_spec_def_args_pass.cpp</in>
+                    <in>no_partial_spec_fail.cpp</in>
+                    <in>no_partial_spec_pass.cpp</in>
+                    <in>no_priv_aggregate_fail.cpp</in>
+                    <in>no_priv_aggregate_pass.cpp</in>
+                    <in>no_ptr_mem_const_fail.cpp</in>
+                    <in>no_ptr_mem_const_pass.cpp</in>
+                    <in>no_range_based_for_fail.cpp</in>
+                    <in>no_range_based_for_pass.cpp</in>
+                    <in>no_raw_literals_fail.cpp</in>
+                    <in>no_raw_literals_pass.cpp</in>
+                    <in>no_restrict_references_fail.cpp</in>
+                    <in>no_restrict_references_pass.cpp</in>
+                    <in>no_ret_det_fail.cpp</in>
+                    <in>no_ret_det_pass.cpp</in>
+                    <in>no_rtti_fail.cpp</in>
+                    <in>no_rtti_pass.cpp</in>
+                    <in>no_rvalue_references_fail.cpp</in>
+                    <in>no_rvalue_references_pass.cpp</in>
+                    <in>no_scoped_enums_fail.cpp</in>
+                    <in>no_scoped_enums_pass.cpp</in>
+                    <in>no_sfinae_expr_fail.cpp</in>
+                    <in>no_sfinae_expr_pass.cpp</in>
+                    <in>no_sfinae_fail.cpp</in>
+                    <in>no_sfinae_pass.cpp</in>
+                    <in>no_sstream_fail.cpp</in>
+                    <in>no_sstream_pass.cpp</in>
+                    <in>no_static_assert_fail.cpp</in>
+                    <in>no_static_assert_pass.cpp</in>
+                    <in>no_std_allocator_fail.cpp</in>
+                    <in>no_std_allocator_pass.cpp</in>
+                    <in>no_std_distance_fail.cpp</in>
+                    <in>no_std_distance_pass.cpp</in>
+                    <in>no_std_iter_traits_fail.cpp</in>
+                    <in>no_std_iter_traits_pass.cpp</in>
+                    <in>no_std_iterator_fail.cpp</in>
+                    <in>no_std_iterator_pass.cpp</in>
+                    <in>no_std_locale_fail.cpp</in>
+                    <in>no_std_locale_pass.cpp</in>
+                    <in>no_std_messages_fail.cpp</in>
+                    <in>no_std_messages_pass.cpp</in>
+                    <in>no_std_min_max_fail.cpp</in>
+                    <in>no_std_min_max_pass.cpp</in>
+                    <in>no_std_oi_assign_fail.cpp</in>
+                    <in>no_std_oi_assign_pass.cpp</in>
+                    <in>no_std_typeinfo_fail.cpp</in>
+                    <in>no_std_typeinfo_pass.cpp</in>
+                    <in>no_std_use_facet_fail.cpp</in>
+                    <in>no_std_use_facet_pass.cpp</in>
+                    <in>no_std_wstreambuf_fail.cpp</in>
+                    <in>no_std_wstreambuf_pass.cpp</in>
+                    <in>no_std_wstring_fail.cpp</in>
+                    <in>no_std_wstring_pass.cpp</in>
+                    <in>no_stdc_namespace_fail.cpp</in>
+                    <in>no_stdc_namespace_pass.cpp</in>
+                    <in>no_swprintf_fail.cpp</in>
+                    <in>no_swprintf_pass.cpp</in>
+                    <in>no_tem_local_classes_fail.cpp</in>
+                    <in>no_tem_local_classes_pass.cpp</in>
+                    <in>no_template_aliases_fail.cpp</in>
+                    <in>no_template_aliases_pass.cpp</in>
+                    <in>no_template_streams_fail.cpp</in>
+                    <in>no_template_streams_pass.cpp</in>
+                    <in>no_template_template_fail.cpp</in>
+                    <in>no_template_template_pass.cpp</in>
+                    <in>no_two_phase_lookup_fail.cpp</in>
+                    <in>no_two_phase_lookup_pass.cpp</in>
+                    <in>no_typeid_fail.cpp</in>
+                    <in>no_typeid_pass.cpp</in>
+                    <in>no_typename_with_ctor_fail.cpp</in>
+                    <in>no_typename_with_ctor_pass.cpp</in>
+                    <in>no_unicode_literals_fail.cpp</in>
+                    <in>no_unicode_literals_pass.cpp</in>
+                    <in>no_unified_init_fail.cpp</in>
+                    <in>no_unified_init_pass.cpp</in>
+                    <in>no_using_breaks_adl_fail.cpp</in>
+                    <in>no_using_breaks_adl_pass.cpp</in>
+                    <in>no_using_decl_overld_fail.cpp</in>
+                    <in>no_using_decl_overld_pass.cpp</in>
+                    <in>no_using_template_fail.cpp</in>
+                    <in>no_using_template_pass.cpp</in>
+                    <in>no_variadic_macros_fail.cpp</in>
+                    <in>no_variadic_macros_pass.cpp</in>
+                    <in>no_variadic_templates_fail.cpp</in>
+                    <in>no_variadic_templates_pass.cpp</in>
+                    <in>no_void_returns_fail.cpp</in>
+                    <in>no_void_returns_pass.cpp</in>
+                    <in>no_wchar_t_fail.cpp</in>
+                    <in>no_wchar_t_pass.cpp</in>
+                    <in>pragma_message_test.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <in>generate.cpp</in>
+                  </df>
+                </df>
+                <df name="container">
+                  <df name="bench">
+                    <in>bench_adaptive_node_pool.cpp</in>
+                    <in>bench_alloc.cpp</in>
+                    <in>bench_alloc_expand_bwd.cpp</in>
+                    <in>bench_alloc_expand_fwd.cpp</in>
+                    <in>bench_alloc_shrink_to_fit.cpp</in>
+                    <in>bench_alloc_stable_vector_burst.cpp</in>
+                    <in>bench_flat_multiset.cpp</in>
+                    <in>bench_flat_set.cpp</in>
+                    <in>bench_set.cpp</in>
+                    <in>bench_set_adaptive_pool.cpp</in>
+                    <in>bench_set_alloc_v2.cpp</in>
+                    <in>bench_set_avl.cpp</in>
+                    <in>bench_set_multi.cpp</in>
+                    <in>bench_set_sg.cpp</in>
+                    <in>bench_set_sp.cpp</in>
+                    <in>bench_static_vector.cpp</in>
+                    <in>bench_vectors.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>doc_custom_deque.cpp</in>
+                    <in>doc_custom_small_vector.cpp</in>
+                    <in>doc_custom_static_vector.cpp</in>
+                    <in>doc_custom_tree.cpp</in>
+                    <in>doc_custom_vector.cpp</in>
+                    <in>doc_emplace.cpp</in>
+                    <in>doc_extended_allocators.cpp</in>
+                    <in>doc_move_containers.cpp</in>
+                    <in>doc_pmr.cpp</in>
+                    <in>doc_recursive_containers.cpp</in>
+                    <in>doc_type_erasure.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>alloc_lib.c</in>
+                    <in>dlmalloc.cpp</in>
+                    <in>dlmalloc_2_8_6.c</in>
+                    <in>dlmalloc_ext_2_8_6.c</in>
+                    <in>global_resource.cpp</in>
+                    <in>monotonic_buffer_resource.cpp</in>
+                    <in>pool_resource.cpp</in>
+                    <in>synchronized_pool_resource.cpp</in>
+                    <in>unsynchronized_pool_resource.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>alloc_basic_test.cpp</in>
+                    <in>alloc_full_test.cpp</in>
+                    <in>allocator_traits_test.cpp</in>
+                    <in>deque_options_test.cpp</in>
+                    <in>deque_test.cpp</in>
+                    <in>devector_options_test.cpp</in>
+                    <in>devector_test.cpp</in>
+                    <in>explicit_inst_deque_test.cpp</in>
+                    <in>explicit_inst_devector_test.cpp</in>
+                    <in>explicit_inst_flat_map_test.cpp</in>
+                    <in>explicit_inst_flat_set_test.cpp</in>
+                    <in>explicit_inst_list_test.cpp</in>
+                    <in>explicit_inst_map_test.cpp</in>
+                    <in>explicit_inst_set_test.cpp</in>
+                    <in>explicit_inst_slist_test.cpp</in>
+                    <in>explicit_inst_small_vector_test.cpp</in>
+                    <in>explicit_inst_stable_vector_test.cpp</in>
+                    <in>explicit_inst_static_vector_test.cpp</in>
+                    <in>explicit_inst_string_test.cpp</in>
+                    <in>explicit_inst_vector_test.cpp</in>
+                    <in>flat_map_adaptor_test.cpp</in>
+                    <in>flat_map_test.cpp</in>
+                    <in>flat_set_adaptor_test.cpp</in>
+                    <in>flat_set_test.cpp</in>
+                    <in>flat_tree_test.cpp</in>
+                    <in>global_resource_test.cpp</in>
+                    <in>insert_vs_emplace_test.cpp</in>
+                    <in>list_test.cpp</in>
+                    <in>map_test.cpp</in>
+                    <in>memory_resource_test.cpp</in>
+                    <in>monotonic_buffer_resource_test.cpp</in>
+                    <in>node_handle_test.cpp</in>
+                    <in>null_iterators_test.cpp</in>
+                    <in>pair_test.cpp</in>
+                    <in>pmr_deque_test.cpp</in>
+                    <in>pmr_devector_test.cpp</in>
+                    <in>pmr_flat_map_test.cpp</in>
+                    <in>pmr_flat_set_test.cpp</in>
+                    <in>pmr_list_test.cpp</in>
+                    <in>pmr_map_test.cpp</in>
+                    <in>pmr_set_test.cpp</in>
+                    <in>pmr_slist_test.cpp</in>
+                    <in>pmr_small_vector_test.cpp</in>
+                    <in>pmr_stable_vector_test.cpp</in>
+                    <in>pmr_string_test.cpp</in>
+                    <in>pmr_vector_test.cpp</in>
+                    <in>polymorphic_allocator_test.cpp</in>
+                    <in>resource_adaptor_test.cpp</in>
+                    <in>scoped_allocator_adaptor_test.cpp</in>
+                    <in>scoped_allocator_usage_test.cpp</in>
+                    <in>set_test.cpp</in>
+                    <in>slist_test.cpp</in>
+                    <in>small_vector_options_test.cpp</in>
+                    <in>small_vector_test.cpp</in>
+                    <in>stable_vector_test.cpp</in>
+                    <in>static_vector_options_test.cpp</in>
+                    <in>static_vector_test.cpp</in>
+                    <in>string_test.cpp</in>
+                    <in>string_view_compat_test.cpp</in>
+                    <in>synchronized_pool_resource_test.cpp</in>
+                    <in>throw_exception_test.cpp</in>
+                    <in>tree_test.cpp</in>
+                    <in>unsynchronized_pool_resource_test.cpp</in>
+                    <in>uses_allocator_test.cpp</in>
+                    <in>vector_options_test.cpp</in>
+                    <in>vector_test.cpp</in>
+                  </df>
+                </df>
+                <df name="container_hash">
+                  <df name="doc">
+                    <df name="samples">
+                      <in>tutorial.cpp</in>
+                    </df>
+                  </df>
+                  <df name="examples">
+                    <in>books.cpp</in>
+                    <in>point.cpp</in>
+                    <in>portable.cpp</in>
+                    <in>template.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>check_float_funcs.cpp</in>
+                    <in>extensions_hpp_test.cpp</in>
+                    <in>hash_built_in_array_test.cpp</in>
+                    <in>hash_complex_test.cpp</in>
+                    <in>hash_custom_test.cpp</in>
+                    <in>hash_deque_test.cpp</in>
+                    <in>hash_enum_test.cpp</in>
+                    <in>hash_float_test.cpp</in>
+                    <in>hash_friend_test.cpp</in>
+                    <in>hash_function_pointer_test.cpp</in>
+                    <in>hash_fwd_test_1.cpp</in>
+                    <in>hash_fwd_test_2.cpp</in>
+                    <in>hash_global_namespace_test.cpp</in>
+                    <in>hash_info.cpp</in>
+                    <in>hash_list_test.cpp</in>
+                    <in>hash_long_double_test.cpp</in>
+                    <in>hash_map_test.cpp</in>
+                    <in>hash_no_ext_fail_test.cpp</in>
+                    <in>hash_no_ext_macro_1.cpp</in>
+                    <in>hash_no_ext_macro_2.cpp</in>
+                    <in>hash_number_test.cpp</in>
+                    <in>hash_optional_test.cpp</in>
+                    <in>hash_pointer_test.cpp</in>
+                    <in>hash_range_test.cpp</in>
+                    <in>hash_reference_values.cpp</in>
+                    <in>hash_set_test.cpp</in>
+                    <in>hash_std_array_test.cpp</in>
+                    <in>hash_std_smart_ptr_test.cpp</in>
+                    <in>hash_std_tuple_test.cpp</in>
+                    <in>hash_string_test.cpp</in>
+                    <in>hash_system_error_test.cpp</in>
+                    <in>hash_type_index_test.cpp</in>
+                    <in>hash_value_array_test.cpp</in>
+                    <in>hash_variant_test.cpp</in>
+                    <in>hash_vector_test.cpp</in>
+                    <in>implicit_test.cpp</in>
+                    <in>link_ext_test.cpp</in>
+                    <in>link_no_ext_test.cpp</in>
+                    <in>link_test.cpp</in>
+                    <in>link_test_2.cpp</in>
+                    <in>namespace_fail_test.cpp</in>
+                  </df>
+                </df>
+                <df name="context">
+                  <df name="example">
+                    <df name="callcc">
+                      <in>backtrace.cpp</in>
+                      <in>echosse.cpp</in>
+                      <in>endless_loop.cpp</in>
+                      <in>fibonacci.cpp</in>
+                      <in>jump.cpp</in>
+                      <in>jump_mov.cpp</in>
+                      <in>jump_void.cpp</in>
+                      <in>ontop.cpp</in>
+                      <in>ontop_void.cpp</in>
+                      <in>parser.cpp</in>
+                      <in>segmented.cpp</in>
+                      <in>stack.cpp</in>
+                      <in>throw.cpp</in>
+                    </df>
+                    <df name="fiber">
+                      <in>backtrace.cpp</in>
+                      <in>circle.cpp</in>
+                      <in>echosse.cpp</in>
+                      <in>endless_loop.cpp</in>
+                      <in>fibonacci.cpp</in>
+                      <in>jump.cpp</in>
+                      <in>jump_mov.cpp</in>
+                      <in>jump_void.cpp</in>
+                      <in>ontop.cpp</in>
+                      <in>ontop_void.cpp</in>
+                      <in>parser.cpp</in>
+                      <in>segmented.cpp</in>
+                      <in>stack.cpp</in>
+                      <in>throw.cpp</in>
+                    </df>
+                  </df>
+                  <df name="performance">
+                    <df name="callcc">
+                      <in>performance.cpp</in>
+                    </df>
+                    <df name="fcontext">
+                      <in>performance.cpp</in>
+                    </df>
+                    <df name="fiber">
+                      <in>performance.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <df name="asm">
+                      <in>tail_ppc32_sysv_elf_gas.cpp</in>
+                    </df>
+                    <df name="posix">
+                      <in>stack_traits.cpp</in>
+                    </df>
+                    <df name="windows">
+                      <in>stack_traits.cpp</in>
+                    </df>
+                    <in>continuation.cpp</in>
+                    <in>dummy.cpp</in>
+                    <in>fiber.cpp</in>
+                    <in>untested.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>test_apply.cpp</in>
+                    <in>test_callcc.cpp</in>
+                    <in>test_fcontext.cpp</in>
+                    <in>test_fiber.cpp</in>
+                    <in>test_invoke.cpp</in>
+                  </df>
+                </df>
+                <df name="contract">
+                  <df name="example">
+                    <df name="cline90">
+                      <in>calendar.cpp</in>
+                      <in>stack.cpp</in>
+                      <in>vector_main.cpp</in>
+                      <in>vstack.cpp</in>
+                    </df>
+                    <df name="features">
+                      <in>access.cpp</in>
+                      <in>assertion_level.cpp</in>
+                      <in>base_types.cpp</in>
+                      <in>base_types_no_macro.cpp</in>
+                      <in>call_if_cxx14.cpp</in>
+                      <in>check.cpp</in>
+                      <in>check_macro.cpp</in>
+                      <in>code_block.cpp</in>
+                      <in>condition_if.cpp</in>
+                      <in>friend.cpp</in>
+                      <in>friend_invariant.cpp</in>
+                      <in>if_constexpr.cpp</in>
+                      <in>ifdef.cpp</in>
+                      <in>ifdef_macro.cpp</in>
+                      <in>introduction.cpp</in>
+                      <in>introduction_comments.cpp</in>
+                      <in>introduction_public.cpp</in>
+                      <in>lambda.cpp</in>
+                      <in>loop.cpp</in>
+                      <in>move.cpp</in>
+                      <in>named_override.cpp</in>
+                      <in>no_lambdas.cpp</in>
+                      <in>no_lambdas_local_func.cpp</in>
+                      <in>non_member.cpp</in>
+                      <in>old.cpp</in>
+                      <in>old_if_copyable.cpp</in>
+                      <in>old_no_macro.cpp</in>
+                      <in>optional_result.cpp</in>
+                      <in>optional_result_virtual.cpp</in>
+                      <in>overload.cpp</in>
+                      <in>private_protected.cpp</in>
+                      <in>private_protected_virtual.cpp</in>
+                      <in>private_protected_virtual_multi.cpp</in>
+                      <in>public.cpp</in>
+                      <in>pure_virtual_public.cpp</in>
+                      <in>separate_body.cpp</in>
+                      <in>static_public.cpp</in>
+                      <in>throw_on_failure.cpp</in>
+                      <in>union.cpp</in>
+                      <in>volatile.cpp</in>
+                    </df>
+                    <df name="meyer97">
+                      <in>stack3.cpp</in>
+                      <in>stack4_main.cpp</in>
+                    </df>
+                    <df name="mitchell02">
+                      <in>counter_main.cpp</in>
+                      <in>courier.cpp</in>
+                      <in>customer_manager.cpp</in>
+                      <in>dictionary.cpp</in>
+                      <in>name_list.cpp</in>
+                      <in>observer_main.cpp</in>
+                      <in>simple_queue.cpp</in>
+                      <in>stack.cpp</in>
+                    </df>
+                    <df name="n1962">
+                      <in>circle.cpp</in>
+                      <in>equal.cpp</in>
+                      <in>factorial.cpp</in>
+                      <in>sqrt.cpp</in>
+                      <in>sum.cpp</in>
+                      <in>vector.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <in>contract.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="call_if">
+                      <in>equal_to.cpp</in>
+                      <in>equal_to_cxx14.cpp</in>
+                      <in>false_.cpp</in>
+                      <in>false_void.cpp</in>
+                      <in>no_equal_call_if.cpp</in>
+                      <in>no_equal_condition_if.cpp</in>
+                      <in>no_equal_error.cpp</in>
+                      <in>true_.cpp</in>
+                      <in>true_void.cpp</in>
+                    </df>
+                    <df name="check">
+                      <in>audit.cpp</in>
+                      <in>audit_disabled.cpp</in>
+                      <in>audit_disabled_error.cpp</in>
+                      <in>audit_error.cpp</in>
+                      <in>axiom.cpp</in>
+                      <in>axiom_error.cpp</in>
+                      <in>decl_class.cpp</in>
+                      <in>decl_macro.cpp</in>
+                      <in>ifdef.cpp</in>
+                      <in>ifdef_macro.cpp</in>
+                    </df>
+                    <df name="constructor">
+                      <in>access.cpp</in>
+                      <in>decl_entry_static_inv_all.cpp</in>
+                      <in>decl_entry_static_inv_ends.cpp</in>
+                      <in>decl_entry_static_inv_mid.cpp</in>
+                      <in>decl_entry_static_inv_none.cpp</in>
+                      <in>decl_exit_inv_all.cpp</in>
+                      <in>decl_exit_inv_ends.cpp</in>
+                      <in>decl_exit_inv_mid.cpp</in>
+                      <in>decl_exit_inv_none.cpp</in>
+                      <in>decl_exit_static_inv_all.cpp</in>
+                      <in>decl_exit_static_inv_ends.cpp</in>
+                      <in>decl_exit_static_inv_mid.cpp</in>
+                      <in>decl_exit_static_inv_none.cpp</in>
+                      <in>decl_post_all.cpp</in>
+                      <in>decl_post_ends.cpp</in>
+                      <in>decl_post_mid.cpp</in>
+                      <in>decl_post_none.cpp</in>
+                      <in>decl_pre_all.cpp</in>
+                      <in>decl_pre_ends.cpp</in>
+                      <in>decl_pre_mid.cpp</in>
+                      <in>decl_pre_none.cpp</in>
+                      <in>ifdef.cpp</in>
+                      <in>ifdef_macro.cpp</in>
+                      <in>pre_error.cpp</in>
+                      <in>smoke.cpp</in>
+                      <in>throwing_body.cpp</in>
+                      <in>throwing_old.cpp</in>
+                      <in>throwing_post.cpp</in>
+                      <in>throwing_pre.cpp</in>
+                    </df>
+                    <df name="destructor">
+                      <in>access.cpp</in>
+                      <in>decl_entry_inv_all.cpp</in>
+                      <in>decl_entry_inv_ends.cpp</in>
+                      <in>decl_entry_inv_mid.cpp</in>
+                      <in>decl_entry_inv_none.cpp</in>
+                      <in>decl_entry_static_inv_all.cpp</in>
+                      <in>decl_entry_static_inv_ends.cpp</in>
+                      <in>decl_entry_static_inv_mid.cpp</in>
+                      <in>decl_entry_static_inv_none.cpp</in>
+                      <in>decl_exit_static_inv_all.cpp</in>
+                      <in>decl_exit_static_inv_ends.cpp</in>
+                      <in>decl_exit_static_inv_mid.cpp</in>
+                      <in>decl_exit_static_inv_none.cpp</in>
+                      <in>decl_post_all.cpp</in>
+                      <in>decl_post_ends.cpp</in>
+                      <in>decl_post_mid.cpp</in>
+                      <in>decl_post_none.cpp</in>
+                      <in>ifdef.cpp</in>
+                      <in>ifdef_macro.cpp</in>
+                      <in>pre_error.cpp</in>
+                      <in>smoke.cpp</in>
+                      <in>throwing_body.cpp</in>
+                      <in>throwing_old.cpp</in>
+                      <in>throwing_post.cpp</in>
+                    </df>
+                    <df name="disable">
+                      <in>audit.cpp</in>
+                      <in>audit_disabled.cpp</in>
+                      <in>audit_disabled_error.cpp</in>
+                      <in>audit_error.cpp</in>
+                      <in>axiom.cpp</in>
+                      <in>axiom_error.cpp</in>
+                      <in>lib_a.cpp</in>
+                      <in>lib_b.cpp</in>
+                      <in>lib_x.cpp</in>
+                      <in>lib_y.cpp</in>
+                      <in>no_post_except_lib.cpp</in>
+                      <in>no_post_except_unit.cpp</in>
+                      <in>nothing_for_pre_prog.cpp</in>
+                      <in>other_assertions_lib.cpp</in>
+                      <in>other_assertions_prog.cpp</in>
+                      <in>other_assertions_unit.cpp</in>
+                    </df>
+                    <df name="function">
+                      <in>decl_post_all.cpp</in>
+                      <in>decl_post_none.cpp</in>
+                      <in>decl_pre_all.cpp</in>
+                      <in>decl_pre_none.cpp</in>
+                      <in>ifdef.cpp</in>
+                      <in>ifdef_macro.cpp</in>
+                      <in>smoke.cpp</in>
+                      <in>throwing_body.cpp</in>
+                      <in>throwing_old.cpp</in>
+                      <in>throwing_post.cpp</in>
+                      <in>throwing_pre.cpp</in>
+                    </df>
+                    <df name="invariant">
+                      <in>decl_const.cpp</in>
+                      <in>decl_cv.cpp</in>
+                      <in>decl_cv_const.cpp</in>
+                      <in>decl_nothing.cpp</in>
+                      <in>decl_static.cpp</in>
+                      <in>decl_static_const.cpp</in>
+                      <in>decl_static_cv.cpp</in>
+                      <in>decl_static_cv_const.cpp</in>
+                      <in>ifdef.cpp</in>
+                      <in>ifdef_macro.cpp</in>
+                      <in>mutable_error.cpp</in>
+                      <in>mutable_permissive.cpp</in>
+                      <in>static_const_error.cpp</in>
+                      <in>static_const_permissive.cpp</in>
+                      <in>static_cv_error.cpp</in>
+                      <in>static_cv_permissive.cpp</in>
+                      <in>static_error.cpp</in>
+                      <in>static_mutable_error.cpp</in>
+                      <in>static_mutable_permissive.cpp</in>
+                      <in>static_permissive.cpp</in>
+                      <in>static_volatile_error.cpp</in>
+                      <in>static_volatile_permissive.cpp</in>
+                      <in>volatile_error.cpp</in>
+                      <in>volatile_permissive.cpp</in>
+                    </df>
+                    <df name="old">
+                      <in>auto.cpp</in>
+                      <in>copyable_traits.cpp</in>
+                      <in>if_copyable.cpp</in>
+                      <in>if_copyable_error.cpp</in>
+                      <in>if_copyable_macro.cpp</in>
+                      <in>no_macro.cpp</in>
+                      <in>no_macro_if_copyable.cpp</in>
+                      <in>no_make_old_error.cpp</in>
+                      <in>no_make_old_if_copyable_error.cpp</in>
+                    </df>
+                    <df name="public_function">
+                      <in>access.cpp</in>
+                      <in>decl_entry_inv_all.cpp</in>
+                      <in>decl_entry_inv_ends.cpp</in>
+                      <in>decl_entry_inv_mid.cpp</in>
+                      <in>decl_entry_inv_none.cpp</in>
+                      <in>decl_entry_static_inv_all.cpp</in>
+                      <in>decl_entry_static_inv_ends.cpp</in>
+                      <in>decl_entry_static_inv_mid.cpp</in>
+                      <in>decl_entry_static_inv_none.cpp</in>
+                      <in>decl_exit_inv_all.cpp</in>
+                      <in>decl_exit_inv_ends.cpp</in>
+                      <in>decl_exit_inv_mid.cpp</in>
+                      <in>decl_exit_inv_none.cpp</in>
+                      <in>decl_exit_static_inv_all.cpp</in>
+                      <in>decl_exit_static_inv_ends.cpp</in>
+                      <in>decl_exit_static_inv_mid.cpp</in>
+                      <in>decl_exit_static_inv_none.cpp</in>
+                      <in>decl_post_all.cpp</in>
+                      <in>decl_post_ends.cpp</in>
+                      <in>decl_post_mid.cpp</in>
+                      <in>decl_post_none.cpp</in>
+                      <in>decl_pre_all.cpp</in>
+                      <in>decl_pre_ends.cpp</in>
+                      <in>decl_pre_mid.cpp</in>
+                      <in>decl_pre_none.cpp</in>
+                      <in>friend.cpp</in>
+                      <in>ifdef.cpp</in>
+                      <in>ifdef_macro.cpp</in>
+                      <in>max_args.cpp</in>
+                      <in>max_args0.cpp</in>
+                      <in>max_args0_no_tva.cpp</in>
+                      <in>max_args1.cpp</in>
+                      <in>max_args1_no_tva.cpp</in>
+                      <in>max_args2.cpp</in>
+                      <in>max_args2_no_tva.cpp</in>
+                      <in>max_args_no_tva.cpp</in>
+                      <in>max_bases.cpp</in>
+                      <in>old_virtual.cpp</in>
+                      <in>overload.cpp</in>
+                      <in>overload_no_tva.cpp</in>
+                      <in>override_error.cpp</in>
+                      <in>override_permissive.cpp</in>
+                      <in>protected.cpp</in>
+                      <in>protected_error.cpp</in>
+                      <in>smoke.cpp</in>
+                      <in>static.cpp</in>
+                      <in>static_ifdef.cpp</in>
+                      <in>static_ifdef_macro.cpp</in>
+                      <in>static_throwing_body.cpp</in>
+                      <in>static_throwing_old.cpp</in>
+                      <in>static_throwing_post.cpp</in>
+                      <in>static_throwing_pre.cpp</in>
+                      <in>throwing_body.cpp</in>
+                      <in>throwing_body_virtual.cpp</in>
+                      <in>throwing_body_virtual_branch.cpp</in>
+                      <in>throwing_old.cpp</in>
+                      <in>throwing_post.cpp</in>
+                      <in>throwing_pre.cpp</in>
+                      <in>virtual.cpp</in>
+                      <in>virtual_access.cpp</in>
+                      <in>virtual_access_multi.cpp</in>
+                      <in>virtual_branch.cpp</in>
+                      <in>virtual_sparse.cpp</in>
+                    </df>
+                    <df name="result">
+                      <in>mixed_optional.cpp</in>
+                      <in>mixed_optional_ref.cpp</in>
+                      <in>type_mismatch_error.cpp</in>
+                    </df>
+                    <df name="specify">
+                      <in>auto_error.cpp</in>
+                      <in>auto_pre_error.cpp</in>
+                      <in>auto_pre_old_error.cpp</in>
+                      <in>auto_pre_old_post_error.cpp</in>
+                      <in>auto_pre_old_post_except_error.cpp</in>
+                      <in>except.cpp</in>
+                      <in>except_old_error.cpp</in>
+                      <in>except_post_error.cpp</in>
+                      <in>except_pre_error.cpp</in>
+                      <in>missing_check.cpp</in>
+                      <in>nothing.cpp</in>
+                      <in>old.cpp</in>
+                      <in>old_except.cpp</in>
+                      <in>old_post.cpp</in>
+                      <in>old_post_except.cpp</in>
+                      <in>old_pre_error.cpp</in>
+                      <in>post.cpp</in>
+                      <in>post_except.cpp</in>
+                      <in>post_old_error.cpp</in>
+                      <in>post_pre_error.cpp</in>
+                      <in>pre.cpp</in>
+                      <in>pre_except.cpp</in>
+                      <in>pre_old.cpp</in>
+                      <in>pre_old_except.cpp</in>
+                      <in>pre_old_post.cpp</in>
+                      <in>pre_old_post_except.cpp</in>
+                      <in>pre_post.cpp</in>
+                      <in>pre_post_except.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="conversion">
+                  <df name="test">
+                    <in>cast_test.cpp</in>
+                    <in>implicit_cast.cpp</in>
+                    <in>implicit_cast_fail.cpp</in>
+                    <in>implicit_cast_fail2.cpp</in>
+                    <in>polymorphic_cast_test.cpp</in>
+                  </df>
+                </df>
+                <df name="convert">
+                  <df name="example">
+                    <in>algorithms.cpp</in>
+                    <in>default_converter.cpp</in>
+                    <in>default_converter_fail.cpp</in>
+                    <in>getting_serious.cpp</in>
+                    <in>getting_started.cpp</in>
+                    <in>lexical_cast.cpp</in>
+                    <in>stream.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>callable.cpp</in>
+                    <in>encryption.cpp</in>
+                    <in>fallbacks.cpp</in>
+                    <in>has_member.cpp</in>
+                    <in>is_converter.cpp</in>
+                    <in>lcast_converter.cpp</in>
+                    <in>performance.cpp</in>
+                    <in>performance_spirit.cpp</in>
+                    <in>printf_converter.cpp</in>
+                    <in>sfinae.cpp</in>
+                    <in>spirit_converter.cpp</in>
+                    <in>str_to_int.cpp</in>
+                    <in>stream_converter.cpp</in>
+                    <in>strtol_converter.cpp</in>
+                    <in>user_type.cpp</in>
+                  </df>
+                </df>
+                <df name="core">
+                  <df name="test">
+                    <df name="swap">
+                      <in>swap_array_of_array_of_class.cpp</in>
+                      <in>swap_array_of_array_of_int.cpp</in>
+                      <in>swap_array_of_class.cpp</in>
+                      <in>swap_array_of_int.cpp</in>
+                      <in>swap_array_of_template.cpp</in>
+                      <in>swap_const_wrapper_fail.cpp</in>
+                      <in>swap_lib_header_1.cpp</in>
+                      <in>swap_lib_header_2.cpp</in>
+                      <in>swap_mixed_headers_1.cpp</in>
+                      <in>swap_mixed_headers_2.cpp</in>
+                      <in>swap_no_ambiguity_in_boost.cpp</in>
+                      <in>swap_primitive.cpp</in>
+                      <in>swap_root_header_1.cpp</in>
+                      <in>swap_root_header_2.cpp</in>
+                      <in>swap_specialized_in_boost.cpp</in>
+                      <in>swap_specialized_in_boost_and_other.cpp</in>
+                      <in>swap_specialized_in_global.cpp</in>
+                      <in>swap_specialized_in_other.cpp</in>
+                      <in>swap_specialized_in_std.cpp</in>
+                      <in>swap_std_bitset.cpp</in>
+                      <in>swap_std_dateorder.cpp</in>
+                      <in>swap_std_string.cpp</in>
+                      <in>swap_std_typeinfo_ptr.cpp</in>
+                      <in>swap_std_vector_of_boost.cpp</in>
+                      <in>swap_std_vector_of_global.cpp</in>
+                      <in>swap_std_vector_of_other.cpp</in>
+                    </df>
+                    <in>addressof_constexpr_test.cpp</in>
+                    <in>addressof_fail_rvalue.cpp</in>
+                    <in>addressof_fn_test.cpp</in>
+                    <in>addressof_np_test.cpp</in>
+                    <in>addressof_test.cpp</in>
+                    <in>addressof_test2.cpp</in>
+                    <in>alloc_construct_cxx11_test.cpp</in>
+                    <in>alloc_construct_test.cpp</in>
+                    <in>alloc_construct_throws_test.cpp</in>
+                    <in>allocator_allocate_hint_test.cpp</in>
+                    <in>allocator_allocate_test.cpp</in>
+                    <in>allocator_const_pointer_test.cpp</in>
+                    <in>allocator_const_void_pointer_test.cpp</in>
+                    <in>allocator_construct_test.cpp</in>
+                    <in>allocator_deallocate_test.cpp</in>
+                    <in>allocator_destroy_test.cpp</in>
+                    <in>allocator_difference_type_test.cpp</in>
+                    <in>allocator_is_always_equal_test.cpp</in>
+                    <in>allocator_max_size_test.cpp</in>
+                    <in>allocator_pocca_test.cpp</in>
+                    <in>allocator_pocma_test.cpp</in>
+                    <in>allocator_pocs_test.cpp</in>
+                    <in>allocator_pointer_test.cpp</in>
+                    <in>allocator_rebind_test.cpp</in>
+                    <in>allocator_size_type_test.cpp</in>
+                    <in>allocator_soccc_test.cpp</in>
+                    <in>allocator_value_type_test.cpp</in>
+                    <in>allocator_void_pointer_test.cpp</in>
+                    <in>as_bytes_test.cpp</in>
+                    <in>as_writable_bytes_test.cpp</in>
+                    <in>bit_cast_test.cpp</in>
+                    <in>bit_ceil_test.cpp</in>
+                    <in>bit_countl_test.cpp</in>
+                    <in>bit_countr_test.cpp</in>
+                    <in>bit_endian_test.cpp</in>
+                    <in>bit_floor_test.cpp</in>
+                    <in>bit_popcount_test.cpp</in>
+                    <in>bit_rotate_test.cpp</in>
+                    <in>bit_width_test.cpp</in>
+                    <in>checked_delete_fail.cpp</in>
+                    <in>checked_delete_fail2.cpp</in>
+                    <in>checked_delete_test.cpp</in>
+                    <in>cmath_test.cpp</in>
+                    <in>default_allocator_test.cpp</in>
+                    <in>demangle_test.cpp</in>
+                    <in>demangled_name_test.cpp</in>
+                    <in>detail_iterator_test.cpp</in>
+                    <in>eif_constructors.cpp</in>
+                    <in>eif_dummy_arg_disambiguation.cpp</in>
+                    <in>eif_lazy.cpp</in>
+                    <in>eif_lazy_test.cpp</in>
+                    <in>eif_member_templates.cpp</in>
+                    <in>eif_namespace_disambiguation.cpp</in>
+                    <in>eif_no_disambiguation.cpp</in>
+                    <in>eif_partial_specializations.cpp</in>
+                    <in>empty_value_final_test.cpp</in>
+                    <in>empty_value_size_test.cpp</in>
+                    <in>empty_value_test.cpp</in>
+                    <in>exchange_move_test.cpp</in>
+                    <in>exchange_test.cpp</in>
+                    <in>explicit_operator_bool.cpp</in>
+                    <in>explicit_operator_bool_compile_fail_conv_int.cpp</in>
+                    <in>explicit_operator_bool_compile_fail_conv_pvoid.cpp</in>
+                    <in>explicit_operator_bool_compile_fail_delete.cpp</in>
+                    <in>explicit_operator_bool_compile_fail_shift.cpp</in>
+                    <in>explicit_operator_bool_noexcept.cpp</in>
+                    <in>first_scalar_constexpr_test.cpp</in>
+                    <in>first_scalar_test.cpp</in>
+                    <in>get_pointer_test.cpp</in>
+                    <in>has_single_bit_test.cpp</in>
+                    <in>ignore_unused_test.cpp</in>
+                    <in>is_same_test.cpp</in>
+                    <in>iterator_test.cpp</in>
+                    <in>lib_typeid.cpp</in>
+                    <in>lightweight_test_all_eq_test.cpp</in>
+                    <in>lightweight_test_all_with_fail.cpp</in>
+                    <in>lightweight_test_all_with_test.cpp</in>
+                    <in>lightweight_test_bool.cpp</in>
+                    <in>lightweight_test_eq_nullptr.cpp</in>
+                    <in>lightweight_test_fail.cpp</in>
+                    <in>lightweight_test_fail10.cpp</in>
+                    <in>lightweight_test_fail11.cpp</in>
+                    <in>lightweight_test_fail12.cpp</in>
+                    <in>lightweight_test_fail13.cpp</in>
+                    <in>lightweight_test_fail14.cpp</in>
+                    <in>lightweight_test_fail15.cpp</in>
+                    <in>lightweight_test_fail2.cpp</in>
+                    <in>lightweight_test_fail3.cpp</in>
+                    <in>lightweight_test_fail4.cpp</in>
+                    <in>lightweight_test_fail5.cpp</in>
+                    <in>lightweight_test_fail6.cpp</in>
+                    <in>lightweight_test_fail7.cpp</in>
+                    <in>lightweight_test_fail8.cpp</in>
+                    <in>lightweight_test_fail9.cpp</in>
+                    <in>lightweight_test_ge_fail.cpp</in>
+                    <in>lightweight_test_gt_fail.cpp</in>
+                    <in>lightweight_test_gt_ge_test.cpp</in>
+                    <in>lightweight_test_le_fail.cpp</in>
+                    <in>lightweight_test_lt_fail.cpp</in>
+                    <in>lightweight_test_lt_le_test.cpp</in>
+                    <in>lightweight_test_test.cpp</in>
+                    <in>lightweight_test_test2.cpp</in>
+                    <in>lightweight_test_test3.cpp</in>
+                    <in>lightweight_test_test4.cpp</in>
+                    <in>lightweight_test_test5.cpp</in>
+                    <in>lightweight_test_test6.cpp</in>
+                    <in>lightweight_test_with_fail.cpp</in>
+                    <in>lightweight_test_with_test.cpp</in>
+                    <in>no_exceptions_support_test.cpp</in>
+                    <in>noinit_adaptor_test.cpp</in>
+                    <in>noncopyable_compile_fail.cpp</in>
+                    <in>nvp_test.cpp</in>
+                    <in>pointer_traits_difference_type_test.cpp</in>
+                    <in>pointer_traits_element_type_test.cpp</in>
+                    <in>pointer_traits_pointer_test.cpp</in>
+                    <in>pointer_traits_pointer_to_test.cpp</in>
+                    <in>pointer_traits_rebind_test.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>quick_exit_fail.cpp</in>
+                    <in>quick_exit_test.cpp</in>
+                    <in>ref_conversion_test.cpp</in>
+                    <in>ref_ct_test.cpp</in>
+                    <in>ref_cv_test.cpp</in>
+                    <in>ref_fn_test.cpp</in>
+                    <in>ref_implicit_fail.cpp</in>
+                    <in>ref_implicit_fail2.cpp</in>
+                    <in>ref_implicit_fail3.cpp</in>
+                    <in>ref_implicit_fail4.cpp</in>
+                    <in>ref_ref_test.cpp</in>
+                    <in>ref_rv_fail1.cpp</in>
+                    <in>ref_rv_fail2.cpp</in>
+                    <in>ref_rv_fail3.cpp</in>
+                    <in>ref_rv_fail4.cpp</in>
+                    <in>ref_rv_fail5.cpp</in>
+                    <in>ref_test.cpp</in>
+                    <in>scoped_enum.cpp</in>
+                    <in>scoped_enum_compile_fail_conv_from_int.cpp</in>
+                    <in>scoped_enum_compile_fail_conv_to_int.cpp</in>
+                    <in>sp_typeinfo_test.cpp</in>
+                    <in>span_constructible_test.cpp</in>
+                    <in>span_deduction_guide_test.cpp</in>
+                    <in>span_test.cpp</in>
+                    <in>span_types_test.cpp</in>
+                    <in>sv_compare_test.cpp</in>
+                    <in>sv_construct_test.cpp</in>
+                    <in>sv_contains_test.cpp</in>
+                    <in>sv_conversion_test.cpp</in>
+                    <in>sv_copy_test.cpp</in>
+                    <in>sv_element_access_test.cpp</in>
+                    <in>sv_ends_with_test.cpp</in>
+                    <in>sv_eq_test.cpp</in>
+                    <in>sv_find_first_not_of_test.cpp</in>
+                    <in>sv_find_first_of_test.cpp</in>
+                    <in>sv_find_last_not_of_test.cpp</in>
+                    <in>sv_find_last_of_test.cpp</in>
+                    <in>sv_find_test.cpp</in>
+                    <in>sv_iteration_test.cpp</in>
+                    <in>sv_lt_test.cpp</in>
+                    <in>sv_modifiers_test.cpp</in>
+                    <in>sv_rfind_test.cpp</in>
+                    <in>sv_starts_with_test.cpp</in>
+                    <in>sv_stream_insert_test.cpp</in>
+                    <in>sv_substr_test.cpp</in>
+                    <in>sv_types_test.cpp</in>
+                    <in>test_lib_typeid.cpp</in>
+                    <in>test_lib_typeid2.cpp</in>
+                    <in>to_address_test.cpp</in>
+                    <in>type_name_test.cpp</in>
+                    <in>typeinfo_test.cpp</in>
+                    <in>uncaught_exceptions.cpp</in>
+                    <in>uncaught_exceptions_np.cpp</in>
+                    <in>underlying_type.cpp</in>
+                    <in>use_default_test.cpp</in>
+                    <in>visit_each_test.cpp</in>
+                  </df>
+                </df>
+                <df name="coroutine">
+                  <df name="example">
+                    <df name="asymmetric">
+                      <in>chaining.cpp</in>
+                      <in>echo.cpp</in>
+                      <in>exception.cpp</in>
+                      <in>fibonacci.cpp</in>
+                      <in>layout.cpp</in>
+                      <in>parallel.cpp</in>
+                      <in>power.cpp</in>
+                      <in>same_fringe.cpp</in>
+                      <in>segmented_stack.cpp</in>
+                      <in>simple.cpp</in>
+                      <in>test.cpp</in>
+                      <in>unwind.cpp</in>
+                    </df>
+                    <df name="symmetric">
+                      <in>dice_game.cpp</in>
+                      <in>merge_arrays.cpp</in>
+                      <in>segmented_stack.cpp</in>
+                      <in>simple.cpp</in>
+                      <in>unwind.cpp</in>
+                    </df>
+                  </df>
+                  <df name="performance">
+                    <df name="asymmetric">
+                      <df name="segmented">
+                        <in>performance_create_segmented.cpp</in>
+                      </df>
+                      <in>performance_create_prealloc.cpp</in>
+                      <in>performance_create_protected.cpp</in>
+                      <in>performance_create_standard.cpp</in>
+                      <in>performance_switch.cpp</in>
+                    </df>
+                    <df name="symmetric">
+                      <df name="segmented">
+                        <in>performance_create_segmented.cpp</in>
+                      </df>
+                      <in>performance_create_prealloc.cpp</in>
+                      <in>performance_create_protected.cpp</in>
+                      <in>performance_create_standard.cpp</in>
+                      <in>performance_switch.cpp</in>
+                    </df>
+                    <in>bind_processor_aix.cpp</in>
+                    <in>bind_processor_freebsd.cpp</in>
+                    <in>bind_processor_hpux.cpp</in>
+                    <in>bind_processor_linux.cpp</in>
+                    <in>bind_processor_solaris.cpp</in>
+                    <in>bind_processor_windows.cpp</in>
+                  </df>
+                  <df name="src">
+                    <df name="detail">
+                      <in>coroutine_context.cpp</in>
+                    </df>
+                    <df name="posix">
+                      <in>stack_traits.cpp</in>
+                    </df>
+                    <df name="windows">
+                      <in>stack_traits.cpp</in>
+                    </df>
+                    <in>exceptions.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>test_asymmetric_coroutine.cpp</in>
+                    <in>test_symmetric_coroutine.cpp</in>
+                  </df>
+                </df>
+                <df name="coroutine2">
+                  <df name="example">
+                    <in>fibonacci.cpp</in>
+                    <in>layout.cpp</in>
+                    <in>parser.cpp</in>
+                    <in>same_fringe.cpp</in>
+                    <in>segmented.cpp</in>
+                  </df>
+                  <df name="performance">
+                    <df name="segmented">
+                      <in>performance_create_segmented.cpp</in>
+                      <in>performance_switch.cpp</in>
+                    </df>
+                    <in>bind_processor_aix.cpp</in>
+                    <in>bind_processor_freebsd.cpp</in>
+                    <in>bind_processor_hpux.cpp</in>
+                    <in>bind_processor_linux.cpp</in>
+                    <in>bind_processor_solaris.cpp</in>
+                    <in>bind_processor_windows.cpp</in>
+                    <in>performance.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>test_coroutine.cpp</in>
+                  </df>
+                </df>
+                <df name="crc">
+                  <df name="doc">
+                    <in>crc_examples.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>crc_test.cpp</in>
+                    <in>crc_test2.cpp</in>
+                  </df>
+                  <in>crc_example.cpp</in>
+                </df>
+                <df name="date_time">
+                  <df name="example">
+                    <df name="gregorian">
+                      <in>date_serialization_demo.cpp</in>
+                      <in>dates_as_strings.cpp</in>
+                      <in>days_alive.cpp</in>
+                      <in>days_between_new_years.cpp</in>
+                      <in>days_since_year_start.cpp</in>
+                      <in>days_till_new_year.cpp</in>
+                      <in>end_of_month_day.cpp</in>
+                      <in>find_last_day_of_months.cpp</in>
+                      <in>localization.cpp</in>
+                      <in>month_add.cpp</in>
+                      <in>period_calc.cpp</in>
+                      <in>print_holidays.cpp</in>
+                      <in>print_month.cpp</in>
+                    </df>
+                    <df name="local_time">
+                      <in>calc_rules.cpp</in>
+                      <in>flight.cpp</in>
+                      <in>local_date_time.cpp</in>
+                      <in>seconds_since_epoch.cpp</in>
+                      <in>simple_time_zone.cpp</in>
+                    </df>
+                    <df name="posix_time">
+                      <in>local_utc_conversion.cpp</in>
+                      <in>print_hours.cpp</in>
+                      <in>time_math.cpp</in>
+                      <in>time_periods.cpp</in>
+                    </df>
+                    <df name="tutorial">
+                      <in>io_tutorial.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <df name="gregorian">
+                      <in>date_generators.cpp</in>
+                      <in>greg_month.cpp</in>
+                      <in>greg_weekday.cpp</in>
+                      <in>gregorian_types.cpp</in>
+                    </df>
+                    <df name="posix_time">
+                      <in>posix_time_types.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="gregorian">
+                      <in>testcurrent_day.cpp</in>
+                      <in>testdate.cpp</in>
+                      <in>testdate_duration.cpp</in>
+                      <in>testdate_facet_new.cpp</in>
+                      <in>testdate_input_facet.cpp</in>
+                      <in>testdate_iterator.cpp</in>
+                      <in>testfacet.cpp</in>
+                      <in>testformat_date_parser.cpp</in>
+                      <in>testformatters.cpp</in>
+                      <in>testgenerators.cpp</in>
+                      <in>testgreg_cal.cpp</in>
+                      <in>testgreg_day.cpp</in>
+                      <in>testgreg_durations.cpp</in>
+                      <in>testgreg_month.cpp</in>
+                      <in>testgreg_serialize.cpp</in>
+                      <in>testgreg_wstream.cpp</in>
+                      <in>testgreg_year.cpp</in>
+                      <in>testparse_date.cpp</in>
+                      <in>testperiod.cpp</in>
+                    </df>
+                    <df name="local_time">
+                      <in>testclocks.cpp</in>
+                      <in>testcustom_time_zone.cpp</in>
+                      <in>testdst_transition_day_rule.cpp</in>
+                      <in>testlocal_time.cpp</in>
+                      <in>testlocal_time_facet.cpp</in>
+                      <in>testlocal_time_input_facet.cpp</in>
+                      <in>testlocal_time_iterator.cpp</in>
+                      <in>testlocal_time_period.cpp</in>
+                      <in>testposix_time_zone.cpp</in>
+                      <in>testtz_database.cpp</in>
+                      <in>testwcustom_time_zone.cpp</in>
+                      <in>testwposix_time_zone.cpp</in>
+                    </df>
+                    <df name="posix_time">
+                      <df name="compile_fail">
+                        <in>hours_special_value.cpp</in>
+                        <in>millisec_special_value.cpp</in>
+                        <in>minutes_special_value.cpp</in>
+                        <in>seconds_special_value.cpp</in>
+                      </df>
+                      <in>testc_local_adjustor.cpp</in>
+                      <in>testclock.cpp</in>
+                      <in>testdst_rules.cpp</in>
+                      <in>testduration.cpp</in>
+                      <in>testfiletime_functions.cpp</in>
+                      <in>testformatters.cpp</in>
+                      <in>testgreg_duration_operators.cpp</in>
+                      <in>testiterator.cpp</in>
+                      <in>testlocal_adjustor.cpp</in>
+                      <in>testmicrosec_time_clock.cpp</in>
+                      <in>testparse_time.cpp</in>
+                      <in>testperiod.cpp</in>
+                      <in>teststreams.cpp</in>
+                      <in>testtime.cpp</in>
+                      <in>testtime_facet.cpp</in>
+                      <in>testtime_formatters.cpp</in>
+                      <in>testtime_input_facet.cpp</in>
+                      <in>testtime_period.cpp</in>
+                      <in>testtime_serialize.cpp</in>
+                      <in>testtime_serialize_versioning.cpp</in>
+                      <in>testtime_wstream.cpp</in>
+                    </df>
+                    <in>self_contained_header.cpp</in>
+                    <in>testconstrained_value.cpp</in>
+                    <in>testfrom_facet.cpp</in>
+                    <in>testgeneric_period.cpp</in>
+                    <in>testgregorian_calendar.cpp</in>
+                    <in>testint64_range.cpp</in>
+                    <in>testint_adapter.cpp</in>
+                    <in>testmisc.cpp</in>
+                    <in>testtime_resolution_traits.cpp</in>
+                    <in>testwrapping_int.cpp</in>
+                  </df>
+                </df>
+                <df name="describe">
+                  <df name="example">
+                    <in>console.cpp</in>
+                    <in>enum_to_string.cpp</in>
+                    <in>equality.cpp</in>
+                    <in>from_json.cpp</in>
+                    <in>hash_value.cpp</in>
+                    <in>json_rpc.cpp</in>
+                    <in>print_function.cpp</in>
+                    <in>printing_enums_ct.cpp</in>
+                    <in>printing_enums_rt.cpp</in>
+                    <in>serialization.cpp</in>
+                    <in>string_to_enum.cpp</in>
+                    <in>struct_to_tuple.cpp</in>
+                    <in>to_json.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>bases_test.cpp</in>
+                    <in>class_template_test.cpp</in>
+                    <in>compute_base_modifiers.cpp</in>
+                    <in>describe_cxx14.cpp</in>
+                    <in>descriptor_by_name_test.cpp</in>
+                    <in>descriptor_by_pointer_test.cpp</in>
+                    <in>empty_enum_test.cpp</in>
+                    <in>enum_from_string_test.cpp</in>
+                    <in>enum_struct_fail.cpp</in>
+                    <in>enum_to_string_test.cpp</in>
+                    <in>enumerators_test.cpp</in>
+                    <in>has_bases_test.cpp</in>
+                    <in>has_enumerators_test.cpp</in>
+                    <in>has_members_test.cpp</in>
+                    <in>members_test.cpp</in>
+                    <in>members_test2.cpp</in>
+                    <in>members_test3.cpp</in>
+                    <in>members_test4.cpp</in>
+                    <in>members_test5.cpp</in>
+                    <in>members_test6.cpp</in>
+                    <in>members_test7.cpp</in>
+                    <in>members_test8.cpp</in>
+                    <in>nested_enum_test.cpp</in>
+                    <in>operator_eq_test.cpp</in>
+                    <in>operator_lt_test.cpp</in>
+                    <in>overloaded_test.cpp</in>
+                    <in>overloaded_test2.cpp</in>
+                    <in>pp_call_test.cpp</in>
+                    <in>pp_for_each_test.cpp</in>
+                    <in>pp_is_empty_test.cpp</in>
+                    <in>pp_is_paren_test.cpp</in>
+                    <in>pp_name_test.cpp</in>
+                    <in>pp_parse_test.cpp</in>
+                    <in>pp_pointer_test.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>struct_enum_fail.cpp</in>
+                    <in>test_d_type.cpp</in>
+                    <in>trailing_comma_test.cpp</in>
+                    <in>unnamed_namespace_test.cpp</in>
+                    <in>unnamed_namespace_test2.cpp</in>
+                  </df>
+                </df>
+                <df name="detail">
+                  <df name="test">
+                    <df name="container_fwd">
+                      <in>container_fwd_test.cpp</in>
+                      <in>container_no_fwd_test.cpp</in>
+                      <in>correctly_disable_fail.cpp</in>
+                    </df>
+                    <in>allocator_utilities_test.cpp</in>
+                    <in>binary_search_test.cpp</in>
+                    <in>blank_test.cpp</in>
+                    <in>is_sorted_test.cpp</in>
+                    <in>is_xxx_test.cpp</in>
+                    <in>numeric_traits_test.cpp</in>
+                    <in>reference_content_test.cpp</in>
+                    <in>test_utf8_codecvt.cpp</in>
+                  </df>
+                </df>
+                <df name="dll">
+                  <df name="example">
+                    <df name="mangled">
+                      <in>import_class.cpp</in>
+                      <in>smart_lib.cpp</in>
+                    </df>
+                    <df name="tutorial1">
+                      <in>my_plugin_sum.cpp</in>
+                      <in>tutorial1.cpp</in>
+                    </df>
+                    <df name="tutorial2">
+                      <in>my_plugin_aggregator.cpp</in>
+                      <in>tutorial2.cpp</in>
+                    </df>
+                    <df name="tutorial3">
+                      <in>tutorial3.cpp</in>
+                    </df>
+                    <df name="tutorial4">
+                      <in>load_self.cpp</in>
+                      <in>static_plugin.cpp</in>
+                    </df>
+                    <df name="tutorial5">
+                      <in>load_all.cpp</in>
+                    </df>
+                    <df name="tutorial6">
+                      <in>on_unload_lib.cpp</in>
+                      <in>tutorial6.cpp</in>
+                    </df>
+                    <df name="tutorial7">
+                      <in>library1.cpp</in>
+                      <in>library2.cpp</in>
+                      <in>tutorial7.cpp</in>
+                    </df>
+                    <df name="tutorial8">
+                      <in>refcounting_plugin.cpp</in>
+                      <in>tutorial8.cpp</in>
+                      <in>tutorial8_static.cpp</in>
+                    </df>
+                    <df name="tutorial9">
+                      <in>tutorial9.cpp</in>
+                    </df>
+                    <in>getting_started.cpp</in>
+                    <in>getting_started_library.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>cpp_ctti_type_name_parser_lib.cpp</in>
+                    <in>cpp_import_class_test.cpp</in>
+                    <in>cpp_import_test.cpp</in>
+                    <in>cpp_load_test.cpp</in>
+                    <in>cpp_mangle_test.cpp</in>
+                    <in>cpp_test_library.cpp</in>
+                    <in>ctti_type_name_parser_test.cpp</in>
+                    <in>empty_library.cpp</in>
+                    <in>empty_library_info_test.cpp</in>
+                    <in>library_info_test.cpp</in>
+                    <in>link1.cpp</in>
+                    <in>link2.cpp</in>
+                    <in>section_name_too_big.cpp</in>
+                    <in>shared_library_concurrent_load_test.cpp</in>
+                    <in>shared_library_errors.cpp</in>
+                    <in>shared_library_get_symbol_test.cpp</in>
+                    <in>shared_library_load_test.cpp</in>
+                    <in>shared_library_search_symbol_test.cpp</in>
+                    <in>structures_tests.cpp</in>
+                    <in>symbol_runtime_info_test.cpp</in>
+                    <in>template_method_linux_test.cpp</in>
+                    <in>test_library.cpp</in>
+                  </df>
+                </df>
+                <df name="dynamic_bitset">
+                  <df name="example">
+                    <in>example1.cpp</in>
+                    <in>example2.cpp</in>
+                    <in>example3.cpp</in>
+                    <in>timing_tests.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>dyn_bitset_unit_tests1.cpp</in>
+                    <in>dyn_bitset_unit_tests2.cpp</in>
+                    <in>dyn_bitset_unit_tests3.cpp</in>
+                    <in>dyn_bitset_unit_tests4.cpp</in>
+                    <in>dyn_bitset_unit_tests5.cpp</in>
+                    <in>test_ambiguous_set.cpp</in>
+                    <in>test_boost_hash.cpp</in>
+                    <in>test_lowest_bit.cpp</in>
+                    <in>test_std_hash.cpp</in>
+                  </df>
+                </df>
+                <df name="endian">
+                  <df name="example">
+                    <in>conversion_use_case.cpp</in>
+                    <in>endian_example.cpp</in>
+                    <in>udt_conversion_example.cpp</in>
+                    <in>use_cases.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>arithmetic_buffer_test.cpp</in>
+                    <in>benchmark.cpp</in>
+                    <in>buffer_test.cpp</in>
+                    <in>conversion_test.cpp</in>
+                    <in>data_test.cpp</in>
+                    <in>deprecated_test.cpp</in>
+                    <in>endian_arithmetic_test.cpp</in>
+                    <in>endian_hpp_test.cpp</in>
+                    <in>endian_in_union_test.cpp</in>
+                    <in>endian_ld_st_roundtrip_test.cpp</in>
+                    <in>endian_load_test.cpp</in>
+                    <in>endian_operations_test.cpp</in>
+                    <in>endian_reverse_cx_test.cpp</in>
+                    <in>endian_reverse_test.cpp</in>
+                    <in>endian_reverse_test2.cpp</in>
+                    <in>endian_reverse_test3.cpp</in>
+                    <in>endian_reverse_test4.cpp</in>
+                    <in>endian_reverse_test5.cpp</in>
+                    <in>endian_store_test.cpp</in>
+                    <in>endian_test.cpp</in>
+                    <in>float_typedef_test.cpp</in>
+                    <in>intrinsic_test.cpp</in>
+                    <in>is_scoped_enum_test.cpp</in>
+                    <in>load_convenience_test.cpp</in>
+                    <in>loop_time_test.cpp</in>
+                    <in>order_test.cpp</in>
+                    <in>packed_arithmetic_test.cpp</in>
+                    <in>packed_buffer_test.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>scoped_enum_emulation_test.cpp</in>
+                    <in>speed_test.cpp</in>
+                    <in>speed_test_functions.cpp</in>
+                    <in>spirit_conflict_test.cpp</in>
+                    <in>store_convenience_test.cpp</in>
+                  </df>
+                </df>
+                <df name="exception">
+                  <df name="example">
+                    <in>cloning_1.cpp</in>
+                    <in>cloning_2.cpp</in>
+                    <in>enable_error_info.cpp</in>
+                    <in>errinfos.cpp</in>
+                    <in>error_info_1.cpp</in>
+                    <in>error_info_2.cpp</in>
+                    <in>example_io.cpp</in>
+                    <in>info_tuple.cpp</in>
+                    <in>logging.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>clone_current_exception_non_intrusive.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>1-throw_exception_test.cpp</in>
+                    <in>2-throw_exception_no_exceptions_test.cpp</in>
+                    <in>3-throw_exception_no_integration_test.cpp</in>
+                    <in>4-throw_exception_no_both_test.cpp</in>
+                    <in>all_hpp_test.cpp</in>
+                    <in>cloning_test.cpp</in>
+                    <in>copy_exception_no_exceptions_test.cpp</in>
+                    <in>copy_exception_test.cpp</in>
+                    <in>current_exception_cast_hpp_test.cpp</in>
+                    <in>current_exception_cast_test.cpp</in>
+                    <in>diagnostic_information_hpp_test.cpp</in>
+                    <in>diagnostic_information_test.cpp</in>
+                    <in>enable_error_info_test.cpp</in>
+                    <in>errinfo_api_function_hpp_test.cpp</in>
+                    <in>errinfo_at_line_hpp_test.cpp</in>
+                    <in>errinfo_errno_hpp_test.cpp</in>
+                    <in>errinfo_file_handle_hpp_test.cpp</in>
+                    <in>errinfo_file_name_hpp_test.cpp</in>
+                    <in>errinfo_file_open_mode_hpp_test.cpp</in>
+                    <in>errinfo_nested_exception_hpp_test.cpp</in>
+                    <in>errinfo_type_info_name_hpp_test.cpp</in>
+                    <in>errinfos_test.cpp</in>
+                    <in>errno_test.cpp</in>
+                    <in>error_info_basic_test.cpp</in>
+                    <in>error_info_const_fail.cpp</in>
+                    <in>error_info_hpp_test.cpp</in>
+                    <in>error_info_lv_const_test.cpp</in>
+                    <in>error_info_lv_test.cpp</in>
+                    <in>error_info_rv_const_test.cpp</in>
+                    <in>error_info_rv_test.cpp</in>
+                    <in>exception_fail.cpp</in>
+                    <in>exception_ptr_hpp_test.cpp</in>
+                    <in>exception_ptr_test.cpp</in>
+                    <in>exception_test.cpp</in>
+                    <in>get_error_info_hpp_test.cpp</in>
+                    <in>has_to_string_test.cpp</in>
+                    <in>helper1.cpp</in>
+                    <in>helper2.cpp</in>
+                    <in>info_hpp_test.cpp</in>
+                    <in>info_tuple_hpp_test.cpp</in>
+                    <in>is_output_streamable_test.cpp</in>
+                    <in>no_exceptions_test.cpp</in>
+                    <in>refcount_ptr_test.cpp</in>
+                    <in>throw_exception_fail.cpp</in>
+                    <in>throw_exception_test.cpp</in>
+                    <in>to_string_fail.cpp</in>
+                    <in>to_string_hpp_test.cpp</in>
+                    <in>to_string_stub_hpp_test.cpp</in>
+                    <in>to_string_stub_test.cpp</in>
+                    <in>to_string_test.cpp</in>
+                    <in>unknown_exception_test.cpp</in>
+                    <in>visibility_test.cpp</in>
+                    <in>visibility_test_lib.cpp</in>
+                  </df>
+                </df>
+                <df name="fiber">
+                  <df name="examples">
+                    <df name="asio">
+                      <df name="ps">
+                        <in>publisher.cpp</in>
+                        <in>server.cpp</in>
+                        <in>subscriber.cpp</in>
+                      </df>
+                      <in>autoecho.cpp</in>
+                      <in>exchange.cpp</in>
+                    </df>
+                    <df name="hip">
+                      <in>multiple_streams.cpp</in>
+                      <in>single_stream.cpp</in>
+                    </df>
+                    <df name="numa">
+                      <in>topology.cpp</in>
+                    </df>
+                    <in>adapt_callbacks.cpp</in>
+                    <in>adapt_method_calls.cpp</in>
+                    <in>adapt_nonblocking.cpp</in>
+                    <in>barrier.cpp</in>
+                    <in>future.cpp</in>
+                    <in>join.cpp</in>
+                    <in>ping_pong.cpp</in>
+                    <in>priority.cpp</in>
+                    <in>range_for.cpp</in>
+                    <in>segmented_stack.cpp</in>
+                    <in>simple.cpp</in>
+                    <in>wait_stuff.cpp</in>
+                    <in>work_sharing.cpp</in>
+                    <in>work_stealing.cpp</in>
+                  </df>
+                  <df name="performance">
+                    <df name="fiber">
+                      <df name="numa">
+                        <in>skynet_stealing_detach.cpp</in>
+                      </df>
+                      <in>skynet_detach.cpp</in>
+                      <in>skynet_join.cpp</in>
+                      <in>skynet_shared_detach.cpp</in>
+                      <in>skynet_shared_join.cpp</in>
+                      <in>skynet_stealing_async.cpp</in>
+                      <in>skynet_stealing_detach.cpp</in>
+                      <in>skynet_stealing_join.cpp</in>
+                    </df>
+                    <df name="thread">
+                      <in>skynet_async.cpp</in>
+                      <in>skynet_pthread.cpp</in>
+                      <in>skynet_std.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <df name="algo">
+                      <in>algorithm.cpp</in>
+                      <in>round_robin.cpp</in>
+                      <in>shared_work.cpp</in>
+                      <in>work_stealing.cpp</in>
+                    </df>
+                    <df name="numa">
+                      <df name="aix">
+                        <in>pin_thread.cpp</in>
+                        <in>topology.cpp</in>
+                      </df>
+                      <df name="algo">
+                        <in>work_stealing.cpp</in>
+                      </df>
+                      <df name="freebsd">
+                        <in>pin_thread.cpp</in>
+                        <in>topology.cpp</in>
+                      </df>
+                      <df name="hpux">
+                        <in>pin_thread.cpp</in>
+                        <in>topology.cpp</in>
+                      </df>
+                      <df name="linux">
+                        <in>pin_thread.cpp</in>
+                        <in>topology.cpp</in>
+                      </df>
+                      <df name="solaris">
+                        <in>pin_thread.cpp</in>
+                        <in>topology.cpp</in>
+                      </df>
+                      <df name="windows">
+                        <in>pin_thread.cpp</in>
+                        <in>topology.cpp</in>
+                      </df>
+                      <in>pin_thread.cpp</in>
+                      <in>topology.cpp</in>
+                    </df>
+                    <in>barrier.cpp</in>
+                    <in>condition_variable.cpp</in>
+                    <in>context.cpp</in>
+                    <in>fiber.cpp</in>
+                    <in>future.cpp</in>
+                    <in>mutex.cpp</in>
+                    <in>properties.cpp</in>
+                    <in>recursive_mutex.cpp</in>
+                    <in>recursive_timed_mutex.cpp</in>
+                    <in>scheduler.cpp</in>
+                    <in>timed_mutex.cpp</in>
+                    <in>waker.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>test_async_dispatch.cpp</in>
+                    <in>test_async_post.cpp</in>
+                    <in>test_barrier_dispatch.cpp</in>
+                    <in>test_barrier_post.cpp</in>
+                    <in>test_buffered_channel_dispatch.cpp</in>
+                    <in>test_buffered_channel_post.cpp</in>
+                    <in>test_condition_mt_dispatch.cpp</in>
+                    <in>test_condition_mt_post.cpp</in>
+                    <in>test_condition_variable_any_dispatch.cpp</in>
+                    <in>test_condition_variable_any_post.cpp</in>
+                    <in>test_condition_variable_dispatch.cpp</in>
+                    <in>test_condition_variable_post.cpp</in>
+                    <in>test_fiber_dispatch.cpp</in>
+                    <in>test_fiber_post.cpp</in>
+                    <in>test_fss_dispatch.cpp</in>
+                    <in>test_fss_post.cpp</in>
+                    <in>test_future_dispatch.cpp</in>
+                    <in>test_future_mt_dispatch.cpp</in>
+                    <in>test_future_mt_post.cpp</in>
+                    <in>test_future_post.cpp</in>
+                    <in>test_mutex_dispatch.cpp</in>
+                    <in>test_mutex_mt_dispatch.cpp</in>
+                    <in>test_mutex_mt_post.cpp</in>
+                    <in>test_mutex_post.cpp</in>
+                    <in>test_packaged_task_dispatch.cpp</in>
+                    <in>test_packaged_task_post.cpp</in>
+                    <in>test_promise_dispatch.cpp</in>
+                    <in>test_promise_post.cpp</in>
+                    <in>test_shared_future_dispatch.cpp</in>
+                    <in>test_shared_future_post.cpp</in>
+                    <in>test_unbuffered_channel_dispatch.cpp</in>
+                    <in>test_unbuffered_channel_post.cpp</in>
+                  </df>
+                </df>
+                <df name="filesystem">
+                  <df name="bug">
+                    <in>bug.cpp</in>
+                  </df>
+                  <df name="config">
+                    <in>has_attribute_init_priority.cpp</in>
+                    <in>has_bcrypt.cpp</in>
+                    <in>has_cxx20_atomic_ref.cpp</in>
+                    <in>has_stat_st_birthtim.cpp</in>
+                    <in>has_stat_st_birthtimensec.cpp</in>
+                    <in>has_stat_st_birthtimespec.cpp</in>
+                    <in>has_stat_st_blksize.cpp</in>
+                    <in>has_stat_st_mtim.cpp</in>
+                    <in>has_stat_st_mtimensec.cpp</in>
+                    <in>has_stat_st_mtimespec.cpp</in>
+                    <in>has_statx.cpp</in>
+                    <in>has_statx_syscall.cpp</in>
+                    <in>is_windows_ce.cpp</in>
+                  </df>
+                  <df name="doc">
+                    <in>path_table.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>directory_symlink_parent_resolution.cpp</in>
+                    <in>error_demo.cpp</in>
+                    <in>file_size.cpp</in>
+                    <in>file_status.cpp</in>
+                    <in>mbcopy.cpp</in>
+                    <in>mbpath.cpp</in>
+                    <in>path_info.cpp</in>
+                    <in>simple_ls.cpp</in>
+                    <in>stems.cpp</in>
+                    <in>tchar.cpp</in>
+                    <in>tut0.cpp</in>
+                    <in>tut1.cpp</in>
+                    <in>tut2.cpp</in>
+                    <in>tut3.cpp</in>
+                    <in>tut4.cpp</in>
+                    <in>tut5.cpp</in>
+                    <in>tut6a.cpp</in>
+                    <in>tut6b.cpp</in>
+                    <in>tut6c.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>codecvt_error_category.cpp</in>
+                    <in>directory.cpp</in>
+                    <in>exception.cpp</in>
+                    <in>operations.cpp</in>
+                    <in>path.cpp</in>
+                    <in>path_traits.cpp</in>
+                    <in>portability.cpp</in>
+                    <in>unique_path.cpp</in>
+                    <in>utf8_codecvt_facet.cpp</in>
+                    <in>windows_file_codecvt.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="issues">
+                      <df name="3332">
+                        <in>test.cpp</in>
+                      </df>
+                      <in>10038.cpp</in>
+                      <in>10205.cpp</in>
+                      <in>10485.cpp</in>
+                      <in>10641.cpp</in>
+                      <in>11166-remove-race.cpp</in>
+                      <in>11228--filtered-recursive_directory_iterator-range.cpp</in>
+                      <in>4329.-basename.cpp</in>
+                      <in>5300-temp-dir-path-130.cpp</in>
+                      <in>6638-global-init-fails-3.cpp</in>
+                      <in>70-71-copy.cpp</in>
+                      <in>8930.cpp</in>
+                      <in>9054_static_const_codecvt_segfault_pre_main.cpp</in>
+                      <in>9219.cpp</in>
+                      <in>99_canonical_with_junction_point.cpp</in>
+                      <in>copy_file-compilation-error-2015-05-04.cpp</in>
+                      <in>fchmodat_AT_SYMLINK_NOFOLLOW_6659.cpp</in>
+                      <in>hello_filesystem.cpp</in>
+                      <in>recurse_dir_iter_5403.cpp</in>
+                      <in>reparse_tag_file_placeholder.cpp</in>
+                    </df>
+                    <df name="test_cmake">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>config_info.cpp</in>
+                    <in>convenience_test.cpp</in>
+                    <in>copy_test.cpp</in>
+                    <in>deprecated_test.cpp</in>
+                    <in>design_use_cases.cpp</in>
+                    <in>equivalent.cpp</in>
+                    <in>foreach_test.cpp</in>
+                    <in>fstream_test.cpp</in>
+                    <in>large_file_support_test.cpp</in>
+                    <in>locale_info.cpp</in>
+                    <in>long_path_test.cpp</in>
+                    <in>macro_default_test.cpp</in>
+                    <in>odr1_test.cpp</in>
+                    <in>odr2_test.cpp</in>
+                    <in>operations_test.cpp</in>
+                    <in>operations_unit_test.cpp</in>
+                    <in>path_test.cpp</in>
+                    <in>path_times.cpp</in>
+                    <in>path_unit_test.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>relative_test.cpp</in>
+                    <in>sample_test.cpp</in>
+                    <in>windows_attributes.cpp</in>
+                  </df>
+                </df>
+                <df name="flyweight">
+                  <df name="example">
+                    <in>basic.cpp</in>
+                    <in>composite.cpp</in>
+                    <in>custom_factory.cpp</in>
+                    <in>fibonacci.cpp</in>
+                    <in>html.cpp</in>
+                    <in>key_value.cpp</in>
+                    <in>perf.cpp</in>
+                    <in>serialization.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>intermod_holder_dll.cpp</in>
+                    <in>test_all_main.cpp</in>
+                    <in>test_assoc_cont_fact_main.cpp</in>
+                    <in>test_assoc_cont_factory.cpp</in>
+                    <in>test_basic.cpp</in>
+                    <in>test_basic_main.cpp</in>
+                    <in>test_custom_factory.cpp</in>
+                    <in>test_custom_factory_main.cpp</in>
+                    <in>test_init.cpp</in>
+                    <in>test_init_main.cpp</in>
+                    <in>test_intermod_holder.cpp</in>
+                    <in>test_intermod_holder_main.cpp</in>
+                    <in>test_multictor.cpp</in>
+                    <in>test_multictor_main.cpp</in>
+                    <in>test_no_locking.cpp</in>
+                    <in>test_no_locking_main.cpp</in>
+                    <in>test_no_tracking.cpp</in>
+                    <in>test_no_tracking_main.cpp</in>
+                    <in>test_serialization.cpp</in>
+                    <in>test_serialization_main.cpp</in>
+                    <in>test_set_factory.cpp</in>
+                    <in>test_set_factory_main.cpp</in>
+                  </df>
+                </df>
+                <df name="foreach">
+                  <df name="test">
+                    <in>array_byref.cpp</in>
+                    <in>array_byref_r.cpp</in>
+                    <in>array_byval.cpp</in>
+                    <in>array_byval_r.cpp</in>
+                    <in>call_once.cpp</in>
+                    <in>cstr_byref.cpp</in>
+                    <in>cstr_byref_r.cpp</in>
+                    <in>cstr_byval.cpp</in>
+                    <in>cstr_byval_r.cpp</in>
+                    <in>dependent_type.cpp</in>
+                    <in>misc.cpp</in>
+                    <in>noncopyable.cpp</in>
+                    <in>pair_byref.cpp</in>
+                    <in>pair_byref_r.cpp</in>
+                    <in>pair_byval.cpp</in>
+                    <in>pair_byval_r.cpp</in>
+                    <in>rvalue_const.cpp</in>
+                    <in>rvalue_const_r.cpp</in>
+                    <in>rvalue_nonconst.cpp</in>
+                    <in>rvalue_nonconst_r.cpp</in>
+                    <in>stl_byref.cpp</in>
+                    <in>stl_byref_r.cpp</in>
+                    <in>stl_byval.cpp</in>
+                    <in>stl_byval_r.cpp</in>
+                    <in>user_defined.cpp</in>
+                  </df>
+                </df>
+                <df name="format">
+                  <df name="benchmark">
+                    <in>bench_format.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>sample_advanced.cpp</in>
+                    <in>sample_formats.cpp</in>
+                    <in>sample_new_features.cpp</in>
+                    <in>sample_userType.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>format_test1.cpp</in>
+                    <in>format_test2.cpp</in>
+                    <in>format_test3.cpp</in>
+                    <in>format_test_enum.cpp</in>
+                    <in>format_test_exceptions.cpp</in>
+                    <in>format_test_wstring.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <in>format_matrix.cpp</in>
+                  </df>
+                </df>
+                <df name="function">
+                  <df name="example">
+                    <in>bind1st.cpp</in>
+                    <in>int_div.cpp</in>
+                    <in>sum_avg.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>allocator_test.cpp</in>
+                    <in>contains2_test.cpp</in>
+                    <in>contains_test.cpp</in>
+                    <in>function_30.cpp</in>
+                    <in>function_30_repeat.cpp</in>
+                    <in>function_arith_cxx98.cpp</in>
+                    <in>function_arith_portable.cpp</in>
+                    <in>function_n_test.cpp</in>
+                    <in>function_ref_cxx98.cpp</in>
+                    <in>function_ref_portable.cpp</in>
+                    <in>function_test.cpp</in>
+                    <in>function_test_fail1.cpp</in>
+                    <in>function_test_fail2.cpp</in>
+                    <in>function_typeof_test.cpp</in>
+                    <in>lambda_test.cpp</in>
+                    <in>mem_fun_cxx98.cpp</in>
+                    <in>mem_fun_portable.cpp</in>
+                    <in>mixed_cxxstd.cpp</in>
+                    <in>nothrow_swap.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>result_arg_types_test.cpp</in>
+                    <in>return_function.cpp</in>
+                    <in>rvalues_test.cpp</in>
+                    <in>stateless_test.cpp</in>
+                    <in>std_bind_cxx98.cpp</in>
+                    <in>std_bind_portable.cpp</in>
+                    <in>sum_avg_cxx98.cpp</in>
+                    <in>sum_avg_portable.cpp</in>
+                    <in>test_bad_function_call.cpp</in>
+                    <in>test_mixed_cxxstd.cpp</in>
+                    <in>test_return_function.cpp</in>
+                    <in>throw_bad_function_call.cpp</in>
+                  </df>
+                </df>
+                <df name="function_types">
+                  <df name="build">
+                    <in>preprocess_arity_loops.cpp</in>
+                    <in>preprocess_cc_names.cpp</in>
+                    <in>preprocess_encoding.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>fast_mem_fn_example.cpp</in>
+                    <in>interface_example.cpp</in>
+                    <in>interpreter_example.cpp</in>
+                    <in>macro_type_args_example.cpp</in>
+                    <in>result_of_example.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="classification">
+                      <in>is_callable_builtin.cpp</in>
+                      <in>is_cv_function.cpp</in>
+                      <in>is_cv_mem_func_ptr.cpp</in>
+                      <in>is_cv_pointer.cpp</in>
+                      <in>is_function.cpp</in>
+                      <in>is_function_pointer.cpp</in>
+                      <in>is_function_reference.cpp</in>
+                      <in>is_member_function_pointer.cpp</in>
+                      <in>is_member_object_pointer.cpp</in>
+                      <in>is_member_pointer.cpp</in>
+                      <in>is_nonmember_callable_builtin.cpp</in>
+                      <in>is_variadic.cpp</in>
+                    </df>
+                    <df name="custom_ccs">
+                      <in>member_ccs.cpp</in>
+                      <in>member_ccs_exact.cpp</in>
+                      <in>nonmember_ccs.cpp</in>
+                      <in>nonmember_ccs_exact.cpp</in>
+                      <in>property_tag.cpp</in>
+                    </df>
+                    <df name="decomposition">
+                      <in>class_type_transform.cpp</in>
+                      <in>components.cpp</in>
+                      <in>components_seq.cpp</in>
+                      <in>function_arity.cpp</in>
+                      <in>function_arity_fail.cpp</in>
+                      <in>parameter_types.cpp</in>
+                      <in>parameter_types_fail.cpp</in>
+                      <in>result_type.cpp</in>
+                      <in>result_type_fail.cpp</in>
+                    </df>
+                    <df name="reconfiguration">
+                      <in>cc_preprocessing.cpp</in>
+                      <in>partial_arity_preprocessing.cpp</in>
+                      <in>preprocessing_mode.cpp</in>
+                    </df>
+                    <df name="synthesis">
+                      <in>cv_function_synthesis.cpp</in>
+                      <in>function_pointer.cpp</in>
+                      <in>function_reference.cpp</in>
+                      <in>function_type.cpp</in>
+                      <in>mem_func_ptr_cv1.cpp</in>
+                      <in>mem_func_ptr_cv2.cpp</in>
+                      <in>mem_func_ptr_cv_ptr_to_this.cpp</in>
+                      <in>member_function_pointer.cpp</in>
+                      <in>member_object_pointer.cpp</in>
+                      <in>transformation.cpp</in>
+                      <in>variadic_function_synthesis.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="functional">
+                  <df name="factory">
+                    <df name="test">
+                      <in>factory.cpp</in>
+                      <in>factory_allocator_throws.cpp</in>
+                      <in>factory_args.cpp</in>
+                      <in>factory_default_allocator.cpp</in>
+                      <in>factory_move.cpp</in>
+                      <in>factory_with_allocator.cpp</in>
+                      <in>factory_with_std_allocator.cpp</in>
+                      <in>value_factory.cpp</in>
+                      <in>value_factory_args.cpp</in>
+                      <in>value_factory_move.cpp</in>
+                    </df>
+                  </df>
+                  <df name="forward">
+                    <df name="test">
+                      <in>forward_adapter.cpp</in>
+                      <in>lightweight_forward_adapter.cpp</in>
+                    </df>
+                  </df>
+                  <df name="overloaded_function">
+                    <df name="test">
+                      <in>functor.cpp</in>
+                      <in>make_call.cpp</in>
+                      <in>make_decl.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>function_test.cpp</in>
+                  </df>
+                </df>
+                <df name="fusion">
+                  <df name="example">
+                    <df name="cookbook">
+                      <in>do_the_bind.cpp</in>
+                      <in>fill_em_up.cpp</in>
+                    </df>
+                    <df name="extension">
+                      <in>test_example.cpp</in>
+                      <in>triple.cpp</in>
+                    </df>
+                    <df name="performance">
+                      <in>accumulate.cpp</in>
+                      <in>functional.cpp</in>
+                      <in>inner_product.cpp</in>
+                      <in>inner_product2.cpp</in>
+                      <in>sequence_efficiency.cpp</in>
+                      <in>zip_efficiency.cpp</in>
+                    </df>
+                  </df>
+                  <df name="preprocess">
+                    <in>preprocess_fusion.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="algorithm">
+                      <in>all.cpp</in>
+                      <in>any.cpp</in>
+                      <in>clear.cpp</in>
+                      <in>copy.cpp</in>
+                      <in>count.cpp</in>
+                      <in>count_if.cpp</in>
+                      <in>erase.cpp</in>
+                      <in>erase_key.cpp</in>
+                      <in>filter.cpp</in>
+                      <in>filter_if.cpp</in>
+                      <in>find.cpp</in>
+                      <in>find_if.cpp</in>
+                      <in>flatten.cpp</in>
+                      <in>fold.cpp</in>
+                      <in>for_each.cpp</in>
+                      <in>insert.cpp</in>
+                      <in>insert_range.cpp</in>
+                      <in>iter_fold.cpp</in>
+                      <in>join.cpp</in>
+                      <in>move.cpp</in>
+                      <in>none.cpp</in>
+                      <in>pop_back.cpp</in>
+                      <in>pop_front.cpp</in>
+                      <in>push_back.cpp</in>
+                      <in>push_front.cpp</in>
+                      <in>remove.cpp</in>
+                      <in>remove_if.cpp</in>
+                      <in>replace.cpp</in>
+                      <in>replace_if.cpp</in>
+                      <in>reverse.cpp</in>
+                      <in>reverse_fold.cpp</in>
+                      <in>reverse_iter_fold.cpp</in>
+                      <in>segmented_find.cpp</in>
+                      <in>segmented_find_if.cpp</in>
+                      <in>segmented_fold.cpp</in>
+                      <in>segmented_for_each.cpp</in>
+                      <in>ticket-5490.cpp</in>
+                      <in>transform.cpp</in>
+                      <in>zip.cpp</in>
+                      <in>zip2.cpp</in>
+                      <in>zip_ignore.cpp</in>
+                    </df>
+                    <df name="compile_time">
+                      <in>fold.cpp</in>
+                      <in>transform.cpp</in>
+                      <in>vector_construction.cpp</in>
+                      <in>vector_intrinsic.cpp</in>
+                      <in>vector_iteration.cpp</in>
+                    </df>
+                    <df name="functional">
+                      <in>fused.cpp</in>
+                      <in>fused_function_object.cpp</in>
+                      <in>fused_procedure.cpp</in>
+                      <in>invoke.cpp</in>
+                      <in>invoke_function_object.cpp</in>
+                      <in>invoke_procedure.cpp</in>
+                      <in>make_fused.cpp</in>
+                      <in>make_fused_function_object.cpp</in>
+                      <in>make_fused_procedure.cpp</in>
+                      <in>make_unfused.cpp</in>
+                      <in>unfused.cpp</in>
+                      <in>unfused_typed.cpp</in>
+                    </df>
+                    <df name="sequence">
+                      <in>adapt_adt.cpp</in>
+                      <in>adapt_adt_empty.cpp</in>
+                      <in>adapt_adt_named.cpp</in>
+                      <in>adapt_adt_named_empty.cpp</in>
+                      <in>adapt_assoc_adt.cpp</in>
+                      <in>adapt_assoc_adt_empty.cpp</in>
+                      <in>adapt_assoc_adt_named.cpp</in>
+                      <in>adapt_assoc_adt_named_empty.cpp</in>
+                      <in>adapt_assoc_struct.cpp</in>
+                      <in>adapt_assoc_struct_empty.cpp</in>
+                      <in>adapt_assoc_struct_named.cpp</in>
+                      <in>adapt_assoc_struct_named_empty.cpp</in>
+                      <in>adapt_assoc_tpl_adt.cpp</in>
+                      <in>adapt_assoc_tpl_adt_empty.cpp</in>
+                      <in>adapt_assoc_tpl_struct.cpp</in>
+                      <in>adapt_assoc_tpl_struct_empty.cpp</in>
+                      <in>adapt_struct.cpp</in>
+                      <in>adapt_struct_empty.cpp</in>
+                      <in>adapt_struct_named.cpp</in>
+                      <in>adapt_struct_named_empty.cpp</in>
+                      <in>adapt_tpl_adt.cpp</in>
+                      <in>adapt_tpl_adt_empty.cpp</in>
+                      <in>adapt_tpl_struct.cpp</in>
+                      <in>adapt_tpl_struct_empty.cpp</in>
+                      <in>adt_attribute_proxy.cpp</in>
+                      <in>array.cpp</in>
+                      <in>as_deque.cpp</in>
+                      <in>as_list.cpp</in>
+                      <in>as_map.cpp</in>
+                      <in>as_map_assoc.cpp</in>
+                      <in>as_set.cpp</in>
+                      <in>as_vector.cpp</in>
+                      <in>back_extended_deque.cpp</in>
+                      <in>boost_array.cpp</in>
+                      <in>boost_tuple.cpp</in>
+                      <in>boost_tuple_iterator.cpp</in>
+                      <in>cons.cpp</in>
+                      <in>convert_boost_tuple.cpp</in>
+                      <in>convert_deque.cpp</in>
+                      <in>convert_list.cpp</in>
+                      <in>convert_std_pair.cpp</in>
+                      <in>convert_std_tuple.cpp</in>
+                      <in>convert_vector.cpp</in>
+                      <in>deduce_sequence.cpp</in>
+                      <in>define_assoc_struct.cpp</in>
+                      <in>define_assoc_struct_empty.cpp</in>
+                      <in>define_assoc_struct_move.cpp</in>
+                      <in>define_assoc_tpl_struct.cpp</in>
+                      <in>define_assoc_tpl_struct_empty.cpp</in>
+                      <in>define_assoc_tpl_struct_move.cpp</in>
+                      <in>define_struct.cpp</in>
+                      <in>define_struct_empty.cpp</in>
+                      <in>define_struct_inline.cpp</in>
+                      <in>define_struct_inline_empty.cpp</in>
+                      <in>define_struct_inline_move.cpp</in>
+                      <in>define_struct_move.cpp</in>
+                      <in>define_tpl_struct.cpp</in>
+                      <in>define_tpl_struct_empty.cpp</in>
+                      <in>define_tpl_struct_inline.cpp</in>
+                      <in>define_tpl_struct_inline_empty.cpp</in>
+                      <in>define_tpl_struct_inline_move.cpp</in>
+                      <in>define_tpl_struct_move.cpp</in>
+                      <in>deque_comparison.cpp</in>
+                      <in>deque_construction.cpp</in>
+                      <in>deque_copy.cpp</in>
+                      <in>deque_hash.cpp</in>
+                      <in>deque_is_constructible.cpp</in>
+                      <in>deque_iterator.cpp</in>
+                      <in>deque_make.cpp</in>
+                      <in>deque_misc.cpp</in>
+                      <in>deque_move.cpp</in>
+                      <in>deque_mutate.cpp</in>
+                      <in>deque_nest.cpp</in>
+                      <in>deque_tie.cpp</in>
+                      <in>deque_value_at.cpp</in>
+                      <in>filter_view.cpp</in>
+                      <in>flatten_view.cpp</in>
+                      <in>front_extended_deque.cpp</in>
+                      <in>github-159.cpp</in>
+                      <in>github-176.cpp</in>
+                      <in>hash.cpp</in>
+                      <in>io.cpp</in>
+                      <in>iterator_range.cpp</in>
+                      <in>joint_view.cpp</in>
+                      <in>list_comparison.cpp</in>
+                      <in>list_construction.cpp</in>
+                      <in>list_copy.cpp</in>
+                      <in>list_hash.cpp</in>
+                      <in>list_iterator.cpp</in>
+                      <in>list_make.cpp</in>
+                      <in>list_misc.cpp</in>
+                      <in>list_mutate.cpp</in>
+                      <in>list_nest.cpp</in>
+                      <in>list_tie.cpp</in>
+                      <in>list_value_at.cpp</in>
+                      <in>make_list.cpp</in>
+                      <in>make_vector.cpp</in>
+                      <in>map.cpp</in>
+                      <in>map_comparison.cpp</in>
+                      <in>map_construction.cpp</in>
+                      <in>map_copy.cpp</in>
+                      <in>map_misc.cpp</in>
+                      <in>map_move.cpp</in>
+                      <in>map_mutate.cpp</in>
+                      <in>map_tie.cpp</in>
+                      <in>nil.cpp</in>
+                      <in>nview.cpp</in>
+                      <in>ref_vector.cpp</in>
+                      <in>repetitive_view.cpp</in>
+                      <in>reverse_view.cpp</in>
+                      <in>segmented_iterator_range.cpp</in>
+                      <in>set.cpp</in>
+                      <in>single_view.cpp</in>
+                      <in>size.cpp</in>
+                      <in>std_array.cpp</in>
+                      <in>std_pair.cpp</in>
+                      <in>std_tuple.cpp</in>
+                      <in>std_tuple_iterator.cpp</in>
+                      <in>swap.cpp</in>
+                      <in>test_deduce_sequence.cpp</in>
+                      <in>transform_view.cpp</in>
+                      <in>tuple_comparison.cpp</in>
+                      <in>tuple_construction.cpp</in>
+                      <in>tuple_conversion.cpp</in>
+                      <in>tuple_copy.cpp</in>
+                      <in>tuple_element.cpp</in>
+                      <in>tuple_hash.cpp</in>
+                      <in>tuple_make.cpp</in>
+                      <in>tuple_misc.cpp</in>
+                      <in>tuple_mutate.cpp</in>
+                      <in>tuple_nest.cpp</in>
+                      <in>tuple_tie.cpp</in>
+                      <in>tuple_traits.cpp</in>
+                      <in>vector_comparison.cpp</in>
+                      <in>vector_construction.cpp</in>
+                      <in>vector_conversion.cpp</in>
+                      <in>vector_copy.cpp</in>
+                      <in>vector_hash.cpp</in>
+                      <in>vector_iterator.cpp</in>
+                      <in>vector_make.cpp</in>
+                      <in>vector_misc.cpp</in>
+                      <in>vector_move.cpp</in>
+                      <in>vector_mutate.cpp</in>
+                      <in>vector_n.cpp</in>
+                      <in>vector_nest.cpp</in>
+                      <in>vector_tie.cpp</in>
+                      <in>vector_traits.cpp</in>
+                      <in>vector_value_at.cpp</in>
+                      <in>zip_view.cpp</in>
+                      <in>zip_view2.cpp</in>
+                      <in>zip_view_ignore.cpp</in>
+                    </df>
+                    <df name="support">
+                      <in>and.cpp</in>
+                      <in>index_sequence.cpp</in>
+                      <in>is_sequence.cpp</in>
+                      <in>is_view.cpp</in>
+                      <in>pair_deque.cpp</in>
+                      <in>pair_list.cpp</in>
+                      <in>pair_map.cpp</in>
+                      <in>pair_nest.cpp</in>
+                      <in>pair_set.cpp</in>
+                      <in>pair_vector.cpp</in>
+                      <in>tag_of.cpp</in>
+                      <in>unused.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="geometry">
+                  <df name="doc">
+                    <df name="doxy">
+                      <df name="doxygen_input">
+                        <df name="sourcecode">
+                          <in>doxygen_1.cpp</in>
+                          <in>doxygen_2.cpp</in>
+                          <in>doxygen_3.cpp</in>
+                          <in>doxygen_4.cpp</in>
+                          <in>doxygen_5.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="index">
+                      <df name="src">
+                        <df name="examples">
+                          <df name="rtree">
+                            <in>interprocess.cpp</in>
+                            <in>iterative_query.cpp</in>
+                            <in>mapped_file.cpp</in>
+                            <in>polygons_shared_ptr.cpp</in>
+                            <in>polygons_vector.cpp</in>
+                            <in>quick_start.cpp</in>
+                            <in>range_adaptors.cpp</in>
+                            <in>value_index.cpp</in>
+                            <in>value_shared_ptr.cpp</in>
+                            <in>variants_map.cpp</in>
+                          </df>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="src">
+                      <df name="docutils">
+                        <df name="tools">
+                          <df name="doxygen_xml2qbk">
+                            <df name="sample">
+                              <df name="src">
+                                <df name="examples">
+                                  <in>apple_example.cpp</in>
+                                </df>
+                                <in>fruit.cpp</in>
+                              </df>
+                            </df>
+                            <in>doxygen_xml2qbk.cpp</in>
+                          </df>
+                          <df name="implementation_status">
+                            <in>implementation_status.cpp</in>
+                          </df>
+                          <df name="support_status">
+                            <in>support_status.cpp</in>
+                          </df>
+                        </df>
+                      </df>
+                      <df name="examples">
+                        <df name="algorithms">
+                          <in>append.cpp</in>
+                          <in>area.cpp</in>
+                          <in>area_with_strategy.cpp</in>
+                          <in>assign.cpp</in>
+                          <in>assign_2d_point.cpp</in>
+                          <in>assign_3d_point.cpp</in>
+                          <in>assign_box_corners.cpp</in>
+                          <in>assign_inverse.cpp</in>
+                          <in>assign_point_from_index.cpp</in>
+                          <in>assign_point_to_index.cpp</in>
+                          <in>assign_points.cpp</in>
+                          <in>azimuth.cpp</in>
+                          <in>azimuth_strategy.cpp</in>
+                          <in>buffer_with_strategies.cpp</in>
+                          <in>centroid.cpp</in>
+                          <in>clear.cpp</in>
+                          <in>comparable_distance.cpp</in>
+                          <in>convert.cpp</in>
+                          <in>convex_hull.cpp</in>
+                          <in>correct.cpp</in>
+                          <in>covered_by.cpp</in>
+                          <in>crosses.cpp</in>
+                          <in>densify.cpp</in>
+                          <in>densify_strategy.cpp</in>
+                          <in>difference.cpp</in>
+                          <in>difference_inserter.cpp</in>
+                          <in>discrete_frechet_distance.cpp</in>
+                          <in>discrete_frechet_distance_strategy.cpp</in>
+                          <in>discrete_hausdorff_distance.cpp</in>
+                          <in>discrete_hausdorff_distance_strategy.cpp</in>
+                          <in>disjoint.cpp</in>
+                          <in>distance.cpp</in>
+                          <in>envelope.cpp</in>
+                          <in>equals.cpp</in>
+                          <in>expand.cpp</in>
+                          <in>for_each_point.cpp</in>
+                          <in>for_each_point_const.cpp</in>
+                          <in>for_each_segment_const.cpp</in>
+                          <in>intersection_ls_ls_point.cpp</in>
+                          <in>intersection_poly_poly.cpp</in>
+                          <in>intersection_segment.cpp</in>
+                          <in>intersects_linestring.cpp</in>
+                          <in>intersects_segment.cpp</in>
+                          <in>is_empty.cpp</in>
+                          <in>is_simple.cpp</in>
+                          <in>is_valid.cpp</in>
+                          <in>is_valid_failure.cpp</in>
+                          <in>is_valid_message.cpp</in>
+                          <in>length.cpp</in>
+                          <in>length_with_strategy.cpp</in>
+                          <in>line_interpolate.cpp</in>
+                          <in>line_interpolate_strategy.cpp</in>
+                          <in>make_2d_point.cpp</in>
+                          <in>make_3d_point.cpp</in>
+                          <in>make_inverse.cpp</in>
+                          <in>make_with_range.cpp</in>
+                          <in>num_geometries.cpp</in>
+                          <in>num_interior_rings.cpp</in>
+                          <in>num_points.cpp</in>
+                          <in>num_segments.cpp</in>
+                          <in>overlaps.cpp</in>
+                          <in>perimeter.cpp</in>
+                          <in>relate.cpp</in>
+                          <in>relation.cpp</in>
+                          <in>return_envelope.cpp</in>
+                          <in>reverse.cpp</in>
+                          <in>simplify.cpp</in>
+                          <in>simplify_insert.cpp</in>
+                          <in>simplify_insert_with_strategy.cpp</in>
+                          <in>sym_difference.cpp</in>
+                          <in>touches_one_geometry.cpp</in>
+                          <in>touches_two_geometries.cpp</in>
+                          <in>transform.cpp</in>
+                          <in>transform_with_strategy.cpp</in>
+                          <in>union.cpp</in>
+                          <in>unique.cpp</in>
+                          <in>within.cpp</in>
+                        </df>
+                        <df name="arithmetic">
+                          <in>cross_product.cpp</in>
+                          <in>dot_product.cpp</in>
+                        </df>
+                        <df name="core">
+                          <in>closure.cpp</in>
+                          <in>coordinate_dimension.cpp</in>
+                          <in>coordinate_system.cpp</in>
+                          <in>coordinate_type.cpp</in>
+                          <in>degree_radian.cpp</in>
+                          <in>get_box.cpp</in>
+                          <in>get_point.cpp</in>
+                          <in>interior_type.cpp</in>
+                          <in>point_order.cpp</in>
+                          <in>point_type.cpp</in>
+                          <in>ring_type.cpp</in>
+                          <in>rings.cpp</in>
+                          <in>set_box.cpp</in>
+                          <in>set_point.cpp</in>
+                          <in>tag.cpp</in>
+                          <in>tag_cast.cpp</in>
+                        </df>
+                        <df name="geometries">
+                          <df name="adapted">
+                            <df name="boost_range">
+                              <in>filtered.cpp</in>
+                              <in>reversed.cpp</in>
+                              <in>sliced.cpp</in>
+                              <in>strided.cpp</in>
+                              <in>uniqued.cpp</in>
+                            </df>
+                            <in>boost_array.cpp</in>
+                            <in>boost_fusion.cpp</in>
+                            <in>boost_polygon_box.cpp</in>
+                            <in>boost_polygon_point.cpp</in>
+                            <in>boost_polygon_polygon.cpp</in>
+                            <in>boost_polygon_ring.cpp</in>
+                            <in>boost_tuple.cpp</in>
+                            <in>c_array.cpp</in>
+                            <in>std_array.cpp</in>
+                          </df>
+                          <df name="register">
+                            <in>box.cpp</in>
+                            <in>box_2d_4values.cpp</in>
+                            <in>box_templated.cpp</in>
+                            <in>linestring.cpp</in>
+                            <in>linestring_templated.cpp</in>
+                            <in>multi_linestring.cpp</in>
+                            <in>multi_point.cpp</in>
+                            <in>multi_point_templated.cpp</in>
+                            <in>multi_polygon.cpp</in>
+                            <in>point.cpp</in>
+                            <in>ring.cpp</in>
+                            <in>ring_templated.cpp</in>
+                          </df>
+                          <in>box.cpp</in>
+                          <in>linestring.cpp</in>
+                          <in>multi_linestring.cpp</in>
+                          <in>multi_point.cpp</in>
+                          <in>multi_polygon.cpp</in>
+                          <in>point.cpp</in>
+                          <in>point_xy.cpp</in>
+                          <in>point_xyz.cpp</in>
+                          <in>polygon.cpp</in>
+                          <in>ring.cpp</in>
+                          <in>segment.cpp</in>
+                        </df>
+                        <df name="io">
+                          <in>from_wkt.cpp</in>
+                          <in>read_wkt.cpp</in>
+                          <in>svg.cpp</in>
+                          <in>svg_mapper_custom.cpp</in>
+                          <in>to_wkt.cpp</in>
+                          <in>wkt.cpp</in>
+                        </df>
+                        <df name="strategies">
+                          <in>buffer_distance_asymmetric.cpp</in>
+                          <in>buffer_distance_symmetric.cpp</in>
+                          <in>buffer_end_flat.cpp</in>
+                          <in>buffer_end_round.cpp</in>
+                          <in>buffer_geographic_point_circle.cpp</in>
+                          <in>buffer_join_miter.cpp</in>
+                          <in>buffer_join_round.cpp</in>
+                          <in>buffer_point_circle.cpp</in>
+                          <in>buffer_point_square.cpp</in>
+                        </df>
+                        <df name="views">
+                          <in>box_view.cpp</in>
+                          <in>segment_view.cpp</in>
+                        </df>
+                        <in>quick_start.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <df name="with_external_libs">
+                      <in>x01_qt_example.cpp</in>
+                      <in>x02_gd_example.cpp</in>
+                      <in>x03_a_soci_example.cpp</in>
+                      <in>x03_b_soci_example.cpp</in>
+                      <in>x03_c_soci_example.cpp</in>
+                      <in>x03_d_soci_example.cpp</in>
+                      <in>x04_wxwidgets_world_mapper.cpp</in>
+                      <in>x05_shapelib_example.cpp</in>
+                      <in>x06_qt_world_mapper.cpp</in>
+                    </df>
+                    <in>01_point_example.cpp</in>
+                    <in>02_linestring_example.cpp</in>
+                    <in>03_polygon_example.cpp</in>
+                    <in>04_boost_example.cpp</in>
+                    <in>05_a_overlay_polygon_example.cpp</in>
+                    <in>05_b_overlay_linestring_polygon_example.cpp</in>
+                    <in>06_a_transformation_example.cpp</in>
+                    <in>06_b_transformation_example.cpp</in>
+                    <in>07_a_graph_route_example.cpp</in>
+                    <in>07_b_graph_route_example.cpp</in>
+                    <in>c01_custom_point_example.cpp</in>
+                    <in>c02_custom_box_example.cpp</in>
+                    <in>c03_custom_linestring_example.cpp</in>
+                    <in>c04_a_custom_triangle_example.cpp</in>
+                    <in>c04_b_custom_triangle_example.cpp</in>
+                    <in>c05_custom_point_pointer_example.cpp</in>
+                    <in>c06_custom_polygon_example.cpp</in>
+                    <in>c07_custom_ring_pointer_example.cpp</in>
+                    <in>c08_custom_non_std_example.cpp</in>
+                    <in>c09_custom_fusion_example.cpp</in>
+                    <in>c10_custom_cs_example.cpp</in>
+                    <in>c11_custom_cs_transform_example.cpp</in>
+                    <in>ml01_multipolygon_simplify.cpp</in>
+                    <in>ml02_distance_strategy.cpp</in>
+                    <in>ml03_distance_formula.cpp</in>
+                  </df>
+                  <df name="index">
+                    <df name="example">
+                      <in>3d_benchmark.cpp</in>
+                      <in>benchmark.cpp</in>
+                      <in>benchmark2.cpp</in>
+                      <in>benchmark3.cpp</in>
+                      <in>benchmark_experimental.cpp</in>
+                      <in>benchmark_insert.cpp</in>
+                      <in>glut_vis.cpp</in>
+                      <in>random_test.cpp</in>
+                      <in>serialize.cpp</in>
+                    </df>
+                    <df name="test">
+                      <df name="algorithms">
+                        <in>content.cpp</in>
+                        <in>intersection_content.cpp</in>
+                        <in>is_valid.cpp</in>
+                        <in>margin.cpp</in>
+                        <in>minmaxdist.cpp</in>
+                        <in>path_intersection.cpp</in>
+                        <in>segment_intersection.cpp</in>
+                        <in>union_content.cpp</in>
+                      </df>
+                      <df name="rtree">
+                        <df name="exceptions">
+                          <in>rtree_exceptions_lin.cpp</in>
+                          <in>rtree_exceptions_qua.cpp</in>
+                          <in>rtree_exceptions_rst.cpp</in>
+                        </df>
+                        <df name="generated">
+                          <df name="b2d">
+                            <in>rtree_dlin_add_b2d.cpp</in>
+                            <in>rtree_dlin_mod_b2d.cpp</in>
+                            <in>rtree_dlin_que_b2d.cpp</in>
+                            <in>rtree_dqua_add_b2d.cpp</in>
+                            <in>rtree_dqua_mod_b2d.cpp</in>
+                            <in>rtree_dqua_que_b2d.cpp</in>
+                            <in>rtree_drst_add_b2d.cpp</in>
+                            <in>rtree_drst_mod_b2d.cpp</in>
+                            <in>rtree_drst_que_b2d.cpp</in>
+                            <in>rtree_lin_add_b2d.cpp</in>
+                            <in>rtree_lin_mod_b2d.cpp</in>
+                            <in>rtree_lin_que_b2d.cpp</in>
+                            <in>rtree_qua_add_b2d.cpp</in>
+                            <in>rtree_qua_mod_b2d.cpp</in>
+                            <in>rtree_qua_que_b2d.cpp</in>
+                            <in>rtree_rst_add_b2d.cpp</in>
+                            <in>rtree_rst_mod_b2d.cpp</in>
+                            <in>rtree_rst_que_b2d.cpp</in>
+                          </df>
+                          <df name="b3d">
+                            <in>rtree_dlin_add_b3d.cpp</in>
+                            <in>rtree_dlin_mod_b3d.cpp</in>
+                            <in>rtree_dlin_que_b3d.cpp</in>
+                            <in>rtree_dqua_add_b3d.cpp</in>
+                            <in>rtree_dqua_mod_b3d.cpp</in>
+                            <in>rtree_dqua_que_b3d.cpp</in>
+                            <in>rtree_drst_add_b3d.cpp</in>
+                            <in>rtree_drst_mod_b3d.cpp</in>
+                            <in>rtree_drst_que_b3d.cpp</in>
+                            <in>rtree_lin_add_b3d.cpp</in>
+                            <in>rtree_lin_mod_b3d.cpp</in>
+                            <in>rtree_lin_que_b3d.cpp</in>
+                            <in>rtree_qua_add_b3d.cpp</in>
+                            <in>rtree_qua_mod_b3d.cpp</in>
+                            <in>rtree_qua_que_b3d.cpp</in>
+                            <in>rtree_rst_add_b3d.cpp</in>
+                            <in>rtree_rst_mod_b3d.cpp</in>
+                            <in>rtree_rst_que_b3d.cpp</in>
+                          </df>
+                          <df name="p2d">
+                            <in>rtree_dlin_add_p2d.cpp</in>
+                            <in>rtree_dlin_mod_p2d.cpp</in>
+                            <in>rtree_dlin_que_p2d.cpp</in>
+                            <in>rtree_dqua_add_p2d.cpp</in>
+                            <in>rtree_dqua_mod_p2d.cpp</in>
+                            <in>rtree_dqua_que_p2d.cpp</in>
+                            <in>rtree_drst_add_p2d.cpp</in>
+                            <in>rtree_drst_mod_p2d.cpp</in>
+                            <in>rtree_drst_que_p2d.cpp</in>
+                            <in>rtree_lin_add_p2d.cpp</in>
+                            <in>rtree_lin_mod_p2d.cpp</in>
+                            <in>rtree_lin_que_p2d.cpp</in>
+                            <in>rtree_qua_add_p2d.cpp</in>
+                            <in>rtree_qua_mod_p2d.cpp</in>
+                            <in>rtree_qua_que_p2d.cpp</in>
+                            <in>rtree_rst_add_p2d.cpp</in>
+                            <in>rtree_rst_mod_p2d.cpp</in>
+                            <in>rtree_rst_que_p2d.cpp</in>
+                          </df>
+                          <df name="p3d">
+                            <in>rtree_dlin_add_p3d.cpp</in>
+                            <in>rtree_dlin_mod_p3d.cpp</in>
+                            <in>rtree_dlin_que_p3d.cpp</in>
+                            <in>rtree_dqua_add_p3d.cpp</in>
+                            <in>rtree_dqua_mod_p3d.cpp</in>
+                            <in>rtree_dqua_que_p3d.cpp</in>
+                            <in>rtree_drst_add_p3d.cpp</in>
+                            <in>rtree_drst_mod_p3d.cpp</in>
+                            <in>rtree_drst_que_p3d.cpp</in>
+                            <in>rtree_lin_add_p3d.cpp</in>
+                            <in>rtree_lin_mod_p3d.cpp</in>
+                            <in>rtree_lin_que_p3d.cpp</in>
+                            <in>rtree_qua_add_p3d.cpp</in>
+                            <in>rtree_qua_mod_p3d.cpp</in>
+                            <in>rtree_qua_que_p3d.cpp</in>
+                            <in>rtree_rst_add_p3d.cpp</in>
+                            <in>rtree_rst_mod_p3d.cpp</in>
+                            <in>rtree_rst_que_p3d.cpp</in>
+                          </df>
+                          <df name="s2d">
+                            <in>rtree_dlin_add_s2d.cpp</in>
+                            <in>rtree_dlin_mod_s2d.cpp</in>
+                            <in>rtree_dlin_que_s2d.cpp</in>
+                            <in>rtree_dqua_add_s2d.cpp</in>
+                            <in>rtree_dqua_mod_s2d.cpp</in>
+                            <in>rtree_dqua_que_s2d.cpp</in>
+                            <in>rtree_drst_add_s2d.cpp</in>
+                            <in>rtree_drst_mod_s2d.cpp</in>
+                            <in>rtree_drst_que_s2d.cpp</in>
+                            <in>rtree_lin_add_s2d.cpp</in>
+                            <in>rtree_lin_mod_s2d.cpp</in>
+                            <in>rtree_lin_que_s2d.cpp</in>
+                            <in>rtree_qua_add_s2d.cpp</in>
+                            <in>rtree_qua_mod_s2d.cpp</in>
+                            <in>rtree_qua_que_s2d.cpp</in>
+                            <in>rtree_rst_add_s2d.cpp</in>
+                            <in>rtree_rst_mod_s2d.cpp</in>
+                            <in>rtree_rst_que_s2d.cpp</in>
+                          </df>
+                        </df>
+                        <df name="interprocess">
+                          <in>rtree_interprocess_linear.cpp</in>
+                          <in>rtree_interprocess_linear_dyn.cpp</in>
+                          <in>rtree_interprocess_quadratic.cpp</in>
+                          <in>rtree_interprocess_quadratic_dyn.cpp</in>
+                          <in>rtree_interprocess_rstar.cpp</in>
+                          <in>rtree_interprocess_rstar_dyn.cpp</in>
+                        </df>
+                        <in>rtree_contains_point.cpp</in>
+                        <in>rtree_epsilon.cpp</in>
+                        <in>rtree_insert_remove.cpp</in>
+                        <in>rtree_intersects_geom.cpp</in>
+                        <in>rtree_move_pack.cpp</in>
+                        <in>rtree_non_cartesian.cpp</in>
+                        <in>rtree_test_generator.cpp</in>
+                        <in>rtree_values.cpp</in>
+                        <in>rtree_values_invalid.cpp</in>
+                      </df>
+                      <in>minmax_heap.cpp</in>
+                      <in>varray.cpp</in>
+                      <in>varray_old.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="algorithms">
+                      <df name="area">
+                        <in>area.cpp</in>
+                        <in>area_box_sg.cpp</in>
+                        <in>area_geo.cpp</in>
+                        <in>area_multi.cpp</in>
+                        <in>area_sph_geo.cpp</in>
+                      </df>
+                      <df name="buffer">
+                        <in>buffer.cpp</in>
+                        <in>buffer_countries.cpp</in>
+                        <in>buffer_linestring.cpp</in>
+                        <in>buffer_linestring_aimes.cpp</in>
+                        <in>buffer_multi_linestring.cpp</in>
+                        <in>buffer_multi_point.cpp</in>
+                        <in>buffer_multi_polygon.cpp</in>
+                        <in>buffer_piece_border.cpp</in>
+                        <in>buffer_point.cpp</in>
+                        <in>buffer_point_geo.cpp</in>
+                        <in>buffer_polygon.cpp</in>
+                        <in>buffer_ring.cpp</in>
+                        <in>buffer_with_strategies.cpp</in>
+                      </df>
+                      <df name="convex_hull">
+                        <in>convex_hull.cpp</in>
+                        <in>convex_hull_multi.cpp</in>
+                        <in>convex_hull_robust.cpp</in>
+                        <in>convex_hull_sph_geo.cpp</in>
+                      </df>
+                      <df name="covered_by">
+                        <in>covered_by.cpp</in>
+                        <in>covered_by_multi.cpp</in>
+                        <in>covered_by_sph.cpp</in>
+                        <in>covered_by_sph_geo.cpp</in>
+                      </df>
+                      <df name="crosses">
+                        <in>crosses.cpp</in>
+                        <in>crosses_sph.cpp</in>
+                      </df>
+                      <df name="detail">
+                        <df name="sections">
+                          <in>range_by_section.cpp</in>
+                          <in>sectionalize.cpp</in>
+                        </df>
+                        <in>approximately_equals.cpp</in>
+                        <in>calculate_point_order.cpp</in>
+                        <in>partition.cpp</in>
+                        <in>tupled_output.cpp</in>
+                        <in>visit.cpp</in>
+                      </df>
+                      <df name="disjoint">
+                        <in>disjoint.cpp</in>
+                        <in>disjoint_coverage_a_a.cpp</in>
+                        <in>disjoint_coverage_l_a.cpp</in>
+                        <in>disjoint_coverage_l_l.cpp</in>
+                        <in>disjoint_coverage_p_a.cpp</in>
+                        <in>disjoint_coverage_p_l.cpp</in>
+                        <in>disjoint_coverage_p_p.cpp</in>
+                        <in>disjoint_multi.cpp</in>
+                        <in>disjoint_point_box_geometry.cpp</in>
+                        <in>disjoint_seg_box.cpp</in>
+                        <in>disjoint_sph.cpp</in>
+                      </df>
+                      <df name="distance">
+                        <in>distance.cpp</in>
+                        <in>distance_all.cpp</in>
+                        <in>distance_ca_ar_ar.cpp</in>
+                        <in>distance_ca_l_ar.cpp</in>
+                        <in>distance_ca_l_l.cpp</in>
+                        <in>distance_ca_pl_ar.cpp</in>
+                        <in>distance_ca_pl_l.cpp</in>
+                        <in>distance_ca_pl_pl.cpp</in>
+                        <in>distance_geo_linear_box.cpp</in>
+                        <in>distance_geo_pl_l.cpp</in>
+                        <in>distance_se_geo_ar_ar.cpp</in>
+                        <in>distance_se_geo_l_ar.cpp</in>
+                        <in>distance_se_geo_l_l.cpp</in>
+                        <in>distance_se_geo_pl_ar.cpp</in>
+                        <in>distance_se_geo_pl_pl.cpp</in>
+                        <in>distance_se_pl_l.cpp</in>
+                        <in>distance_se_pl_pl.cpp</in>
+                      </df>
+                      <df name="envelope_expand">
+                        <in>envelope.cpp</in>
+                        <in>envelope_multi.cpp</in>
+                        <in>envelope_on_spheroid.cpp</in>
+                        <in>expand.cpp</in>
+                        <in>expand_on_spheroid.cpp</in>
+                      </df>
+                      <df name="equals">
+                        <in>equals.cpp</in>
+                        <in>equals_multi.cpp</in>
+                        <in>equals_on_spheroid.cpp</in>
+                        <in>equals_sph.cpp</in>
+                      </df>
+                      <df name="intersects">
+                        <in>intersects.cpp</in>
+                        <in>intersects_box_geometry.cpp</in>
+                        <in>intersects_multi.cpp</in>
+                        <in>intersects_self.cpp</in>
+                        <in>intersects_sph.cpp</in>
+                        <in>intersects_sph_geo.cpp</in>
+                      </df>
+                      <df name="length">
+                        <in>length.cpp</in>
+                        <in>length_geo.cpp</in>
+                        <in>length_multi.cpp</in>
+                        <in>length_sph.cpp</in>
+                      </df>
+                      <df name="overlaps">
+                        <in>overlaps.cpp</in>
+                        <in>overlaps_areal.cpp</in>
+                        <in>overlaps_box.cpp</in>
+                        <in>overlaps_sph.cpp</in>
+                      </df>
+                      <df name="overlay">
+                        <in>assemble.cpp</in>
+                        <in>copy_segment_point.cpp</in>
+                        <in>dissolver.cpp</in>
+                        <in>enrich_intersection_points.cpp</in>
+                        <in>get_clusters.cpp</in>
+                        <in>get_ring.cpp</in>
+                        <in>get_turn_info.cpp</in>
+                        <in>get_turns.cpp</in>
+                        <in>get_turns_areal_areal.cpp</in>
+                        <in>get_turns_areal_areal_sph.cpp</in>
+                        <in>get_turns_linear_areal.cpp</in>
+                        <in>get_turns_linear_areal_sph.cpp</in>
+                        <in>get_turns_linear_linear.cpp</in>
+                        <in>get_turns_linear_linear_geo.cpp</in>
+                        <in>get_turns_linear_linear_sph.cpp</in>
+                        <in>overlay.cpp</in>
+                        <in>relative_order.cpp</in>
+                        <in>select_rings.cpp</in>
+                        <in>self_intersection_points.cpp</in>
+                        <in>sort_by_side.cpp</in>
+                        <in>sort_by_side_basic.cpp</in>
+                        <in>split_rings.cpp</in>
+                        <in>traverse.cpp</in>
+                        <in>traverse_ccw.cpp</in>
+                        <in>traverse_multi.cpp</in>
+                      </df>
+                      <df name="perimeter">
+                        <in>perimeter.cpp</in>
+                        <in>perimeter_geo.cpp</in>
+                        <in>perimeter_sph.cpp</in>
+                      </df>
+                      <df name="relate">
+                        <in>relate_areal_areal.cpp</in>
+                        <in>relate_areal_areal_sph.cpp</in>
+                        <in>relate_linear_areal.cpp</in>
+                        <in>relate_linear_areal_sph.cpp</in>
+                        <in>relate_linear_linear.cpp</in>
+                        <in>relate_linear_linear_sph.cpp</in>
+                        <in>relate_pointlike_geometry.cpp</in>
+                      </df>
+                      <df name="set_operations">
+                        <df name="difference">
+                          <in>difference.cpp</in>
+                          <in>difference_areal_linear.cpp</in>
+                          <in>difference_l_a_sph.cpp</in>
+                          <in>difference_linear_linear.cpp</in>
+                          <in>difference_multi.cpp</in>
+                          <in>difference_multi_areal_linear.cpp</in>
+                          <in>difference_multi_spike.cpp</in>
+                          <in>difference_pl_a.cpp</in>
+                          <in>difference_pl_l.cpp</in>
+                          <in>difference_pl_pl.cpp</in>
+                          <in>difference_tupled.cpp</in>
+                        </df>
+                        <df name="intersection">
+                          <in>intersection.cpp</in>
+                          <in>intersection_aa_sph.cpp</in>
+                          <in>intersection_areal_areal_linear.cpp</in>
+                          <in>intersection_linear_linear.cpp</in>
+                          <in>intersection_multi.cpp</in>
+                          <in>intersection_pl_a.cpp</in>
+                          <in>intersection_pl_l.cpp</in>
+                          <in>intersection_pl_pl.cpp</in>
+                          <in>intersection_segment.cpp</in>
+                          <in>intersection_tupled.cpp</in>
+                        </df>
+                        <df name="sym_difference">
+                          <in>sym_difference_areal_areal.cpp</in>
+                          <in>sym_difference_linear_linear.cpp</in>
+                          <in>sym_difference_tupled.cpp</in>
+                        </df>
+                        <df name="union">
+                          <in>union.cpp</in>
+                          <in>union_aa_geo.cpp</in>
+                          <in>union_aa_sph.cpp</in>
+                          <in>union_linear_linear.cpp</in>
+                          <in>union_multi.cpp</in>
+                          <in>union_other_types.cpp</in>
+                          <in>union_pl_pl.cpp</in>
+                          <in>union_tupled.cpp</in>
+                        </df>
+                        <in>set_ops_ll.cpp</in>
+                        <in>set_ops_pp.cpp</in>
+                      </df>
+                      <df name="similarity">
+                        <in>discrete_frechet_distance.cpp</in>
+                        <in>discrete_hausdorff_distance.cpp</in>
+                      </df>
+                      <df name="touches">
+                        <in>touches.cpp</in>
+                        <in>touches_box.cpp</in>
+                        <in>touches_multi.cpp</in>
+                        <in>touches_self.cpp</in>
+                        <in>touches_sph.cpp</in>
+                      </df>
+                      <df name="within">
+                        <in>within.cpp</in>
+                        <in>within_areal_areal.cpp</in>
+                        <in>within_linear_areal.cpp</in>
+                        <in>within_linear_linear.cpp</in>
+                        <in>within_multi.cpp</in>
+                        <in>within_pointlike_geometry.cpp</in>
+                        <in>within_sph.cpp</in>
+                        <in>within_sph_geo.cpp</in>
+                      </df>
+                      <in>append.cpp</in>
+                      <in>assign.cpp</in>
+                      <in>azimuth.cpp</in>
+                      <in>centroid.cpp</in>
+                      <in>centroid_multi.cpp</in>
+                      <in>clear_multi.cpp</in>
+                      <in>comparable_distance.cpp</in>
+                      <in>convert.cpp</in>
+                      <in>convert_multi.cpp</in>
+                      <in>correct.cpp</in>
+                      <in>correct_closure.cpp</in>
+                      <in>correct_multi.cpp</in>
+                      <in>densify.cpp</in>
+                      <in>for_each.cpp</in>
+                      <in>for_each_multi.cpp</in>
+                      <in>is_convex.cpp</in>
+                      <in>is_empty.cpp</in>
+                      <in>is_simple.cpp</in>
+                      <in>is_simple_geo.cpp</in>
+                      <in>is_valid.cpp</in>
+                      <in>is_valid_failure.cpp</in>
+                      <in>is_valid_geo.cpp</in>
+                      <in>line_interpolate.cpp</in>
+                      <in>make.cpp</in>
+                      <in>maximum_gap.cpp</in>
+                      <in>num_geometries.cpp</in>
+                      <in>num_geometries_multi.cpp</in>
+                      <in>num_interior_rings.cpp</in>
+                      <in>num_interior_rings_multi.cpp</in>
+                      <in>num_points.cpp</in>
+                      <in>num_points_multi.cpp</in>
+                      <in>num_segments.cpp</in>
+                      <in>perimeter.cpp</in>
+                      <in>perimeter_multi.cpp</in>
+                      <in>point_on_surface.cpp</in>
+                      <in>remove_spikes.cpp</in>
+                      <in>reverse.cpp</in>
+                      <in>reverse_multi.cpp</in>
+                      <in>simplify.cpp</in>
+                      <in>simplify_countries.cpp</in>
+                      <in>simplify_multi.cpp</in>
+                      <in>transform.cpp</in>
+                      <in>transform_multi.cpp</in>
+                      <in>unique.cpp</in>
+                      <in>unique_multi.cpp</in>
+                    </df>
+                    <df name="arithmetic">
+                      <in>cross_product.cpp</in>
+                      <in>dot_product.cpp</in>
+                      <in>general.cpp</in>
+                      <in>infinite_line_functions.cpp</in>
+                    </df>
+                    <df name="concepts">
+                      <in>linestring_concept.cpp</in>
+                      <in>point_array.cpp</in>
+                      <in>point_concept_checker.cpp</in>
+                      <in>point_geographic_custom_with_wrong_units.cpp</in>
+                      <in>point_geographic_with_wrong_units.cpp</in>
+                      <in>point_spherical_custom_with_wrong_units.cpp</in>
+                      <in>point_spherical_with_wrong_units.cpp</in>
+                      <in>point_well_formed.cpp</in>
+                      <in>point_well_formed_non_cartesian.cpp</in>
+                      <in>point_well_formed_traits.cpp</in>
+                      <in>point_with_incorrect_dimension.cpp</in>
+                      <in>point_without_coordinate_type.cpp</in>
+                      <in>point_without_dimension.cpp</in>
+                      <in>point_without_getter.cpp</in>
+                      <in>point_without_setter.cpp</in>
+                    </df>
+                    <df name="core">
+                      <in>access.cpp</in>
+                      <in>assert.cpp</in>
+                      <in>coordinate_dimension.cpp</in>
+                      <in>coordinate_system.cpp</in>
+                      <in>coordinate_type.cpp</in>
+                      <in>geometry_id.cpp</in>
+                      <in>point_type.cpp</in>
+                      <in>radian_access.cpp</in>
+                      <in>radius.cpp</in>
+                      <in>reverse_dispatch.cpp</in>
+                      <in>ring.cpp</in>
+                      <in>tag.cpp</in>
+                      <in>topological_dimension.cpp</in>
+                      <in>visit.cpp</in>
+                    </df>
+                    <df name="cs_undefined">
+                      <in>distance.cpp</in>
+                      <in>envelope_expand.cpp</in>
+                      <in>index.cpp</in>
+                      <in>is.cpp</in>
+                      <in>measure.cpp</in>
+                      <in>other.cpp</in>
+                      <in>relops1.cpp</in>
+                      <in>relops2.cpp</in>
+                      <in>setops1.cpp</in>
+                      <in>setops2.cpp</in>
+                    </df>
+                    <df name="formulas">
+                      <in>direct.cpp</in>
+                      <in>direct_accuracy.cpp</in>
+                      <in>direct_meridian.cpp</in>
+                      <in>intersection.cpp</in>
+                      <in>inverse.cpp</in>
+                      <in>inverse_karney.cpp</in>
+                      <in>vertex_longitude.cpp</in>
+                    </df>
+                    <df name="geometries">
+                      <df name="concepts">
+                        <in>check.cpp</in>
+                      </df>
+                      <in>adapted.cpp</in>
+                      <in>boost_array_as_point.cpp</in>
+                      <in>boost_fusion.cpp</in>
+                      <in>boost_polygon.cpp</in>
+                      <in>boost_polygon_overlay.cpp</in>
+                      <in>boost_range.cpp</in>
+                      <in>boost_tuple.cpp</in>
+                      <in>box.cpp</in>
+                      <in>custom_linestring.cpp</in>
+                      <in>infinite_line.cpp</in>
+                      <in>initialization.cpp</in>
+                      <in>linestring.cpp</in>
+                      <in>multi_linestring.cpp</in>
+                      <in>multi_point.cpp</in>
+                      <in>multi_polygon.cpp</in>
+                      <in>point.cpp</in>
+                      <in>point_xy.cpp</in>
+                      <in>point_xyz.cpp</in>
+                      <in>polygon.cpp</in>
+                      <in>ring.cpp</in>
+                      <in>segment.cpp</in>
+                    </df>
+                    <df name="headers">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="io">
+                      <df name="dsv">
+                        <in>dsv_multi.cpp</in>
+                      </df>
+                      <df name="svg">
+                        <in>svg.cpp</in>
+                      </df>
+                      <df name="wkt">
+                        <in>wkt.cpp</in>
+                        <in>wkt_multi.cpp</in>
+                      </df>
+                    </df>
+                    <df name="iterators">
+                      <in>closing_iterator.cpp</in>
+                      <in>concatenate_iterator.cpp</in>
+                      <in>ever_circling_iterator.cpp</in>
+                      <in>flatten_iterator.cpp</in>
+                      <in>point_iterator.cpp</in>
+                      <in>segment_iterator.cpp</in>
+                    </df>
+                    <df name="policies">
+                      <in>compare.cpp</in>
+                      <in>rescale_policy.cpp</in>
+                    </df>
+                    <df name="robustness">
+                      <df name="convex_hull">
+                        <in>random_multi_points.cpp</in>
+                      </df>
+                      <df name="overlay">
+                        <df name="areal_areal">
+                          <in>general_intersection_precision.cpp</in>
+                          <in>interior_triangles.cpp</in>
+                          <in>intersection_pies.cpp</in>
+                          <in>intersection_stars.cpp</in>
+                          <in>intersects.cpp</in>
+                          <in>random_ellipses_stars.cpp</in>
+                          <in>recursive_polygons.cpp</in>
+                          <in>star_comb.cpp</in>
+                          <in>ticket_9081.cpp</in>
+                        </df>
+                        <df name="buffer">
+                          <in>many_ring_buffer.cpp</in>
+                          <in>multi_point_growth.cpp</in>
+                          <in>recursive_polygons_buffer.cpp</in>
+                        </df>
+                        <df name="linear_areal">
+                          <in>recursive_polygons_linear_areal.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="srs">
+                      <in>projection.cpp</in>
+                      <in>projection_epsg.cpp</in>
+                      <in>projection_interface_d.cpp</in>
+                      <in>projection_interface_p4.cpp</in>
+                      <in>projection_interface_s.cpp</in>
+                      <in>projection_selftest.cpp</in>
+                      <in>projections.cpp</in>
+                      <in>projections_combined.cpp</in>
+                      <in>projections_static.cpp</in>
+                      <in>spar.cpp</in>
+                      <in>srs_transformer.cpp</in>
+                      <in>transformation_epsg.cpp</in>
+                      <in>transformation_interface.cpp</in>
+                    </df>
+                    <df name="strategies">
+                      <in>andoyer.cpp</in>
+                      <in>cross_track.cpp</in>
+                      <in>crossings_multiply.cpp</in>
+                      <in>distance.cpp</in>
+                      <in>distance_cross_track.cpp</in>
+                      <in>distance_default_result.cpp</in>
+                      <in>douglas_peucker.cpp</in>
+                      <in>envelope_segment.cpp</in>
+                      <in>franklin.cpp</in>
+                      <in>haversine.cpp</in>
+                      <in>matrix_transformer.cpp</in>
+                      <in>point_in_box.cpp</in>
+                      <in>projected_point.cpp</in>
+                      <in>projected_point_ax.cpp</in>
+                      <in>pythagoras.cpp</in>
+                      <in>pythagoras_point_box.cpp</in>
+                      <in>segment_intersection.cpp</in>
+                      <in>segment_intersection_collinear.cpp</in>
+                      <in>segment_intersection_geo.cpp</in>
+                      <in>segment_intersection_sph.cpp</in>
+                      <in>spherical_side.cpp</in>
+                      <in>thomas.cpp</in>
+                      <in>transform_cs.cpp</in>
+                      <in>transformer.cpp</in>
+                      <in>vincenty.cpp</in>
+                      <in>winding.cpp</in>
+                    </df>
+                    <df name="util">
+                      <in>algorithm.cpp</in>
+                      <in>calculation_type.cpp</in>
+                      <in>compress_variant.cpp</in>
+                      <in>for_each_coordinate.cpp</in>
+                      <in>is_implemented.cpp</in>
+                      <in>math_abs.cpp</in>
+                      <in>math_equals.cpp</in>
+                      <in>math_sqrt.cpp</in>
+                      <in>promote_integral.cpp</in>
+                      <in>range.cpp</in>
+                      <in>rational.cpp</in>
+                      <in>select_most_precise.cpp</in>
+                      <in>transform_variant.cpp</in>
+                      <in>tuples.cpp</in>
+                      <in>write_dsv.cpp</in>
+                    </df>
+                    <df name="views">
+                      <in>box_view.cpp</in>
+                      <in>closeable_view.cpp</in>
+                      <in>reversible_closeable.cpp</in>
+                      <in>reversible_view.cpp</in>
+                      <in>segment_view.cpp</in>
+                    </df>
+                    <in>minimal.cpp</in>
+                  </df>
+                </df>
+                <df name="gil">
+                  <df name="doc">
+                    <df name="html">
+                      <df name="_downloads">
+                        <in>affine.cpp</in>
+                        <in>convolution.cpp</in>
+                        <in>dynamic_image.cpp</in>
+                        <in>histogram.cpp</in>
+                        <in>interleaved_ptr.cpp</in>
+                        <in>mandelbrot.cpp</in>
+                        <in>packed_pixel.cpp</in>
+                        <in>resize.cpp</in>
+                        <in>x_gradient.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <in>adaptive_threshold.cpp</in>
+                    <in>affine.cpp</in>
+                    <in>convolution.cpp</in>
+                    <in>convolve2d.cpp</in>
+                    <in>dynamic_image.cpp</in>
+                    <in>harris.cpp</in>
+                    <in>hessian.cpp</in>
+                    <in>histogram.cpp</in>
+                    <in>interleaved_ptr.cpp</in>
+                    <in>mandelbrot.cpp</in>
+                    <in>packed_pixel.cpp</in>
+                    <in>resize.cpp</in>
+                    <in>sobel_scharr.cpp</in>
+                    <in>threshold.cpp</in>
+                    <in>x_gradient.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="core">
+                      <df name="algorithm">
+                        <in>for_each_pixel.cpp</in>
+                        <in>std_fill.cpp</in>
+                        <in>std_uninitialized_fill.cpp</in>
+                      </df>
+                      <df name="channel">
+                        <in>algorithm_channel_arithmetic.cpp</in>
+                        <in>algorithm_channel_convert.cpp</in>
+                        <in>algorithm_channel_invert.cpp</in>
+                        <in>algorithm_channel_multiply.cpp</in>
+                        <in>algorithm_channel_relation.cpp</in>
+                        <in>channel_traits.cpp</in>
+                        <in>concepts.cpp</in>
+                        <in>is_channel_integral.cpp</in>
+                        <in>packed_channel_value.cpp</in>
+                        <in>scoped_channel_value.cpp</in>
+                        <in>test_fixture.cpp</in>
+                      </df>
+                      <df name="color">
+                        <in>color_spaces_are_compatible.cpp</in>
+                        <in>concepts.cpp</in>
+                        <in>default_color_converter_impl.cpp</in>
+                        <in>default_color_converter_impl_fail.cpp</in>
+                      </df>
+                      <df name="color_base">
+                        <in>concepts.cpp</in>
+                        <in>homogeneous_color_base.cpp</in>
+                        <in>static_transform.cpp</in>
+                        <in>static_transform_gray_to_rgb_fail.cpp</in>
+                        <in>static_transform_rgb_to_cmyk_fail.cpp</in>
+                      </df>
+                      <df name="image">
+                        <in>concepts.cpp</in>
+                        <in>image.cpp</in>
+                      </df>
+                      <df name="image_processing">
+                        <in>box_filter.cpp</in>
+                        <in>harris.cpp</in>
+                        <in>hessian.cpp</in>
+                        <in>lanczos_scaling.cpp</in>
+                        <in>median_filter.cpp</in>
+                        <in>simple_kernels.cpp</in>
+                        <in>sobel_scharr.cpp</in>
+                        <in>threshold_binary.cpp</in>
+                        <in>threshold_color_spaces_not_compatible_fail.cpp</in>
+                        <in>threshold_otsu.cpp</in>
+                        <in>threshold_truncate.cpp</in>
+                      </df>
+                      <df name="image_view">
+                        <in>axis_iterator.cpp</in>
+                        <in>collection.cpp</in>
+                        <in>concepts.cpp</in>
+                        <in>derived_view_type.cpp</in>
+                        <in>dynamic_step.cpp</in>
+                        <in>is_planar.cpp</in>
+                        <in>iterator.cpp</in>
+                        <in>planar_rgba_view.cpp</in>
+                        <in>reverse_iterator.cpp</in>
+                        <in>subimage_view.cpp</in>
+                        <in>view_is_basic.cpp</in>
+                        <in>view_is_mutable.cpp</in>
+                        <in>view_is_step.cpp</in>
+                        <in>view_type.cpp</in>
+                        <in>view_type_from_pixel.cpp</in>
+                        <in>x_iterator.cpp</in>
+                        <in>xy_locator.cpp</in>
+                        <in>y_iterator.cpp</in>
+                      </df>
+                      <df name="iterator">
+                        <in>concepts.cpp</in>
+                        <in>dynamic_step.cpp</in>
+                        <in>is_planar.cpp</in>
+                      </df>
+                      <df name="locator">
+                        <in>concepts.cpp</in>
+                        <in>dynamic_step.cpp</in>
+                      </df>
+                      <df name="pixel">
+                        <in>bit_aligned_pixel_reference.cpp</in>
+                        <in>color_convert_cmyk.cpp</in>
+                        <in>concepts.cpp</in>
+                        <in>is_pixel.cpp</in>
+                        <in>is_planar.cpp</in>
+                        <in>num_channels.cpp</in>
+                        <in>packed_pixel.cpp</in>
+                        <in>pixel_reference_is_mutable.cpp</in>
+                        <in>pixels_are_compatible.cpp</in>
+                        <in>test_fixture.cpp</in>
+                      </df>
+                      <df name="point">
+                        <in>concepts.cpp</in>
+                        <in>multiply_by_non_arithmetic_fail.cpp</in>
+                        <in>point.cpp</in>
+                      </df>
+                      <in>promote_integral.cpp</in>
+                      <in>test_fixture.cpp</in>
+                    </df>
+                    <df name="extension">
+                      <df name="dynamic_image">
+                        <in>any_image.cpp</in>
+                        <in>subimage_view.cpp</in>
+                      </df>
+                      <df name="io">
+                        <df name="bmp">
+                          <in>bmp_make.cpp</in>
+                          <in>bmp_old_test.cpp</in>
+                          <in>bmp_read_test.cpp</in>
+                          <in>bmp_test.cpp</in>
+                          <in>bmp_write_test.cpp</in>
+                        </df>
+                        <df name="jpeg">
+                          <in>jpeg_old_test.cpp</in>
+                          <in>jpeg_read_test.cpp</in>
+                          <in>jpeg_test.cpp</in>
+                          <in>jpeg_write_test.cpp</in>
+                        </df>
+                        <df name="png">
+                          <in>png_file_format_test.cpp</in>
+                          <in>png_old_test.cpp</in>
+                          <in>png_read_test.cpp</in>
+                          <in>png_test.cpp</in>
+                          <in>png_write_test.cpp</in>
+                        </df>
+                        <df name="pnm">
+                          <in>pnm_old_test.cpp</in>
+                          <in>pnm_read_test.cpp</in>
+                          <in>pnm_test.cpp</in>
+                          <in>pnm_write_test.cpp</in>
+                        </df>
+                        <df name="raw">
+                          <in>raw_test.cpp</in>
+                        </df>
+                        <df name="targa">
+                          <in>targa_old_test.cpp</in>
+                          <in>targa_read_test.cpp</in>
+                          <in>targa_test.cpp</in>
+                          <in>targa_write_test.cpp</in>
+                        </df>
+                        <df name="tiff">
+                          <in>tiff_file_format_test.cpp</in>
+                          <in>tiff_old_test.cpp</in>
+                          <in>tiff_subimage_test.cpp</in>
+                          <in>tiff_test.cpp</in>
+                          <in>tiff_tiled_float_test.cpp</in>
+                          <in>tiff_tiled_minisblack_test_1-10.cpp</in>
+                          <in>tiff_tiled_minisblack_test_11-20.cpp</in>
+                          <in>tiff_tiled_minisblack_test_21-31_32-64.cpp</in>
+                          <in>tiff_tiled_minisblack_write_test_1-10.cpp</in>
+                          <in>tiff_tiled_minisblack_write_test_11-20.cpp</in>
+                          <in>tiff_tiled_minisblack_write_test_21-31_32-64.cpp</in>
+                          <in>tiff_tiled_palette_test_1-8.cpp</in>
+                          <in>tiff_tiled_palette_test_8-16.cpp</in>
+                          <in>tiff_tiled_palette_write_test_1-8.cpp</in>
+                          <in>tiff_tiled_palette_write_test_8-16.cpp</in>
+                          <in>tiff_tiled_rgb_contig_test_1-10.cpp</in>
+                          <in>tiff_tiled_rgb_contig_test_11-20.cpp</in>
+                          <in>tiff_tiled_rgb_contig_test_21-31_32_64.cpp</in>
+                          <in>tiff_tiled_rgb_contig_write_test_1-10.cpp</in>
+                          <in>tiff_tiled_rgb_contig_write_test_11-20.cpp</in>
+                          <in>tiff_tiled_rgb_contig_write_test_21-31_32_64.cpp</in>
+                          <in>tiff_tiled_rgb_planar_test_1-10.cpp</in>
+                          <in>tiff_tiled_rgb_planar_test_11-20.cpp</in>
+                          <in>tiff_tiled_rgb_planar_test_21-31_32_64.cpp</in>
+                          <in>tiff_tiled_test.cpp</in>
+                          <in>tiff_write_test.cpp</in>
+                        </df>
+                        <in>simple_all_formats.cpp</in>
+                      </df>
+                      <df name="numeric">
+                        <in>channel_numeric_operations.cpp</in>
+                        <in>convolve.cpp</in>
+                        <in>convolve_2d.cpp</in>
+                        <in>convolve_cols.cpp</in>
+                        <in>convolve_rows.cpp</in>
+                        <in>extend_boundary.cpp</in>
+                        <in>kernel.cpp</in>
+                        <in>kernel_1d_fixed_even_size_fail.cpp</in>
+                        <in>kernel_fixed.cpp</in>
+                        <in>matrix3x2.cpp</in>
+                        <in>pixel_numeric_operations.cpp</in>
+                        <in>pixel_numeric_operations_float.cpp</in>
+                        <in>resample.cpp</in>
+                      </df>
+                      <df name="toolbox">
+                        <in>channel_type.cpp</in>
+                        <in>channel_view.cpp</in>
+                        <in>color_convert_cmyka.cpp</in>
+                        <in>color_convert_gray.cpp</in>
+                        <in>color_convert_gray_alpha.cpp</in>
+                        <in>color_convert_hsl.cpp</in>
+                        <in>color_convert_hsv.cpp</in>
+                        <in>color_convert_lab.cpp</in>
+                        <in>color_convert_luminance.cpp</in>
+                        <in>color_convert_xyz.cpp</in>
+                        <in>get_num_bits.cpp</in>
+                        <in>get_pixel_type.cpp</in>
+                        <in>indexed_image.cpp</in>
+                        <in>is_bit_aligned.cpp</in>
+                        <in>is_homogeneous.cpp</in>
+                        <in>pixel_bit_size.cpp</in>
+                        <in>subchroma_image.cpp</in>
+                      </df>
+                    </df>
+                    <df name="header">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="legacy">
+                      <in>channel.cpp</in>
+                      <in>error_if.cpp</in>
+                      <in>image.cpp</in>
+                      <in>performance.cpp</in>
+                      <in>pixel.cpp</in>
+                      <in>pixel_iterator.cpp</in>
+                      <in>recreate_image.cpp</in>
+                      <in>sample_image.cpp</in>
+                    </df>
+                    <in>test_utility_output_stream.cpp</in>
+                  </df>
+                </df>
+                <df name="graph">
+                  <df name="doc">
+                    <in>eg1-iso.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>accum-compile-times.cpp</in>
+                    <in>actor_clustering.cpp</in>
+                    <in>adj_list_ra_edgelist.cpp</in>
+                    <in>adjacency_list.cpp</in>
+                    <in>adjacency_list_io.cpp</in>
+                    <in>adjacency_matrix.cpp</in>
+                    <in>astar-cities.cpp</in>
+                    <in>astar_maze.cpp</in>
+                    <in>bellman-example.cpp</in>
+                    <in>bellman-ford-internet.cpp</in>
+                    <in>bfs-example.cpp</in>
+                    <in>bfs-example2.cpp</in>
+                    <in>bfs-name-printer.cpp</in>
+                    <in>bfs.cpp</in>
+                    <in>bfs_neighbor.cpp</in>
+                    <in>biconnected_components.cpp</in>
+                    <in>bipartite_example.cpp</in>
+                    <in>boost_web_graph.cpp</in>
+                    <in>boykov_kolmogorov-eg.cpp</in>
+                    <in>bron_kerbosch_clique_number.cpp</in>
+                    <in>bron_kerbosch_print_cliques.cpp</in>
+                    <in>bucket_sorter.cpp</in>
+                    <in>canonical_ordering.cpp</in>
+                    <in>cc-internet.cpp</in>
+                    <in>city_visitor.cpp</in>
+                    <in>closeness_centrality.cpp</in>
+                    <in>clustering_coefficient.cpp</in>
+                    <in>components_on_edgelist.cpp</in>
+                    <in>connected-components.cpp</in>
+                    <in>connected_components.cpp</in>
+                    <in>container_gen.cpp</in>
+                    <in>copy-example.cpp</in>
+                    <in>csr-example.cpp</in>
+                    <in>cuthill_mckee_ordering.cpp</in>
+                    <in>cycle-file-dep.cpp</in>
+                    <in>cycle-file-dep2.cpp</in>
+                    <in>cycle_canceling_example.cpp</in>
+                    <in>cycle_ratio_example.cpp</in>
+                    <in>dag_shortest_paths.cpp</in>
+                    <in>dave.cpp</in>
+                    <in>default-constructor.cpp</in>
+                    <in>default-constructor2.cpp</in>
+                    <in>degree_centrality.cpp</in>
+                    <in>dfs-example.cpp</in>
+                    <in>dfs-parenthesis.cpp</in>
+                    <in>dfs.cpp</in>
+                    <in>dfs_parenthesis.cpp</in>
+                    <in>dijkstra-example-listS.cpp</in>
+                    <in>dijkstra-example.cpp</in>
+                    <in>dijkstra-no-color-map-example.cpp</in>
+                    <in>directed_graph.cpp</in>
+                    <in>eccentricity.cpp</in>
+                    <in>edge-connectivity.cpp</in>
+                    <in>edge-function.cpp</in>
+                    <in>edge-iter-constructor.cpp</in>
+                    <in>edge_basics.cpp</in>
+                    <in>edge_coloring.cpp</in>
+                    <in>edge_connectivity.cpp</in>
+                    <in>edge_iterator_constructor.cpp</in>
+                    <in>edge_property.cpp</in>
+                    <in>edmonds-karp-eg.cpp</in>
+                    <in>exterior_properties.cpp</in>
+                    <in>exterior_property_map.cpp</in>
+                    <in>family_tree.cpp</in>
+                    <in>fibonacci_heap.cpp</in>
+                    <in>file_dependencies.cpp</in>
+                    <in>filtered-copy-example.cpp</in>
+                    <in>filtered_graph.cpp</in>
+                    <in>filtered_graph_edge_range.cpp</in>
+                    <in>filtered_vec_as_graph.cpp</in>
+                    <in>fr_layout.cpp</in>
+                    <in>gerdemann.cpp</in>
+                    <in>girth.cpp</in>
+                    <in>graph-assoc-types.cpp</in>
+                    <in>graph-property-iter-eg.cpp</in>
+                    <in>graph-thingie.cpp</in>
+                    <in>graph.cpp</in>
+                    <in>graph_as_tree.cpp</in>
+                    <in>graph_property.cpp</in>
+                    <in>graphviz.cpp</in>
+                    <in>grid_graph_example.cpp</in>
+                    <in>grid_graph_properties.cpp</in>
+                    <in>hawick_circuits.cpp</in>
+                    <in>implicit_graph.cpp</in>
+                    <in>in_edges.cpp</in>
+                    <in>inclusive_mean_geodesic.cpp</in>
+                    <in>incremental-components-eg.cpp</in>
+                    <in>incremental_components.cpp</in>
+                    <in>influence_prestige.cpp</in>
+                    <in>interior_pmap_bundled.cpp</in>
+                    <in>interior_property_map.cpp</in>
+                    <in>iohb.c</in>
+                    <in>isomorphism.cpp</in>
+                    <in>iteration_macros.cpp</in>
+                    <in>iterator-property-map-eg.cpp</in>
+                    <in>johnson-eg.cpp</in>
+                    <in>kevin-bacon.cpp</in>
+                    <in>kevin-bacon2.cpp</in>
+                    <in>king_ordering.cpp</in>
+                    <in>knights_tour.cpp</in>
+                    <in>kruskal-example.cpp</in>
+                    <in>kruskal-telephone.cpp</in>
+                    <in>kuratowski_subgraph.cpp</in>
+                    <in>labeled_graph.cpp</in>
+                    <in>last-mod-time.cpp</in>
+                    <in>leda-concept-check.cpp</in>
+                    <in>leda-graph-eg.cpp</in>
+                    <in>loops_dfs.cpp</in>
+                    <in>make_biconnected_planar.cpp</in>
+                    <in>make_connected.cpp</in>
+                    <in>make_maximal_planar.cpp</in>
+                    <in>matching_example.cpp</in>
+                    <in>max_flow.cpp</in>
+                    <in>mcgregor_subgraphs_example.cpp</in>
+                    <in>mean_geodesic.cpp</in>
+                    <in>miles_span.cpp</in>
+                    <in>min_max_paths.cpp</in>
+                    <in>minimum_degree_ordering.cpp</in>
+                    <in>modify_graph.cpp</in>
+                    <in>neighbor_bfs.cpp</in>
+                    <in>ordered_out_edges.cpp</in>
+                    <in>ospf-example.cpp</in>
+                    <in>parallel-compile-time.cpp</in>
+                    <in>planar_face_traversal.cpp</in>
+                    <in>prim-example.cpp</in>
+                    <in>prim-telephone.cpp</in>
+                    <in>print-adjacent-vertices.cpp</in>
+                    <in>print-edges.cpp</in>
+                    <in>print-in-edges.cpp</in>
+                    <in>print-out-edges.cpp</in>
+                    <in>property-map-traits-eg.cpp</in>
+                    <in>property_iterator.cpp</in>
+                    <in>push-relabel-eg.cpp</in>
+                    <in>put-get-helper-eg.cpp</in>
+                    <in>quick-tour.cpp</in>
+                    <in>quick_tour.cpp</in>
+                    <in>r_c_shortest_paths_example.cpp</in>
+                    <in>reachable-loop-head.cpp</in>
+                    <in>reachable-loop-tail.cpp</in>
+                    <in>read_graphviz.cpp</in>
+                    <in>read_write_dimacs-eg.cpp</in>
+                    <in>remove_edge_if_bidir.cpp</in>
+                    <in>remove_edge_if_dir.cpp</in>
+                    <in>remove_edge_if_undir.cpp</in>
+                    <in>reverse_graph.cpp</in>
+                    <in>roget_components.cpp</in>
+                    <in>scaled_closeness_centrality.cpp</in>
+                    <in>scc.cpp</in>
+                    <in>simple_planarity_test.cpp</in>
+                    <in>sloan_ordering.cpp</in>
+                    <in>stoer_wagner.cpp</in>
+                    <in>straight_line_drawing.cpp</in>
+                    <in>strong-components.cpp</in>
+                    <in>strong_components.cpp</in>
+                    <in>subgraph.cpp</in>
+                    <in>subgraph_properties.cpp</in>
+                    <in>successive_shortest_path_nonnegative_weights_example.cpp</in>
+                    <in>tiernan_girth_circumference.cpp</in>
+                    <in>tiernan_print_cycles.cpp</in>
+                    <in>topo-sort-file-dep.cpp</in>
+                    <in>topo-sort-file-dep2.cpp</in>
+                    <in>topo-sort-with-leda.cpp</in>
+                    <in>topo-sort-with-sgb.cpp</in>
+                    <in>topo-sort1.cpp</in>
+                    <in>topo-sort2.cpp</in>
+                    <in>topo_sort.cpp</in>
+                    <in>transitive_closure.cpp</in>
+                    <in>transpose-example.cpp</in>
+                    <in>two_graphs_common_spanning_trees.cpp</in>
+                    <in>undirected_adjacency_list.cpp</in>
+                    <in>undirected_dfs.cpp</in>
+                    <in>undirected_graph.cpp</in>
+                    <in>vector_as_graph.cpp</in>
+                    <in>vertex-name-property.cpp</in>
+                    <in>vertex_basics.cpp</in>
+                    <in>vf2_sub_graph_iso_example.cpp</in>
+                    <in>vf2_sub_graph_iso_multi_example.cpp</in>
+                    <in>visitor.cpp</in>
+                    <in>weighted_matching_example.cpp</in>
+                    <in>write_graphviz.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>graphml.cpp</in>
+                    <in>read_graphviz_new.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>adj_list_cc.cpp</in>
+                    <in>adj_list_edge_list_set.cpp</in>
+                    <in>adj_list_invalidation.cpp</in>
+                    <in>adj_list_loops.cpp</in>
+                    <in>adj_matrix_cc.cpp</in>
+                    <in>adjacency_matrix_test.cpp</in>
+                    <in>all_planar_input_files_test.cpp</in>
+                    <in>astar_search_test.cpp</in>
+                    <in>basic_planarity_test.cpp</in>
+                    <in>bellman-test.cpp</in>
+                    <in>betweenness_centrality_test.cpp</in>
+                    <in>bfs.cpp</in>
+                    <in>bfs_cc.cpp</in>
+                    <in>biconnected_components_test.cpp</in>
+                    <in>bidir_remove_edge.cpp</in>
+                    <in>bidir_vec_remove_edge.cpp</in>
+                    <in>bipartite_test.cpp</in>
+                    <in>boykov_kolmogorov_max_flow_test.cpp</in>
+                    <in>bron_kerbosch_all_cliques.cpp</in>
+                    <in>bundled_properties.cpp</in>
+                    <in>closeness_centrality.cpp</in>
+                    <in>clustering_coefficient.cpp</in>
+                    <in>copy.cpp</in>
+                    <in>core_numbers_test.cpp</in>
+                    <in>csr_graph_test.cpp</in>
+                    <in>cuthill_mckee_ordering.cpp</in>
+                    <in>cycle_canceling_test.cpp</in>
+                    <in>cycle_ratio_tests.cpp</in>
+                    <in>dag_longest_paths.cpp</in>
+                    <in>degree_centrality.cpp</in>
+                    <in>delete_edge.cpp</in>
+                    <in>dfs.cpp</in>
+                    <in>dfs_cc.cpp</in>
+                    <in>dijkstra_cc.cpp</in>
+                    <in>dijkstra_heap_performance.cpp</in>
+                    <in>dijkstra_no_color_map_compare.cpp</in>
+                    <in>dimacs.cpp</in>
+                    <in>disjoint_set_test.cpp</in>
+                    <in>dominator_tree_test.cpp</in>
+                    <in>eccentricity.cpp</in>
+                    <in>edge_list_cc.cpp</in>
+                    <in>filter_graph_vp_test.cpp</in>
+                    <in>filtered_graph_cc.cpp</in>
+                    <in>filtered_graph_properties_dijkstra.cpp</in>
+                    <in>find_flow_cost_bundled_properties_and_named_params_test.cpp</in>
+                    <in>finish_edge_bug.cpp</in>
+                    <in>floyd_warshall_test.cpp</in>
+                    <in>generator_test.cpp</in>
+                    <in>graph.cpp</in>
+                    <in>graph_concepts.cpp</in>
+                    <in>graphml_test.cpp</in>
+                    <in>graphviz_test.cpp</in>
+                    <in>grid_graph_cc.cpp</in>
+                    <in>grid_graph_test.cpp</in>
+                    <in>gursoy_atun_layout_test.cpp</in>
+                    <in>hawick_circuits.cpp</in>
+                    <in>incremental_components_test.cpp</in>
+                    <in>index_graph.cpp</in>
+                    <in>is_straight_line_draw_test.cpp</in>
+                    <in>isomorphism.cpp</in>
+                    <in>johnson-test.cpp</in>
+                    <in>king_ordering.cpp</in>
+                    <in>labeled_graph.cpp</in>
+                    <in>layout_test.cpp</in>
+                    <in>leda_graph_cc.cpp</in>
+                    <in>lvalue_pmap.cpp</in>
+                    <in>make_bicon_planar_test.cpp</in>
+                    <in>make_connected_test.cpp</in>
+                    <in>make_maximal_planar_test.cpp</in>
+                    <in>mas_test.cpp</in>
+                    <in>matching_test.cpp</in>
+                    <in>max_flow_algorithms_bundled_properties_and_named_params.cpp</in>
+                    <in>max_flow_test.cpp</in>
+                    <in>mcgregor_subgraphs_test.cpp</in>
+                    <in>mean_geodesic.cpp</in>
+                    <in>metis_test.cpp</in>
+                    <in>metric_tsp_approx.cpp</in>
+                    <in>min_degree_empty.cpp</in>
+                    <in>named_vertices_test.cpp</in>
+                    <in>parallel_edges_loops_test.cpp</in>
+                    <in>property_iter.cpp</in>
+                    <in>r_c_shortest_paths_test.cpp</in>
+                    <in>random_matching_test.cpp</in>
+                    <in>random_spanning_tree_test.cpp</in>
+                    <in>rcsp_custom_vertex_id.cpp</in>
+                    <in>read_propmap.cpp</in>
+                    <in>reverse_graph_cc.cpp</in>
+                    <in>sequential_vertex_coloring.cpp</in>
+                    <in>serialize.cpp</in>
+                    <in>stanford_graph_cc.cpp</in>
+                    <in>stoer_wagner_test.cpp</in>
+                    <in>strong_components_test.cpp</in>
+                    <in>subgraph.cpp</in>
+                    <in>subgraph_add.cpp</in>
+                    <in>subgraph_bundled.cpp</in>
+                    <in>subgraph_props.cpp</in>
+                    <in>successive_shortest_path_nonnegative_weights_test.cpp</in>
+                    <in>swap.cpp</in>
+                    <in>test_graphs.cpp</in>
+                    <in>tiernan_all_cycles.cpp</in>
+                    <in>transitive_closure_test.cpp</in>
+                    <in>transitive_closure_test2.cpp</in>
+                    <in>two_graphs_common_spanning_trees_test.cpp</in>
+                    <in>undirected_dfs.cpp</in>
+                    <in>vector_graph_cc.cpp</in>
+                    <in>vf2_sub_graph_iso_test.cpp</in>
+                    <in>vf2_sub_graph_iso_test_2.cpp</in>
+                    <in>weighted_matching_test.cpp</in>
+                  </df>
+                </df>
+                <df name="graph_parallel">
+                  <df name="example">
+                    <in>breadth_first_search.cpp</in>
+                    <in>dijkstra_shortest_paths.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>mpi_process_group.cpp</in>
+                    <in>tag_allocator.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>adjlist_build_test.cpp</in>
+                    <in>adjlist_redist_test.cpp</in>
+                    <in>adjlist_remove_test.cpp</in>
+                    <in>algorithm_performance.cpp</in>
+                    <in>distributed_adjacency_list_test.cpp</in>
+                    <in>distributed_betweenness_centrality_test.cpp</in>
+                    <in>distributed_connected_components_test.cpp</in>
+                    <in>distributed_csr_algorithm_test.cpp</in>
+                    <in>distributed_csr_test.cpp</in>
+                    <in>distributed_dfs_test.cpp</in>
+                    <in>distributed_dimacs_reader.cpp</in>
+                    <in>distributed_graph_coloring_test.cpp</in>
+                    <in>distributed_mst_test.cpp</in>
+                    <in>distributed_page_rank_test.cpp</in>
+                    <in>distributed_property_map_test.cpp</in>
+                    <in>distributed_queue_test.cpp</in>
+                    <in>distributed_rmat_cc.cpp</in>
+                    <in>distributed_rmat_cc_ps.cpp</in>
+                    <in>distributed_rmat_pagerank.cpp</in>
+                    <in>distributed_shortest_paths_test.cpp</in>
+                    <in>distributed_st_connected_test.cpp</in>
+                    <in>distributed_strong_components_test.cpp</in>
+                    <in>hohberg_biconnected_components_test.cpp</in>
+                    <in>mesh_generator_test.cpp</in>
+                    <in>named_vertices_hash_test.cpp</in>
+                    <in>named_vertices_seq.cpp</in>
+                    <in>named_vertices_test.cpp</in>
+                    <in>process_group_serialization.cpp</in>
+                    <in>ssca.cpp</in>
+                  </df>
+                </df>
+                <df name="hana">
+                  <df name="benchmark">
+                    <df name="find_if">
+                      <in>compile.fusion.list.erb.cpp</in>
+                      <in>compile.fusion.vector.erb.cpp</in>
+                      <in>compile.hana.map.erb.cpp</in>
+                      <in>compile.hana.set.erb.cpp</in>
+                      <in>compile.hana.tuple.erb.cpp</in>
+                      <in>compile.meta.list.erb.cpp</in>
+                      <in>compile.mpl.vector.erb.cpp</in>
+                      <in>compile.std.integer_sequence.erb.cpp</in>
+                    </df>
+                    <df name="fold_left">
+                      <in>compile.cexpr.recursive.erb.cpp</in>
+                      <in>compile.cexpr.unrolled.erb.cpp</in>
+                      <in>compile.fusion.list.erb.cpp</in>
+                      <in>compile.fusion.vector.erb.cpp</in>
+                      <in>compile.hana.basic_tuple.erb.cpp</in>
+                      <in>compile.hana.tuple.erb.cpp</in>
+                      <in>compile.meta.list.erb.cpp</in>
+                      <in>compile.mpl.vector.erb.cpp</in>
+                      <in>compile.mpl11.list.erb.cpp</in>
+                      <in>execute.fusion.list.erb.cpp</in>
+                      <in>execute.fusion.vector.erb.cpp</in>
+                      <in>execute.hana.tuple.erb.cpp</in>
+                      <in>execute.std.array.erb.cpp</in>
+                      <in>execute.std.vector.erb.cpp</in>
+                    </df>
+                    <df name="including">
+                      <in>baseline.erb.cpp</in>
+                      <in>fusion.erb.cpp</in>
+                      <in>hana.erb.cpp</in>
+                      <in>meta.erb.cpp</in>
+                      <in>mpl.erb.cpp</in>
+                      <in>mpl11.erb.cpp</in>
+                    </df>
+                    <df name="make">
+                      <in>compile.fusion.list.erb.cpp</in>
+                      <in>compile.fusion.vector.erb.cpp</in>
+                      <in>compile.hana.basic_tuple.erb.cpp</in>
+                      <in>compile.hana.tuple.erb.cpp</in>
+                      <in>compile.meta.list.erb.cpp</in>
+                      <in>compile.mpl.vector.erb.cpp</in>
+                      <in>compile.mpl11.list.erb.cpp</in>
+                      <in>compile.std.array.erb.cpp</in>
+                      <in>compile.std.tuple.erb.cpp</in>
+                    </df>
+                    <df name="reverse">
+                      <in>move.fusion.vector.erb.cpp</in>
+                      <in>move.hana.tuple.erb.cpp</in>
+                      <in>nomove.fusion.vector.erb.cpp</in>
+                      <in>nomove.hana.tuple.erb.cpp</in>
+                    </df>
+                    <df name="sort">
+                      <in>compile.hana.tuple.rand.erb.cpp</in>
+                      <in>compile.hana.tuple.reversed.erb.cpp</in>
+                      <in>compile.hana.tuple.sorted.erb.cpp</in>
+                      <in>compile.hana.tuple.sorted_but_first.erb.cpp</in>
+                      <in>compile.hana.tuple.sorted_but_last.erb.cpp</in>
+                    </df>
+                    <df name="transform">
+                      <in>compile.fusion.list.erb.cpp</in>
+                      <in>compile.fusion.vector.erb.cpp</in>
+                      <in>compile.hana.tuple.erb.cpp</in>
+                      <in>compile.hana.types.erb.cpp</in>
+                      <in>compile.meta.list.erb.cpp</in>
+                      <in>compile.mpl.vector.erb.cpp</in>
+                      <in>compile.mpl11.list.erb.cpp</in>
+                      <in>execute.fusion.list.erb.cpp</in>
+                      <in>execute.fusion.vector.erb.cpp</in>
+                      <in>execute.hana.tuple.erb.cpp</in>
+                      <in>execute.std.array.erb.cpp</in>
+                      <in>execute.std.vector.erb.cpp</in>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <df name="basic_tuple">
+                      <in>make.cpp</in>
+                    </df>
+                    <df name="cmake_integration">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="core">
+                      <df name="common">
+                        <in>common.cpp</in>
+                        <in>common_t.cpp</in>
+                        <in>has_common.cpp</in>
+                      </df>
+                      <df name="convert">
+                        <in>embedding.cpp</in>
+                        <in>is_convertible.cpp</in>
+                        <in>is_embedded.cpp</in>
+                        <in>to.cpp</in>
+                      </df>
+                      <in>default.cpp</in>
+                      <in>is_a.cpp</in>
+                      <in>make.cpp</in>
+                      <in>tag_of.cpp</in>
+                      <in>tag_of_t.cpp</in>
+                      <in>when.cpp</in>
+                      <in>when_valid.cpp</in>
+                    </df>
+                    <df name="cppcon_2014">
+                      <in>comparable.cpp</in>
+                      <in>det.cpp</in>
+                      <in>functor.cpp</in>
+                      <in>matrix.cpp</in>
+                      <in>ring.cpp</in>
+                    </df>
+                    <df name="detail">
+                      <in>wrong.cpp</in>
+                    </df>
+                    <df name="ext">
+                      <df name="boost">
+                        <df name="fusion">
+                          <in>deque.cpp</in>
+                          <in>list.cpp</in>
+                          <in>tuple.cpp</in>
+                          <in>vector.cpp</in>
+                        </df>
+                        <df name="mpl">
+                          <df name="integral_c">
+                            <in>integral_constant.cpp</in>
+                          </df>
+                          <df name="list">
+                            <in>comparable.cpp</in>
+                            <in>conversion.cpp</in>
+                            <in>foldable.cpp</in>
+                            <in>iterable.cpp</in>
+                            <in>searchable.cpp</in>
+                          </df>
+                          <df name="vector">
+                            <in>comparable.cpp</in>
+                            <in>conversion.cpp</in>
+                            <in>foldable.cpp</in>
+                            <in>iterable.cpp</in>
+                            <in>searchable.cpp</in>
+                          </df>
+                        </df>
+                        <in>tuple.cpp</in>
+                      </df>
+                      <df name="std">
+                        <df name="array">
+                          <in>comparable.cpp</in>
+                          <in>foldable.cpp</in>
+                          <in>iterable.cpp</in>
+                          <in>orderable.cpp</in>
+                        </df>
+                        <df name="integer_sequence">
+                          <in>comparable.cpp</in>
+                          <in>foldable.cpp</in>
+                          <in>iterable.cpp</in>
+                          <in>searchable.cpp</in>
+                        </df>
+                        <df name="ratio">
+                          <in>arithmetic.cpp</in>
+                          <in>comparable.cpp</in>
+                          <in>orderable.cpp</in>
+                        </df>
+                        <in>integral_constant.cpp</in>
+                        <in>pair.cpp</in>
+                        <in>tuple.cpp</in>
+                      </df>
+                    </df>
+                    <df name="foldable">
+                      <in>to.cpp</in>
+                    </df>
+                    <df name="functional">
+                      <in>always.cpp</in>
+                      <in>apply.cpp</in>
+                      <in>arg.cpp</in>
+                      <in>capture.cpp</in>
+                      <in>compose.cpp</in>
+                      <in>curry.cpp</in>
+                      <in>demux.cpp</in>
+                      <in>fix.cpp</in>
+                      <in>flip.cpp</in>
+                      <in>id.cpp</in>
+                      <in>infix.cpp</in>
+                      <in>iterate.cpp</in>
+                      <in>lockstep.cpp</in>
+                      <in>on.cpp</in>
+                      <in>overload.cpp</in>
+                      <in>overload_linearly.cpp</in>
+                      <in>partial.cpp</in>
+                      <in>placeholder.cpp</in>
+                      <in>reverse_partial.cpp</in>
+                    </df>
+                    <df name="iterable">
+                      <in>searchable.cpp</in>
+                    </df>
+                    <df name="lazy">
+                      <in>comonad.cpp</in>
+                      <in>functor.cpp</in>
+                      <in>make.cpp</in>
+                      <in>monad.cpp</in>
+                    </df>
+                    <df name="map">
+                      <in>comparable.cpp</in>
+                      <in>difference.cpp</in>
+                      <in>erase_key.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>insert.cpp</in>
+                      <in>intersection.cpp</in>
+                      <in>keys.cpp</in>
+                      <in>make.cpp</in>
+                      <in>map.cpp</in>
+                      <in>searchable.cpp</in>
+                      <in>symmetric_difference.cpp</in>
+                      <in>to.cpp</in>
+                      <in>union.cpp</in>
+                      <in>values.cpp</in>
+                    </df>
+                    <df name="misc">
+                      <in>dimensional_analysis.cpp</in>
+                      <in>from_json.cpp</in>
+                      <in>indexed_sort.cpp</in>
+                      <in>infinite_list.cpp</in>
+                      <in>infinite_set.cpp</in>
+                      <in>lambda_tuple.cpp</in>
+                      <in>nth.cpp</in>
+                      <in>overload_linearly.cpp</in>
+                      <in>printf.cpp</in>
+                      <in>ref_tuple.cpp</in>
+                      <in>restricted_function.cpp</in>
+                      <in>tree.cpp</in>
+                    </df>
+                    <df name="optional">
+                      <in>applicative.complex.cpp</in>
+                      <in>applicative.cpp</in>
+                      <in>comparable.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>functor.cpp</in>
+                      <in>is_just.cpp</in>
+                      <in>is_nothing.cpp</in>
+                      <in>just.cpp</in>
+                      <in>make.cpp</in>
+                      <in>maybe.cpp</in>
+                      <in>monad.cpp</in>
+                      <in>monad_plus.cpp</in>
+                      <in>nothing.cpp</in>
+                      <in>orderable.cpp</in>
+                      <in>searchable.cpp</in>
+                      <in>sfinae.cpp</in>
+                      <in>sfinae_friendly_metafunctions.cpp</in>
+                      <in>value.cpp</in>
+                      <in>value_or.cpp</in>
+                    </df>
+                    <df name="pair">
+                      <in>comparable.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>make.cpp</in>
+                      <in>orderable.cpp</in>
+                      <in>product.cpp</in>
+                    </df>
+                    <df name="product">
+                      <in>comparable.cpp</in>
+                      <in>make.cpp</in>
+                    </df>
+                    <df name="range">
+                      <in>comparable.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>iterable.cpp</in>
+                      <in>make.cpp</in>
+                      <in>range_c.cpp</in>
+                      <in>searchable.cpp</in>
+                    </df>
+                    <df name="sequence">
+                      <in>applicative.cpp</in>
+                      <in>comparable.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>functor.cpp</in>
+                      <in>iterable.cpp</in>
+                      <in>make.cpp</in>
+                      <in>monad.ints.cpp</in>
+                      <in>monad.types.cpp</in>
+                      <in>monad_plus.cpp</in>
+                      <in>orderable.cpp</in>
+                      <in>searchable.cpp</in>
+                    </df>
+                    <df name="set">
+                      <in>comparable.cpp</in>
+                      <in>difference.cpp</in>
+                      <in>erase_key.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>insert.cpp</in>
+                      <in>intersection.cpp</in>
+                      <in>make.cpp</in>
+                      <in>searchable.cpp</in>
+                      <in>symmetric_difference.cpp</in>
+                      <in>to.cpp</in>
+                      <in>union.cpp</in>
+                    </df>
+                    <df name="string">
+                      <in>comparable.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>from_c_str.cpp</in>
+                      <in>hashable.cpp</in>
+                      <in>iterable.cpp</in>
+                      <in>literal.cpp</in>
+                      <in>macro.cpp</in>
+                      <in>make.cpp</in>
+                      <in>monoid.cpp</in>
+                      <in>orderable.cpp</in>
+                      <in>searchable.cpp</in>
+                      <in>string_c.cpp</in>
+                      <in>to.cpp</in>
+                    </df>
+                    <df name="struct">
+                      <in>comparable.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>keys.cpp</in>
+                      <in>searchable.cpp</in>
+                      <in>to.cpp</in>
+                    </df>
+                    <df name="tuple">
+                      <in>foldable.cpp</in>
+                      <in>interop.cpp</in>
+                      <in>make.cpp</in>
+                      <in>tuple.cpp</in>
+                      <in>tuple_c.cpp</in>
+                      <in>tuple_t.cpp</in>
+                    </df>
+                    <df name="tutorial">
+                      <df name="ext">
+                        <in>fusion_to_hana.cpp</in>
+                        <in>mpl_vector.cpp</in>
+                        <in>ratio_plus.cpp</in>
+                      </df>
+                      <in>algorithms.cpp</in>
+                      <in>appendix_mpl.cpp</in>
+                      <in>concepts.cpp</in>
+                      <in>constant_side_effects.cpp</in>
+                      <in>containers.cpp</in>
+                      <in>include_ext.cpp</in>
+                      <in>integral-branching.cpp</in>
+                      <in>integral.cpp</in>
+                      <in>introduction.cpp</in>
+                      <in>introspection.adapt.cpp</in>
+                      <in>introspection.cpp</in>
+                      <in>introspection.json.cpp</in>
+                      <in>introspection.sfinae.cpp</in>
+                      <in>mpl_cheatsheet.cpp</in>
+                      <in>quickstart.cpp</in>
+                      <in>quickstart.switchAny.cpp</in>
+                      <in>rationale.container.cpp</in>
+                      <in>tag_dispatching.cpp</in>
+                      <in>type.cpp</in>
+                    </df>
+                    <df name="type">
+                      <in>alignof.cpp</in>
+                      <in>basic_type.cpp</in>
+                      <in>comparable.cpp</in>
+                      <in>decltype.cpp</in>
+                      <in>hashable.cpp</in>
+                      <in>integral.cpp</in>
+                      <in>is_valid.cpp</in>
+                      <in>make.cpp</in>
+                      <in>metafunction.cpp</in>
+                      <in>metafunction_class.cpp</in>
+                      <in>sizeof.cpp</in>
+                      <in>template.cpp</in>
+                      <in>trait.cpp</in>
+                      <in>typeid.cpp</in>
+                    </df>
+                    <in>accessors.cpp</in>
+                    <in>adapt_adt.cpp</in>
+                    <in>adapt_struct.cpp</in>
+                    <in>adjust.cpp</in>
+                    <in>adjust_if.cpp</in>
+                    <in>all.cpp</in>
+                    <in>all_of.cpp</in>
+                    <in>and.cpp</in>
+                    <in>any.cpp</in>
+                    <in>any_of.cpp</in>
+                    <in>ap.cpp</in>
+                    <in>append.cpp</in>
+                    <in>at.cpp</in>
+                    <in>at_c.cpp</in>
+                    <in>at_key.cpp</in>
+                    <in>back.cpp</in>
+                    <in>cartesian_product.cpp</in>
+                    <in>chain.cpp</in>
+                    <in>comparing.cpp</in>
+                    <in>concat.cpp</in>
+                    <in>contains.cpp</in>
+                    <in>count.cpp</in>
+                    <in>count_if.cpp</in>
+                    <in>cycle.cpp</in>
+                    <in>define_struct.cpp</in>
+                    <in>div.cpp</in>
+                    <in>drop_back.cpp</in>
+                    <in>drop_front.cpp</in>
+                    <in>drop_front_exactly.cpp</in>
+                    <in>drop_while.cpp</in>
+                    <in>duplicate.cpp</in>
+                    <in>empty.cpp</in>
+                    <in>equal.cpp</in>
+                    <in>eval.cpp</in>
+                    <in>eval_if.cpp</in>
+                    <in>extend.cpp</in>
+                    <in>extract.cpp</in>
+                    <in>fill.cpp</in>
+                    <in>filter.cpp</in>
+                    <in>find.cpp</in>
+                    <in>find_if.cpp</in>
+                    <in>first.cpp</in>
+                    <in>flatten.cpp</in>
+                    <in>fold.cpp</in>
+                    <in>fold_left.cpp</in>
+                    <in>fold_right.cpp</in>
+                    <in>for_each.cpp</in>
+                    <in>front.cpp</in>
+                    <in>fuse.cpp</in>
+                    <in>greater.cpp</in>
+                    <in>greater_equal.cpp</in>
+                    <in>group.cpp</in>
+                    <in>hash.cpp</in>
+                    <in>if.cpp</in>
+                    <in>in.cpp</in>
+                    <in>index_if.cpp</in>
+                    <in>insert.cpp</in>
+                    <in>insert_range.cpp</in>
+                    <in>integral_constant.cpp</in>
+                    <in>intersperse.cpp</in>
+                    <in>is_disjoint.cpp</in>
+                    <in>is_empty.cpp</in>
+                    <in>is_subset.cpp</in>
+                    <in>length.cpp</in>
+                    <in>less.cpp</in>
+                    <in>less_equal.cpp</in>
+                    <in>lexicographical_compare.cpp</in>
+                    <in>lift.cpp</in>
+                    <in>max.cpp</in>
+                    <in>maximum.cpp</in>
+                    <in>maximum_by.cpp</in>
+                    <in>members.cpp</in>
+                    <in>min.cpp</in>
+                    <in>minimum.cpp</in>
+                    <in>minimum_by.cpp</in>
+                    <in>minus.cpp</in>
+                    <in>mod.cpp</in>
+                    <in>monadic_compose.cpp</in>
+                    <in>monadic_fold_left.cpp</in>
+                    <in>monadic_fold_right.cpp</in>
+                    <in>mult.cpp</in>
+                    <in>negate.cpp</in>
+                    <in>none.cpp</in>
+                    <in>none_of.cpp</in>
+                    <in>not.cpp</in>
+                    <in>not_equal.cpp</in>
+                    <in>one.cpp</in>
+                    <in>or.cpp</in>
+                    <in>ordering.cpp</in>
+                    <in>overview.cpp</in>
+                    <in>partition.cpp</in>
+                    <in>permutations.cpp</in>
+                    <in>plus.cpp</in>
+                    <in>power.cpp</in>
+                    <in>prefix.cpp</in>
+                    <in>prepend.cpp</in>
+                    <in>product.cpp</in>
+                    <in>remove.cpp</in>
+                    <in>remove_at.cpp</in>
+                    <in>remove_at_c.cpp</in>
+                    <in>remove_if.cpp</in>
+                    <in>remove_range.cpp</in>
+                    <in>remove_range_c.cpp</in>
+                    <in>repeat.cpp</in>
+                    <in>replace.cpp</in>
+                    <in>replace_if.cpp</in>
+                    <in>replicate.cpp</in>
+                    <in>reverse.cpp</in>
+                    <in>reverse_fold.cpp</in>
+                    <in>scan_left.cpp</in>
+                    <in>scan_right.cpp</in>
+                    <in>second.cpp</in>
+                    <in>size.cpp</in>
+                    <in>slice.cpp</in>
+                    <in>slice_c.cpp</in>
+                    <in>sort.cpp</in>
+                    <in>span.cpp</in>
+                    <in>struct.custom_accessor.cpp</in>
+                    <in>struct.mcd.nested.cpp</in>
+                    <in>struct.mcd.tag_dispatching.cpp</in>
+                    <in>suffix.cpp</in>
+                    <in>sum.cpp</in>
+                    <in>take_back.cpp</in>
+                    <in>take_back_c.cpp</in>
+                    <in>take_front.cpp</in>
+                    <in>take_front_c.cpp</in>
+                    <in>take_while.cpp</in>
+                    <in>tap.cpp</in>
+                    <in>then.cpp</in>
+                    <in>transform.cpp</in>
+                    <in>unfold_left.cpp</in>
+                    <in>unfold_right.cpp</in>
+                    <in>unique.cpp</in>
+                    <in>unpack.cpp</in>
+                    <in>value.cpp</in>
+                    <in>value_of.cpp</in>
+                    <in>version.cpp</in>
+                    <in>wandbox.cpp</in>
+                    <in>while.cpp</in>
+                    <in>zero.cpp</in>
+                    <in>zip.cpp</in>
+                    <in>zip_shortest.cpp</in>
+                    <in>zip_shortest_with.cpp</in>
+                    <in>zip_with.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="assert">
+                      <in>commas.cpp</in>
+                      <in>constant.cpp</in>
+                      <in>constexpr.cpp</in>
+                      <in>flexible.cpp</in>
+                      <in>lambdas.cpp</in>
+                      <in>runtime.cpp</in>
+                    </df>
+                    <df name="basic_tuple">
+                      <df name="auto">
+                        <in>all_of.cpp</in>
+                        <in>any_of.cpp</in>
+                        <in>ap.cpp</in>
+                        <in>at.cpp</in>
+                        <in>cartesian_product.cpp</in>
+                        <in>drop_back.cpp</in>
+                        <in>drop_front.cpp</in>
+                        <in>drop_while.cpp</in>
+                        <in>for_each.cpp</in>
+                        <in>group.cpp</in>
+                        <in>index_if.cpp</in>
+                        <in>insert.cpp</in>
+                        <in>insert_range.cpp</in>
+                        <in>intersperse.cpp</in>
+                        <in>is_empty.cpp</in>
+                        <in>length.cpp</in>
+                        <in>lexicographical_compare.cpp</in>
+                        <in>make.cpp</in>
+                        <in>none_of.cpp</in>
+                        <in>partition.cpp</in>
+                        <in>permutations.cpp</in>
+                        <in>remove_at.cpp</in>
+                        <in>remove_range.cpp</in>
+                        <in>reverse.cpp</in>
+                        <in>scans.cpp</in>
+                        <in>sequence.cpp</in>
+                        <in>slice.cpp</in>
+                        <in>sort.cpp</in>
+                        <in>span.cpp</in>
+                        <in>take_back.cpp</in>
+                        <in>take_front.cpp</in>
+                        <in>take_while.cpp</in>
+                        <in>transform.cpp</in>
+                        <in>unfolds.cpp</in>
+                        <in>unique.cpp</in>
+                        <in>zips.cpp</in>
+                      </df>
+                      <in>cnstr.copy.cpp</in>
+                      <in>construct.cpp</in>
+                      <in>laws.cpp</in>
+                      <in>length.cpp</in>
+                      <in>make.cpp</in>
+                      <in>unpack.cpp</in>
+                    </df>
+                    <df name="concept">
+                      <df name="constant">
+                        <in>arithmetic.cpp</in>
+                        <in>comparable.cpp</in>
+                        <in>laws.cpp</in>
+                        <in>logical.cpp</in>
+                        <in>mcd.cpp</in>
+                        <in>orderable.cpp</in>
+                        <in>to.cpp</in>
+                      </df>
+                      <df name="sequence">
+                        <in>iterable.cpp</in>
+                        <in>monad.cpp</in>
+                        <in>monad_plus.cpp</in>
+                        <in>orderable.cpp</in>
+                        <in>searchable.cpp</in>
+                        <in>sequence.cpp</in>
+                      </df>
+                      <df name="struct">
+                        <in>any_of.cpp</in>
+                        <in>at_key.cpp</in>
+                        <in>equal.cpp</in>
+                        <in>find_if.cpp</in>
+                        <in>fold_left.cpp</in>
+                        <in>fold_right.cpp</in>
+                        <in>keys.cpp</in>
+                        <in>laws.cpp</in>
+                        <in>macro.adapt_adt.cpp</in>
+                        <in>macro.adapt_struct.cpp</in>
+                        <in>macro.define_struct.cpp</in>
+                        <in>member_function.cpp</in>
+                        <in>members.cpp</in>
+                        <in>unpack.cpp</in>
+                      </df>
+                      <in>integral_constant.cpp</in>
+                    </df>
+                    <df name="core">
+                      <in>common.cpp</in>
+                      <in>default.cpp</in>
+                      <in>is_a.cpp</in>
+                      <in>is_embedded.cpp</in>
+                      <in>make.cpp</in>
+                      <in>tag_of.cpp</in>
+                      <in>to.cpp</in>
+                      <in>when.cpp</in>
+                    </df>
+                    <df name="deploy">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="detail">
+                      <df name="canonical_constant">
+                        <in>laws.cpp</in>
+                      </df>
+                      <df name="variadic">
+                        <in>at.cpp</in>
+                        <in>drop_into.cpp</in>
+                        <in>foldl1.cpp</in>
+                        <in>foldr1.cpp</in>
+                        <in>reverse_apply.cpp</in>
+                        <in>split_at.cpp</in>
+                        <in>take.cpp</in>
+                      </df>
+                      <in>algorithm.cpp</in>
+                      <in>any_of.cpp</in>
+                      <in>create.cpp</in>
+                      <in>decay.cpp</in>
+                      <in>ebo.cpp</in>
+                      <in>fast_and.cpp</in>
+                      <in>first_unsatisfied_index.cpp</in>
+                      <in>has_duplicates.cpp</in>
+                      <in>preprocessor.cpp</in>
+                      <in>struct_macros.cpp</in>
+                      <in>type_at.cpp</in>
+                      <in>type_foldl1.cpp</in>
+                      <in>type_foldr1.cpp</in>
+                      <in>unpack_flatten.cpp</in>
+                    </df>
+                    <df name="experimental">
+                      <df name="printable">
+                        <in>map.cpp</in>
+                        <in>metafunction.cpp</in>
+                        <in>optional.cpp</in>
+                        <in>pair.cpp</in>
+                        <in>set.cpp</in>
+                        <in>string.cpp</in>
+                        <in>tuple.cpp</in>
+                        <in>type.cpp</in>
+                      </df>
+                      <df name="types">
+                        <in>at.cpp</in>
+                        <in>contains.cpp</in>
+                        <in>drop_front.cpp</in>
+                        <in>equal.cpp</in>
+                        <in>is_empty.cpp</in>
+                        <in>transform.cpp</in>
+                        <in>unpack.cpp</in>
+                      </df>
+                      <df name="view">
+                        <df name="empty">
+                          <in>is_empty.cpp</in>
+                          <in>length.cpp</in>
+                          <in>unpack.cpp</in>
+                        </df>
+                        <df name="joined">
+                          <in>at.cpp</in>
+                          <in>is_empty.cpp</in>
+                          <in>length.cpp</in>
+                          <in>unpack.cpp</in>
+                        </df>
+                        <df name="single">
+                          <in>at.cpp</in>
+                          <in>is_empty.cpp</in>
+                          <in>length.cpp</in>
+                          <in>unpack.cpp</in>
+                        </df>
+                        <df name="sliced">
+                          <in>at.cpp</in>
+                          <in>is_empty.cpp</in>
+                          <in>length.cpp</in>
+                          <in>unpack.cpp</in>
+                        </df>
+                        <df name="transformed">
+                          <in>ap.cpp</in>
+                          <in>at.cpp</in>
+                          <in>drop_front.cpp</in>
+                          <in>equal.cpp</in>
+                          <in>is_empty.cpp</in>
+                          <in>laziness.cpp</in>
+                          <in>length.cpp</in>
+                          <in>less.cpp</in>
+                          <in>transform.cpp</in>
+                          <in>unpack.cpp</in>
+                        </df>
+                      </df>
+                      <in>type_name.cpp</in>
+                    </df>
+                    <df name="ext">
+                      <df name="boost">
+                        <df name="fusion">
+                          <df name="deque">
+                            <df name="auto">
+                              <in>all_of.cpp</in>
+                              <in>any_of.cpp</in>
+                              <in>ap.cpp</in>
+                              <in>at.cpp</in>
+                              <in>cartesian_product.cpp</in>
+                              <in>drop_back.cpp</in>
+                              <in>drop_front.cpp</in>
+                              <in>drop_while.cpp</in>
+                              <in>for_each.cpp</in>
+                              <in>group.cpp</in>
+                              <in>index_if.cpp</in>
+                              <in>insert.cpp</in>
+                              <in>insert_range.cpp</in>
+                              <in>intersperse.cpp</in>
+                              <in>is_empty.cpp</in>
+                              <in>length.cpp</in>
+                              <in>lexicographical_compare.cpp</in>
+                              <in>make.cpp</in>
+                              <in>none_of.cpp</in>
+                              <in>partition.cpp</in>
+                              <in>permutations.cpp</in>
+                              <in>remove_at.cpp</in>
+                              <in>remove_range.cpp</in>
+                              <in>reverse.cpp</in>
+                              <in>scans.cpp</in>
+                              <in>sequence.cpp</in>
+                              <in>slice.cpp</in>
+                              <in>sort.cpp</in>
+                              <in>span.cpp</in>
+                              <in>take_back.cpp</in>
+                              <in>take_front.cpp</in>
+                              <in>take_while.cpp</in>
+                              <in>transform.cpp</in>
+                              <in>unfolds.cpp</in>
+                              <in>unique.cpp</in>
+                              <in>zips.cpp</in>
+                            </df>
+                          </df>
+                          <df name="list">
+                            <df name="auto">
+                              <in>all_of.cpp</in>
+                              <in>any_of.cpp</in>
+                              <in>ap.cpp</in>
+                              <in>at.cpp</in>
+                              <in>cartesian_product.cpp</in>
+                              <in>drop_back.cpp</in>
+                              <in>drop_front.cpp</in>
+                              <in>drop_while.cpp</in>
+                              <in>for_each.cpp</in>
+                              <in>group.cpp</in>
+                              <in>index_if.cpp</in>
+                              <in>insert.cpp</in>
+                              <in>insert_range.cpp</in>
+                              <in>intersperse.cpp</in>
+                              <in>is_empty.cpp</in>
+                              <in>length.cpp</in>
+                              <in>lexicographical_compare.cpp</in>
+                              <in>make.cpp</in>
+                              <in>none_of.cpp</in>
+                              <in>partition.cpp</in>
+                              <in>permutations.cpp</in>
+                              <in>remove_at.cpp</in>
+                              <in>remove_range.cpp</in>
+                              <in>reverse.cpp</in>
+                              <in>scans.cpp</in>
+                              <in>sequence.cpp</in>
+                              <in>slice.cpp</in>
+                              <in>sort.cpp</in>
+                              <in>span.cpp</in>
+                              <in>take_back.cpp</in>
+                              <in>take_front.cpp</in>
+                              <in>take_while.cpp</in>
+                              <in>transform.cpp</in>
+                              <in>unfolds.cpp</in>
+                              <in>unique.cpp</in>
+                              <in>zips.cpp</in>
+                            </df>
+                          </df>
+                          <df name="tuple">
+                            <df name="auto">
+                              <in>all_of.cpp</in>
+                              <in>any_of.cpp</in>
+                              <in>ap.cpp</in>
+                              <in>at.cpp</in>
+                              <in>cartesian_product.cpp</in>
+                              <in>drop_back.cpp</in>
+                              <in>drop_front.cpp</in>
+                              <in>drop_while.cpp</in>
+                              <in>for_each.cpp</in>
+                              <in>group.cpp</in>
+                              <in>index_if.cpp</in>
+                              <in>insert.cpp</in>
+                              <in>insert_range.cpp</in>
+                              <in>intersperse.cpp</in>
+                              <in>is_empty.cpp</in>
+                              <in>length.cpp</in>
+                              <in>lexicographical_compare.cpp</in>
+                              <in>make.cpp</in>
+                              <in>none_of.cpp</in>
+                              <in>partition.cpp</in>
+                              <in>permutations.cpp</in>
+                              <in>remove_at.cpp</in>
+                              <in>remove_range.cpp</in>
+                              <in>reverse.cpp</in>
+                              <in>scans.cpp</in>
+                              <in>sequence.cpp</in>
+                              <in>slice.cpp</in>
+                              <in>sort.cpp</in>
+                              <in>span.cpp</in>
+                              <in>take_back.cpp</in>
+                              <in>take_front.cpp</in>
+                              <in>take_while.cpp</in>
+                              <in>transform.cpp</in>
+                              <in>unfolds.cpp</in>
+                              <in>unique.cpp</in>
+                              <in>zips.cpp</in>
+                            </df>
+                          </df>
+                          <df name="vector">
+                            <df name="auto">
+                              <in>all_of.cpp</in>
+                              <in>any_of.cpp</in>
+                              <in>ap.cpp</in>
+                              <in>at.cpp</in>
+                              <in>cartesian_product.cpp</in>
+                              <in>drop_back.cpp</in>
+                              <in>drop_front.cpp</in>
+                              <in>drop_while.cpp</in>
+                              <in>for_each.cpp</in>
+                              <in>group.cpp</in>
+                              <in>index_if.cpp</in>
+                              <in>insert.cpp</in>
+                              <in>insert_range.cpp</in>
+                              <in>intersperse.cpp</in>
+                              <in>is_empty.cpp</in>
+                              <in>length.cpp</in>
+                              <in>lexicographical_compare.cpp</in>
+                              <in>make.cpp</in>
+                              <in>none_of.cpp</in>
+                              <in>partition.cpp</in>
+                              <in>permutations.cpp</in>
+                              <in>remove_at.cpp</in>
+                              <in>remove_range.cpp</in>
+                              <in>reverse.cpp</in>
+                              <in>scans.cpp</in>
+                              <in>sequence.cpp</in>
+                              <in>slice.cpp</in>
+                              <in>sort.cpp</in>
+                              <in>span.cpp</in>
+                              <in>take_back.cpp</in>
+                              <in>take_front.cpp</in>
+                              <in>take_while.cpp</in>
+                              <in>transform.cpp</in>
+                              <in>unfolds.cpp</in>
+                              <in>unique.cpp</in>
+                              <in>zips.cpp</in>
+                            </df>
+                          </df>
+                        </df>
+                        <df name="mpl">
+                          <df name="integral_c">
+                            <in>arithmetic.cpp</in>
+                            <in>comparable.cpp</in>
+                            <in>constant.cpp</in>
+                            <in>interop.cpp</in>
+                            <in>logical.cpp</in>
+                            <in>orderable.cpp</in>
+                            <in>tag.cpp</in>
+                          </df>
+                          <df name="list">
+                            <in>comparable.cpp</in>
+                            <in>foldable.cpp</in>
+                            <in>iterable.cpp</in>
+                            <in>searchable.cpp</in>
+                            <in>tag.cpp</in>
+                            <in>to.cpp</in>
+                          </df>
+                          <df name="vector">
+                            <in>comparable.cpp</in>
+                            <in>foldable.cpp</in>
+                            <in>iterable.cpp</in>
+                            <in>searchable.cpp</in>
+                            <in>tag.cpp</in>
+                            <in>to.cpp</in>
+                          </df>
+                        </df>
+                        <df name="tuple">
+                          <df name="auto">
+                            <in>all_of.cpp</in>
+                            <in>any_of.cpp</in>
+                            <in>ap.cpp</in>
+                            <in>at.cpp</in>
+                            <in>cartesian_product.cpp</in>
+                            <in>drop_back.cpp</in>
+                            <in>drop_front.cpp</in>
+                            <in>drop_while.cpp</in>
+                            <in>for_each.cpp</in>
+                            <in>group.cpp</in>
+                            <in>index_if.cpp</in>
+                            <in>insert.cpp</in>
+                            <in>insert_range.cpp</in>
+                            <in>intersperse.broken.cpp</in>
+                            <in>is_empty.cpp</in>
+                            <in>length.cpp</in>
+                            <in>lexicographical_compare.cpp</in>
+                            <in>make.cpp</in>
+                            <in>none_of.cpp</in>
+                            <in>partition.cpp</in>
+                            <in>permutations.broken.cpp</in>
+                            <in>remove_at.cpp</in>
+                            <in>remove_range.cpp</in>
+                            <in>reverse.cpp</in>
+                            <in>scans.cpp</in>
+                            <in>sequence.cpp</in>
+                            <in>slice.cpp</in>
+                            <in>sort.cpp</in>
+                            <in>span.cpp</in>
+                            <in>take_back.cpp</in>
+                            <in>take_front.broken.cpp</in>
+                            <in>take_while.cpp</in>
+                            <in>transform.cpp</in>
+                            <in>unfolds.cpp</in>
+                            <in>unique.cpp</in>
+                            <in>zips.cpp</in>
+                          </df>
+                          <in>iterable.cpp</in>
+                          <in>monad.cpp</in>
+                          <in>monad_plus.cpp</in>
+                          <in>orderable.cpp</in>
+                          <in>searchable.cpp</in>
+                          <in>tag_of.cpp</in>
+                        </df>
+                      </df>
+                      <df name="std">
+                        <df name="array">
+                          <in>at.cpp</in>
+                          <in>comparable.cpp</in>
+                          <in>foldable.cpp</in>
+                          <in>issue_304.cpp</in>
+                          <in>iterable.cpp</in>
+                          <in>orderable.cpp</in>
+                          <in>searchable.cpp</in>
+                        </df>
+                        <df name="bugs">
+                          <in>libcxx_19616.cpp</in>
+                          <in>libcxx_22806.cpp</in>
+                        </df>
+                        <df name="integer_sequence">
+                          <in>drop_front_exactly.cpp</in>
+                          <in>equal.cpp</in>
+                          <in>find_if.cpp</in>
+                          <in>front.cpp</in>
+                          <in>is_empty.cpp</in>
+                          <in>laws.cpp</in>
+                          <in>unpack.cpp</in>
+                        </df>
+                        <df name="integral_constant">
+                          <in>arithmetic.cpp</in>
+                          <in>comparable.cpp</in>
+                          <in>constant.cpp</in>
+                          <in>interop.cpp</in>
+                          <in>logical.cpp</in>
+                          <in>orderable.cpp</in>
+                          <in>tag.cpp</in>
+                        </df>
+                        <df name="pair">
+                          <in>first_second.cpp</in>
+                          <in>issue_90.cpp</in>
+                          <in>laws.cpp</in>
+                          <in>make.cpp</in>
+                        </df>
+                        <df name="ratio">
+                          <in>div.cpp</in>
+                          <in>equal.cpp</in>
+                          <in>laws.cpp</in>
+                          <in>less.cpp</in>
+                          <in>minus.cpp</in>
+                          <in>mod.cpp</in>
+                          <in>mult.cpp</in>
+                          <in>one.cpp</in>
+                          <in>plus.cpp</in>
+                          <in>to.cpp</in>
+                          <in>zero.cpp</in>
+                        </df>
+                        <df name="tuple">
+                          <df name="auto">
+                            <in>all_of.cpp</in>
+                            <in>any_of.cpp</in>
+                            <in>ap.cpp</in>
+                            <in>at.cpp</in>
+                            <in>cartesian_product.cpp</in>
+                            <in>drop_back.cpp</in>
+                            <in>drop_front.cpp</in>
+                            <in>drop_while.cpp</in>
+                            <in>for_each.cpp</in>
+                            <in>group.cpp</in>
+                            <in>index_if.cpp</in>
+                            <in>insert.cpp</in>
+                            <in>insert_range.cpp</in>
+                            <in>intersperse.cpp</in>
+                            <in>is_empty.cpp</in>
+                            <in>length.cpp</in>
+                            <in>lexicographical_compare.cpp</in>
+                            <in>make.cpp</in>
+                            <in>none_of.cpp</in>
+                            <in>partition.cpp</in>
+                            <in>permutations.cpp</in>
+                            <in>remove_at.cpp</in>
+                            <in>remove_range.cpp</in>
+                            <in>reverse.cpp</in>
+                            <in>scans.cpp</in>
+                            <in>sequence.cpp</in>
+                            <in>slice.cpp</in>
+                            <in>sort.cpp</in>
+                            <in>span.cpp</in>
+                            <in>take_back.cpp</in>
+                            <in>take_front.cpp</in>
+                            <in>take_while.cpp</in>
+                            <in>transform.cpp</in>
+                            <in>unfolds.cpp</in>
+                            <in>unique.cpp</in>
+                            <in>zips.cpp</in>
+                          </df>
+                          <in>issue_90.cpp</in>
+                          <in>laws.cpp</in>
+                          <in>laws.functor.cpp</in>
+                          <in>laws.searchable.cpp</in>
+                        </df>
+                        <in>vector.cpp</in>
+                      </df>
+                    </df>
+                    <df name="fold_left">
+                      <in>ref.cpp</in>
+                    </df>
+                    <df name="fold_right">
+                      <in>ref.cpp</in>
+                    </df>
+                    <df name="foldable">
+                      <df name="fold_left_mcd">
+                        <in>iterable.cpp</in>
+                        <in>monad.cpp</in>
+                        <in>monad_plus.cpp</in>
+                        <in>orderable.cpp</in>
+                        <in>searchable.cpp</in>
+                        <in>sequence.cpp</in>
+                      </df>
+                      <df name="iterable_mcd">
+                        <in>iterable.cpp</in>
+                        <in>monad.cpp</in>
+                        <in>monad_plus.cpp</in>
+                        <in>orderable.cpp</in>
+                        <in>searchable.cpp</in>
+                        <in>sequence.cpp</in>
+                      </df>
+                      <df name="unpack_mcd">
+                        <in>iterable.cpp</in>
+                        <in>monad.cpp</in>
+                        <in>monad_plus.cpp</in>
+                        <in>orderable.cpp</in>
+                        <in>searchable.cpp</in>
+                        <in>sequence.cpp</in>
+                      </df>
+                    </df>
+                    <df name="functional">
+                      <in>apply.cpp</in>
+                      <in>capture.cpp</in>
+                      <in>demux.cpp</in>
+                      <in>fix.cpp</in>
+                      <in>iterate.cpp</in>
+                      <in>lockstep.cpp</in>
+                      <in>overload_linearly.cpp</in>
+                      <in>partial.cpp</in>
+                      <in>placeholder.cpp</in>
+                      <in>reverse_partial.cpp</in>
+                    </df>
+                    <df name="identity">
+                      <in>applicative.full_mcd.cpp</in>
+                      <in>applicative.monad_mcd.cpp</in>
+                      <in>functor.adjust_mcd.cpp</in>
+                      <in>functor.transform_mcd.cpp</in>
+                      <in>monad.chain_mcd.cpp</in>
+                      <in>monad.flatten_mcd.cpp</in>
+                    </df>
+                    <df name="if_">
+                      <in>non_copyable.cpp</in>
+                    </df>
+                    <df name="integral_constant">
+                      <in>arithmetic.cpp</in>
+                      <in>comparable.cpp</in>
+                      <in>constant.cpp</in>
+                      <in>constexpr_init.cpp</in>
+                      <in>github_354.cpp</in>
+                      <in>hash.cpp</in>
+                      <in>hashable.cpp</in>
+                      <in>logical.cpp</in>
+                      <in>operators.cpp</in>
+                      <in>orderable.cpp</in>
+                      <in>std_api.cpp</in>
+                      <in>tag.cpp</in>
+                      <in>times.cpp</in>
+                      <in>udl.cpp</in>
+                    </df>
+                    <df name="issues">
+                      <df name="github_75">
+                        <in>tu1.cpp</in>
+                        <in>tu2.cpp</in>
+                      </df>
+                      <in>clang_20046.cpp</in>
+                      <in>github_112.cpp</in>
+                      <in>github_113.cpp</in>
+                      <in>github_149.cpp</in>
+                      <in>github_15.cpp</in>
+                      <in>github_165.cpp</in>
+                      <in>github_202.cpp</in>
+                      <in>github_221.cpp</in>
+                      <in>github_234.cpp</in>
+                      <in>github_252.cpp</in>
+                      <in>github_260.cpp</in>
+                      <in>github_266.cpp</in>
+                      <in>github_269.cpp</in>
+                      <in>github_297.cpp</in>
+                      <in>github_31.cpp</in>
+                      <in>github_331.cpp</in>
+                      <in>github_362.cpp</in>
+                      <in>github_365.cpp</in>
+                      <in>github_460.cpp</in>
+                      <in>github_470.cpp</in>
+                      <in>github_91.cpp</in>
+                    </df>
+                    <df name="map">
+                      <in>any_of.cpp</in>
+                      <in>assign.copy.cpp</in>
+                      <in>assign.move.cpp</in>
+                      <in>at_key.collisions.cpp</in>
+                      <in>at_key.cpp</in>
+                      <in>at_key.ref.cpp</in>
+                      <in>at_key.stackoverflow.cpp</in>
+                      <in>cnstr.copy.cpp</in>
+                      <in>cnstr.default.cpp</in>
+                      <in>cnstr.move.cpp</in>
+                      <in>cnstr.trap.cpp</in>
+                      <in>cnstr.variadic.cpp</in>
+                      <in>contains.cpp</in>
+                      <in>difference.cpp</in>
+                      <in>equal.cpp</in>
+                      <in>erase_key.cpp</in>
+                      <in>find_if.cpp</in>
+                      <in>fold_left.cpp</in>
+                      <in>fold_right.cpp</in>
+                      <in>insert.cpp</in>
+                      <in>intersection.cpp</in>
+                      <in>is_subset.cpp</in>
+                      <in>keys.cpp</in>
+                      <in>laws.cpp</in>
+                      <in>map.cpp</in>
+                      <in>symmetric_difference.cpp</in>
+                      <in>to.cpp</in>
+                      <in>union.cpp</in>
+                      <in>unpack.cpp</in>
+                      <in>values.cpp</in>
+                    </df>
+                    <df name="numeric">
+                      <in>minus_mcd.cpp</in>
+                      <in>negate_mcd.cpp</in>
+                    </df>
+                    <df name="optional">
+                      <in>any_of.cpp</in>
+                      <in>ap.cpp</in>
+                      <in>chain.cpp</in>
+                      <in>concat.cpp</in>
+                      <in>copy.trap_construct.cpp</in>
+                      <in>empty.cpp</in>
+                      <in>equal.cpp</in>
+                      <in>find_if.cpp</in>
+                      <in>flatten.cpp</in>
+                      <in>fold_left.cpp</in>
+                      <in>fold_right.cpp</in>
+                      <in>is_just.cpp</in>
+                      <in>is_nothing.cpp</in>
+                      <in>laws.cpp</in>
+                      <in>less.cpp</in>
+                      <in>lift.cpp</in>
+                      <in>make.cpp</in>
+                      <in>maybe.cpp</in>
+                      <in>nested_type.cpp</in>
+                      <in>operator_arrow.cpp</in>
+                      <in>operator_deref.cpp</in>
+                      <in>representation.cpp</in>
+                      <in>sfinae.cpp</in>
+                      <in>transform.cpp</in>
+                      <in>unpack.cpp</in>
+                      <in>value.cpp</in>
+                      <in>value_or.cpp</in>
+                    </df>
+                    <df name="pair">
+                      <in>assign.copy.cpp</in>
+                      <in>assign.move.cpp</in>
+                      <in>cnstr.copy.cpp</in>
+                      <in>cnstr.default.cpp</in>
+                      <in>cnstr.memberwise.cpp</in>
+                      <in>cnstr.move.cpp</in>
+                      <in>comparable.cpp</in>
+                      <in>empty_storage.cpp</in>
+                      <in>foldable.cpp</in>
+                      <in>issue_90.cpp</in>
+                      <in>make.cpp</in>
+                      <in>orderable.cpp</in>
+                      <in>product.cpp</in>
+                      <in>tag_of.cpp</in>
+                    </df>
+                    <df name="range">
+                      <in>at.cpp</in>
+                      <in>back.cpp</in>
+                      <in>contains.cpp</in>
+                      <in>drop_front.cpp</in>
+                      <in>drop_front_exactly.cpp</in>
+                      <in>equal.cpp</in>
+                      <in>find.cpp</in>
+                      <in>front.cpp</in>
+                      <in>is_empty.cpp</in>
+                      <in>laws.cpp</in>
+                      <in>length.cpp</in>
+                      <in>make.cpp</in>
+                      <in>maximum.cpp</in>
+                      <in>minimum.cpp</in>
+                      <in>product.cpp</in>
+                      <in>range_c.cpp</in>
+                      <in>sum.cpp</in>
+                      <in>unpack.cpp</in>
+                    </df>
+                    <df name="set">
+                      <in>any_of.cpp</in>
+                      <in>cnstr.copy.cpp</in>
+                      <in>cnstr.default.cpp</in>
+                      <in>cnstr.move.cpp</in>
+                      <in>cnstr.trap.cpp</in>
+                      <in>difference.cpp</in>
+                      <in>equal.cpp</in>
+                      <in>erase_key.cpp</in>
+                      <in>find_if.cpp</in>
+                      <in>insert.cpp</in>
+                      <in>intersection.cpp</in>
+                      <in>is_subset.cpp</in>
+                      <in>laws.cpp</in>
+                      <in>make.cpp</in>
+                      <in>symmetric_difference.cpp</in>
+                      <in>to.cpp</in>
+                      <in>union.cpp</in>
+                      <in>unpack.cpp</in>
+                    </df>
+                    <df name="string">
+                      <in>any_of.cpp</in>
+                      <in>at.cpp</in>
+                      <in>c_str.cpp</in>
+                      <in>cnstr.c_str.cpp</in>
+                      <in>cnstr.copy.cpp</in>
+                      <in>cnstr.default.cpp</in>
+                      <in>contains.cpp</in>
+                      <in>drop_front_exactly.cpp</in>
+                      <in>equal.cpp</in>
+                      <in>find.cpp</in>
+                      <in>find_if.cpp</in>
+                      <in>front.cpp</in>
+                      <in>hash.cpp</in>
+                      <in>is_empty.cpp</in>
+                      <in>laws.cpp</in>
+                      <in>length.cpp</in>
+                      <in>less.cpp</in>
+                      <in>macro.cpp</in>
+                      <in>make.cpp</in>
+                      <in>plus.cpp</in>
+                      <in>to.cpp</in>
+                      <in>udl.cpp</in>
+                      <in>unpack.cpp</in>
+                      <in>zero.cpp</in>
+                    </df>
+                    <df name="tuple">
+                      <df name="auto">
+                        <in>all_of.cpp</in>
+                        <in>any_of.cpp</in>
+                        <in>ap.cpp</in>
+                        <in>at.cpp</in>
+                        <in>cartesian_product.cpp</in>
+                        <in>drop_back.cpp</in>
+                        <in>drop_front.cpp</in>
+                        <in>drop_while.cpp</in>
+                        <in>for_each.cpp</in>
+                        <in>group.cpp</in>
+                        <in>index_if.cpp</in>
+                        <in>insert.cpp</in>
+                        <in>insert_range.cpp</in>
+                        <in>intersperse.cpp</in>
+                        <in>is_empty.cpp</in>
+                        <in>length.cpp</in>
+                        <in>lexicographical_compare.cpp</in>
+                        <in>make.cpp</in>
+                        <in>none_of.cpp</in>
+                        <in>partition.cpp</in>
+                        <in>permutations.cpp</in>
+                        <in>remove_at.cpp</in>
+                        <in>remove_range.cpp</in>
+                        <in>reverse.cpp</in>
+                        <in>scans.cpp</in>
+                        <in>sequence.cpp</in>
+                        <in>slice.cpp</in>
+                        <in>sort.cpp</in>
+                        <in>span.cpp</in>
+                        <in>take_back.cpp</in>
+                        <in>take_front.cpp</in>
+                        <in>take_while.cpp</in>
+                        <in>transform.cpp</in>
+                        <in>unfolds.cpp</in>
+                        <in>unique.cpp</in>
+                        <in>zips.cpp</in>
+                      </df>
+                      <in>any_of.clang_ice.cpp</in>
+                      <in>assign.convert_copy.cpp</in>
+                      <in>assign.convert_move.cpp</in>
+                      <in>assign.copy.cpp</in>
+                      <in>assign.move.cpp</in>
+                      <in>at.const.cpp</in>
+                      <in>at.non_const.cpp</in>
+                      <in>at.rv.cpp</in>
+                      <in>cnstr.convert_copy.cpp</in>
+                      <in>cnstr.convert_move.cpp</in>
+                      <in>cnstr.copy.cpp</in>
+                      <in>cnstr.default.cpp</in>
+                      <in>cnstr.move.cpp</in>
+                      <in>cnstr.nested.cpp</in>
+                      <in>cnstr.trap.cpp</in>
+                      <in>cnstr.variadic_array.cpp</in>
+                      <in>cnstr.variadic_copy.cpp</in>
+                      <in>cnstr.variadic_forward.cpp</in>
+                      <in>empty_member.cpp</in>
+                      <in>hold_refs.cpp</in>
+                      <in>issue_90.cpp</in>
+                      <in>laws.cpp</in>
+                      <in>laws.functor.cpp</in>
+                      <in>laws.searchable.cpp</in>
+                      <in>move_only.cpp</in>
+                      <in>pair_interop.cpp</in>
+                      <in>smart_ptr.cpp</in>
+                      <in>special.drop_front_exactly.cpp</in>
+                      <in>special.empty.cpp</in>
+                      <in>special.equal.cpp</in>
+                      <in>special.fill.cpp</in>
+                      <in>special.fold_left.cpp</in>
+                      <in>special.fold_right.cpp</in>
+                      <in>special.front.cpp</in>
+                      <in>special.is_empty.cpp</in>
+                      <in>special.prepend.cpp</in>
+                      <in>special.transform.cpp</in>
+                      <in>to.cpp</in>
+                      <in>unpack.cpp</in>
+                      <in>usability_of_types.cpp</in>
+                    </df>
+                    <df name="type">
+                      <in>adl.cpp</in>
+                      <in>alignof.cpp</in>
+                      <in>decltype.cpp</in>
+                      <in>equal.cpp</in>
+                      <in>hash.cpp</in>
+                      <in>inherit_basic_type.cpp</in>
+                      <in>integral.cpp</in>
+                      <in>is_valid.cpp</in>
+                      <in>laws.cpp</in>
+                      <in>make.cpp</in>
+                      <in>metafunction.cpp</in>
+                      <in>metafunction_class.cpp</in>
+                      <in>nested_type.cpp</in>
+                      <in>sizeof.cpp</in>
+                      <in>template.cpp</in>
+                      <in>traits.cpp</in>
+                      <in>typeid.cpp</in>
+                      <in>unary_plus.cpp</in>
+                    </df>
+                    <in>builtin_array.cpp</in>
+                    <in>comparable.cpp</in>
+                    <in>euclidean_ring.cpp</in>
+                    <in>functional.cpp</in>
+                    <in>group.cpp</in>
+                    <in>index_if.cpp</in>
+                    <in>lazy.cpp</in>
+                    <in>logical.cpp</in>
+                    <in>minimal_product.cpp</in>
+                    <in>monoid.cpp</in>
+                    <in>orderable.cpp</in>
+                    <in>repeat.cpp</in>
+                    <in>ring.cpp</in>
+                    <in>searchable.cpp</in>
+                  </df>
+                </df>
+                <df name="heap">
+                  <df name="examples">
+                    <in>interface.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>binomial_heap_test.cpp</in>
+                    <in>d_ary_heap_test.cpp</in>
+                    <in>fibonacci_heap_test.cpp</in>
+                    <in>mutable_heap_test.cpp</in>
+                    <in>pairing_heap_tests.cpp</in>
+                    <in>priority_queue_test.cpp</in>
+                    <in>self_contained_header.cpp</in>
+                    <in>skew_heap_test.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <in>throughput_benchmarks.cpp</in>
+                  </df>
+                </df>
+                <df name="histogram">
+                  <df name="benchmark">
+                    <in>axis_index.cpp</in>
+                    <in>axis_size.cpp</in>
+                    <in>histogram_filling.cpp</in>
+                    <in>histogram_filling_gsl.cpp</in>
+                    <in>histogram_filling_root.cpp</in>
+                    <in>histogram_iteration.cpp</in>
+                    <in>histogram_parallel_filling.cpp</in>
+                  </df>
+                  <df name="examples">
+                    <in>getting_started_listing_01.cpp</in>
+                    <in>getting_started_listing_02.cpp</in>
+                    <in>getting_started_listing_03.cpp</in>
+                    <in>getting_started_listing_04.cpp</in>
+                    <in>getting_started_listing_05.cpp</in>
+                    <in>guide_axis_basic_demo.cpp</in>
+                    <in>guide_axis_circular.cpp</in>
+                    <in>guide_axis_growing.cpp</in>
+                    <in>guide_axis_with_labels.cpp</in>
+                    <in>guide_axis_with_transform.cpp</in>
+                    <in>guide_axis_with_uoflow_off.cpp</in>
+                    <in>guide_custom_2d_axis.cpp</in>
+                    <in>guide_custom_accumulators_advanced.cpp</in>
+                    <in>guide_custom_accumulators_builtin.cpp</in>
+                    <in>guide_custom_accumulators_ouroboros.cpp</in>
+                    <in>guide_custom_accumulators_simple.cpp</in>
+                    <in>guide_custom_accumulators_with_metadata.cpp</in>
+                    <in>guide_custom_minimal_axis.cpp</in>
+                    <in>guide_custom_modified_axis.cpp</in>
+                    <in>guide_custom_storage.cpp</in>
+                    <in>guide_fill_histogram.cpp</in>
+                    <in>guide_fill_profile.cpp</in>
+                    <in>guide_fill_weighted_histogram.cpp</in>
+                    <in>guide_fill_weighted_profile.cpp</in>
+                    <in>guide_histogram_in_api.cpp</in>
+                    <in>guide_histogram_operators.cpp</in>
+                    <in>guide_histogram_projection.cpp</in>
+                    <in>guide_histogram_reduction.cpp</in>
+                    <in>guide_histogram_serialization.cpp</in>
+                    <in>guide_histogram_streaming.cpp</in>
+                    <in>guide_indexed_access.cpp</in>
+                    <in>guide_make_dynamic_histogram.cpp</in>
+                    <in>guide_make_static_histogram.cpp</in>
+                    <in>guide_parallel_filling.cpp</in>
+                    <in>guide_stdlib_algorithms.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>accumulators_count_test.cpp</in>
+                    <in>accumulators_count_thread_safe_test.cpp</in>
+                    <in>accumulators_mean_test.cpp</in>
+                    <in>accumulators_serialization_test.cpp</in>
+                    <in>accumulators_sum_test.cpp</in>
+                    <in>accumulators_thread_safe_test.cpp</in>
+                    <in>accumulators_weighted_mean_test.cpp</in>
+                    <in>accumulators_weighted_sum_test.cpp</in>
+                    <in>algorithm_empty_test.cpp</in>
+                    <in>algorithm_project_test.cpp</in>
+                    <in>algorithm_reduce_test.cpp</in>
+                    <in>algorithm_sum_test.cpp</in>
+                    <in>axis_boolean_test.cpp</in>
+                    <in>axis_category_fail0.cpp</in>
+                    <in>axis_category_fail1.cpp</in>
+                    <in>axis_category_fail2.cpp</in>
+                    <in>axis_category_test.cpp</in>
+                    <in>axis_integer_fail0.cpp</in>
+                    <in>axis_integer_fail1.cpp</in>
+                    <in>axis_integer_fail2.cpp</in>
+                    <in>axis_integer_fail3.cpp</in>
+                    <in>axis_integer_fail4.cpp</in>
+                    <in>axis_integer_test.cpp</in>
+                    <in>axis_option_test.cpp</in>
+                    <in>axis_regular_fail0.cpp</in>
+                    <in>axis_regular_fail1.cpp</in>
+                    <in>axis_regular_test.cpp</in>
+                    <in>axis_traits_test.cpp</in>
+                    <in>axis_variable_fail0.cpp</in>
+                    <in>axis_variable_fail1.cpp</in>
+                    <in>axis_variable_test.cpp</in>
+                    <in>axis_variant_serialization_test.cpp</in>
+                    <in>axis_variant_test.cpp</in>
+                    <in>boost_accumulators_support_test.cpp</in>
+                    <in>boost_range_support_test.cpp</in>
+                    <in>boost_units_support_test.cpp</in>
+                    <in>deduction_guides_test.cpp</in>
+                    <in>detail_accumulator_traits_test.cpp</in>
+                    <in>detail_args_type_test.cpp</in>
+                    <in>detail_argument_traits_test.cpp</in>
+                    <in>detail_array_wrapper_serialization_test.cpp</in>
+                    <in>detail_axes_test.cpp</in>
+                    <in>detail_convert_integer_test.cpp</in>
+                    <in>detail_detect_test.cpp</in>
+                    <in>detail_iterator_adaptor_test.cpp</in>
+                    <in>detail_large_int_test.cpp</in>
+                    <in>detail_limits_test.cpp</in>
+                    <in>detail_make_default_test.cpp</in>
+                    <in>detail_misc_test.cpp</in>
+                    <in>detail_operators_test.cpp</in>
+                    <in>detail_relaxed_equal_test.cpp</in>
+                    <in>detail_replace_type_test.cpp</in>
+                    <in>detail_safe_comparison_test.cpp</in>
+                    <in>detail_static_if_test.cpp</in>
+                    <in>detail_tuple_slice_test.cpp</in>
+                    <in>histogram_custom_axis_test.cpp</in>
+                    <in>histogram_dynamic_test.cpp</in>
+                    <in>histogram_fail0.cpp</in>
+                    <in>histogram_fail1.cpp</in>
+                    <in>histogram_fail2.cpp</in>
+                    <in>histogram_fail3.cpp</in>
+                    <in>histogram_fail4.cpp</in>
+                    <in>histogram_fill_test.cpp</in>
+                    <in>histogram_growing_test.cpp</in>
+                    <in>histogram_mixed_test.cpp</in>
+                    <in>histogram_operators_test.cpp</in>
+                    <in>histogram_ostream_ascii_test.cpp</in>
+                    <in>histogram_ostream_test.cpp</in>
+                    <in>histogram_serialization_test.cpp</in>
+                    <in>histogram_test.cpp</in>
+                    <in>histogram_threaded_test.cpp</in>
+                    <in>indexed_test.cpp</in>
+                    <in>issue_290_test.cpp</in>
+                    <in>issue_327_test.cpp</in>
+                    <in>make_histogram_fail0.cpp</in>
+                    <in>make_histogram_fail1.cpp</in>
+                    <in>odr_main_test.cpp</in>
+                    <in>odr_test.cpp</in>
+                    <in>storage_adaptor_serialization_test.cpp</in>
+                    <in>storage_adaptor_test.cpp</in>
+                    <in>storage_adaptor_threaded_test.cpp</in>
+                    <in>unlimited_storage_serialization_test.cpp</in>
+                    <in>unlimited_storage_test.cpp</in>
+                    <in>utility_test.cpp</in>
+                  </df>
+                </df>
+                <df name="hof">
+                  <df name="example">
+                    <in>in.cpp</in>
+                    <in>pointfree.cpp</in>
+                    <in>print.cpp</in>
+                    <in>sequence.cpp</in>
+                    <in>static_if.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="fail">
+                      <in>always.cpp</in>
+                      <in>apply_eval.cpp</in>
+                      <in>flip_lazy.cpp</in>
+                      <in>implicit.cpp</in>
+                      <in>rotate_lazy.cpp</in>
+                      <in>unpack.cpp</in>
+                      <in>unpack_uncallable.cpp</in>
+                    </df>
+                    <df name="static_def">
+                      <in>static_def.cpp</in>
+                      <in>static_def2.cpp</in>
+                    </df>
+                    <in>alias.cpp</in>
+                    <in>always.cpp</in>
+                    <in>apply.cpp</in>
+                    <in>apply_eval.cpp</in>
+                    <in>arg.cpp</in>
+                    <in>capture.cpp</in>
+                    <in>combine.cpp</in>
+                    <in>compose.cpp</in>
+                    <in>construct.cpp</in>
+                    <in>decay.cpp</in>
+                    <in>decorate.cpp</in>
+                    <in>filter.cpp</in>
+                    <in>final_base.cpp</in>
+                    <in>first_of.cpp</in>
+                    <in>fix.cpp</in>
+                    <in>flip.cpp</in>
+                    <in>flow.cpp</in>
+                    <in>fold.cpp</in>
+                    <in>function.cpp</in>
+                    <in>identity.cpp</in>
+                    <in>if.cpp</in>
+                    <in>implicit.cpp</in>
+                    <in>indirect.cpp</in>
+                    <in>infix.cpp</in>
+                    <in>is_invocable.cpp</in>
+                    <in>issue8.cpp</in>
+                    <in>lambda.cpp</in>
+                    <in>lazy.cpp</in>
+                    <in>lift.cpp</in>
+                    <in>limit.cpp</in>
+                    <in>match.cpp</in>
+                    <in>mutable.cpp</in>
+                    <in>pack.cpp</in>
+                    <in>partial.cpp</in>
+                    <in>pipable.cpp</in>
+                    <in>placeholders.cpp</in>
+                    <in>proj.cpp</in>
+                    <in>protect.cpp</in>
+                    <in>repeat.cpp</in>
+                    <in>repeat_while.cpp</in>
+                    <in>result.cpp</in>
+                    <in>returns.cpp</in>
+                    <in>reveal.cpp</in>
+                    <in>reverse_fold.cpp</in>
+                    <in>rotate.cpp</in>
+                    <in>static.cpp</in>
+                    <in>tap.cpp</in>
+                    <in>tuple_for_each.cpp</in>
+                    <in>tuple_transform.cpp</in>
+                    <in>unpack.cpp</in>
+                    <in>virtual_base.cpp</in>
+                  </df>
+                </df>
+                <df name="icl">
+                  <df name="example">
+                    <df name="boost_party_">
+                      <in>boost_party.cpp</in>
+                    </df>
+                    <df name="custom_interval_">
+                      <in>custom_interval.cpp</in>
+                    </df>
+                    <df name="dynamic_interval_">
+                      <in>dynamic_interval.cpp</in>
+                    </df>
+                    <df name="interval_">
+                      <in>interval.cpp</in>
+                    </df>
+                    <df name="interval_container_">
+                      <in>interval_container.cpp</in>
+                    </df>
+                    <df name="itvset_shell_">
+                      <in>itvset_shell.cpp</in>
+                    </df>
+                    <df name="large_bitset_">
+                      <in>large_bitset.cpp</in>
+                    </df>
+                    <df name="man_power_">
+                      <in>man_power.cpp</in>
+                    </df>
+                    <df name="month_and_week_grid_">
+                      <in>month_and_week_grid.cpp</in>
+                    </df>
+                    <df name="overlap_counter_">
+                      <in>overlap_counter.cpp</in>
+                    </df>
+                    <df name="party_">
+                      <in>party.cpp</in>
+                    </df>
+                    <df name="partys_height_average_">
+                      <in>partys_height_average.cpp</in>
+                    </df>
+                    <df name="partys_tallest_guests_">
+                      <in>partys_tallest_guests.cpp</in>
+                    </df>
+                    <df name="splititvmap_shell_">
+                      <in>splititvmap_shell.cpp</in>
+                    </df>
+                    <df name="static_interval_">
+                      <in>static_interval.cpp</in>
+                    </df>
+                    <df name="std_copy_">
+                      <in>std_copy.cpp</in>
+                    </df>
+                    <df name="std_transform_">
+                      <in>std_transform.cpp</in>
+                    </df>
+                    <df name="user_groups_">
+                      <in>user_groups.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="cmp_clang_ttp_passing2_">
+                      <in>cmp_clang_ttp_passing2.cpp</in>
+                    </df>
+                    <df name="cmp_clang_ttp_passing_">
+                      <in>cmp_clang_ttp_passing.cpp</in>
+                    </df>
+                    <df name="cmp_msvc_value_born_error_">
+                      <in>cmp_msvc_value_born_error.cpp</in>
+                    </df>
+                    <df name="ex_boost_party_">
+                      <in>ex_boost_party.cpp</in>
+                    </df>
+                    <df name="fast_stat_interval_map_">
+                      <in>fast_stat_interval_map.cpp</in>
+                    </df>
+                    <df name="fastest_icl_interval_">
+                      <in>fastest_icl_interval.cpp</in>
+                    </df>
+                    <df name="fastest_icl_map_">
+                      <in>fastest_icl_map.cpp</in>
+                    </df>
+                    <df name="fastest_interval_map_">
+                      <in>fastest_interval_map.cpp</in>
+                    </df>
+                    <df name="fastest_interval_map_infix_">
+                      <in>fastest_interval_map_infix.cpp</in>
+                    </df>
+                    <df name="fastest_interval_map_infix_mixed_">
+                      <in>fastest_interval_map_infix_mixed.cpp</in>
+                    </df>
+                    <df name="fastest_interval_map_mixed2_">
+                      <in>fastest_interval_map_mixed2.cpp</in>
+                    </df>
+                    <df name="fastest_interval_map_mixed_">
+                      <in>fastest_interval_map_mixed.cpp</in>
+                    </df>
+                    <df name="fastest_interval_set_">
+                      <in>fastest_interval_set.cpp</in>
+                    </df>
+                    <df name="fastest_interval_set_infix_">
+                      <in>fastest_interval_set_infix.cpp</in>
+                    </df>
+                    <df name="fastest_interval_set_mixed_">
+                      <in>fastest_interval_set_mixed.cpp</in>
+                    </df>
+                    <df name="fastest_partial_icl_quantifier_">
+                      <in>fastest_partial_icl_quantifier.cpp</in>
+                    </df>
+                    <df name="fastest_partial_interval_quantifier_">
+                      <in>fastest_partial_interval_quantifier.cpp</in>
+                    </df>
+                    <df name="fastest_separate_interval_set_">
+                      <in>fastest_separate_interval_set.cpp</in>
+                    </df>
+                    <df name="fastest_separate_interval_set_infix_">
+                      <in>fastest_separate_interval_set_infix.cpp</in>
+                    </df>
+                    <df name="fastest_set_icl_set_">
+                      <in>fastest_set_icl_set.cpp</in>
+                      <in>fastest_set_icl_set_shared.cpp</in>
+                    </df>
+                    <df name="fastest_set_interval_set_">
+                      <in>fastest_set_interval_set.cpp</in>
+                    </df>
+                    <df name="fastest_split_interval_map_">
+                      <in>fastest_split_interval_map.cpp</in>
+                      <in>fastest_split_interval_map_shared.cpp</in>
+                    </df>
+                    <df name="fastest_split_interval_map_infix_">
+                      <in>fastest_split_interval_map_infix.cpp</in>
+                    </df>
+                    <df name="fastest_split_interval_set_">
+                      <in>fastest_split_interval_set.cpp</in>
+                      <in>fastest_split_interval_set_shared.cpp</in>
+                    </df>
+                    <df name="fastest_split_interval_set_infix_">
+                      <in>fastest_split_interval_set_infix.cpp</in>
+                    </df>
+                    <df name="fastest_total_icl_quantifier_">
+                      <in>fastest_total_icl_quantifier.cpp</in>
+                    </df>
+                    <df name="fastest_total_interval_quantifier_">
+                      <in>fastest_total_interval_quantifier.cpp</in>
+                    </df>
+                    <df name="fix_icl_after_thread_">
+                      <in>fix_icl_after_thread.cpp</in>
+                    </df>
+                    <df name="fix_include_after_thread_">
+                      <in>fix_include_after_thread.cpp</in>
+                    </df>
+                    <df name="fix_tickets_">
+                      <in>fix_tickets.cpp</in>
+                    </df>
+                    <df name="test_casual_">
+                      <in>test_casual.cpp</in>
+                    </df>
+                    <df name="test_changing_interval_defaults_">
+                      <in>test_changing_interval_defaults.cpp</in>
+                    </df>
+                    <df name="test_combinable_">
+                      <in>test_combinable.cpp</in>
+                    </df>
+                    <df name="test_doc_code_">
+                      <in>test_doc_code.cpp</in>
+                    </df>
+                    <df name="test_icl_interval_">
+                      <in>test_icl_interval.cpp</in>
+                    </df>
+                    <df name="test_icl_map_">
+                      <in>test_icl_map.cpp</in>
+                    </df>
+                    <df name="test_interval_map_">
+                      <in>test_interval_map.cpp</in>
+                    </df>
+                    <df name="test_interval_map_infix_">
+                      <in>test_interval_map_infix.cpp</in>
+                    </df>
+                    <df name="test_interval_map_infix_mixed_">
+                      <in>test_interval_map_infix_mixed.cpp</in>
+                    </df>
+                    <df name="test_interval_map_mixed2_">
+                      <in>test_interval_map_mixed2.cpp</in>
+                    </df>
+                    <df name="test_interval_map_mixed_">
+                      <in>test_interval_map_mixed.cpp</in>
+                    </df>
+                    <df name="test_interval_set_">
+                      <in>test_interval_set.cpp</in>
+                    </df>
+                    <df name="test_interval_set_infix_">
+                      <in>test_interval_set_infix.cpp</in>
+                    </df>
+                    <df name="test_interval_set_mixed_">
+                      <in>test_interval_set_mixed.cpp</in>
+                    </df>
+                    <df name="test_misc_">
+                      <in>test_misc.cpp</in>
+                    </df>
+                    <df name="test_partial_icl_quantifier_">
+                      <in>test_partial_icl_quantifier.cpp</in>
+                    </df>
+                    <df name="test_partial_interval_quantifier_">
+                      <in>test_partial_interval_quantifier.cpp</in>
+                    </df>
+                    <df name="test_separate_interval_set_">
+                      <in>test_separate_interval_set.cpp</in>
+                    </df>
+                    <df name="test_separate_interval_set_infix_">
+                      <in>test_separate_interval_set_infix.cpp</in>
+                    </df>
+                    <df name="test_set_icl_set_">
+                      <in>test_set_icl_set.cpp</in>
+                      <in>test_set_icl_set_shared.cpp</in>
+                    </df>
+                    <df name="test_set_interval_set_">
+                      <in>test_set_interval_set.cpp</in>
+                    </df>
+                    <df name="test_split_interval_map_">
+                      <in>test_split_interval_map.cpp</in>
+                      <in>test_split_interval_map_shared.cpp</in>
+                    </df>
+                    <df name="test_split_interval_map_infix_">
+                      <in>test_split_interval_map_infix.cpp</in>
+                    </df>
+                    <df name="test_split_interval_set_">
+                      <in>test_split_interval_set.cpp</in>
+                      <in>test_split_interval_set_shared.cpp</in>
+                    </df>
+                    <df name="test_split_interval_set_infix_">
+                      <in>test_split_interval_set_infix.cpp</in>
+                    </df>
+                    <df name="test_total_icl_quantifier_">
+                      <in>test_total_icl_quantifier.cpp</in>
+                    </df>
+                    <df name="test_total_interval_quantifier_">
+                      <in>test_total_interval_quantifier.cpp</in>
+                    </df>
+                    <df name="test_type_traits_">
+                      <in>test_type_traits.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="integer">
+                  <df name="test">
+                    <in>common_factor_test.cpp</in>
+                    <in>extended_euclidean_test.cpp</in>
+                    <in>fail_int_exact.cpp</in>
+                    <in>fail_int_fast.cpp</in>
+                    <in>fail_int_least.cpp</in>
+                    <in>fail_uint_65.cpp</in>
+                    <in>fail_uint_exact.cpp</in>
+                    <in>fail_uint_fast.cpp</in>
+                    <in>fail_uint_least.cpp</in>
+                    <in>gcd_constexpr14_test.cpp</in>
+                    <in>gcd_noexcept_test.cpp</in>
+                    <in>has_gmpxx.cpp</in>
+                    <in>integer_fwd_include_test.cpp</in>
+                    <in>integer_include_test.cpp</in>
+                    <in>integer_mask_include_test.cpp</in>
+                    <in>integer_mask_test.cpp</in>
+                    <in>integer_test.cpp</in>
+                    <in>integer_traits_include_test.cpp</in>
+                    <in>integer_traits_test.cpp</in>
+                    <in>mod_inverse_test.cpp</in>
+                    <in>static_log2_include_test.cpp</in>
+                    <in>static_log2_test.cpp</in>
+                    <in>static_min_max_include_test.cpp</in>
+                    <in>static_min_max_test.cpp</in>
+                  </df>
+                </df>
+                <df name="interprocess">
+                  <df name="example">
+                    <in>comp_doc_anonymous_conditionA.cpp</in>
+                    <in>comp_doc_anonymous_conditionB.cpp</in>
+                    <in>comp_doc_anonymous_mutexA.cpp</in>
+                    <in>comp_doc_anonymous_mutexB.cpp</in>
+                    <in>comp_doc_anonymous_semaphoreA.cpp</in>
+                    <in>comp_doc_anonymous_semaphoreB.cpp</in>
+                    <in>comp_doc_anonymous_upgradable_mutexA.cpp</in>
+                    <in>comp_doc_anonymous_upgradable_mutexB.cpp</in>
+                    <in>comp_doc_message_queueA.cpp</in>
+                    <in>comp_doc_message_queueB.cpp</in>
+                    <in>doc_adaptive_pool.cpp</in>
+                    <in>doc_allocator.cpp</in>
+                    <in>doc_anonymous_shared_memory.cpp</in>
+                    <in>doc_bufferstream.cpp</in>
+                    <in>doc_cached_adaptive_pool.cpp</in>
+                    <in>doc_cached_node_allocator.cpp</in>
+                    <in>doc_complex_map.cpp</in>
+                    <in>doc_cont.cpp</in>
+                    <in>doc_file_mapping.cpp</in>
+                    <in>doc_intrusive.cpp</in>
+                    <in>doc_ipc_message.cpp</in>
+                    <in>doc_managed_aligned_allocation.cpp</in>
+                    <in>doc_managed_allocation_command.cpp</in>
+                    <in>doc_managed_construction_info.cpp</in>
+                    <in>doc_managed_copy_on_write.cpp</in>
+                    <in>doc_managed_external_buffer.cpp</in>
+                    <in>doc_managed_grow.cpp</in>
+                    <in>doc_managed_heap_memory.cpp</in>
+                    <in>doc_managed_mapped_file.cpp</in>
+                    <in>doc_managed_multiple_allocation.cpp</in>
+                    <in>doc_managed_raw_allocation.cpp</in>
+                    <in>doc_map.cpp</in>
+                    <in>doc_move_containers.cpp</in>
+                    <in>doc_multi_index.cpp</in>
+                    <in>doc_named_alloc.cpp</in>
+                    <in>doc_named_mutex.cpp</in>
+                    <in>doc_node_allocator.cpp</in>
+                    <in>doc_offset_ptr.cpp</in>
+                    <in>doc_private_adaptive_pool.cpp</in>
+                    <in>doc_private_node_allocator.cpp</in>
+                    <in>doc_scoped_ptr.cpp</in>
+                    <in>doc_shared_memory.cpp</in>
+                    <in>doc_shared_ptr.cpp</in>
+                    <in>doc_shared_ptr_explicit.cpp</in>
+                    <in>doc_spawn_vector.cpp</in>
+                    <in>doc_unique_ptr.cpp</in>
+                    <in>doc_unordered_map.cpp</in>
+                    <in>doc_vectorstream.cpp</in>
+                    <in>doc_where_allocate.cpp</in>
+                    <in>doc_windows_shared_memory.cpp</in>
+                    <in>doc_xsi_shared_memory.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>adaptive_node_pool_test.cpp</in>
+                    <in>adaptive_pool_test.cpp</in>
+                    <in>allocexcept_test.cpp</in>
+                    <in>anonymous_shared_memory_test.cpp</in>
+                    <in>boost_use_windows_h.cpp</in>
+                    <in>bufferstream_test.cpp</in>
+                    <in>cached_adaptive_pool_test.cpp</in>
+                    <in>cached_node_allocator_test.cpp</in>
+                    <in>condition_any_test.cpp</in>
+                    <in>condition_test.cpp</in>
+                    <in>data_test.cpp</in>
+                    <in>deque_test.cpp</in>
+                    <in>enable_shared_from_this_test.cpp</in>
+                    <in>file_lock_test.cpp</in>
+                    <in>file_mapping_test.cpp</in>
+                    <in>flat_map_index_allocation_test.cpp</in>
+                    <in>flat_tree_test.cpp</in>
+                    <in>include_but_no_use_windows_h.cpp</in>
+                    <in>intermodule_singleton_test.cpp</in>
+                    <in>intrusive_ptr_test.cpp</in>
+                    <in>iset_index_allocation_test.cpp</in>
+                    <in>iunordered_set_index_allocation_test.cpp</in>
+                    <in>list_test.cpp</in>
+                    <in>managed_mapped_file_test.cpp</in>
+                    <in>managed_shared_memory_test.cpp</in>
+                    <in>managed_windows_shared_memory_test.cpp</in>
+                    <in>managed_xsi_shared_memory_test.cpp</in>
+                    <in>map_index_allocation_test.cpp</in>
+                    <in>mapped_file_test.cpp</in>
+                    <in>memory_algorithm_test.cpp</in>
+                    <in>message_queue_test.cpp</in>
+                    <in>multiprocess_managed_shared_memory_test.cpp</in>
+                    <in>mutex_owner_dead_test.cpp</in>
+                    <in>mutex_test.cpp</in>
+                    <in>mutex_timeout_test.cpp</in>
+                    <in>named_condition_any_test.cpp</in>
+                    <in>named_condition_test.cpp</in>
+                    <in>named_construct_test.cpp</in>
+                    <in>named_mutex_test.cpp</in>
+                    <in>named_recursive_mutex_test.cpp</in>
+                    <in>named_semaphore_test.cpp</in>
+                    <in>named_sharable_mutex_test.cpp</in>
+                    <in>named_upgradable_mutex_test.cpp</in>
+                    <in>node_allocator_test.cpp</in>
+                    <in>node_pool_test.cpp</in>
+                    <in>null_index_test.cpp</in>
+                    <in>offset_ptr_test.cpp</in>
+                    <in>private_adaptive_pool_test.cpp</in>
+                    <in>private_node_allocator_test.cpp</in>
+                    <in>recursive_mutex_test.cpp</in>
+                    <in>robust_emulation_test.cpp</in>
+                    <in>robust_recursive_emulation_test.cpp</in>
+                    <in>segment_manager_test.cpp</in>
+                    <in>semaphore_test.cpp</in>
+                    <in>sharable_mutex_test.cpp</in>
+                    <in>shared_memory_mapping_test.cpp</in>
+                    <in>shared_memory_test.cpp</in>
+                    <in>shared_ptr_test.cpp</in>
+                    <in>slist_test.cpp</in>
+                    <in>stable_vector_test.cpp</in>
+                    <in>string_test.cpp</in>
+                    <in>tree_test.cpp</in>
+                    <in>unique_ptr_test.cpp</in>
+                    <in>unordered_test.cpp</in>
+                    <in>upgradable_mutex_test.cpp</in>
+                    <in>user_buffer_test.cpp</in>
+                    <in>vector_test.cpp</in>
+                    <in>vectorstream_test.cpp</in>
+                    <in>windows_eventlog_stamp_shared_memory_test.cpp</in>
+                    <in>windows_shared_dir_func.cpp</in>
+                    <in>windows_shared_dir_path.cpp</in>
+                    <in>windows_shared_memory_mapping_test.cpp</in>
+                    <in>windows_shared_memory_test.cpp</in>
+                    <in>xsi_shared_memory_mapping_test.cpp</in>
+                  </df>
+                </df>
+                <df name="intrusive">
+                  <df name="example">
+                    <in>doc_advanced_value_traits.cpp</in>
+                    <in>doc_any_hook.cpp</in>
+                    <in>doc_assoc_optimized_code.cpp</in>
+                    <in>doc_auto_unlink.cpp</in>
+                    <in>doc_avl_set.cpp</in>
+                    <in>doc_avltree_algorithms.cpp</in>
+                    <in>doc_bucket_traits.cpp</in>
+                    <in>doc_clone_from.cpp</in>
+                    <in>doc_derivation_value_traits.cpp</in>
+                    <in>doc_entity.cpp</in>
+                    <in>doc_erasing_and_disposing.cpp</in>
+                    <in>doc_function_hooks.cpp</in>
+                    <in>doc_how_to_use.cpp</in>
+                    <in>doc_iterator_from_value.cpp</in>
+                    <in>doc_list.cpp</in>
+                    <in>doc_list_algorithms.cpp</in>
+                    <in>doc_map.cpp</in>
+                    <in>doc_member_value_traits.cpp</in>
+                    <in>doc_offset_ptr.cpp</in>
+                    <in>doc_positional_insertion.cpp</in>
+                    <in>doc_rbtree_algorithms.cpp</in>
+                    <in>doc_recursive.cpp</in>
+                    <in>doc_recursive_member.cpp</in>
+                    <in>doc_set.cpp</in>
+                    <in>doc_sg_set.cpp</in>
+                    <in>doc_slist.cpp</in>
+                    <in>doc_slist_algorithms.cpp</in>
+                    <in>doc_splay_algorithms.cpp</in>
+                    <in>doc_splay_set.cpp</in>
+                    <in>doc_splaytree_algorithms.cpp</in>
+                    <in>doc_stateful_value_traits.cpp</in>
+                    <in>doc_treap_algorithms.cpp</in>
+                    <in>doc_treap_set.cpp</in>
+                    <in>doc_unordered_set.cpp</in>
+                    <in>doc_value_traits.cpp</in>
+                    <in>doc_window.cpp</in>
+                  </df>
+                  <df name="perf">
+                    <in>perf_list.cpp</in>
+                    <in>tree_perf_test.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>any_test.cpp</in>
+                    <in>avl_multiset_test.cpp</in>
+                    <in>avl_set_test.cpp</in>
+                    <in>bs_multiset_test.cpp</in>
+                    <in>bs_set_test.cpp</in>
+                    <in>container_size_test.cpp</in>
+                    <in>custom_bucket_traits_test.cpp</in>
+                    <in>default_hook_test.cpp</in>
+                    <in>function_hook_test.cpp</in>
+                    <in>has_member_function_callable_with.cpp</in>
+                    <in>has_member_function_callable_with_no_decltype.cpp</in>
+                    <in>has_member_function_callable_with_no_variadic.cpp</in>
+                    <in>list_test.cpp</in>
+                    <in>make_functions_test.cpp</in>
+                    <in>multiset_test.cpp</in>
+                    <in>null_iterator_test.cpp</in>
+                    <in>pack_options_test.cpp</in>
+                    <in>parent_from_member_test.cpp</in>
+                    <in>pointer_traits_test.cpp</in>
+                    <in>recursive_test.cpp</in>
+                    <in>scary_iterators_test.cpp</in>
+                    <in>set_test.cpp</in>
+                    <in>sg_multiset_test.cpp</in>
+                    <in>sg_set_test.cpp</in>
+                    <in>slist_test.cpp</in>
+                    <in>splay_multiset_test.cpp</in>
+                    <in>splay_set_test.cpp</in>
+                    <in>stateful_value_traits_test.cpp</in>
+                    <in>treap_multiset_test.cpp</in>
+                    <in>treap_set_test.cpp</in>
+                    <in>unordered_multiset_test.cpp</in>
+                    <in>unordered_set_test.cpp</in>
+                    <in>virtual_base_test.cpp</in>
+                    <in>voidptr_key_test.cpp</in>
+                  </df>
+                </df>
+                <df name="io">
+                  <df name="test">
+                    <in>ios_state_test.cpp</in>
+                    <in>ios_state_unit_test.cpp</in>
+                    <in>make_ostream_joiner_test.cpp</in>
+                    <in>ostream_joiner_test.cpp</in>
+                    <in>ostream_put_test.cpp</in>
+                    <in>quoted_fill_test.cpp</in>
+                    <in>quoted_test.cpp</in>
+                  </df>
+                </df>
+                <df name="iostreams">
+                  <df name="build">
+                    <in>has_lzma_cputhreads.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>boost_back_inserter_example.cpp</in>
+                    <in>container_device_example.cpp</in>
+                    <in>container_sink_example.cpp</in>
+                    <in>container_source_example.cpp</in>
+                    <in>iterator_range_example.cpp</in>
+                    <in>std_back_inserter_example.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>bzip2.cpp</in>
+                    <in>file_descriptor.cpp</in>
+                    <in>gzip.cpp</in>
+                    <in>lzma.cpp</in>
+                    <in>mapped_file.cpp</in>
+                    <in>zlib.cpp</in>
+                    <in>zstd.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="cmake_install_test">
+                      <in>test_fd.cpp</in>
+                    </df>
+                    <df name="cmake_subdir_test">
+                      <in>test_fd.cpp</in>
+                    </df>
+                    <df name="detail">
+                      <in>utf8_codecvt_facet.cpp</in>
+                    </df>
+                    <in>array_test.cpp</in>
+                    <in>auto_close_test.cpp</in>
+                    <in>bool_trait_test.cpp</in>
+                    <in>buffer_size_test.cpp</in>
+                    <in>bzip2_test.cpp</in>
+                    <in>close_test.cpp</in>
+                    <in>code_converter_test.cpp</in>
+                    <in>combine_test.cpp</in>
+                    <in>component_access_test.cpp</in>
+                    <in>compose_test.cpp</in>
+                    <in>copy_test.cpp</in>
+                    <in>counter_test.cpp</in>
+                    <in>deprecated_file_descriptor_test.cpp</in>
+                    <in>direct_adapter_test.cpp</in>
+                    <in>dual_seekable_test.cpp</in>
+                    <in>example_test.cpp</in>
+                    <in>execute_test.cpp</in>
+                    <in>file_descriptor_test.cpp</in>
+                    <in>file_test.cpp</in>
+                    <in>filter_test.cpp</in>
+                    <in>filtering_stream_test.cpp</in>
+                    <in>finite_state_filter_test.cpp</in>
+                    <in>flush_test.cpp</in>
+                    <in>grep_test.cpp</in>
+                    <in>gzip_test.cpp</in>
+                    <in>invert_test.cpp</in>
+                    <in>large_file_test.cpp</in>
+                    <in>line_filter_test.cpp</in>
+                    <in>lzma_test.cpp</in>
+                    <in>mapped_file_test.cpp</in>
+                    <in>newline_test.cpp</in>
+                    <in>null_test.cpp</in>
+                    <in>operation_sequence_test.cpp</in>
+                    <in>path_test.cpp</in>
+                    <in>pipeline_test.cpp</in>
+                    <in>read_nonblocking_test.cpp</in>
+                    <in>regex_filter_test.cpp</in>
+                    <in>restrict_test.cpp</in>
+                    <in>seekable_file_test.cpp</in>
+                    <in>seekable_filter_test.cpp</in>
+                    <in>sequence_test.cpp</in>
+                    <in>slice_test.cpp</in>
+                    <in>stdio_filter_test.cpp</in>
+                    <in>stream_offset_32bit_test.cpp</in>
+                    <in>stream_offset_64bit_test.cpp</in>
+                    <in>stream_state_test.cpp</in>
+                    <in>symmetric_filter_test.cpp</in>
+                    <in>tee_test.cpp</in>
+                    <in>wide_stream_test.cpp</in>
+                    <in>windows_pipe_test.cpp</in>
+                    <in>write_failure_test.cpp</in>
+                    <in>zlib_test.cpp</in>
+                    <in>zstd_test.cpp</in>
+                  </df>
+                </df>
+                <df name="iterator">
+                  <df name="example">
+                    <in>counting_iterator_example.cpp</in>
+                    <in>filter_iterator_example.cpp</in>
+                    <in>func_output_iter_example.cpp</in>
+                    <in>indirect_iterator_example.cpp</in>
+                    <in>node_iterator1.cpp</in>
+                    <in>node_iterator2.cpp</in>
+                    <in>node_iterator3.cpp</in>
+                    <in>permutation_iter_example.cpp</in>
+                    <in>reverse_iterator.cpp</in>
+                    <in>reverse_iterator_example.cpp</in>
+                    <in>shared_iterator_example1.cpp</in>
+                    <in>shared_iterator_example2.cpp</in>
+                    <in>shared_iterator_example3.cpp</in>
+                    <in>transform_iterator_example.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>adl_test.cpp</in>
+                    <in>advance_test.cpp</in>
+                    <in>concept_tests.cpp</in>
+                    <in>constant_iter_arrow.cpp</in>
+                    <in>constant_iter_arrow_fail.cpp</in>
+                    <in>counting_iterator_test.cpp</in>
+                    <in>distance_test.cpp</in>
+                    <in>filter_iterator_test.cpp</in>
+                    <in>function_input_iterator_test.cpp</in>
+                    <in>generator_iterator_test.cpp</in>
+                    <in>indirect_iter_member_types.cpp</in>
+                    <in>indirect_iterator_test.cpp</in>
+                    <in>interoperable.cpp</in>
+                    <in>interoperable_fail.cpp</in>
+                    <in>is_convertible_fail.cpp</in>
+                    <in>is_lvalue_iterator.cpp</in>
+                    <in>is_readable_iterator.cpp</in>
+                    <in>iter_archetype_default_ctor.cpp</in>
+                    <in>iterator_adaptor_cc.cpp</in>
+                    <in>iterator_adaptor_test.cpp</in>
+                    <in>iterator_archetype_cc.cpp</in>
+                    <in>iterator_facade.cpp</in>
+                    <in>iterator_traits_test.cpp</in>
+                    <in>lvalue_concept_fail.cpp</in>
+                    <in>minimum_category.cpp</in>
+                    <in>minimum_category_compile_fail.cpp</in>
+                    <in>next_prior_test.cpp</in>
+                    <in>permutation_iterator_test.cpp</in>
+                    <in>pointee.cpp</in>
+                    <in>range_distance_compat_test.cpp</in>
+                    <in>reverse_iterator_test.cpp</in>
+                    <in>shared_iterator_test.cpp</in>
+                    <in>transform_iterator_test.cpp</in>
+                    <in>unit_tests.cpp</in>
+                    <in>zip_iterator_test.cpp</in>
+                    <in>zip_iterator_test2_fusion_deque.cpp</in>
+                    <in>zip_iterator_test2_fusion_list.cpp</in>
+                    <in>zip_iterator_test2_fusion_vector.cpp</in>
+                    <in>zip_iterator_test2_std_tuple.cpp</in>
+                    <in>zip_iterator_test_fusion.cpp</in>
+                    <in>zip_iterator_test_std_pair.cpp</in>
+                    <in>zip_iterator_test_std_tuple.cpp</in>
+                  </df>
+                </df>
+                <df name="json">
+                  <df name="bench">
+                    <in>bench.cpp</in>
+                  </df>
+                  <df name="check">
+                    <in>basic_alignas.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>path.cpp</in>
+                    <in>pretty.cpp</in>
+                    <in>proxy.cpp</in>
+                    <in>validate.cpp</in>
+                  </df>
+                  <df name="fuzzing">
+                    <in>fuzz_basic_parser.cpp</in>
+                    <in>fuzz_parse.cpp</in>
+                    <in>fuzz_parser.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>src.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="cmake_install_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="ryu">
+                      <in>d2s_intrinsics_test.cpp</in>
+                      <in>d2s_table_test.cpp</in>
+                      <in>d2s_test.cpp</in>
+                    </df>
+                    <in>array.cpp</in>
+                    <in>basic_parser.cpp</in>
+                    <in>doc_background.cpp</in>
+                    <in>doc_forward_conversion.cpp</in>
+                    <in>doc_parsing.cpp</in>
+                    <in>doc_quick_look.cpp</in>
+                    <in>doc_serializing.cpp</in>
+                    <in>doc_storage_ptr.cpp</in>
+                    <in>doc_uses_allocator.cpp</in>
+                    <in>doc_using_numbers.cpp</in>
+                    <in>double.cpp</in>
+                    <in>error.cpp</in>
+                    <in>fwd.cpp</in>
+                    <in>json.cpp</in>
+                    <in>kind.cpp</in>
+                    <in>limits.cpp</in>
+                    <in>main.cpp</in>
+                    <in>memory_resource.cpp</in>
+                    <in>monotonic_resource.cpp</in>
+                    <in>natvis.cpp</in>
+                    <in>null_resource.cpp</in>
+                    <in>object.cpp</in>
+                    <in>parse.cpp</in>
+                    <in>parser.cpp</in>
+                    <in>pilfer.cpp</in>
+                    <in>serialize.cpp</in>
+                    <in>serializer.cpp</in>
+                    <in>snippets.cpp</in>
+                    <in>standalone_with_boost.cpp</in>
+                    <in>static_resource.cpp</in>
+                    <in>storage_ptr.cpp</in>
+                    <in>stream_parser.cpp</in>
+                    <in>string.cpp</in>
+                    <in>string_view.cpp</in>
+                    <in>system_error.cpp</in>
+                    <in>value.cpp</in>
+                    <in>value_from.cpp</in>
+                    <in>value_ref.cpp</in>
+                    <in>value_stack.cpp</in>
+                    <in>value_to.cpp</in>
+                    <in>visit.cpp</in>
+                  </df>
+                </df>
+                <df name="lambda">
+                  <df name="test">
+                    <in>algorithm_test.cpp</in>
+                    <in>bind_tests_advanced.cpp</in>
+                    <in>bind_tests_simple.cpp</in>
+                    <in>bind_tests_simple_f_refs.cpp</in>
+                    <in>bll_and_function.cpp</in>
+                    <in>cast_test.cpp</in>
+                    <in>constructor_tests.cpp</in>
+                    <in>control_structures.cpp</in>
+                    <in>exception_test.cpp</in>
+                    <in>extending_rt_traits.cpp</in>
+                    <in>is_instance_of_test.cpp</in>
+                    <in>istreambuf_test.cpp</in>
+                    <in>member_pointer_test.cpp</in>
+                    <in>operator_tests_simple.cpp</in>
+                    <in>phoenix_control_structures.cpp</in>
+                    <in>result_of_tests.cpp</in>
+                    <in>ret_test.cpp</in>
+                    <in>rvalue_test.cpp</in>
+                    <in>switch_construct.cpp</in>
+                  </df>
+                </df>
+                <df name="lambda2">
+                  <df name="test">
+                    <in>compound.cpp</in>
+                    <in>dereference.cpp</in>
+                    <in>increment.cpp</in>
+                    <in>lambda2_test.cpp</in>
+                    <in>lookup_problem.cpp</in>
+                    <in>placeholders.cpp</in>
+                    <in>project.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>stream_extract.cpp</in>
+                    <in>stream_insert.cpp</in>
+                    <in>subscript.cpp</in>
+                    <in>version.cpp</in>
+                  </df>
+                </df>
+                <df name="leaf">
+                  <df name="benchmark">
+                    <in>deep_stack_leaf.cpp</in>
+                    <in>deep_stack_other.cpp</in>
+                  </df>
+                  <df name="example">
+                    <df name="print_file">
+                      <in>print_file_eh.cpp</in>
+                      <in>print_file_outcome_result.cpp</in>
+                      <in>print_file_result.cpp</in>
+                    </df>
+                    <in>asio_beast_leaf_rpc.cpp</in>
+                    <in>capture_in_exception.cpp</in>
+                    <in>capture_in_result.cpp</in>
+                    <in>error_log.cpp</in>
+                    <in>error_trace.cpp</in>
+                    <in>exception_to_result.cpp</in>
+                    <in>lua_callback_eh.cpp</in>
+                    <in>lua_callback_result.cpp</in>
+                    <in>print_half.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>BOOST_LEAF_ASSIGN_test.cpp</in>
+                    <in>BOOST_LEAF_AUTO_test.cpp</in>
+                    <in>_compile-fail-BOOST_LEAF_ASSIGN.cpp</in>
+                    <in>_compile-fail-BOOST_LEAF_AUTO.cpp</in>
+                    <in>_compile-fail-arg_boost_error_info_1.cpp</in>
+                    <in>_compile-fail-arg_boost_error_info_2.cpp</in>
+                    <in>_compile-fail-arg_catch_1.cpp</in>
+                    <in>_compile-fail-arg_catch_2.cpp</in>
+                    <in>_compile-fail-arg_match_1.cpp</in>
+                    <in>_compile-fail-arg_match_2.cpp</in>
+                    <in>_compile-fail-arg_rvalue_ref.cpp</in>
+                    <in>_compile-fail-diagnostic_info.cpp</in>
+                    <in>_compile-fail-error_info.cpp</in>
+                    <in>_compile-fail-exception_1.cpp</in>
+                    <in>_compile-fail-exception_2.cpp</in>
+                    <in>_compile-fail-new_error.cpp</in>
+                    <in>_compile-fail-result_1.cpp</in>
+                    <in>_compile-fail-result_2.cpp</in>
+                    <in>_compile-fail-result_3.cpp</in>
+                    <in>_compile-fail-result_4.cpp</in>
+                    <in>_compile-fail-verbose_diagnostic_info.cpp</in>
+                    <in>_hpp_capture_test.cpp</in>
+                    <in>_hpp_common_test.cpp</in>
+                    <in>_hpp_context_test.cpp</in>
+                    <in>_hpp_error_test.cpp</in>
+                    <in>_hpp_exception_test.cpp</in>
+                    <in>_hpp_handle_errors_test.cpp</in>
+                    <in>_hpp_leaf_test.cpp</in>
+                    <in>_hpp_on_error_test.cpp</in>
+                    <in>_hpp_pred_test.cpp</in>
+                    <in>_hpp_result_test.cpp</in>
+                    <in>accumulate_basic_test.cpp</in>
+                    <in>accumulate_nested_error_exception_test.cpp</in>
+                    <in>accumulate_nested_error_result_test.cpp</in>
+                    <in>accumulate_nested_new_error_exception_test.cpp</in>
+                    <in>accumulate_nested_new_error_result_test.cpp</in>
+                    <in>accumulate_nested_success_exception_test.cpp</in>
+                    <in>accumulate_nested_success_result_test.cpp</in>
+                    <in>boost_exception_test.cpp</in>
+                    <in>capture_exception_async_test.cpp</in>
+                    <in>capture_exception_result_async_test.cpp</in>
+                    <in>capture_exception_state_test.cpp</in>
+                    <in>capture_exception_unload_test.cpp</in>
+                    <in>capture_result_async_test.cpp</in>
+                    <in>capture_result_state_test.cpp</in>
+                    <in>capture_result_unload_test.cpp</in>
+                    <in>context_activator_test.cpp</in>
+                    <in>context_deduction_test.cpp</in>
+                    <in>ctx_handle_all_test.cpp</in>
+                    <in>ctx_handle_some_test.cpp</in>
+                    <in>ctx_remote_handle_all_test.cpp</in>
+                    <in>ctx_remote_handle_some_test.cpp</in>
+                    <in>defer_basic_test.cpp</in>
+                    <in>defer_nested_error_exception_test.cpp</in>
+                    <in>defer_nested_error_result_test.cpp</in>
+                    <in>defer_nested_new_error_exception_test.cpp</in>
+                    <in>defer_nested_new_error_result_test.cpp</in>
+                    <in>defer_nested_success_exception_test.cpp</in>
+                    <in>defer_nested_success_result_test.cpp</in>
+                    <in>diagnostic_info_test.cpp</in>
+                    <in>e_LastError_test.cpp</in>
+                    <in>e_errno_test.cpp</in>
+                    <in>error_code_test.cpp</in>
+                    <in>error_id_test.cpp</in>
+                    <in>exception_test.cpp</in>
+                    <in>exception_to_result_test.cpp</in>
+                    <in>function_traits_test.cpp</in>
+                    <in>handle_all_other_result_test.cpp</in>
+                    <in>handle_all_test.cpp</in>
+                    <in>handle_basic_test.cpp</in>
+                    <in>handle_some_other_result_test.cpp</in>
+                    <in>handle_some_test.cpp</in>
+                    <in>match_member_test.cpp</in>
+                    <in>match_test.cpp</in>
+                    <in>match_value_test.cpp</in>
+                    <in>multiple_errors_test.cpp</in>
+                    <in>optional_test.cpp</in>
+                    <in>preload_basic_test.cpp</in>
+                    <in>preload_exception_test.cpp</in>
+                    <in>preload_nested_error_exception_test.cpp</in>
+                    <in>preload_nested_error_result_test.cpp</in>
+                    <in>preload_nested_new_error_exception_test.cpp</in>
+                    <in>preload_nested_new_error_result_test.cpp</in>
+                    <in>preload_nested_success_exception_test.cpp</in>
+                    <in>preload_nested_success_result_test.cpp</in>
+                    <in>print_test.cpp</in>
+                    <in>result_bad_result_test.cpp</in>
+                    <in>result_implicit_conversion_test.cpp</in>
+                    <in>result_load_test.cpp</in>
+                    <in>result_ref_test.cpp</in>
+                    <in>result_state_test.cpp</in>
+                    <in>try_catch_error_id_test.cpp</in>
+                    <in>try_catch_system_error_test.cpp</in>
+                    <in>try_catch_test.cpp</in>
+                    <in>try_exception_and_result_test.cpp</in>
+                    <in>visibility_test.cpp</in>
+                    <in>visibility_test_lib.cpp</in>
+                  </df>
+                </df>
+                <df name="lexical_cast">
+                  <df name="example">
+                    <in>args_to_numbers.cpp</in>
+                    <in>generic_stringize.cpp</in>
+                    <in>small_examples.cpp</in>
+                    <in>variant_to_long_double.cpp</in>
+                  </df>
+                  <df name="perf">
+                    <in>performance_test.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>abstract_test.cpp</in>
+                    <in>arrays_test.cpp</in>
+                    <in>containers_test.cpp</in>
+                    <in>empty_input_test.cpp</in>
+                    <in>filesystem_test.cpp</in>
+                    <in>float_types_test.cpp</in>
+                    <in>inf_nan_test.cpp</in>
+                    <in>integral_types_test.cpp</in>
+                    <in>iterator_range_test.cpp</in>
+                    <in>lexical_cast_test.cpp</in>
+                    <in>loopback_test.cpp</in>
+                    <in>no_comp_time_prcision.cpp</in>
+                    <in>no_exceptions_test.cpp</in>
+                    <in>no_locale_test.cpp</in>
+                    <in>noncopyable_test.cpp</in>
+                    <in>pointers_test.cpp</in>
+                    <in>stream_detection_test.cpp</in>
+                    <in>stream_traits_test.cpp</in>
+                    <in>to_pointer_test.cpp</in>
+                    <in>try_lexical_convert.cpp</in>
+                    <in>typedefed_wchar_test.cpp</in>
+                    <in>typedefed_wchar_test_runtime.cpp</in>
+                    <in>vc8_bug_test.cpp</in>
+                    <in>wchars_test.cpp</in>
+                  </df>
+                </df>
+                <df name="local_function">
+                  <df name="example">
+                    <in>add_cxx11_lambda.cpp</in>
+                    <in>add_global_functor.cpp</in>
+                    <in>add_local_functor.cpp</in>
+                    <in>add_phoenix.cpp</in>
+                    <in>const_block.cpp</in>
+                    <in>const_block_error.cpp</in>
+                    <in>const_block_error_cxx11_lambda.cpp</in>
+                    <in>expensive_copy_cxx11_lambda.cpp</in>
+                    <in>expensive_copy_local_function.cpp</in>
+                    <in>gcc_access.cpp</in>
+                    <in>gcc_cxx11_lambda.cpp</in>
+                    <in>gcc_lambda.cpp</in>
+                    <in>gcc_square.cpp</in>
+                    <in>gcc_store.cpp</in>
+                    <in>impl_pp_keyword.cpp</in>
+                    <in>impl_tparam_tricks.cpp</in>
+                    <in>n2529_this.cpp</in>
+                    <in>n2550_find_if.cpp</in>
+                    <in>noncopyable_cxx11_lambda_error.cpp</in>
+                    <in>noncopyable_local_function.cpp</in>
+                    <in>phoenix_factorial.cpp</in>
+                    <in>phoenix_factorial_local.cpp</in>
+                    <in>profile_cxx11_lambda.cpp</in>
+                    <in>profile_global_functor.cpp</in>
+                    <in>profile_local_function.cpp</in>
+                    <in>profile_local_function_inline.cpp</in>
+                    <in>profile_local_functor.cpp</in>
+                    <in>profile_phoenix.cpp</in>
+                    <in>scope_exit.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>add.cpp</in>
+                    <in>add_default.cpp</in>
+                    <in>add_default_seq.cpp</in>
+                    <in>add_default_seq_nova.cpp</in>
+                    <in>add_except.cpp</in>
+                    <in>add_except_seq.cpp</in>
+                    <in>add_except_seq_nova.cpp</in>
+                    <in>add_inline.cpp</in>
+                    <in>add_inline_seq.cpp</in>
+                    <in>add_inline_seq_nova.cpp</in>
+                    <in>add_params_only.cpp</in>
+                    <in>add_params_only_seq.cpp</in>
+                    <in>add_params_only_seq_nova.cpp</in>
+                    <in>add_seq.cpp</in>
+                    <in>add_seq_nova.cpp</in>
+                    <in>add_template.cpp</in>
+                    <in>add_template_seq.cpp</in>
+                    <in>add_template_seq_nova.cpp</in>
+                    <in>add_this.cpp</in>
+                    <in>add_this_seq.cpp</in>
+                    <in>add_this_seq_nova.cpp</in>
+                    <in>add_typed.cpp</in>
+                    <in>add_typed_seq.cpp</in>
+                    <in>add_typed_seq_nova.cpp</in>
+                    <in>add_with_default.cpp</in>
+                    <in>add_with_default_seq.cpp</in>
+                    <in>add_with_default_seq_nova.cpp</in>
+                    <in>all_decl.cpp</in>
+                    <in>all_decl_seq.cpp</in>
+                    <in>all_decl_seq_nova.cpp</in>
+                    <in>factorial.cpp</in>
+                    <in>factorial_seq.cpp</in>
+                    <in>factorial_seq_nova.cpp</in>
+                    <in>goto.cpp</in>
+                    <in>goto_error.cpp</in>
+                    <in>goto_error_seq.cpp</in>
+                    <in>goto_error_seq_nova.cpp</in>
+                    <in>goto_seq.cpp</in>
+                    <in>goto_seq_nova.cpp</in>
+                    <in>macro_commas.cpp</in>
+                    <in>macro_commas_seq.cpp</in>
+                    <in>macro_commas_seq_nova.cpp</in>
+                    <in>nesting.cpp</in>
+                    <in>nesting_seq.cpp</in>
+                    <in>nesting_seq_nova.cpp</in>
+                    <in>operator.cpp</in>
+                    <in>operator_error.cpp</in>
+                    <in>operator_error_seq.cpp</in>
+                    <in>operator_error_seq_nova.cpp</in>
+                    <in>operator_seq.cpp</in>
+                    <in>operator_seq_nova.cpp</in>
+                    <in>overload.cpp</in>
+                    <in>overload_seq.cpp</in>
+                    <in>overload_seq_nova.cpp</in>
+                    <in>return_assign.cpp</in>
+                    <in>return_assign_seq.cpp</in>
+                    <in>return_assign_seq_nova.cpp</in>
+                    <in>return_derivative.cpp</in>
+                    <in>return_derivative_seq.cpp</in>
+                    <in>return_derivative_seq_nova.cpp</in>
+                    <in>return_inc.cpp</in>
+                    <in>return_inc_seq.cpp</in>
+                    <in>return_inc_seq_nova.cpp</in>
+                    <in>return_setget.cpp</in>
+                    <in>return_setget_seq.cpp</in>
+                    <in>return_setget_seq_nova.cpp</in>
+                    <in>return_this.cpp</in>
+                    <in>return_this_seq.cpp</in>
+                    <in>return_this_seq_nova.cpp</in>
+                    <in>same_line.cpp</in>
+                    <in>same_line_seq.cpp</in>
+                    <in>same_line_seq_nova.cpp</in>
+                    <in>ten_void.cpp</in>
+                    <in>ten_void_nova.cpp</in>
+                    <in>transform.cpp</in>
+                    <in>transform_seq.cpp</in>
+                    <in>transform_seq_nova.cpp</in>
+                    <in>typeof.cpp</in>
+                    <in>typeof_seq.cpp</in>
+                    <in>typeof_seq_nova.cpp</in>
+                    <in>typeof_template.cpp</in>
+                    <in>typeof_template_seq.cpp</in>
+                    <in>typeof_template_seq_nova.cpp</in>
+                  </df>
+                </df>
+                <df name="locale">
+                  <df name="build">
+                    <in>has_iconv.cpp</in>
+                    <in>has_icu_test.cpp</in>
+                    <in>has_xlocale.cpp</in>
+                    <in>option.cpp</in>
+                  </df>
+                  <df name="examples">
+                    <in>boundary.cpp</in>
+                    <in>calendar.cpp</in>
+                    <in>collate.cpp</in>
+                    <in>conversions.cpp</in>
+                    <in>hello.cpp</in>
+                    <in>wboundary.cpp</in>
+                    <in>wconversions.cpp</in>
+                    <in>whello.cpp</in>
+                  </df>
+                  <df name="performance">
+                    <in>perf_collate.cpp</in>
+                    <in>perf_convert.cpp</in>
+                    <in>perf_format.cpp</in>
+                  </df>
+                  <df name="src">
+                    <df name="encoding">
+                      <in>codepage.cpp</in>
+                    </df>
+                    <df name="icu">
+                      <in>boundary.cpp</in>
+                      <in>codecvt.cpp</in>
+                      <in>collator.cpp</in>
+                      <in>conversion.cpp</in>
+                      <in>date_time.cpp</in>
+                      <in>formatter.cpp</in>
+                      <in>icu_backend.cpp</in>
+                      <in>numeric.cpp</in>
+                      <in>time_zone.cpp</in>
+                    </df>
+                    <df name="posix">
+                      <in>codecvt.cpp</in>
+                      <in>collate.cpp</in>
+                      <in>converter.cpp</in>
+                      <in>numeric.cpp</in>
+                      <in>posix_backend.cpp</in>
+                    </df>
+                    <df name="shared">
+                      <in>date_time.cpp</in>
+                      <in>format.cpp</in>
+                      <in>formatting.cpp</in>
+                      <in>generator.cpp</in>
+                      <in>ids.cpp</in>
+                      <in>localization_backend.cpp</in>
+                      <in>message.cpp</in>
+                      <in>mo_lambda.cpp</in>
+                    </df>
+                    <df name="std">
+                      <in>codecvt.cpp</in>
+                      <in>collate.cpp</in>
+                      <in>converter.cpp</in>
+                      <in>numeric.cpp</in>
+                      <in>std_backend.cpp</in>
+                    </df>
+                    <df name="util">
+                      <in>codecvt_converter.cpp</in>
+                      <in>default_locale.cpp</in>
+                      <in>gregorian.cpp</in>
+                      <in>info.cpp</in>
+                      <in>locale_data.cpp</in>
+                    </df>
+                    <df name="win32">
+                      <in>collate.cpp</in>
+                      <in>converter.cpp</in>
+                      <in>lcid.cpp</in>
+                      <in>numeric.cpp</in>
+                      <in>win_backend.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>test_boundary.cpp</in>
+                    <in>test_codecvt.cpp</in>
+                    <in>test_codepage.cpp</in>
+                    <in>test_codepage_converter.cpp</in>
+                    <in>test_collate.cpp</in>
+                    <in>test_config.cpp</in>
+                    <in>test_convert.cpp</in>
+                    <in>test_date_time.cpp</in>
+                    <in>test_formatting.cpp</in>
+                    <in>test_generator.cpp</in>
+                    <in>test_icu_vs_os_timezone.cpp</in>
+                    <in>test_ios_prop.cpp</in>
+                    <in>test_message.cpp</in>
+                    <in>test_posix_collate.cpp</in>
+                    <in>test_posix_convert.cpp</in>
+                    <in>test_posix_formatting.cpp</in>
+                    <in>test_std_collate.cpp</in>
+                    <in>test_std_convert.cpp</in>
+                    <in>test_std_formatting.cpp</in>
+                    <in>test_utf.cpp</in>
+                    <in>test_winapi_collate.cpp</in>
+                    <in>test_winapi_convert.cpp</in>
+                    <in>test_winapi_formatting.cpp</in>
+                  </df>
+                </df>
+                <df name="lockfree">
+                  <df name="examples">
+                    <in>queue.cpp</in>
+                    <in>spsc_queue.cpp</in>
+                    <in>stack.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>destructor_test.cpp</in>
+                    <in>freelist_test.cpp</in>
+                    <in>queue_bounded_stress_test.cpp</in>
+                    <in>queue_fixedsize_stress_test.cpp</in>
+                    <in>queue_interprocess_test.cpp</in>
+                    <in>queue_test.cpp</in>
+                    <in>queue_unbounded_stress_test.cpp</in>
+                    <in>spsc_queue_stress_test.cpp</in>
+                    <in>spsc_queue_test.cpp</in>
+                    <in>stack_bounded_stress_test.cpp</in>
+                    <in>stack_fixedsize_stress_test.cpp</in>
+                    <in>stack_interprocess_test.cpp</in>
+                    <in>stack_test.cpp</in>
+                    <in>stack_unbounded_stress_test.cpp</in>
+                    <in>tagged_ptr_test.cpp</in>
+                  </df>
+                </df>
+                <df name="log">
+                  <df name="config">
+                    <df name="atomic-int32">
+                      <in>atomic_int32.cpp</in>
+                    </df>
+                    <df name="native-syslog">
+                      <in>native_syslog.cpp</in>
+                    </df>
+                    <df name="pthread-mutex-robust">
+                      <in>pthread_mutex_robust.cpp</in>
+                    </df>
+                    <df name="x86-ext">
+                      <in>avx2.cpp</in>
+                      <in>ssse3.cpp</in>
+                    </df>
+                    <df name="xopen-source-600">
+                      <in>xopen_source_600.cpp</in>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <df name="advanced_usage">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="async_log">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="basic_usage">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="bounded_async_log">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="doc">
+                      <in>attr_value_extraction.cpp</in>
+                      <in>attr_value_visitation.cpp</in>
+                      <in>core_core_manual.cpp</in>
+                      <in>core_record.cpp</in>
+                      <in>exception_handling.cpp</in>
+                      <in>expressions_attr_fmt_tag.cpp</in>
+                      <in>expressions_channel_severity_filter.cpp</in>
+                      <in>expressions_has_attr_stat_accum.cpp</in>
+                      <in>expressions_keyword_fmt_tag.cpp</in>
+                      <in>extension_app_launcher.cpp</in>
+                      <in>extension_filter_parser.cpp</in>
+                      <in>extension_filter_parser_custom_rel.cpp</in>
+                      <in>extension_formatter_parser.cpp</in>
+                      <in>extension_record_tagger.cpp</in>
+                      <in>extension_stat_collector.cpp</in>
+                      <in>extension_stat_collector_settings.cpp</in>
+                      <in>extension_system_uptime_attr.cpp</in>
+                      <in>sinks_async.cpp</in>
+                      <in>sinks_async_bounded.cpp</in>
+                      <in>sinks_async_ordering.cpp</in>
+                      <in>sinks_debugger.cpp</in>
+                      <in>sinks_file.cpp</in>
+                      <in>sinks_ipc_logger.cpp</in>
+                      <in>sinks_ipc_receiver.cpp</in>
+                      <in>sinks_multifile.cpp</in>
+                      <in>sinks_ostream.cpp</in>
+                      <in>sinks_simple_event_log.cpp</in>
+                      <in>sinks_sync.cpp</in>
+                      <in>sinks_syslog.cpp</in>
+                      <in>sinks_unlocked.cpp</in>
+                      <in>sinks_xml_file.cpp</in>
+                      <in>sources_net_connection.cpp</in>
+                      <in>sources_net_connection_chan.cpp</in>
+                      <in>sources_net_connection_dynamic_chan.cpp</in>
+                      <in>sources_severity.cpp</in>
+                      <in>sources_severity_channel.cpp</in>
+                      <in>tutorial_attributes.cpp</in>
+                      <in>tutorial_file.cpp</in>
+                      <in>tutorial_file_manual.cpp</in>
+                      <in>tutorial_filtering.cpp</in>
+                      <in>tutorial_fmt_custom.cpp</in>
+                      <in>tutorial_fmt_format.cpp</in>
+                      <in>tutorial_fmt_stream.cpp</in>
+                      <in>tutorial_fmt_stream_manual.cpp</in>
+                      <in>tutorial_fmt_string.cpp</in>
+                      <in>tutorial_logging.cpp</in>
+                      <in>tutorial_trivial.cpp</in>
+                      <in>tutorial_trivial_flt.cpp</in>
+                      <in>util_dynamic_type_disp.cpp</in>
+                      <in>util_ipc_reliable_mq_writer.cpp</in>
+                      <in>util_manip_to_log.cpp</in>
+                      <in>util_setup_settings.cpp</in>
+                      <in>util_static_type_disp.cpp</in>
+                    </df>
+                    <df name="event_log">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="keywords">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="multiple_files">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="multiple_threads">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="native_syslog">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="rotating_file">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="settings_file">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="settings_file_custom_factories">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="syslog">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="trivial">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="wide_char">
+                      <in>main.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <df name="posix">
+                      <in>ipc_reliable_message_queue.cpp</in>
+                      <in>object_name.cpp</in>
+                    </df>
+                    <df name="setup">
+                      <in>default_filter_factory.cpp</in>
+                      <in>default_formatter_factory.cpp</in>
+                      <in>filter_parser.cpp</in>
+                      <in>formatter_parser.cpp</in>
+                      <in>init_from_settings.cpp</in>
+                      <in>init_from_stream.cpp</in>
+                      <in>matches_relation_factory.cpp</in>
+                      <in>parser_utils.cpp</in>
+                      <in>settings_parser.cpp</in>
+                    </df>
+                    <df name="windows">
+                      <in>debug_output_backend.cpp</in>
+                      <in>event_log_backend.cpp</in>
+                      <in>ipc_reliable_message_queue.cpp</in>
+                      <in>ipc_sync_wrappers.cpp</in>
+                      <in>is_debugger_present.cpp</in>
+                      <in>light_rw_mutex.cpp</in>
+                      <in>mapped_shared_memory.cpp</in>
+                      <in>object_name.cpp</in>
+                    </df>
+                    <in>attribute_name.cpp</in>
+                    <in>attribute_set.cpp</in>
+                    <in>attribute_value_set.cpp</in>
+                    <in>code_conversion.cpp</in>
+                    <in>core.cpp</in>
+                    <in>date_time_format_parser.cpp</in>
+                    <in>default_attribute_names.cpp</in>
+                    <in>default_sink.cpp</in>
+                    <in>dump.cpp</in>
+                    <in>dump_avx2.cpp</in>
+                    <in>dump_ssse3.cpp</in>
+                    <in>event.cpp</in>
+                    <in>exceptions.cpp</in>
+                    <in>format_parser.cpp</in>
+                    <in>global_logger_storage.cpp</in>
+                    <in>named_scope.cpp</in>
+                    <in>named_scope_format_parser.cpp</in>
+                    <in>once_block.cpp</in>
+                    <in>permissions.cpp</in>
+                    <in>process_id.cpp</in>
+                    <in>process_name.cpp</in>
+                    <in>record_ostream.cpp</in>
+                    <in>severity_level.cpp</in>
+                    <in>spirit_encoding.cpp</in>
+                    <in>syslog_backend.cpp</in>
+                    <in>text_file_backend.cpp</in>
+                    <in>text_multifile_backend.cpp</in>
+                    <in>text_ostream_backend.cpp</in>
+                    <in>thread_id.cpp</in>
+                    <in>thread_specific.cpp</in>
+                    <in>threadsafe_queue.cpp</in>
+                    <in>timer.cpp</in>
+                    <in>timestamp.cpp</in>
+                    <in>trivial.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="compile">
+                      <in>current_function_support.cpp</in>
+                      <in>self_contained_header.cpp</in>
+                      <in>src_logger_assignable.cpp</in>
+                      <in>src_logger_get_attributes.cpp</in>
+                      <in>util_unique_identifier.cpp</in>
+                    </df>
+                    <df name="compile_fail">
+                      <in>attr_functor_void_return.cpp</in>
+                    </df>
+                    <df name="performance">
+                      <in>dump.cpp</in>
+                      <in>record_emission.cpp</in>
+                    </df>
+                    <df name="run">
+                      <in>attr_attribute_set.cpp</in>
+                      <in>attr_attribute_set_ticket11106.cpp</in>
+                      <in>attr_attribute_value_impl.cpp</in>
+                      <in>attr_attribute_value_set.cpp</in>
+                      <in>attr_attribute_value_set_ticket11190.cpp</in>
+                      <in>attr_function.cpp</in>
+                      <in>attr_named_scope.cpp</in>
+                      <in>attr_sets_insertion_lookup.cpp</in>
+                      <in>attr_value_visitation.cpp</in>
+                      <in>core.cpp</in>
+                      <in>filt_attr.cpp</in>
+                      <in>filt_has_attr.cpp</in>
+                      <in>filt_matches_boost_regex.cpp</in>
+                      <in>filt_matches_spirit_classic.cpp</in>
+                      <in>filt_matches_spirit_qi.cpp</in>
+                      <in>filt_matches_std_regex.cpp</in>
+                      <in>filt_matches_xpressive.cpp</in>
+                      <in>form_attr.cpp</in>
+                      <in>form_auto_newline.cpp</in>
+                      <in>form_c_decor.cpp</in>
+                      <in>form_char_decor.cpp</in>
+                      <in>form_csv_decor.cpp</in>
+                      <in>form_date_time.cpp</in>
+                      <in>form_format.cpp</in>
+                      <in>form_if.cpp</in>
+                      <in>form_max_size_decor.cpp</in>
+                      <in>form_message.cpp</in>
+                      <in>form_named_scope.cpp</in>
+                      <in>form_to_log_manip.cpp</in>
+                      <in>form_xml_decor.cpp</in>
+                      <in>sink_text_ipc_mq_backend.cpp</in>
+                      <in>src_channel_logger_copy.cpp</in>
+                      <in>src_record_ostream.cpp</in>
+                      <in>util_dynamic_type_disp.cpp</in>
+                      <in>util_exception_handler.cpp</in>
+                      <in>util_formatting_ostream.cpp</in>
+                      <in>util_ipc_object_name.cpp</in>
+                      <in>util_ipc_reliable_mq.cpp</in>
+                      <in>util_manip_add_value.cpp</in>
+                      <in>util_manip_auto_newline.cpp</in>
+                      <in>util_manip_dump.cpp</in>
+                      <in>util_manip_optional.cpp</in>
+                      <in>util_manip_range.cpp</in>
+                      <in>util_manip_to_log.cpp</in>
+                      <in>util_manip_tuple.cpp</in>
+                      <in>util_once_block.cpp</in>
+                      <in>util_static_type_disp.cpp</in>
+                      <in>util_stp_filter_parser.cpp</in>
+                      <in>util_stp_formatter_parser.cpp</in>
+                      <in>util_stp_settings_parser.cpp</in>
+                      <in>util_string_literal.cpp</in>
+                    </df>
+                    <df name="test_cmake">
+                      <in>log_setup_test.cpp</in>
+                      <in>log_test.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="logic">
+                  <df name="test">
+                    <df name="compile">
+                      <in>decl_header.cpp</in>
+                    </df>
+                    <df name="compile-fail">
+                      <in>implicit.cpp</in>
+                      <in>implicit_int_1.cpp</in>
+                      <in>implicit_int_2.cpp</in>
+                      <in>implicit_int_3.cpp</in>
+                      <in>operator_less_1.cpp</in>
+                      <in>operator_less_2.cpp</in>
+                    </df>
+                    <in>tribool_io_test.cpp</in>
+                    <in>tribool_rename_test.cpp</in>
+                    <in>tribool_test.cpp</in>
+                  </df>
+                </df>
+                <df name="math">
+                  <df name="config">
+                    <in>has_128bit_floatmax_t.cpp</in>
+                    <in>has_fftw3.cpp</in>
+                    <in>has_float128.cpp</in>
+                    <in>has_gcc_visibility.cpp</in>
+                    <in>has_gmp.cpp</in>
+                    <in>has_gmpxx.cpp</in>
+                    <in>has_intel_quad.cpp</in>
+                    <in>has_long_double_support.cpp</in>
+                    <in>has_mpfr.cpp</in>
+                    <in>has_mpfr_class.cpp</in>
+                    <in>has_mpreal.cpp</in>
+                    <in>has_ntl_rr.cpp</in>
+                    <in>is_ci_sanitizer_run.cpp</in>
+                  </df>
+                  <df name="doc">
+                    <df name="graphs">
+                      <in>bessel_i0_errors.cpp</in>
+                      <in>bessel_i1_errors.cpp</in>
+                      <in>dist_graphs.cpp</in>
+                      <in>plot_1d_errors.cpp</in>
+                      <in>sf_graphs.cpp</in>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <df name="daubechies_wavelets">
+                      <in>bench.cpp</in>
+                      <in>bootstrap_chebyshev.cpp</in>
+                      <in>daubechies_coefficients.cpp</in>
+                      <in>daubechies_scaling_integer_grid.cpp</in>
+                      <in>daubechies_scaling_memory_occupation.cpp</in>
+                      <in>daubechies_scaling_plots.cpp</in>
+                      <in>daubechies_wavelet_plots.cpp</in>
+                      <in>find_best_daubechies_interpolator.cpp</in>
+                      <in>regress_daubechies_accuracy.cpp</in>
+                      <in>wavelet_transform.cpp</in>
+                    </df>
+                    <df name="dot_net_example">
+                      <df name="boost_math">
+                        <in>AssemblyInfo.cpp</in>
+                        <in>Stdafx.cpp</in>
+                        <in>boost_math.cpp</in>
+                      </df>
+                    </df>
+                    <in>HSO3SO4.cpp</in>
+                    <in>agm_example.cpp</in>
+                    <in>airy_ulps_plot.cpp</in>
+                    <in>airy_zeros_example.cpp</in>
+                    <in>arcsine_example.cpp</in>
+                    <in>autodiff_black_scholes.cpp</in>
+                    <in>autodiff_black_scholes_brief.cpp</in>
+                    <in>autodiff_fourth_power.cpp</in>
+                    <in>autodiff_mixed_partials.cpp</in>
+                    <in>autodiff_multiprecision.cpp</in>
+                    <in>barycentric_interpolation_example.cpp</in>
+                    <in>barycentric_interpolation_example_2.cpp</in>
+                    <in>bernoulli_example.cpp</in>
+                    <in>bessel_errors_example.cpp</in>
+                    <in>bessel_zeros_example.cpp</in>
+                    <in>bessel_zeros_example_1.cpp</in>
+                    <in>bessel_zeros_interator_example.cpp</in>
+                    <in>big_seventh.cpp</in>
+                    <in>binomial_coinflip_example.cpp</in>
+                    <in>binomial_confidence_limits.cpp</in>
+                    <in>binomial_example_nag.cpp</in>
+                    <in>binomial_quiz_example.cpp</in>
+                    <in>binomial_sample_sizes.cpp</in>
+                    <in>brent_minimise_example.cpp</in>
+                    <in>c_error_policy_example.cpp</in>
+                    <in>cardinal_cubic_b_spline_example.cpp</in>
+                    <in>catmull_rom_example.cpp</in>
+                    <in>centered_continued_fraction.cpp</in>
+                    <in>chi_square_std_dev_test.cpp</in>
+                    <in>cohen_acceleration.cpp</in>
+                    <in>constants_eg1.cpp</in>
+                    <in>continued_fractions.cpp</in>
+                    <in>cstdfloat_example.cpp</in>
+                    <in>distribution_construction.cpp</in>
+                    <in>double_exponential.cpp</in>
+                    <in>error_handling_example.cpp</in>
+                    <in>error_policies_example.cpp</in>
+                    <in>error_policy_example.cpp</in>
+                    <in>f_test.cpp</in>
+                    <in>factorial_example.cpp</in>
+                    <in>fft_sines_table.cpp</in>
+                    <in>find_location_example.cpp</in>
+                    <in>find_mean_and_sd_normal.cpp</in>
+                    <in>find_root_example.cpp</in>
+                    <in>find_scale_example.cpp</in>
+                    <in>float128_example.cpp</in>
+                    <in>float_comparison_example.cpp</in>
+                    <in>gauss_example.cpp</in>
+                    <in>geometric_examples.cpp</in>
+                    <in>hyperexponential_more_snips.cpp</in>
+                    <in>hyperexponential_snips.cpp</in>
+                    <in>inspect_fp.cpp</in>
+                    <in>inverse_chi_squared_bayes_eg.cpp</in>
+                    <in>inverse_chi_squared_example.cpp</in>
+                    <in>inverse_chi_squared_find_df_example.cpp</in>
+                    <in>inverse_gamma_distribution_example.cpp</in>
+                    <in>inverse_gamma_example.cpp</in>
+                    <in>inverse_gaussian_example.cpp</in>
+                    <in>jacobi_zeta_example.cpp</in>
+                    <in>lambert_w_basic_example.cpp</in>
+                    <in>lambert_w_diode.cpp</in>
+                    <in>lambert_w_diode_graph.cpp</in>
+                    <in>lambert_w_example.cpp</in>
+                    <in>lambert_w_graph.cpp</in>
+                    <in>lambert_w_precision_example.cpp</in>
+                    <in>lambert_w_simple_examples.cpp</in>
+                    <in>laplace_example.cpp</in>
+                    <in>legendre_stieltjes_example.cpp</in>
+                    <in>lexical_cast_native.cpp</in>
+                    <in>lexical_cast_nonfinite_facets.cpp</in>
+                    <in>luroth.cpp</in>
+                    <in>naive_monte_carlo_example.cpp</in>
+                    <in>nc_chi_sq_example.cpp</in>
+                    <in>neg_binom_confidence_limits.cpp</in>
+                    <in>neg_binomial_sample_sizes.cpp</in>
+                    <in>negative_binomial_example1.cpp</in>
+                    <in>negative_binomial_example2.cpp</in>
+                    <in>neumann_zeros_example_1.cpp</in>
+                    <in>nonfinite_facet_simple.cpp</in>
+                    <in>nonfinite_facet_sstream.cpp</in>
+                    <in>nonfinite_legacy.cpp</in>
+                    <in>nonfinite_loopback_ok.cpp</in>
+                    <in>nonfinite_num_facet.cpp</in>
+                    <in>nonfinite_num_facet_serialization.cpp</in>
+                    <in>nonfinite_num_facet_trap.cpp</in>
+                    <in>nonfinite_serialization_archives.cpp</in>
+                    <in>nonfinite_signaling_NaN.cpp</in>
+                    <in>normal_misc_examples.cpp</in>
+                    <in>normal_tables.cpp</in>
+                    <in>numerical_derivative_example.cpp</in>
+                    <in>ooura_fourier_integrals_cosine_example.cpp</in>
+                    <in>ooura_fourier_integrals_example.cpp</in>
+                    <in>ooura_fourier_integrals_multiprecision_example.cpp</in>
+                    <in>owens_t_example.cpp</in>
+                    <in>policy_eg_1.cpp</in>
+                    <in>policy_eg_10.cpp</in>
+                    <in>policy_eg_2.cpp</in>
+                    <in>policy_eg_3.cpp</in>
+                    <in>policy_eg_4.cpp</in>
+                    <in>policy_eg_5.cpp</in>
+                    <in>policy_eg_6.cpp</in>
+                    <in>policy_eg_7.cpp</in>
+                    <in>policy_eg_8.cpp</in>
+                    <in>policy_eg_9.cpp</in>
+                    <in>policy_ref_snip1.cpp</in>
+                    <in>policy_ref_snip10.cpp</in>
+                    <in>policy_ref_snip11.cpp</in>
+                    <in>policy_ref_snip12.cpp</in>
+                    <in>policy_ref_snip13.cpp</in>
+                    <in>policy_ref_snip2.cpp</in>
+                    <in>policy_ref_snip3.cpp</in>
+                    <in>policy_ref_snip4.cpp</in>
+                    <in>policy_ref_snip5.cpp</in>
+                    <in>policy_ref_snip6.cpp</in>
+                    <in>policy_ref_snip7.cpp</in>
+                    <in>policy_ref_snip8.cpp</in>
+                    <in>policy_ref_snip9.cpp</in>
+                    <in>polynomial_arithmetic.cpp</in>
+                    <in>reciprocal_fibonacci_constant.cpp</in>
+                    <in>root_elliptic_finding.cpp</in>
+                    <in>root_finding_algorithms.cpp</in>
+                    <in>root_finding_example.cpp</in>
+                    <in>root_finding_fifth.cpp</in>
+                    <in>root_finding_multiprecision_example.cpp</in>
+                    <in>root_finding_n_example.cpp</in>
+                    <in>root_finding_start_locations.cpp</in>
+                    <in>root_n_finding_algorithms.cpp</in>
+                    <in>series.cpp</in>
+                    <in>skew_normal_example.cpp</in>
+                    <in>special_data.cpp</in>
+                    <in>students_t_example1.cpp</in>
+                    <in>students_t_example2.cpp</in>
+                    <in>students_t_example3.cpp</in>
+                    <in>students_t_single_sample.cpp</in>
+                    <in>students_t_two_samples.cpp</in>
+                    <in>test_cpp_float_close_fraction.cpp</in>
+                    <in>test_nonfinite_loopback.cpp</in>
+                    <in>to_continued_fraction.cpp</in>
+                    <in>trapezoidal_example.cpp</in>
+                  </df>
+                  <df name="reporting">
+                    <df name="accuracy">
+                      <in>erf_error_plot.cpp</in>
+                      <in>erfc_error_plot.cpp</in>
+                      <in>has_c99_cmath.cpp</in>
+                      <in>has_cxx17_cmath.cpp</in>
+                      <in>has_gsl.cpp</in>
+                      <in>has_libstdcxx_tr1.cpp</in>
+                      <in>has_rmath.cpp</in>
+                      <in>plot_jacobi_theta_q.cpp</in>
+                      <in>plot_jacobi_theta_x.cpp</in>
+                      <in>plot_kolmogorov_smirnov_pdf.cpp</in>
+                      <in>test_agm.cpp</in>
+                      <in>test_bessel_i.cpp</in>
+                      <in>test_bessel_i_prime.cpp</in>
+                      <in>test_bessel_j.cpp</in>
+                      <in>test_bessel_j_prime.cpp</in>
+                      <in>test_bessel_k.cpp</in>
+                      <in>test_bessel_k_prime.cpp</in>
+                      <in>test_bessel_y.cpp</in>
+                      <in>test_bessel_y_prime.cpp</in>
+                      <in>test_beta.cpp</in>
+                      <in>test_binomial_coeff.cpp</in>
+                      <in>test_carlson.cpp</in>
+                      <in>test_cbrt.cpp</in>
+                      <in>test_digamma.cpp</in>
+                      <in>test_ellint_1.cpp</in>
+                      <in>test_ellint_2.cpp</in>
+                      <in>test_ellint_3.cpp</in>
+                      <in>test_ellint_d.cpp</in>
+                      <in>test_erf.cpp</in>
+                      <in>test_expint.cpp</in>
+                      <in>test_gamma.cpp</in>
+                      <in>test_hermite.cpp</in>
+                      <in>test_heuman_lambda.cpp</in>
+                      <in>test_ibeta.cpp</in>
+                      <in>test_ibeta_inv.cpp</in>
+                      <in>test_ibeta_inva.cpp</in>
+                      <in>test_igamma.cpp</in>
+                      <in>test_igamma_inv.cpp</in>
+                      <in>test_igamma_inva.cpp</in>
+                      <in>test_jacobi.cpp</in>
+                      <in>test_jacobi_zeta.cpp</in>
+                      <in>test_laguerre.cpp</in>
+                      <in>test_legendre.cpp</in>
+                      <in>test_log1p_expm1.cpp</in>
+                      <in>test_nc_beta.cpp</in>
+                      <in>test_nc_chi_squared.cpp</in>
+                      <in>test_nc_t.cpp</in>
+                      <in>test_owens_t.cpp</in>
+                      <in>test_polygamma.cpp</in>
+                      <in>test_powm1.cpp</in>
+                      <in>test_rsqrt.cpp</in>
+                      <in>test_spherical_harmonic.cpp</in>
+                      <in>test_tgamma_ratio.cpp</in>
+                      <in>test_trig.cpp</in>
+                      <in>test_trigamma.cpp</in>
+                      <in>test_zeta.cpp</in>
+                    </df>
+                    <df name="performance">
+                      <in>bezier_polynomial_performance.cpp</in>
+                      <in>bilinear_interpolation_performance.cpp</in>
+                      <in>bivariate_statistics_performance.cpp</in>
+                      <in>chebyshev_clenshaw.cpp</in>
+                      <in>cohen_acceleration_performance.cpp</in>
+                      <in>constants_performance.cpp</in>
+                      <in>cubic_roots_performance.cpp</in>
+                      <in>is_intel_win.cpp</in>
+                      <in>jacobi_theta_performance.cpp</in>
+                      <in>rsqrt_performance.cpp</in>
+                      <in>table_helper.cpp</in>
+                      <in>test_agm.cpp</in>
+                      <in>test_assoc_laguerre.cpp</in>
+                      <in>test_assoc_legendre.cpp</in>
+                      <in>test_beta.cpp</in>
+                      <in>test_beta_inc.cpp</in>
+                      <in>test_cbrt.cpp</in>
+                      <in>test_cn.cpp</in>
+                      <in>test_digamma.cpp</in>
+                      <in>test_distributions.cpp</in>
+                      <in>test_distributions_mode.cpp</in>
+                      <in>test_dn.cpp</in>
+                      <in>test_ellint_1.cpp</in>
+                      <in>test_ellint_1c.cpp</in>
+                      <in>test_ellint_2.cpp</in>
+                      <in>test_ellint_2c.cpp</in>
+                      <in>test_ellint_3.cpp</in>
+                      <in>test_ellint_3c.cpp</in>
+                      <in>test_ellint_rc.cpp</in>
+                      <in>test_ellint_rd.cpp</in>
+                      <in>test_ellint_rf.cpp</in>
+                      <in>test_ellint_rj.cpp</in>
+                      <in>test_erf.cpp</in>
+                      <in>test_erfc.cpp</in>
+                      <in>test_expint.cpp</in>
+                      <in>test_expint_n.cpp</in>
+                      <in>test_expm1.cpp</in>
+                      <in>test_fibonacci.cpp</in>
+                      <in>test_gamma_p.cpp</in>
+                      <in>test_gamma_p_inv.cpp</in>
+                      <in>test_gamma_q.cpp</in>
+                      <in>test_gamma_q_inv.cpp</in>
+                      <in>test_gcd.cpp</in>
+                      <in>test_ibeta.cpp</in>
+                      <in>test_ibeta_inv.cpp</in>
+                      <in>test_ibetac.cpp</in>
+                      <in>test_ibetac_inv.cpp</in>
+                      <in>test_igamma.cpp</in>
+                      <in>test_in.cpp</in>
+                      <in>test_iv.cpp</in>
+                      <in>test_jn.cpp</in>
+                      <in>test_js.cpp</in>
+                      <in>test_jv.cpp</in>
+                      <in>test_kn.cpp</in>
+                      <in>test_kv.cpp</in>
+                      <in>test_laguerre.cpp</in>
+                      <in>test_legendre.cpp</in>
+                      <in>test_legendre_q.cpp</in>
+                      <in>test_lgamma.cpp</in>
+                      <in>test_log1p.cpp</in>
+                      <in>test_mode.cpp</in>
+                      <in>test_poly_method.cpp</in>
+                      <in>test_polygamma.cpp</in>
+                      <in>test_polynomial.cpp</in>
+                      <in>test_sn.cpp</in>
+                      <in>test_tgamma.cpp</in>
+                      <in>test_trigamma.cpp</in>
+                      <in>test_yn.cpp</in>
+                      <in>test_ys.cpp</in>
+                      <in>test_yv.cpp</in>
+                      <in>test_zeta.cpp</in>
+                      <in>univariate_statistics_performance.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <df name="tr1">
+                      <in>acosh.cpp</in>
+                      <in>acoshf.cpp</in>
+                      <in>acoshl.cpp</in>
+                      <in>asinh.cpp</in>
+                      <in>asinhf.cpp</in>
+                      <in>asinhl.cpp</in>
+                      <in>assoc_laguerre.cpp</in>
+                      <in>assoc_laguerref.cpp</in>
+                      <in>assoc_laguerrel.cpp</in>
+                      <in>assoc_legendre.cpp</in>
+                      <in>assoc_legendref.cpp</in>
+                      <in>assoc_legendrel.cpp</in>
+                      <in>atanh.cpp</in>
+                      <in>atanhf.cpp</in>
+                      <in>atanhl.cpp</in>
+                      <in>beta.cpp</in>
+                      <in>betaf.cpp</in>
+                      <in>betal.cpp</in>
+                      <in>cbrt.cpp</in>
+                      <in>cbrtf.cpp</in>
+                      <in>cbrtl.cpp</in>
+                      <in>comp_ellint_1.cpp</in>
+                      <in>comp_ellint_1f.cpp</in>
+                      <in>comp_ellint_1l.cpp</in>
+                      <in>comp_ellint_2.cpp</in>
+                      <in>comp_ellint_2f.cpp</in>
+                      <in>comp_ellint_2l.cpp</in>
+                      <in>comp_ellint_3.cpp</in>
+                      <in>comp_ellint_3f.cpp</in>
+                      <in>comp_ellint_3l.cpp</in>
+                      <in>copysign.cpp</in>
+                      <in>copysignf.cpp</in>
+                      <in>copysignl.cpp</in>
+                      <in>cyl_bessel_i.cpp</in>
+                      <in>cyl_bessel_if.cpp</in>
+                      <in>cyl_bessel_il.cpp</in>
+                      <in>cyl_bessel_j.cpp</in>
+                      <in>cyl_bessel_jf.cpp</in>
+                      <in>cyl_bessel_jl.cpp</in>
+                      <in>cyl_bessel_k.cpp</in>
+                      <in>cyl_bessel_kf.cpp</in>
+                      <in>cyl_bessel_kl.cpp</in>
+                      <in>cyl_neumann.cpp</in>
+                      <in>cyl_neumannf.cpp</in>
+                      <in>cyl_neumannl.cpp</in>
+                      <in>ellint_1.cpp</in>
+                      <in>ellint_1f.cpp</in>
+                      <in>ellint_1l.cpp</in>
+                      <in>ellint_2.cpp</in>
+                      <in>ellint_2f.cpp</in>
+                      <in>ellint_2l.cpp</in>
+                      <in>ellint_3.cpp</in>
+                      <in>ellint_3f.cpp</in>
+                      <in>ellint_3l.cpp</in>
+                      <in>erf.cpp</in>
+                      <in>erfc.cpp</in>
+                      <in>erfcf.cpp</in>
+                      <in>erfcl.cpp</in>
+                      <in>erff.cpp</in>
+                      <in>erfl.cpp</in>
+                      <in>expint.cpp</in>
+                      <in>expintf.cpp</in>
+                      <in>expintl.cpp</in>
+                      <in>expm1.cpp</in>
+                      <in>expm1f.cpp</in>
+                      <in>expm1l.cpp</in>
+                      <in>fmax.cpp</in>
+                      <in>fmaxf.cpp</in>
+                      <in>fmaxl.cpp</in>
+                      <in>fmin.cpp</in>
+                      <in>fminf.cpp</in>
+                      <in>fminl.cpp</in>
+                      <in>fpclassify.cpp</in>
+                      <in>fpclassifyf.cpp</in>
+                      <in>fpclassifyl.cpp</in>
+                      <in>hermite.cpp</in>
+                      <in>hermitef.cpp</in>
+                      <in>hermitel.cpp</in>
+                      <in>hypot.cpp</in>
+                      <in>hypotf.cpp</in>
+                      <in>hypotl.cpp</in>
+                      <in>laguerre.cpp</in>
+                      <in>laguerref.cpp</in>
+                      <in>laguerrel.cpp</in>
+                      <in>legendre.cpp</in>
+                      <in>legendref.cpp</in>
+                      <in>legendrel.cpp</in>
+                      <in>lgamma.cpp</in>
+                      <in>lgammaf.cpp</in>
+                      <in>lgammal.cpp</in>
+                      <in>llround.cpp</in>
+                      <in>llroundf.cpp</in>
+                      <in>llroundl.cpp</in>
+                      <in>log1p.cpp</in>
+                      <in>log1pf.cpp</in>
+                      <in>log1pl.cpp</in>
+                      <in>lround.cpp</in>
+                      <in>lroundf.cpp</in>
+                      <in>lroundl.cpp</in>
+                      <in>nextafter.cpp</in>
+                      <in>nextafterf.cpp</in>
+                      <in>nextafterl.cpp</in>
+                      <in>nexttoward.cpp</in>
+                      <in>nexttowardf.cpp</in>
+                      <in>nexttowardl.cpp</in>
+                      <in>riemann_zeta.cpp</in>
+                      <in>riemann_zetaf.cpp</in>
+                      <in>riemann_zetal.cpp</in>
+                      <in>round.cpp</in>
+                      <in>roundf.cpp</in>
+                      <in>roundl.cpp</in>
+                      <in>sph_bessel.cpp</in>
+                      <in>sph_besself.cpp</in>
+                      <in>sph_bessell.cpp</in>
+                      <in>sph_legendre.cpp</in>
+                      <in>sph_legendref.cpp</in>
+                      <in>sph_legendrel.cpp</in>
+                      <in>sph_neumann.cpp</in>
+                      <in>sph_neumannf.cpp</in>
+                      <in>sph_neumannl.cpp</in>
+                      <in>tgamma.cpp</in>
+                      <in>tgammaf.cpp</in>
+                      <in>tgammal.cpp</in>
+                      <in>trunc.cpp</in>
+                      <in>truncf.cpp</in>
+                      <in>truncl.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="compile_test">
+                      <in>ccmath_abs_incl_test.cpp</in>
+                      <in>ccmath_ceil_incl_test.cpp</in>
+                      <in>ccmath_copysign_incl_test.cpp</in>
+                      <in>ccmath_div_incl_test.cpp</in>
+                      <in>ccmath_floor_incl_test.cpp</in>
+                      <in>ccmath_fmod_incl_test.cpp</in>
+                      <in>ccmath_fpclassify_incl_test.cpp</in>
+                      <in>ccmath_frexp_incl_test.cpp</in>
+                      <in>ccmath_ilogb_incl_test.cpp</in>
+                      <in>ccmath_isfinite_incl_test.cpp</in>
+                      <in>ccmath_isinf_incl_test.cpp</in>
+                      <in>ccmath_isnan_incl_test.cpp</in>
+                      <in>ccmath_isnormal_incl_test.cpp</in>
+                      <in>ccmath_ldexp_incl_test.cpp</in>
+                      <in>ccmath_logb_incl_test.cpp</in>
+                      <in>ccmath_modf_incl_test.cpp</in>
+                      <in>ccmath_remainder_incl_test.cpp</in>
+                      <in>ccmath_round_incl_test.cpp</in>
+                      <in>ccmath_scalbln_incl_test.cpp</in>
+                      <in>ccmath_scalbn_incl_test.cpp</in>
+                      <in>ccmath_sqrt_incl_test.cpp</in>
+                      <in>ccmath_trunc_incl_test.cpp</in>
+                      <in>compl_abs_incl_test.cpp</in>
+                      <in>compl_acos_incl_test.cpp</in>
+                      <in>compl_acosh_incl_test.cpp</in>
+                      <in>compl_asin_incl_test.cpp</in>
+                      <in>compl_asinh_incl_test.cpp</in>
+                      <in>compl_atan_incl_test.cpp</in>
+                      <in>compl_atanh_incl_test.cpp</in>
+                      <in>constants_incl_test.cpp</in>
+                      <in>cstdfloat_cmath_incl_test.cpp</in>
+                      <in>cstdfloat_complex_incl_test.cpp</in>
+                      <in>cstdfloat_concept_check_1.cpp</in>
+                      <in>cstdfloat_concept_check_2.cpp</in>
+                      <in>cstdfloat_concept_check_3.cpp</in>
+                      <in>cstdfloat_concept_check_4.cpp</in>
+                      <in>cstdfloat_iostream_incl_test.cpp</in>
+                      <in>cstdfloat_limits_incl_test.cpp</in>
+                      <in>cstdfloat_types_incl_test.cpp</in>
+                      <in>diff_autodiff_incl_test.cpp</in>
+                      <in>diff_finite_difference_incl_test.cpp</in>
+                      <in>diff_lanczos_smoothing_incl_test.cpp</in>
+                      <in>diff_numerical_differentiation_concept_test.cpp</in>
+                      <in>diff_numerical_differentiation_incl_test.cpp</in>
+                      <in>dist_arcsine_incl_test.cpp</in>
+                      <in>dist_bernoulli_incl_test.cpp</in>
+                      <in>dist_beta_incl_test.cpp</in>
+                      <in>dist_binomial_incl_test.cpp</in>
+                      <in>dist_cauchy_incl_test.cpp</in>
+                      <in>dist_chi_squared_incl_test.cpp</in>
+                      <in>dist_complement_incl_test.cpp</in>
+                      <in>dist_empirical_cumulative_dist_func_incl_test.cpp</in>
+                      <in>dist_exponential_incl_test.cpp</in>
+                      <in>dist_extreme_val_incl_test.cpp</in>
+                      <in>dist_find_location_incl_test.cpp</in>
+                      <in>dist_find_scale_incl_test.cpp</in>
+                      <in>dist_fisher_f_incl_test.cpp</in>
+                      <in>dist_gamma_incl_test.cpp</in>
+                      <in>dist_geometric_incl_test.cpp</in>
+                      <in>dist_hyperexponential_incl_test.cpp</in>
+                      <in>dist_hypergeo_incl_test.cpp</in>
+                      <in>dist_inv_chi_sq_incl_test.cpp</in>
+                      <in>dist_inv_gamma_incl_test.cpp</in>
+                      <in>dist_inv_gaussian_incl_test.cpp</in>
+                      <in>dist_kolmogorov_smirnov_incl_test.cpp</in>
+                      <in>dist_laplace_incl_test.cpp</in>
+                      <in>dist_logistic_incl_test.cpp</in>
+                      <in>dist_lognormal_incl_test.cpp</in>
+                      <in>dist_nc_beta_incl_test.cpp</in>
+                      <in>dist_nc_chi_squ_incl_test.cpp</in>
+                      <in>dist_nc_f_incl_test.cpp</in>
+                      <in>dist_nc_t_incl_test.cpp</in>
+                      <in>dist_neg_binom_incl_test.cpp</in>
+                      <in>dist_normal_incl_test.cpp</in>
+                      <in>dist_pareto_incl_test.cpp</in>
+                      <in>dist_poisson_incl_test.cpp</in>
+                      <in>dist_skew_norm_incl_test.cpp</in>
+                      <in>dist_students_t_incl_test.cpp</in>
+                      <in>dist_triangular_incl_test.cpp</in>
+                      <in>dist_uniform_incl_test.cpp</in>
+                      <in>dist_weibull_incl_test.cpp</in>
+                      <in>distribution_concept_check.cpp</in>
+                      <in>filters_daubechies_incl_test.cpp</in>
+                      <in>gauss_concept_test.cpp</in>
+                      <in>gauss_kronrod_concept_test.cpp</in>
+                      <in>interpolators_barycentric_rational_concept_test.cpp</in>
+                      <in>interpolators_barycentric_rational_incl_test.cpp</in>
+                      <in>interpolators_bezier_polynomial_incl_test.cpp</in>
+                      <in>interpolators_bilinear_uniform.cpp</in>
+                      <in>interpolators_cardinal_trig_incl_test.cpp</in>
+                      <in>interpolators_catmull_rom_concept_test.cpp</in>
+                      <in>interpolators_catmull_rom_incl_test.cpp</in>
+                      <in>interpolators_cubic_hermite_incl_test.cpp</in>
+                      <in>interpolators_cubic_spline_concept_test.cpp</in>
+                      <in>interpolators_cubic_spline_incl_test.cpp</in>
+                      <in>interpolators_makima_incl_test.cpp</in>
+                      <in>interpolators_pchip_incl_test.cpp</in>
+                      <in>interpolators_quintic_hermite_incl_test.cpp</in>
+                      <in>interpolators_septic_hermite_incl_test.cpp</in>
+                      <in>interpolators_vector_barycentric_rational_incl_test.cpp</in>
+                      <in>interpolators_whittaker_shannon_incl_test.cpp</in>
+                      <in>main.cpp</in>
+                      <in>quad_exp_sinh_concept_test.cpp</in>
+                      <in>quad_exp_sinh_incl_test.cpp</in>
+                      <in>quad_gauss_incl_test.cpp</in>
+                      <in>quad_gauss_kronrod_incl_test.cpp</in>
+                      <in>quad_naive_monte_carlo_concept_test.cpp</in>
+                      <in>quad_naive_monte_carlo_incl_test.cpp</in>
+                      <in>quad_ooura_fourier_integrals_incl_test.cpp</in>
+                      <in>quad_sinh_sinh_concept_test.cpp</in>
+                      <in>quad_sinh_sinh_incl_test.cpp</in>
+                      <in>quad_tanh_sinh_concept_test.cpp</in>
+                      <in>quad_tanh_sinh_incl_test.cpp</in>
+                      <in>quad_trapezoidal_concept_test.cpp</in>
+                      <in>quad_trapezoidal_incl_test.cpp</in>
+                      <in>quad_wavelet_transforms_incl_test.cpp</in>
+                      <in>sf_acosh_incl_test.cpp</in>
+                      <in>sf_airy_incl_test.cpp</in>
+                      <in>sf_asinh_incl_test.cpp</in>
+                      <in>sf_atanh_incl_test.cpp</in>
+                      <in>sf_bernoulli_incl_test.cpp</in>
+                      <in>sf_bessel_deriv_incl_test.cpp</in>
+                      <in>sf_bessel_incl_test.cpp</in>
+                      <in>sf_beta_incl_test.cpp</in>
+                      <in>sf_binomial_incl_test.cpp</in>
+                      <in>sf_cbrt_incl_test.cpp</in>
+                      <in>sf_chebyshev_incl_test.cpp</in>
+                      <in>sf_chebyshev_transform_incl_test.cpp</in>
+                      <in>sf_cos_pi_incl_test.cpp</in>
+                      <in>sf_daubechies_scaling_incl_test.cpp</in>
+                      <in>sf_digamma_incl_test.cpp</in>
+                      <in>sf_ellint_1_incl_test.cpp</in>
+                      <in>sf_ellint_2_incl_test.cpp</in>
+                      <in>sf_ellint_3_incl_test.cpp</in>
+                      <in>sf_ellint_d_incl_test.cpp</in>
+                      <in>sf_ellint_rc_incl_test.cpp</in>
+                      <in>sf_ellint_rd_incl_test.cpp</in>
+                      <in>sf_ellint_rf_incl_test.cpp</in>
+                      <in>sf_ellint_rg_incl_test.cpp</in>
+                      <in>sf_ellint_rj_incl_test.cpp</in>
+                      <in>sf_erf_incl_test.cpp</in>
+                      <in>sf_expint_incl_test.cpp</in>
+                      <in>sf_expm1_incl_test.cpp</in>
+                      <in>sf_factorials_incl_test.cpp</in>
+                      <in>sf_fibonacci_incl_test.cpp</in>
+                      <in>sf_fpclassify_incl_test.cpp</in>
+                      <in>sf_gamma_incl_test.cpp</in>
+                      <in>sf_gegenbauer_incl_test.cpp</in>
+                      <in>sf_hankel_incl_test.cpp</in>
+                      <in>sf_hermite_incl_test.cpp</in>
+                      <in>sf_heuman_lambda_incl_test.cpp</in>
+                      <in>sf_hypot_incl_test.cpp</in>
+                      <in>sf_jacobi_incl_test.cpp</in>
+                      <in>sf_jacobi_theta_incl_test.cpp</in>
+                      <in>sf_jacobi_zeta_incl_test.cpp</in>
+                      <in>sf_laguerre_incl_test.cpp</in>
+                      <in>sf_lambert_w_incl_test.cpp</in>
+                      <in>sf_lanczos_incl_test.cpp</in>
+                      <in>sf_legendre_incl_test.cpp</in>
+                      <in>sf_legendre_stieltjes_concept_test.cpp</in>
+                      <in>sf_legendre_stieltjes_incl_test.cpp</in>
+                      <in>sf_log1p_incl_test.cpp</in>
+                      <in>sf_math_fwd_incl_test.cpp</in>
+                      <in>sf_modf_incl_test.cpp</in>
+                      <in>sf_next_incl_test.cpp</in>
+                      <in>sf_nonfinite_num_facets_incl_test.cpp</in>
+                      <in>sf_owens_t_incl_test.cpp</in>
+                      <in>sf_polygamma_incl_test.cpp</in>
+                      <in>sf_powm1_incl_test.cpp</in>
+                      <in>sf_prime_incl_test.cpp</in>
+                      <in>sf_relative_distance_incl_test.cpp</in>
+                      <in>sf_round_incl_test.cpp</in>
+                      <in>sf_rsqrt_incl_test.cpp</in>
+                      <in>sf_sign_incl_test.cpp</in>
+                      <in>sf_sin_pi_incl_test.cpp</in>
+                      <in>sf_sinc_incl_test.cpp</in>
+                      <in>sf_sinhc_incl_test.cpp</in>
+                      <in>sf_sph_harm_incl_test.cpp</in>
+                      <in>sf_sqrt1pm1_incl_test.cpp</in>
+                      <in>sf_trigamma_incl_test.cpp</in>
+                      <in>sf_trunc_incl_test.cpp</in>
+                      <in>sf_ulp_incl_test.cpp</in>
+                      <in>sf_zeta_incl_test.cpp</in>
+                      <in>stats_anderson_darling_inc_test.cpp</in>
+                      <in>stats_bivariate_inc_test.cpp</in>
+                      <in>stats_linear_regression_inc_test.cpp</in>
+                      <in>stats_ljung_box_inc_test.cpp</in>
+                      <in>stats_runs_test_inc_test.cpp</in>
+                      <in>stats_signal_statistics_inc_test.cpp</in>
+                      <in>stats_t_test_inc_test.cpp</in>
+                      <in>stats_univariate_inc_test.cpp</in>
+                      <in>stats_z_test_inc_test.cpp</in>
+                      <in>std_real_concept_check.cpp</in>
+                      <in>test_traits.cpp</in>
+                      <in>tools_agm_incl_test.cpp</in>
+                      <in>tools_assert_incl_test.cpp</in>
+                      <in>tools_atomic_incl_test.cpp</in>
+                      <in>tools_big_constant_incl_test.cpp</in>
+                      <in>tools_centered_continued_fraction_incl_test.cpp</in>
+                      <in>tools_cohen_acceleration_incl_test.cpp</in>
+                      <in>tools_complex_incl_test.cpp</in>
+                      <in>tools_condition_numbers_incl_test.cpp</in>
+                      <in>tools_config_inc_test.cpp</in>
+                      <in>tools_convert_from_string_incl_test.cpp</in>
+                      <in>tools_cxx03_warn_incl_test.cpp</in>
+                      <in>tools_engel_expansion_incl_test.cpp</in>
+                      <in>tools_fraction_inc_test.cpp</in>
+                      <in>tools_header_deprecated_incl_test.cpp</in>
+                      <in>tools_is_detected_incl_test.cpp</in>
+                      <in>tools_lexical_cast_incl_test.cpp</in>
+                      <in>tools_luroth_expansion_incl_test.cpp</in>
+                      <in>tools_minima_inc_test.cpp</in>
+                      <in>tools_mp_incl_test.cpp</in>
+                      <in>tools_norms_incl_test.cpp</in>
+                      <in>tools_polynomial_gcd_incl_test.cpp</in>
+                      <in>tools_polynomial_inc_test.cpp</in>
+                      <in>tools_precision_inc_test.cpp</in>
+                      <in>tools_promotion_incl_test.cpp</in>
+                      <in>tools_random_vector_incl_test.cpp</in>
+                      <in>tools_rational_inc_test.cpp</in>
+                      <in>tools_real_cast_inc_test.cpp</in>
+                      <in>tools_remez_inc_test.cpp</in>
+                      <in>tools_roots_inc_test.cpp</in>
+                      <in>tools_series_inc_test.cpp</in>
+                      <in>tools_simple_continued_fraction_incl_test.cpp</in>
+                      <in>tools_solve_inc_test.cpp</in>
+                      <in>tools_stats_inc_test.cpp</in>
+                      <in>tools_test_data_inc_test.cpp</in>
+                      <in>tools_test_inc_test.cpp</in>
+                      <in>tools_test_value_incl_test.cpp</in>
+                      <in>tools_throw_exception_incl_test.cpp</in>
+                      <in>tools_toms748_inc_test.cpp</in>
+                      <in>tools_traits_incl_test.cpp</in>
+                      <in>tools_tuple_inc_test.cpp</in>
+                      <in>tools_ulps_plot_incl_test.cpp</in>
+                      <in>tools_workaround_incl_test.cpp</in>
+                      <in>tr1_incl_test.cpp</in>
+                    </df>
+                    <df name="float128">
+                      <in>log1p_expm1_test.cpp</in>
+                      <in>powm1_sqrtp1m1_test.cpp</in>
+                      <in>test_bessel_i.cpp</in>
+                      <in>test_bessel_j.cpp</in>
+                      <in>test_bessel_k.cpp</in>
+                      <in>test_bessel_y.cpp</in>
+                      <in>test_beta.cpp</in>
+                      <in>test_binomial_coeff.cpp</in>
+                      <in>test_carlson.cpp</in>
+                      <in>test_cbrt.cpp</in>
+                      <in>test_digamma.cpp</in>
+                      <in>test_ellint_1.cpp</in>
+                      <in>test_ellint_2.cpp</in>
+                      <in>test_ellint_3.cpp</in>
+                      <in>test_erf.cpp</in>
+                      <in>test_expint.cpp</in>
+                      <in>test_factorials.cpp</in>
+                      <in>test_gamma.cpp</in>
+                      <in>test_hermite.cpp</in>
+                      <in>test_ibeta.cpp</in>
+                      <in>test_ibeta_inv_1.cpp</in>
+                      <in>test_ibeta_inv_ab_4.cpp</in>
+                      <in>test_igamma.cpp</in>
+                      <in>test_igamma_inv.cpp</in>
+                      <in>test_igamma_inva.cpp</in>
+                      <in>test_laguerre.cpp</in>
+                      <in>test_legendre.cpp</in>
+                      <in>test_polygamma.cpp</in>
+                      <in>test_std_lib.cpp</in>
+                      <in>test_tgamma_ratio.cpp</in>
+                      <in>test_trigamma.cpp</in>
+                      <in>test_zeta.cpp</in>
+                    </df>
+                    <df name="test_instances">
+                      <in>double_test_instances_1.cpp</in>
+                      <in>double_test_instances_10.cpp</in>
+                      <in>double_test_instances_2.cpp</in>
+                      <in>double_test_instances_3.cpp</in>
+                      <in>double_test_instances_4.cpp</in>
+                      <in>double_test_instances_5.cpp</in>
+                      <in>double_test_instances_6.cpp</in>
+                      <in>double_test_instances_7.cpp</in>
+                      <in>double_test_instances_8.cpp</in>
+                      <in>double_test_instances_9.cpp</in>
+                      <in>float_test_instances_1.cpp</in>
+                      <in>float_test_instances_10.cpp</in>
+                      <in>float_test_instances_2.cpp</in>
+                      <in>float_test_instances_3.cpp</in>
+                      <in>float_test_instances_4.cpp</in>
+                      <in>float_test_instances_5.cpp</in>
+                      <in>float_test_instances_6.cpp</in>
+                      <in>float_test_instances_7.cpp</in>
+                      <in>float_test_instances_8.cpp</in>
+                      <in>float_test_instances_9.cpp</in>
+                      <in>ldouble_test_instances_10.cpp</in>
+                      <in>ldouble_test_instances_2.cpp</in>
+                      <in>ldouble_test_instances_3.cpp</in>
+                      <in>ldouble_test_instances_4.cpp</in>
+                      <in>ldouble_test_instances_5.cpp</in>
+                      <in>ldouble_test_instances_6.cpp</in>
+                      <in>ldouble_test_instances_7.cpp</in>
+                      <in>ldouble_test_instances_8.cpp</in>
+                      <in>ldouble_test_instances_9.cpp</in>
+                      <in>long_double_test_instances_1.cpp</in>
+                      <in>real_concept_test_instances_1.cpp</in>
+                      <in>real_concept_test_instances_10.cpp</in>
+                      <in>real_concept_test_instances_2.cpp</in>
+                      <in>real_concept_test_instances_3.cpp</in>
+                      <in>real_concept_test_instances_4.cpp</in>
+                      <in>real_concept_test_instances_5.cpp</in>
+                      <in>real_concept_test_instances_6.cpp</in>
+                      <in>real_concept_test_instances_7.cpp</in>
+                      <in>real_concept_test_instances_8.cpp</in>
+                      <in>real_concept_test_instances_9.cpp</in>
+                    </df>
+                    <df name="test_rational_instances">
+                      <in>test_rational_double1.cpp</in>
+                      <in>test_rational_double2.cpp</in>
+                      <in>test_rational_double3.cpp</in>
+                      <in>test_rational_double4.cpp</in>
+                      <in>test_rational_double5.cpp</in>
+                      <in>test_rational_float1.cpp</in>
+                      <in>test_rational_float2.cpp</in>
+                      <in>test_rational_float3.cpp</in>
+                      <in>test_rational_float4.cpp</in>
+                      <in>test_rational_ldouble1.cpp</in>
+                      <in>test_rational_ldouble2.cpp</in>
+                      <in>test_rational_ldouble3.cpp</in>
+                      <in>test_rational_ldouble4.cpp</in>
+                      <in>test_rational_ldouble5.cpp</in>
+                      <in>test_rational_real_concept1.cpp</in>
+                      <in>test_rational_real_concept2.cpp</in>
+                      <in>test_rational_real_concept3.cpp</in>
+                      <in>test_rational_real_concept4.cpp</in>
+                      <in>test_rational_real_concept5.cpp</in>
+                    </df>
+                    <in>adaptive_gauss_kronrod_quadrature_test.cpp</in>
+                    <in>agm_test.cpp</in>
+                    <in>anderson_darling_test.cpp</in>
+                    <in>bernoulli_no_atomic_d.cpp</in>
+                    <in>bernoulli_no_atomic_fail.cpp</in>
+                    <in>bernoulli_no_atomic_mp.cpp</in>
+                    <in>bezier_polynomial_test.cpp</in>
+                    <in>bilinear_uniform_test.cpp</in>
+                    <in>bivariate_statistics_test.cpp</in>
+                    <in>cardinal_b_spline_test.cpp</in>
+                    <in>cardinal_cubic_b_spline_test.cpp</in>
+                    <in>cardinal_quadratic_b_spline_test.cpp</in>
+                    <in>cardinal_quintic_b_spline_test.cpp</in>
+                    <in>cardinal_trigonometric_test.cpp</in>
+                    <in>catmull_rom_test.cpp</in>
+                    <in>ccmath_abs_test.cpp</in>
+                    <in>ccmath_ceil_test.cpp</in>
+                    <in>ccmath_copysign_test.cpp</in>
+                    <in>ccmath_div_test.cpp</in>
+                    <in>ccmath_floor_test.cpp</in>
+                    <in>ccmath_fmod_test.cpp</in>
+                    <in>ccmath_fpclassify_test.cpp</in>
+                    <in>ccmath_frexp_test.cpp</in>
+                    <in>ccmath_ilogb_test.cpp</in>
+                    <in>ccmath_isfinite_test.cpp</in>
+                    <in>ccmath_isinf_test.cpp</in>
+                    <in>ccmath_isnan_test.cpp</in>
+                    <in>ccmath_isnormal_test.cpp</in>
+                    <in>ccmath_ldexp_test.cpp</in>
+                    <in>ccmath_logb_test.cpp</in>
+                    <in>ccmath_modf_test.cpp</in>
+                    <in>ccmath_remainder_test.cpp</in>
+                    <in>ccmath_round_test.cpp</in>
+                    <in>ccmath_scalbln_test.cpp</in>
+                    <in>ccmath_scalbn_test.cpp</in>
+                    <in>ccmath_sqrt_test.cpp</in>
+                    <in>ccmath_trunc_test.cpp</in>
+                    <in>centered_continued_fraction_test.cpp</in>
+                    <in>chebyshev_test.cpp</in>
+                    <in>chebyshev_transform_test.cpp</in>
+                    <in>cohen_acceleration_test.cpp</in>
+                    <in>complex_test.cpp</in>
+                    <in>condition_number_test.cpp</in>
+                    <in>cubic_hermite_test.cpp</in>
+                    <in>cubic_roots_test.cpp</in>
+                    <in>daubechies_scaling_test.cpp</in>
+                    <in>daubechies_wavelet_test.cpp</in>
+                    <in>empirical_cumulative_distribution_test.cpp</in>
+                    <in>engel_expansion_test.cpp</in>
+                    <in>erf_limits_test.cpp</in>
+                    <in>exp_sinh_quadrature_test.cpp</in>
+                    <in>gauss_kronrod_quadrature_test.cpp</in>
+                    <in>gauss_quadrature_test.cpp</in>
+                    <in>gegenbauer_test.cpp</in>
+                    <in>header_deprecated_test.cpp</in>
+                    <in>hypot_test.cpp</in>
+                    <in>jacobi_test.cpp</in>
+                    <in>lanczos_smoothing_test.cpp</in>
+                    <in>legendre_stieltjes_test.cpp</in>
+                    <in>linear_regression_test.cpp</in>
+                    <in>ljung_box_test.cpp</in>
+                    <in>log1p_expm1_test.cpp</in>
+                    <in>luroth_expansion_test.cpp</in>
+                    <in>makima_test.cpp</in>
+                    <in>mpfr_concept_check.cpp</in>
+                    <in>mpreal_concept_check.cpp</in>
+                    <in>multiprc_concept_check_1.cpp</in>
+                    <in>multiprc_concept_check_10.cpp</in>
+                    <in>multiprc_concept_check_2.cpp</in>
+                    <in>multiprc_concept_check_3.cpp</in>
+                    <in>multiprc_concept_check_4.cpp</in>
+                    <in>multiprc_concept_check_5.cpp</in>
+                    <in>multiprc_concept_check_6.cpp</in>
+                    <in>multiprc_concept_check_7.cpp</in>
+                    <in>multiprc_concept_check_8.cpp</in>
+                    <in>multiprc_concept_check_9.cpp</in>
+                    <in>naive_monte_carlo_test.cpp</in>
+                    <in>noeh_support.cpp</in>
+                    <in>norms_test.cpp</in>
+                    <in>ntl_concept_check.cpp</in>
+                    <in>octonion_test.cpp</in>
+                    <in>ooura_fourier_integral_test.cpp</in>
+                    <in>pchip_test.cpp</in>
+                    <in>polynomial_concept_check.cpp</in>
+                    <in>pow_test.cpp</in>
+                    <in>powm1_sqrtp1m1_test.cpp</in>
+                    <in>quaternion_constexpr_test.cpp</in>
+                    <in>quaternion_mi1.cpp</in>
+                    <in>quaternion_mi2.cpp</in>
+                    <in>quaternion_mult_incl_test.cpp</in>
+                    <in>quaternion_test.cpp</in>
+                    <in>quintic_hermite_test.cpp</in>
+                    <in>rsqrt_test.cpp</in>
+                    <in>septic_hermite_test.cpp</in>
+                    <in>signal_statistics_test.cpp</in>
+                    <in>simple_continued_fraction_test.cpp</in>
+                    <in>sinh_sinh_quadrature_test.cpp</in>
+                    <in>special_functions_test.cpp</in>
+                    <in>std_real_concept_check.cpp</in>
+                    <in>tanh_sinh_mpfr.cpp</in>
+                    <in>tanh_sinh_quadrature_test.cpp</in>
+                    <in>test_0F1.cpp</in>
+                    <in>test_1F0.cpp</in>
+                    <in>test_1F1.cpp</in>
+                    <in>test_1F1_log.cpp</in>
+                    <in>test_1F1_regularized.cpp</in>
+                    <in>test_2F0.cpp</in>
+                    <in>test_airy.cpp</in>
+                    <in>test_archive.cpp</in>
+                    <in>test_arcsine.cpp</in>
+                    <in>test_autodiff_1.cpp</in>
+                    <in>test_autodiff_2.cpp</in>
+                    <in>test_autodiff_3.cpp</in>
+                    <in>test_autodiff_4.cpp</in>
+                    <in>test_autodiff_5.cpp</in>
+                    <in>test_autodiff_6.cpp</in>
+                    <in>test_autodiff_7.cpp</in>
+                    <in>test_autodiff_8.cpp</in>
+                    <in>test_barycentric_rational.cpp</in>
+                    <in>test_basic_nonfinite.cpp</in>
+                    <in>test_bernoulli.cpp</in>
+                    <in>test_bernoulli_constants.cpp</in>
+                    <in>test_bessel_airy_zeros.cpp</in>
+                    <in>test_bessel_i.cpp</in>
+                    <in>test_bessel_i_prime.cpp</in>
+                    <in>test_bessel_j.cpp</in>
+                    <in>test_bessel_j_prime.cpp</in>
+                    <in>test_bessel_k.cpp</in>
+                    <in>test_bessel_k_prime.cpp</in>
+                    <in>test_bessel_y.cpp</in>
+                    <in>test_bessel_y_prime.cpp</in>
+                    <in>test_beta.cpp</in>
+                    <in>test_beta_dist.cpp</in>
+                    <in>test_binomial.cpp</in>
+                    <in>test_binomial_coeff.cpp</in>
+                    <in>test_carlson.cpp</in>
+                    <in>test_cauchy.cpp</in>
+                    <in>test_cbrt.cpp</in>
+                    <in>test_chi_squared.cpp</in>
+                    <in>test_classify.cpp</in>
+                    <in>test_constant_generate.cpp</in>
+                    <in>test_constants.cpp</in>
+                    <in>test_cstdfloat.cpp</in>
+                    <in>test_difference.cpp</in>
+                    <in>test_digamma.cpp</in>
+                    <in>test_dist_overloads.cpp</in>
+                    <in>test_ellint_1.cpp</in>
+                    <in>test_ellint_2.cpp</in>
+                    <in>test_ellint_3.cpp</in>
+                    <in>test_ellint_d.cpp</in>
+                    <in>test_erf.cpp</in>
+                    <in>test_error_handling.cpp</in>
+                    <in>test_expint.cpp</in>
+                    <in>test_exponential_dist.cpp</in>
+                    <in>test_extreme_value.cpp</in>
+                    <in>test_factorials.cpp</in>
+                    <in>test_fibonacci.cpp</in>
+                    <in>test_find_location.cpp</in>
+                    <in>test_find_scale.cpp</in>
+                    <in>test_fisher_f.cpp</in>
+                    <in>test_gamma.cpp</in>
+                    <in>test_gamma_dist.cpp</in>
+                    <in>test_gamma_mp.cpp</in>
+                    <in>test_geometric.cpp</in>
+                    <in>test_hankel.cpp</in>
+                    <in>test_hermite.cpp</in>
+                    <in>test_heuman_lambda.cpp</in>
+                    <in>test_hyperexponential_dist.cpp</in>
+                    <in>test_hypergeometric_dist.cpp</in>
+                    <in>test_ibeta.cpp</in>
+                    <in>test_ibeta_derivative.cpp</in>
+                    <in>test_ibeta_inv.cpp</in>
+                    <in>test_ibeta_inv_ab.cpp</in>
+                    <in>test_igamma.cpp</in>
+                    <in>test_igamma_inv.cpp</in>
+                    <in>test_igamma_inva.cpp</in>
+                    <in>test_instantiate1.cpp</in>
+                    <in>test_instantiate2.cpp</in>
+                    <in>test_inv_hyp.cpp</in>
+                    <in>test_inverse_chi_squared_distribution.cpp</in>
+                    <in>test_inverse_gamma_distribution.cpp</in>
+                    <in>test_inverse_gaussian.cpp</in>
+                    <in>test_jacobi.cpp</in>
+                    <in>test_jacobi_theta.cpp</in>
+                    <in>test_jacobi_zeta.cpp</in>
+                    <in>test_kolmogorov_smirnov.cpp</in>
+                    <in>test_laguerre.cpp</in>
+                    <in>test_lambert_w.cpp</in>
+                    <in>test_lambert_w_derivative.cpp</in>
+                    <in>test_lambert_w_integrals_double.cpp</in>
+                    <in>test_lambert_w_integrals_float.cpp</in>
+                    <in>test_lambert_w_integrals_float128.cpp</in>
+                    <in>test_lambert_w_integrals_long_double.cpp</in>
+                    <in>test_lambert_w_integrals_quad.cpp</in>
+                    <in>test_laplace.cpp</in>
+                    <in>test_ldouble_simple.cpp</in>
+                    <in>test_legacy_nonfinite.cpp</in>
+                    <in>test_legendre.cpp</in>
+                    <in>test_lexical_cast.cpp</in>
+                    <in>test_logistic_dist.cpp</in>
+                    <in>test_lognormal.cpp</in>
+                    <in>test_long_double_support.cpp</in>
+                    <in>test_math_fwd.cpp</in>
+                    <in>test_minima.cpp</in>
+                    <in>test_nc_beta.cpp</in>
+                    <in>test_nc_chi_squared.cpp</in>
+                    <in>test_nc_f.cpp</in>
+                    <in>test_nc_t.cpp</in>
+                    <in>test_nc_t_quad.cpp</in>
+                    <in>test_negative_binomial.cpp</in>
+                    <in>test_next.cpp</in>
+                    <in>test_next_decimal.cpp</in>
+                    <in>test_no_long_double_policy.cpp</in>
+                    <in>test_nonfinite_io.cpp</in>
+                    <in>test_nonfinite_trap.cpp</in>
+                    <in>test_normal.cpp</in>
+                    <in>test_numerical_differentiation.cpp</in>
+                    <in>test_owens_t.cpp</in>
+                    <in>test_pFq.cpp</in>
+                    <in>test_pFq_precision.cpp</in>
+                    <in>test_pareto.cpp</in>
+                    <in>test_poisson.cpp</in>
+                    <in>test_policy.cpp</in>
+                    <in>test_policy_10.cpp</in>
+                    <in>test_policy_2.cpp</in>
+                    <in>test_policy_3.cpp</in>
+                    <in>test_policy_4.cpp</in>
+                    <in>test_policy_5.cpp</in>
+                    <in>test_policy_6.cpp</in>
+                    <in>test_policy_7.cpp</in>
+                    <in>test_policy_8.cpp</in>
+                    <in>test_policy_9.cpp</in>
+                    <in>test_policy_sf.cpp</in>
+                    <in>test_polygamma.cpp</in>
+                    <in>test_polynomial.cpp</in>
+                    <in>test_print_info_on_type.cpp</in>
+                    <in>test_rationals.cpp</in>
+                    <in>test_rayleigh.cpp</in>
+                    <in>test_real_concept.cpp</in>
+                    <in>test_real_concept_neg_bin.cpp</in>
+                    <in>test_recurrence.cpp</in>
+                    <in>test_remez.cpp</in>
+                    <in>test_root_finding_concepts.cpp</in>
+                    <in>test_root_iterations.cpp</in>
+                    <in>test_roots.cpp</in>
+                    <in>test_round.cpp</in>
+                    <in>test_runs_test.cpp</in>
+                    <in>test_sign.cpp</in>
+                    <in>test_signed_zero.cpp</in>
+                    <in>test_sinc.cpp</in>
+                    <in>test_skew_normal.cpp</in>
+                    <in>test_spherical_harmonic.cpp</in>
+                    <in>test_standalone_asserts.cpp</in>
+                    <in>test_students_t.cpp</in>
+                    <in>test_t_test.cpp</in>
+                    <in>test_tgamma_for_issue396_part1.cpp</in>
+                    <in>test_tgamma_for_issue396_part2.cpp</in>
+                    <in>test_tgamma_ratio.cpp</in>
+                    <in>test_toms748_solve.cpp</in>
+                    <in>test_tr1.c</in>
+                    <in>test_tr1.cpp</in>
+                    <in>test_trapezoidal.cpp</in>
+                    <in>test_triangular.cpp</in>
+                    <in>test_trig.cpp</in>
+                    <in>test_trigamma.cpp</in>
+                    <in>test_uniform.cpp</in>
+                    <in>test_vector_barycentric_rational.cpp</in>
+                    <in>test_weibull.cpp</in>
+                    <in>test_z_test.cpp</in>
+                    <in>test_zeta.cpp</in>
+                    <in>threading_sanity_check.cpp</in>
+                    <in>univariate_statistics_backwards_compatible_test.cpp</in>
+                    <in>univariate_statistics_test.cpp</in>
+                    <in>wavelet_transform_test.cpp</in>
+                    <in>whittaker_shannon_test.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <df name="minimax">
+                      <in>f.cpp</in>
+                      <in>main.cpp</in>
+                    </df>
+                    <in>bessel_data.cpp</in>
+                    <in>bessel_derivative_append_negative.cpp</in>
+                    <in>bessel_derivative_data.cpp</in>
+                    <in>bessel_derivative_data_from_bessel_ipps.cpp</in>
+                    <in>beta_data.cpp</in>
+                    <in>carlson_ellint_data.cpp</in>
+                    <in>cbrt_data.cpp</in>
+                    <in>digamma_data.cpp</in>
+                    <in>ellint_d2_data.cpp</in>
+                    <in>ellint_d_data.cpp</in>
+                    <in>ellint_e_data.cpp</in>
+                    <in>ellint_f_data.cpp</in>
+                    <in>ellint_k_data.cpp</in>
+                    <in>ellint_pi2_data.cpp</in>
+                    <in>ellint_pi3_data.cpp</in>
+                    <in>erf_data.cpp</in>
+                    <in>expint_data.cpp</in>
+                    <in>expint_i_data.cpp</in>
+                    <in>factorial_tables.cpp</in>
+                    <in>gamma_P_inva_data.cpp</in>
+                    <in>gauss_kronrod_constants.cpp</in>
+                    <in>generate_rational_code.cpp</in>
+                    <in>generate_rational_test.cpp</in>
+                    <in>generate_test_values.cpp</in>
+                    <in>hermite_data.cpp</in>
+                    <in>heuman_lambda_data.cpp</in>
+                    <in>hyp_0f2_data.cpp</in>
+                    <in>hyp_1f1_big_data.cpp</in>
+                    <in>hyp_1f1_data.cpp</in>
+                    <in>hyp_1f1_log_big_data.cpp</in>
+                    <in>hyp_1f1_reg_big_data.cpp</in>
+                    <in>hyp_1f2_data.cpp</in>
+                    <in>hyp_2f0_data.cpp</in>
+                    <in>hyp_2f1_data.cpp</in>
+                    <in>hyp_2f2_data.cpp</in>
+                    <in>hypergeometric_1F1_error_plot.cpp</in>
+                    <in>hypergeometric_1F1_map_neg_b_fwd_recurrence.cpp</in>
+                    <in>hypergeometric_dist_data.cpp</in>
+                    <in>ibeta_data.cpp</in>
+                    <in>ibeta_derivative_data.cpp</in>
+                    <in>ibeta_inv_data.cpp</in>
+                    <in>ibeta_invab_data.cpp</in>
+                    <in>igamma_data.cpp</in>
+                    <in>igamma_temme_large_coef.cpp</in>
+                    <in>inv_hyp_data.cpp</in>
+                    <in>jacobi_theta_data.cpp</in>
+                    <in>jacobi_zeta_data.cpp</in>
+                    <in>laguerre_data.cpp</in>
+                    <in>lambert_w_errors_graph.cpp</in>
+                    <in>lambert_w_high_reference_values.cpp</in>
+                    <in>lambert_w_lookup_table_generator.cpp</in>
+                    <in>lambert_w_low_reference_values.cpp</in>
+                    <in>lanczos_generator.cpp</in>
+                    <in>legendre_data.cpp</in>
+                    <in>log1p_expm1_data.cpp</in>
+                    <in>nc_t_data.cpp</in>
+                    <in>process_perf_results.cpp</in>
+                    <in>rational_tests.cpp</in>
+                    <in>sinc_data.cpp</in>
+                    <in>spherical_harmonic_data.cpp</in>
+                    <in>tgamma_large_data.cpp</in>
+                    <in>tgamma_ratio_data.cpp</in>
+                    <in>trig_data.cpp</in>
+                    <in>zeta_data.cpp</in>
+                  </df>
+                </df>
+                <df name="metaparse">
+                  <df name="example">
+                    <df name="binary_number">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="calculator">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="calculator_with_parens">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="calculator_with_parens_and_unary_ops">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="compile_to_native_code">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="constexpr_parser">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="grammar_calculator">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="meta_hs">
+                      <in>main_handcrafted.cpp</in>
+                      <in>main_in_haskell.cpp</in>
+                    </df>
+                    <df name="meta_lambda">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="meta_metaparse">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="minimal_rational">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="parsing_error">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="rational">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="regexp">
+                      <in>main.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>BOOST_METAPARSE_STRING.cpp</in>
+                    <in>accept.cpp</in>
+                    <in>accept_when.cpp</in>
+                    <in>all_headers.cpp</in>
+                    <in>alphanum.cpp</in>
+                    <in>always.cpp</in>
+                    <in>always_c.cpp</in>
+                    <in>at_c.cpp</in>
+                    <in>back_inserter.cpp</in>
+                    <in>build_parser.cpp</in>
+                    <in>change_error_message.cpp</in>
+                    <in>concat.cpp</in>
+                    <in>define_error.cpp</in>
+                    <in>digit.cpp</in>
+                    <in>digit_to_int.cpp</in>
+                    <in>digit_val.cpp</in>
+                    <in>empty.cpp</in>
+                    <in>empty_string.cpp</in>
+                    <in>entire_input.cpp</in>
+                    <in>except.cpp</in>
+                    <in>fail.cpp</in>
+                    <in>fail_at_first_char_expected.cpp</in>
+                    <in>fail_tag.cpp</in>
+                    <in>first_of.cpp</in>
+                    <in>foldl.cpp</in>
+                    <in>foldl1.cpp</in>
+                    <in>foldl_reject_incomplete.cpp</in>
+                    <in>foldl_reject_incomplete1.cpp</in>
+                    <in>foldl_reject_incomplete_start_with_parser.cpp</in>
+                    <in>foldl_start_with_parser.cpp</in>
+                    <in>foldr.cpp</in>
+                    <in>foldr1.cpp</in>
+                    <in>foldr_reject_incomplete.cpp</in>
+                    <in>foldr_reject_incomplete1.cpp</in>
+                    <in>foldr_start_with_parser.cpp</in>
+                    <in>front_inserter.cpp</in>
+                    <in>grammar.cpp</in>
+                    <in>has_type.cpp</in>
+                    <in>if_.cpp</in>
+                    <in>in_range.cpp</in>
+                    <in>in_range_c.cpp</in>
+                    <in>int_.cpp</in>
+                    <in>int_to_digit.cpp</in>
+                    <in>is_char_c.cpp</in>
+                    <in>is_digit.cpp</in>
+                    <in>is_error.cpp</in>
+                    <in>is_lcase_letter.cpp</in>
+                    <in>is_letter.cpp</in>
+                    <in>is_ucase_letter.cpp</in>
+                    <in>is_whitespace.cpp</in>
+                    <in>iterate.cpp</in>
+                    <in>iterate_c.cpp</in>
+                    <in>keyword.cpp</in>
+                    <in>last_of.cpp</in>
+                    <in>letter.cpp</in>
+                    <in>lit.cpp</in>
+                    <in>lit_c.cpp</in>
+                    <in>long_string.cpp</in>
+                    <in>look_ahead.cpp</in>
+                    <in>middle_of.cpp</in>
+                    <in>next_digit.cpp</in>
+                    <in>nth_of.cpp</in>
+                    <in>one_char.cpp</in>
+                    <in>one_char_except.cpp</in>
+                    <in>one_char_except_c.cpp</in>
+                    <in>one_of.cpp</in>
+                    <in>one_of_c.cpp</in>
+                    <in>optional.cpp</in>
+                    <in>pop_back.cpp</in>
+                    <in>pop_front.cpp</in>
+                    <in>push_back_c.cpp</in>
+                    <in>push_front_c.cpp</in>
+                    <in>range.cpp</in>
+                    <in>range_c.cpp</in>
+                    <in>reject.cpp</in>
+                    <in>repeated.cpp</in>
+                    <in>repeated1.cpp</in>
+                    <in>repeated_one_of.cpp</in>
+                    <in>repeated_one_of1.cpp</in>
+                    <in>repeated_reject_incomplete.cpp</in>
+                    <in>repeated_reject_incomplete1.cpp</in>
+                    <in>return_.cpp</in>
+                    <in>returns.cpp</in>
+                    <in>sequence.cpp</in>
+                    <in>sequence_apply.cpp</in>
+                    <in>size.cpp</in>
+                    <in>source_position.cpp</in>
+                    <in>space.cpp</in>
+                    <in>spaces.cpp</in>
+                    <in>string.cpp</in>
+                    <in>string_iterator_tag.cpp</in>
+                    <in>string_tag.cpp</in>
+                    <in>string_value.cpp</in>
+                    <in>swap.cpp</in>
+                    <in>token.cpp</in>
+                    <in>too_long_string.cpp</in>
+                    <in>transform.cpp</in>
+                    <in>transform_error.cpp</in>
+                    <in>transform_error_message.cpp</in>
+                    <in>unless_error.cpp</in>
+                    <in>unpaired.cpp</in>
+                    <in>update_c.cpp</in>
+                    <in>version.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <df name="benchmark">
+                      <df name="src">
+                        <in>length128.cpp</in>
+                        <in>max_length.cpp</in>
+                        <in>number.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                </df>
+                <df name="move">
+                  <df name="example">
+                    <in>doc_clone_ptr.cpp</in>
+                    <in>doc_construct_forward.cpp</in>
+                    <in>doc_file_descriptor.cpp</in>
+                    <in>doc_how_works.cpp</in>
+                    <in>doc_move_algorithms.cpp</in>
+                    <in>doc_move_inserter.cpp</in>
+                    <in>doc_move_iterator.cpp</in>
+                    <in>doc_move_return.cpp</in>
+                    <in>doc_template_assign.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>adaptive_merge_test.cpp</in>
+                    <in>adaptive_sort_test.cpp</in>
+                    <in>adl_move_swap.cpp</in>
+                    <in>algo_test.cpp</in>
+                    <in>back_move_inserter.cpp</in>
+                    <in>bench_merge.cpp</in>
+                    <in>bench_sort.cpp</in>
+                    <in>construct_forward.cpp</in>
+                    <in>conversion_test.cpp</in>
+                    <in>copy_elision_test.cpp</in>
+                    <in>copy_move_optimization.cpp</in>
+                    <in>inplace_merge_test.cpp</in>
+                    <in>move.cpp</in>
+                    <in>move_algorithm.cpp</in>
+                    <in>move_if_noexcept.cpp</in>
+                    <in>move_iterator.cpp</in>
+                    <in>type_traits.cpp</in>
+                    <in>unique_ptr_assign.cpp</in>
+                    <in>unique_ptr_ctordtor.cpp</in>
+                    <in>unique_ptr_default_deleter.cpp</in>
+                    <in>unique_ptr_functions.cpp</in>
+                    <in>unique_ptr_modifiers.cpp</in>
+                    <in>unique_ptr_movector.cpp</in>
+                    <in>unique_ptr_nullptr.cpp</in>
+                    <in>unique_ptr_observers.cpp</in>
+                    <in>unique_ptr_std_move.cpp</in>
+                    <in>unique_ptr_types.cpp</in>
+                  </df>
+                </df>
+                <df name="mp11">
+                  <df name="test">
+                    <df name="cmake_install_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="cmake_subdir_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>algorithm_version.cpp</in>
+                    <in>bind_version.cpp</in>
+                    <in>check_cmake_version.cpp</in>
+                    <in>construct_from_tuple.cpp</in>
+                    <in>construct_from_tuple_cx.cpp</in>
+                    <in>function_version.cpp</in>
+                    <in>integer_sequence.cpp</in>
+                    <in>integer_sequence_version.cpp</in>
+                    <in>integral.cpp</in>
+                    <in>integral_version.cpp</in>
+                    <in>list_version.cpp</in>
+                    <in>map_version.cpp</in>
+                    <in>mp11.cpp</in>
+                    <in>mp11_version.cpp</in>
+                    <in>mp_all.cpp</in>
+                    <in>mp_all_2.cpp</in>
+                    <in>mp_all_of.cpp</in>
+                    <in>mp_all_of_q.cpp</in>
+                    <in>mp_and.cpp</in>
+                    <in>mp_any.cpp</in>
+                    <in>mp_any_2.cpp</in>
+                    <in>mp_any_of.cpp</in>
+                    <in>mp_any_of_q.cpp</in>
+                    <in>mp_append.cpp</in>
+                    <in>mp_append_2.cpp</in>
+                    <in>mp_append_sf.cpp</in>
+                    <in>mp_apply_q.cpp</in>
+                    <in>mp_assign.cpp</in>
+                    <in>mp_at.cpp</in>
+                    <in>mp_at_sf.cpp</in>
+                    <in>mp_back.cpp</in>
+                    <in>mp_bind.cpp</in>
+                    <in>mp_bind_back.cpp</in>
+                    <in>mp_bind_front.cpp</in>
+                    <in>mp_bind_q.cpp</in>
+                    <in>mp_clear.cpp</in>
+                    <in>mp_compose.cpp</in>
+                    <in>mp_cond.cpp</in>
+                    <in>mp_cond_sf.cpp</in>
+                    <in>mp_contains.cpp</in>
+                    <in>mp_copy_if.cpp</in>
+                    <in>mp_copy_if_q.cpp</in>
+                    <in>mp_count.cpp</in>
+                    <in>mp_count_if.cpp</in>
+                    <in>mp_count_if_q.cpp</in>
+                    <in>mp_defer.cpp</in>
+                    <in>mp_drop.cpp</in>
+                    <in>mp_empty.cpp</in>
+                    <in>mp_erase.cpp</in>
+                    <in>mp_eval_if.cpp</in>
+                    <in>mp_eval_if_not.cpp</in>
+                    <in>mp_eval_if_sf.cpp</in>
+                    <in>mp_eval_or.cpp</in>
+                    <in>mp_fill.cpp</in>
+                    <in>mp_filter.cpp</in>
+                    <in>mp_find.cpp</in>
+                    <in>mp_find_if.cpp</in>
+                    <in>mp_find_if_q.cpp</in>
+                    <in>mp_flatten.cpp</in>
+                    <in>mp_fold.cpp</in>
+                    <in>mp_fold_q.cpp</in>
+                    <in>mp_for_each.cpp</in>
+                    <in>mp_from_sequence.cpp</in>
+                    <in>mp_front.cpp</in>
+                    <in>mp_identity.cpp</in>
+                    <in>mp_if.cpp</in>
+                    <in>mp_if_sf.cpp</in>
+                    <in>mp_inherit.cpp</in>
+                    <in>mp_insert.cpp</in>
+                    <in>mp_intersperse.cpp</in>
+                    <in>mp_invoke_q.cpp</in>
+                    <in>mp_invoke_q_sf.cpp</in>
+                    <in>mp_iota.cpp</in>
+                    <in>mp_is_list.cpp</in>
+                    <in>mp_is_map.cpp</in>
+                    <in>mp_is_set.cpp</in>
+                    <in>mp_iterate.cpp</in>
+                    <in>mp_join.cpp</in>
+                    <in>mp_less.cpp</in>
+                    <in>mp_list_c.cpp</in>
+                    <in>mp_map_contains.cpp</in>
+                    <in>mp_map_erase.cpp</in>
+                    <in>mp_map_find.cpp</in>
+                    <in>mp_map_find_2.cpp</in>
+                    <in>mp_map_find_3.cpp</in>
+                    <in>mp_map_insert.cpp</in>
+                    <in>mp_map_keys.cpp</in>
+                    <in>mp_map_replace.cpp</in>
+                    <in>mp_map_update.cpp</in>
+                    <in>mp_map_update_q.cpp</in>
+                    <in>mp_max.cpp</in>
+                    <in>mp_max_element.cpp</in>
+                    <in>mp_max_element_q.cpp</in>
+                    <in>mp_min.cpp</in>
+                    <in>mp_min_element.cpp</in>
+                    <in>mp_min_element_q.cpp</in>
+                    <in>mp_none_of.cpp</in>
+                    <in>mp_none_of_q.cpp</in>
+                    <in>mp_not_fn.cpp</in>
+                    <in>mp_nth_element.cpp</in>
+                    <in>mp_nth_element_q.cpp</in>
+                    <in>mp_or.cpp</in>
+                    <in>mp_pairwise_fold.cpp</in>
+                    <in>mp_pairwise_fold_q.cpp</in>
+                    <in>mp_partial_sum.cpp</in>
+                    <in>mp_partition.cpp</in>
+                    <in>mp_partition_q.cpp</in>
+                    <in>mp_plus.cpp</in>
+                    <in>mp_pop_back.cpp</in>
+                    <in>mp_pop_front.cpp</in>
+                    <in>mp_power_set.cpp</in>
+                    <in>mp_product.cpp</in>
+                    <in>mp_push_back.cpp</in>
+                    <in>mp_push_front.cpp</in>
+                    <in>mp_quote.cpp</in>
+                    <in>mp_quote_trait.cpp</in>
+                    <in>mp_remove.cpp</in>
+                    <in>mp_remove_if.cpp</in>
+                    <in>mp_remove_if_q.cpp</in>
+                    <in>mp_rename.cpp</in>
+                    <in>mp_repeat.cpp</in>
+                    <in>mp_replace.cpp</in>
+                    <in>mp_replace_at.cpp</in>
+                    <in>mp_replace_at_c.cpp</in>
+                    <in>mp_replace_front.cpp</in>
+                    <in>mp_replace_if.cpp</in>
+                    <in>mp_replace_if_q.cpp</in>
+                    <in>mp_replace_second.cpp</in>
+                    <in>mp_replace_third.cpp</in>
+                    <in>mp_reverse.cpp</in>
+                    <in>mp_reverse_fold.cpp</in>
+                    <in>mp_reverse_fold_q.cpp</in>
+                    <in>mp_rotate_left.cpp</in>
+                    <in>mp_rotate_right.cpp</in>
+                    <in>mp_same.cpp</in>
+                    <in>mp_second.cpp</in>
+                    <in>mp_set_contains.cpp</in>
+                    <in>mp_set_difference.cpp</in>
+                    <in>mp_set_difference_sf.cpp</in>
+                    <in>mp_set_intersection.cpp</in>
+                    <in>mp_set_intersection_sf.cpp</in>
+                    <in>mp_set_push_back.cpp</in>
+                    <in>mp_set_push_front.cpp</in>
+                    <in>mp_set_union.cpp</in>
+                    <in>mp_set_union_sf.cpp</in>
+                    <in>mp_similar.cpp</in>
+                    <in>mp_size.cpp</in>
+                    <in>mp_sort.cpp</in>
+                    <in>mp_sort_q.cpp</in>
+                    <in>mp_split.cpp</in>
+                    <in>mp_starts_with.cpp</in>
+                    <in>mp_starts_with_sf.cpp</in>
+                    <in>mp_take.cpp</in>
+                    <in>mp_third.cpp</in>
+                    <in>mp_transform.cpp</in>
+                    <in>mp_transform_front.cpp</in>
+                    <in>mp_transform_if.cpp</in>
+                    <in>mp_transform_if_q.cpp</in>
+                    <in>mp_transform_q.cpp</in>
+                    <in>mp_transform_second.cpp</in>
+                    <in>mp_transform_sf.cpp</in>
+                    <in>mp_transform_third.cpp</in>
+                    <in>mp_unique.cpp</in>
+                    <in>mp_unique_if.cpp</in>
+                    <in>mp_unique_if_q.cpp</in>
+                    <in>mp_valid.cpp</in>
+                    <in>mp_with_index.cpp</in>
+                    <in>mp_with_index_cx.cpp</in>
+                    <in>mpl.cpp</in>
+                    <in>mpl_list.cpp</in>
+                    <in>mpl_tuple.cpp</in>
+                    <in>mpl_version.cpp</in>
+                    <in>set_version.cpp</in>
+                    <in>tuple_apply.cpp</in>
+                    <in>tuple_apply_cx.cpp</in>
+                    <in>tuple_for_each.cpp</in>
+                    <in>tuple_for_each_cx.cpp</in>
+                    <in>tuple_transform.cpp</in>
+                    <in>tuple_transform_2.cpp</in>
+                    <in>tuple_transform_cx.cpp</in>
+                    <in>tuple_version.cpp</in>
+                    <in>utility_version.cpp</in>
+                    <in>version.cpp</in>
+                  </df>
+                </df>
+                <df name="mpi">
+                  <df name="example">
+                    <in>cartesian_communicator.cpp</in>
+                    <in>generate_collect.cpp</in>
+                    <in>generate_collect_optional.cpp</in>
+                    <in>global_min.cpp</in>
+                    <in>hello_world.cpp</in>
+                    <in>hello_world_broadcast.cpp</in>
+                    <in>hello_world_groups.cpp</in>
+                    <in>hello_world_nonblocking.cpp</in>
+                    <in>in_place_global_min.cpp</in>
+                    <in>parallel_example.cpp</in>
+                    <in>random_content.cpp</in>
+                    <in>random_gather.cpp</in>
+                    <in>random_min.cpp</in>
+                    <in>random_scatter.cpp</in>
+                    <in>reduce_performance_test.cpp</in>
+                    <in>string_cat.cpp</in>
+                  </df>
+                  <df name="src">
+                    <df name="python">
+                      <in>collectives.cpp</in>
+                      <in>datatypes.cpp</in>
+                      <in>documentation.cpp</in>
+                      <in>module.cpp</in>
+                      <in>py_communicator.cpp</in>
+                      <in>py_environment.cpp</in>
+                      <in>py_exception.cpp</in>
+                      <in>py_nonblocking.cpp</in>
+                      <in>py_request.cpp</in>
+                      <in>py_timer.cpp</in>
+                      <in>serialize.cpp</in>
+                      <in>skeleton_and_content.cpp</in>
+                      <in>status.cpp</in>
+                    </df>
+                    <in>broadcast.cpp</in>
+                    <in>cartesian_communicator.cpp</in>
+                    <in>communicator.cpp</in>
+                    <in>computation_tree.cpp</in>
+                    <in>content_oarchive.cpp</in>
+                    <in>environment.cpp</in>
+                    <in>error_string.cpp</in>
+                    <in>exception.cpp</in>
+                    <in>graph_communicator.cpp</in>
+                    <in>group.cpp</in>
+                    <in>intercommunicator.cpp</in>
+                    <in>mpi_datatype_cache.cpp</in>
+                    <in>mpi_datatype_oarchive.cpp</in>
+                    <in>offsets.cpp</in>
+                    <in>packed_iarchive.cpp</in>
+                    <in>packed_oarchive.cpp</in>
+                    <in>packed_skeleton_iarchive.cpp</in>
+                    <in>packed_skeleton_oarchive.cpp</in>
+                    <in>point_to_point.cpp</in>
+                    <in>request.cpp</in>
+                    <in>status.cpp</in>
+                    <in>text_skeleton_oarchive.cpp</in>
+                    <in>timer.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="python">
+                      <in>skeleton_content_test.cpp</in>
+                    </df>
+                    <in>all_gather_test.cpp</in>
+                    <in>all_reduce_test.cpp</in>
+                    <in>all_to_all_test.cpp</in>
+                    <in>block_nonblock_test.cpp</in>
+                    <in>broadcast_stl_test.cpp</in>
+                    <in>broadcast_test.cpp</in>
+                    <in>cartesian_topology_init_test.cpp</in>
+                    <in>cartesian_topology_test.cpp</in>
+                    <in>debugger.cpp</in>
+                    <in>gather_test.cpp</in>
+                    <in>graph_topology_test.cpp</in>
+                    <in>groups_test.cpp</in>
+                    <in>is_mpi_op_test.cpp</in>
+                    <in>mt_init_test.cpp</in>
+                    <in>mt_level_test.cpp</in>
+                    <in>non_blocking_any_source.cpp</in>
+                    <in>nonblocking_test.cpp</in>
+                    <in>pointer_test.cpp</in>
+                    <in>reduce_test.cpp</in>
+                    <in>ring_test.cpp</in>
+                    <in>scan_test.cpp</in>
+                    <in>scatter_test.cpp</in>
+                    <in>sendrecv_test.cpp</in>
+                    <in>sendrecv_vector.cpp</in>
+                    <in>skeleton_content_test.cpp</in>
+                    <in>version_test.cpp</in>
+                    <in>wait_all_on_null.cpp</in>
+                    <in>wait_all_vector_test.cpp</in>
+                    <in>wait_any_test.cpp</in>
+                  </df>
+                </df>
+                <df name="mpl">
+                  <df name="example">
+                    <df name="fsm">
+                      <in>player.cpp</in>
+                      <in>player1.cpp</in>
+                      <in>player2.cpp</in>
+                    </df>
+                    <in>inherit_linearly.cpp</in>
+                    <in>inherit_multiply.cpp</in>
+                    <in>integer.cpp</in>
+                    <in>tuple_from_list.cpp</in>
+                  </df>
+                  <df name="preprocessed">
+                    <df name="list">
+                      <in>list10.cpp</in>
+                      <in>list10_c.cpp</in>
+                      <in>list20.cpp</in>
+                      <in>list20_c.cpp</in>
+                      <in>list30.cpp</in>
+                      <in>list30_c.cpp</in>
+                      <in>list40.cpp</in>
+                      <in>list40_c.cpp</in>
+                      <in>list50.cpp</in>
+                      <in>list50_c.cpp</in>
+                    </df>
+                    <df name="map">
+                      <in>map10.cpp</in>
+                      <in>map20.cpp</in>
+                      <in>map30.cpp</in>
+                      <in>map40.cpp</in>
+                      <in>map50.cpp</in>
+                    </df>
+                    <df name="set">
+                      <in>set10.cpp</in>
+                      <in>set10_c.cpp</in>
+                      <in>set20.cpp</in>
+                      <in>set20_c.cpp</in>
+                      <in>set30.cpp</in>
+                      <in>set30_c.cpp</in>
+                      <in>set40.cpp</in>
+                      <in>set40_c.cpp</in>
+                      <in>set50.cpp</in>
+                      <in>set50_c.cpp</in>
+                    </df>
+                    <df name="src">
+                      <in>advance_backward.cpp</in>
+                      <in>advance_forward.cpp</in>
+                      <in>and.cpp</in>
+                      <in>apply.cpp</in>
+                      <in>apply_fwd.cpp</in>
+                      <in>apply_wrap.cpp</in>
+                      <in>arg.cpp</in>
+                      <in>basic_bind.cpp</in>
+                      <in>bind.cpp</in>
+                      <in>bind_fwd.cpp</in>
+                      <in>bitand.cpp</in>
+                      <in>bitor.cpp</in>
+                      <in>bitxor.cpp</in>
+                      <in>deque.cpp</in>
+                      <in>divides.cpp</in>
+                      <in>equal_to.cpp</in>
+                      <in>fold_impl.cpp</in>
+                      <in>full_lambda.cpp</in>
+                      <in>greater.cpp</in>
+                      <in>greater_equal.cpp</in>
+                      <in>inherit.cpp</in>
+                      <in>iter_fold_if_impl.cpp</in>
+                      <in>iter_fold_impl.cpp</in>
+                      <in>lambda_no_ctps.cpp</in>
+                      <in>less.cpp</in>
+                      <in>less_equal.cpp</in>
+                      <in>list.cpp</in>
+                      <in>list_c.cpp</in>
+                      <in>map.cpp</in>
+                      <in>minus.cpp</in>
+                      <in>modulus.cpp</in>
+                      <in>not_equal_to.cpp</in>
+                      <in>or.cpp</in>
+                      <in>placeholders.cpp</in>
+                      <in>plus.cpp</in>
+                      <in>quote.cpp</in>
+                      <in>reverse_fold_impl.cpp</in>
+                      <in>reverse_iter_fold_impl.cpp</in>
+                      <in>set.cpp</in>
+                      <in>set_c.cpp</in>
+                      <in>shift_left.cpp</in>
+                      <in>shift_right.cpp</in>
+                      <in>template_arity.cpp</in>
+                      <in>times.cpp</in>
+                      <in>unpack_args.cpp</in>
+                      <in>vector.cpp</in>
+                      <in>vector_c.cpp</in>
+                    </df>
+                    <df name="vector">
+                      <in>vector10.cpp</in>
+                      <in>vector10_c.cpp</in>
+                      <in>vector20.cpp</in>
+                      <in>vector20_c.cpp</in>
+                      <in>vector30.cpp</in>
+                      <in>vector30_c.cpp</in>
+                      <in>vector40.cpp</in>
+                      <in>vector40_c.cpp</in>
+                      <in>vector50.cpp</in>
+                      <in>vector50_c.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="aux_">
+                      <df name="preprocessor">
+                        <in>is_seq.cpp</in>
+                        <in>token_equal.cpp</in>
+                      </df>
+                      <in>increased_arity.cpp</in>
+                      <in>largest_int.cpp</in>
+                      <in>msvc_is_class.cpp</in>
+                      <in>template_arity.cpp</in>
+                    </df>
+                    <in>advance.cpp</in>
+                    <in>always.cpp</in>
+                    <in>apply.cpp</in>
+                    <in>apply_wrap.cpp</in>
+                    <in>arithmetic.cpp</in>
+                    <in>as_sequence.cpp</in>
+                    <in>assert.cpp</in>
+                    <in>assert_vc8_p1.cpp</in>
+                    <in>assert_vc8_p2.cpp</in>
+                    <in>at.cpp</in>
+                    <in>back.cpp</in>
+                    <in>bind.cpp</in>
+                    <in>bitwise.cpp</in>
+                    <in>bool.cpp</in>
+                    <in>char.cpp</in>
+                    <in>comparison.cpp</in>
+                    <in>contains.cpp</in>
+                    <in>copy.cpp</in>
+                    <in>copy_if.cpp</in>
+                    <in>count.cpp</in>
+                    <in>count_if.cpp</in>
+                    <in>deque.cpp</in>
+                    <in>distance.cpp</in>
+                    <in>empty.cpp</in>
+                    <in>empty_sequence.cpp</in>
+                    <in>equal.cpp</in>
+                    <in>erase.cpp</in>
+                    <in>erase_range.cpp</in>
+                    <in>eval_if.cpp</in>
+                    <in>filter_view.cpp</in>
+                    <in>find.cpp</in>
+                    <in>find_if.cpp</in>
+                    <in>fold.cpp</in>
+                    <in>for_each.cpp</in>
+                    <in>front.cpp</in>
+                    <in>get_tag_def.cpp</in>
+                    <in>has_xxx.cpp</in>
+                    <in>identity.cpp</in>
+                    <in>if.cpp</in>
+                    <in>index_of.cpp</in>
+                    <in>inherit.cpp</in>
+                    <in>insert.cpp</in>
+                    <in>insert_range.cpp</in>
+                    <in>int.cpp</in>
+                    <in>integral_c.cpp</in>
+                    <in>is_placeholder.cpp</in>
+                    <in>is_sequence.cpp</in>
+                    <in>iterator_tags.cpp</in>
+                    <in>joint_view.cpp</in>
+                    <in>lambda.cpp</in>
+                    <in>lambda_args.cpp</in>
+                    <in>list.cpp</in>
+                    <in>list_c.cpp</in>
+                    <in>logical.cpp</in>
+                    <in>lower_bound.cpp</in>
+                    <in>map.cpp</in>
+                    <in>max_element.cpp</in>
+                    <in>min_max.cpp</in>
+                    <in>multiset.cpp</in>
+                    <in>next.cpp</in>
+                    <in>no_has_xxx.cpp</in>
+                    <in>numeric_ops.cpp</in>
+                    <in>pair_view.cpp</in>
+                    <in>partition.cpp</in>
+                    <in>pop_front.cpp</in>
+                    <in>print.cpp</in>
+                    <in>push_back.cpp</in>
+                    <in>push_front.cpp</in>
+                    <in>quote.cpp</in>
+                    <in>range_c.cpp</in>
+                    <in>remove.cpp</in>
+                    <in>remove_if.cpp</in>
+                    <in>replace.cpp</in>
+                    <in>replace_if.cpp</in>
+                    <in>reverse.cpp</in>
+                    <in>same_as.cpp</in>
+                    <in>set.cpp</in>
+                    <in>set_c.cpp</in>
+                    <in>single_view.cpp</in>
+                    <in>size.cpp</in>
+                    <in>size_t.cpp</in>
+                    <in>sizeof.cpp</in>
+                    <in>sort.cpp</in>
+                    <in>stable_partition.cpp</in>
+                    <in>string.cpp</in>
+                    <in>transform.cpp</in>
+                    <in>transform_view.cpp</in>
+                    <in>unique.cpp</in>
+                    <in>unpack_args.cpp</in>
+                    <in>upper_bound.cpp</in>
+                    <in>vector.cpp</in>
+                    <in>vector_c.cpp</in>
+                    <in>zip_view.cpp</in>
+                  </df>
+                </df>
+                <df name="msm">
+                  <df name="doc">
+                    <df name="HTML">
+                      <df name="examples">
+                        <df name="distributed_table">
+                          <in>DistributedTable.cpp</in>
+                          <in>Empty.cpp</in>
+                          <in>Open.cpp</in>
+                        </df>
+                        <df name="iPod_distributed">
+                          <in>MenuMode.cpp</in>
+                          <in>PlayingMode.cpp</in>
+                          <in>iPod.cpp</in>
+                        </df>
+                        <in>ActivateStateBeforeTransitionEuml.cpp</in>
+                        <in>ActiveStateSetBeforeTransition.cpp</in>
+                        <in>AnonymousTutorial.cpp</in>
+                        <in>AnonymousTutorialEuml.cpp</in>
+                        <in>AnonymousTutorialWithFunctors.cpp</in>
+                        <in>BoostCon09Full.cpp</in>
+                        <in>CompilerStressTestEuml.cpp</in>
+                        <in>CompositeTutorial.cpp</in>
+                        <in>CompositeTutorialEuml.cpp</in>
+                        <in>CompositeTutorialWithEumlTable.cpp</in>
+                        <in>Constructor.cpp</in>
+                        <in>DirectEntryEuml.cpp</in>
+                        <in>DirectEntryTutorial.cpp</in>
+                        <in>EumlInternal.cpp</in>
+                        <in>EumlInternalDistributed.cpp</in>
+                        <in>EumlSimple.cpp</in>
+                        <in>ExampleCircularBuffer.cpp</in>
+                        <in>Flags.cpp</in>
+                        <in>FsmAsPtr.cpp</in>
+                        <in>History.cpp</in>
+                        <in>HistoryEuml.cpp</in>
+                        <in>MsmComposite.cpp</in>
+                        <in>MsmSimple.cpp</in>
+                        <in>MsmSimpleFunctors.cpp</in>
+                        <in>Orthogonal-deferred.cpp</in>
+                        <in>Orthogonal-deferred2.cpp</in>
+                        <in>OrthogonalDeferredEuml.cpp</in>
+                        <in>OrthogonalDeferredEuml2.cpp</in>
+                        <in>ParsingDigits.cpp</in>
+                        <in>SCComposite.cpp</in>
+                        <in>SCSimple.cpp</in>
+                        <in>SM-2Arg.cpp</in>
+                        <in>Serialize.cpp</in>
+                        <in>SerializeCompositeAndHistory.cpp</in>
+                        <in>SimplePhoenix.cpp</in>
+                        <in>SimpleTimer.cpp</in>
+                        <in>SimpleTutorial.cpp</in>
+                        <in>SimpleTutorial2.cpp</in>
+                        <in>SimpleTutorialEuml.cpp</in>
+                        <in>SimpleTutorialEuml2.cpp</in>
+                        <in>SimpleTutorialInternal.cpp</in>
+                        <in>SimpleTutorialInternal2.cpp</in>
+                        <in>SimpleTutorialInternalFunctors.cpp</in>
+                        <in>SimpleTutorialWithEumlTable.cpp</in>
+                        <in>SimpleTutorialWithEumlTableKleene.cpp</in>
+                        <in>SimpleTutorialWithEumlTableTypeErasure.cpp</in>
+                        <in>SimpleWithFunctors.cpp</in>
+                        <in>SimpleWithFunctors2.cpp</in>
+                        <in>SimpleWithFunctors3.cpp</in>
+                        <in>TestErrorOrthogonality.cpp</in>
+                        <in>TestInternal.cpp</in>
+                        <in>Visitor.cpp</in>
+                        <in>iPodEuml.cpp</in>
+                        <in>iPodSearch.cpp</in>
+                        <in>iPodSearchEuml.cpp</in>
+                      </df>
+                    </df>
+                    <df name="PDF">
+                      <df name="examples">
+                        <df name="distributed_table">
+                          <in>DistributedTable.cpp</in>
+                          <in>Empty.cpp</in>
+                          <in>Open.cpp</in>
+                        </df>
+                        <df name="iPod_distributed">
+                          <in>MenuMode.cpp</in>
+                          <in>PlayingMode.cpp</in>
+                          <in>iPod.cpp</in>
+                        </df>
+                        <in>ActivateStateBeforeTransitionEuml.cpp</in>
+                        <in>ActiveStateSetBeforeTransition.cpp</in>
+                        <in>AnonymousTutorial.cpp</in>
+                        <in>AnonymousTutorialEuml.cpp</in>
+                        <in>AnonymousTutorialWithFunctors.cpp</in>
+                        <in>BoostCon09Full.cpp</in>
+                        <in>CompilerStressTestEuml.cpp</in>
+                        <in>CompositeTutorial.cpp</in>
+                        <in>CompositeTutorialEuml.cpp</in>
+                        <in>CompositeTutorialWithEumlTable.cpp</in>
+                        <in>Constructor.cpp</in>
+                        <in>DirectEntryEuml.cpp</in>
+                        <in>DirectEntryTutorial.cpp</in>
+                        <in>EumlInternal.cpp</in>
+                        <in>EumlInternalDistributed.cpp</in>
+                        <in>EumlSimple.cpp</in>
+                        <in>ExampleCircularBuffer.cpp</in>
+                        <in>Flags.cpp</in>
+                        <in>FsmAsPtr.cpp</in>
+                        <in>History.cpp</in>
+                        <in>HistoryEuml.cpp</in>
+                        <in>MsmComposite.cpp</in>
+                        <in>MsmSimple.cpp</in>
+                        <in>MsmSimpleFunctors.cpp</in>
+                        <in>Orthogonal-deferred.cpp</in>
+                        <in>Orthogonal-deferred2.cpp</in>
+                        <in>OrthogonalDeferredEuml.cpp</in>
+                        <in>OrthogonalDeferredEuml2.cpp</in>
+                        <in>ParsingDigits.cpp</in>
+                        <in>SCComposite.cpp</in>
+                        <in>SCSimple.cpp</in>
+                        <in>SM-2Arg.cpp</in>
+                        <in>Serialize.cpp</in>
+                        <in>SerializeCompositeAndHistory.cpp</in>
+                        <in>SimplePhoenix.cpp</in>
+                        <in>SimpleTimer.cpp</in>
+                        <in>SimpleTutorial.cpp</in>
+                        <in>SimpleTutorial2.cpp</in>
+                        <in>SimpleTutorialEuml.cpp</in>
+                        <in>SimpleTutorialEuml2.cpp</in>
+                        <in>SimpleTutorialInternal.cpp</in>
+                        <in>SimpleTutorialInternal2.cpp</in>
+                        <in>SimpleTutorialInternalFunctors.cpp</in>
+                        <in>SimpleTutorialWithEumlTable.cpp</in>
+                        <in>SimpleTutorialWithEumlTableKleene.cpp</in>
+                        <in>SimpleTutorialWithEumlTableTypeErasure.cpp</in>
+                        <in>SimpleWithFunctors.cpp</in>
+                        <in>SimpleWithFunctors2.cpp</in>
+                        <in>SimpleWithFunctors3.cpp</in>
+                        <in>TestErrorOrthogonality.cpp</in>
+                        <in>TestInternal.cpp</in>
+                        <in>Visitor.cpp</in>
+                        <in>iPodEuml.cpp</in>
+                        <in>iPodSearch.cpp</in>
+                        <in>iPodSearchEuml.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <df name="mpl_graph">
+                      <in>adjacency_list_graph.cpp</in>
+                      <in>breadth_first_search.cpp</in>
+                      <in>depth_first_search.cpp</in>
+                      <in>incidence_list_graph.cpp</in>
+                      <in>msm_adaptor.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>Anonymous.cpp</in>
+                    <in>AnonymousEuml.cpp</in>
+                    <in>CompositeEuml.cpp</in>
+                    <in>CompositeMachine.cpp</in>
+                    <in>Constructor.cpp</in>
+                    <in>Entries.cpp</in>
+                    <in>EventQueue.cpp</in>
+                    <in>History.cpp</in>
+                    <in>OrthogonalDeferred.cpp</in>
+                    <in>OrthogonalDeferred2.cpp</in>
+                    <in>OrthogonalDeferred3.cpp</in>
+                    <in>OrthogonalDeferredEuml.cpp</in>
+                    <in>Serialize.cpp</in>
+                    <in>SerializeSimpleEuml.cpp</in>
+                    <in>SerializeWithHistory.cpp</in>
+                    <in>SimpleEuml.cpp</in>
+                    <in>SimpleEuml2.cpp</in>
+                    <in>SimpleInternal.cpp</in>
+                    <in>SimpleInternalEuml.cpp</in>
+                    <in>SimpleInternalFunctors.cpp</in>
+                    <in>SimpleMachine.cpp</in>
+                    <in>SimpleWithFunctors.cpp</in>
+                    <in>Test2RegionsAnonymous.cpp</in>
+                    <in>TestConstructor.cpp</in>
+                    <in>TestConstructorMovableOnlyTypes.cpp</in>
+                    <in>TestDeferAndMessageQueue.cpp</in>
+                    <in>TestDeferAndMessageQueue2.cpp</in>
+                    <in>TestDeferAndMessageQueue3.cpp</in>
+                    <in>TestDeferIn2Regions.cpp</in>
+                  </df>
+                </df>
+                <df name="multi_array">
+                  <df name="example">
+                    <in>basic1.cpp</in>
+                    <in>basic2.cpp</in>
+                    <in>foreach_test.cpp</in>
+                    <in>foreach_test2.cpp</in>
+                    <in>op_paren.cpp</in>
+                    <in>print_array.cpp</in>
+                    <in>resize_from_other.cpp</in>
+                    <in>subview.cpp</in>
+                    <in>subview2.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>access.cpp</in>
+                    <in>allocators.cpp</in>
+                    <in>assert.cpp</in>
+                    <in>assign.cpp</in>
+                    <in>assign_to_array.cpp</in>
+                    <in>compare.cpp</in>
+                    <in>concept_checks.cpp</in>
+                    <in>constructors.cpp</in>
+                    <in>dimtest.cpp</in>
+                    <in>fail_cbracket.cpp</in>
+                    <in>fail_cdata.cpp</in>
+                    <in>fail_citerator.cpp</in>
+                    <in>fail_cparen.cpp</in>
+                    <in>fail_criterator.cpp</in>
+                    <in>fail_csubarray.cpp</in>
+                    <in>fail_csubarray2.cpp</in>
+                    <in>fail_csubarray3.cpp</in>
+                    <in>fail_cview.cpp</in>
+                    <in>fail_cview2.cpp</in>
+                    <in>fail_cview3.cpp</in>
+                    <in>fail_ref_cbracket.cpp</in>
+                    <in>fail_ref_cdata.cpp</in>
+                    <in>fail_ref_citerator.cpp</in>
+                    <in>fail_ref_cparen.cpp</in>
+                    <in>fail_ref_criterator.cpp</in>
+                    <in>fail_ref_csubarray.cpp</in>
+                    <in>fail_ref_csubarray2.cpp</in>
+                    <in>fail_ref_csubarray3.cpp</in>
+                    <in>fail_ref_cview.cpp</in>
+                    <in>fail_ref_cview2.cpp</in>
+                    <in>fail_ref_cview3.cpp</in>
+                    <in>idxgen1.cpp</in>
+                    <in>index_bases.cpp</in>
+                    <in>iterators.cpp</in>
+                    <in>range1.cpp</in>
+                    <in>reshape.cpp</in>
+                    <in>resize.cpp</in>
+                    <in>reverse_view.cpp</in>
+                    <in>slice.cpp</in>
+                    <in>stl_interaction.cpp</in>
+                    <in>storage_order.cpp</in>
+                    <in>storage_order_convert.cpp</in>
+                    <in>vc_death.cpp</in>
+                  </df>
+                </df>
+                <df name="multi_index">
+                  <df name="example">
+                    <in>basic.cpp</in>
+                    <in>bimap.cpp</in>
+                    <in>complex_structs.cpp</in>
+                    <in>composite_keys.cpp</in>
+                    <in>fun_key.cpp</in>
+                    <in>hashed.cpp</in>
+                    <in>ip_allocator.cpp</in>
+                    <in>non_default_ctor.cpp</in>
+                    <in>random_access.cpp</in>
+                    <in>rearrange.cpp</in>
+                    <in>sequenced.cpp</in>
+                    <in>serialization.cpp</in>
+                  </df>
+                  <df name="perf">
+                    <in>test_perf.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>check_bmi_key_supported.cpp</in>
+                    <in>test_all_main.cpp</in>
+                    <in>test_alloc_awareness.cpp</in>
+                    <in>test_alloc_awareness_main.cpp</in>
+                    <in>test_basic.cpp</in>
+                    <in>test_basic_main.cpp</in>
+                    <in>test_capacity.cpp</in>
+                    <in>test_capacity_main.cpp</in>
+                    <in>test_comparison.cpp</in>
+                    <in>test_comparison_main.cpp</in>
+                    <in>test_composite_key.cpp</in>
+                    <in>test_composite_key_main.cpp</in>
+                    <in>test_conv_iterators.cpp</in>
+                    <in>test_conv_iterators_main.cpp</in>
+                    <in>test_copy_assignment.cpp</in>
+                    <in>test_copy_assignment_main.cpp</in>
+                    <in>test_hash_ops.cpp</in>
+                    <in>test_hash_ops_main.cpp</in>
+                    <in>test_iterators.cpp</in>
+                    <in>test_iterators_main.cpp</in>
+                    <in>test_key.cpp</in>
+                    <in>test_key_extractors.cpp</in>
+                    <in>test_key_extractors_main.cpp</in>
+                    <in>test_key_main.cpp</in>
+                    <in>test_list_ops.cpp</in>
+                    <in>test_list_ops_main.cpp</in>
+                    <in>test_modifiers.cpp</in>
+                    <in>test_modifiers_main.cpp</in>
+                    <in>test_mpl_ops.cpp</in>
+                    <in>test_mpl_ops_main.cpp</in>
+                    <in>test_node_handling.cpp</in>
+                    <in>test_node_handling_main.cpp</in>
+                    <in>test_observers.cpp</in>
+                    <in>test_observers_main.cpp</in>
+                    <in>test_projection.cpp</in>
+                    <in>test_projection_main.cpp</in>
+                    <in>test_range.cpp</in>
+                    <in>test_range_main.cpp</in>
+                    <in>test_rank_ops.cpp</in>
+                    <in>test_rank_ops_main.cpp</in>
+                    <in>test_rearrange.cpp</in>
+                    <in>test_rearrange_main.cpp</in>
+                    <in>test_safe_mode.cpp</in>
+                    <in>test_safe_mode_main.cpp</in>
+                    <in>test_serialization.cpp</in>
+                    <in>test_serialization1.cpp</in>
+                    <in>test_serialization2.cpp</in>
+                    <in>test_serialization3.cpp</in>
+                    <in>test_serialization_main.cpp</in>
+                    <in>test_set_ops.cpp</in>
+                    <in>test_set_ops_main.cpp</in>
+                    <in>test_special_set_ops.cpp</in>
+                    <in>test_special_set_ops_main.cpp</in>
+                    <in>test_update.cpp</in>
+                    <in>test_update_main.cpp</in>
+                  </df>
+                </df>
+                <df name="multiprecision">
+                  <df name="config">
+                    <in>has_big_obj.cpp</in>
+                    <in>has_constexpr_limits_cmd.cpp</in>
+                    <in>has_eigen.cpp</in>
+                    <in>has_f2c.cpp</in>
+                    <in>has_float128.cpp</in>
+                    <in>has_gmp.cpp</in>
+                    <in>has_intel_quad.cpp</in>
+                    <in>has_is_constant_evaluated.cpp</in>
+                    <in>has_mpc.cpp</in>
+                    <in>has_mpfi.cpp</in>
+                    <in>has_mpfr.cpp</in>
+                    <in>has_tommath.cpp</in>
+                    <in>is_ci_sanitizer_run.cpp</in>
+                  </df>
+                  <df name="doc">
+                    <in>numeric_limits_qbk.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>big_seventh.cpp</in>
+                    <in>complex128_examples.cpp</in>
+                    <in>constexpr_float_arithmetic_examples.cpp</in>
+                    <in>cpp_bin_float_import_export.cpp</in>
+                    <in>cpp_bin_float_snips.cpp</in>
+                    <in>cpp_complex_examples.cpp</in>
+                    <in>cpp_dec_float_snips.cpp</in>
+                    <in>cpp_int_import_export.cpp</in>
+                    <in>cpp_int_mul_timing.cpp</in>
+                    <in>cpp_int_snips.cpp</in>
+                    <in>debug_adaptor_snips.cpp</in>
+                    <in>eigen_example.cpp</in>
+                    <in>exercise_threading_log_agm.cpp</in>
+                    <in>float128_snips.cpp</in>
+                    <in>floating_point_examples.cpp</in>
+                    <in>gauss_laguerre_quadrature.cpp</in>
+                    <in>gmp_snips.cpp</in>
+                    <in>hashing_examples.cpp</in>
+                    <in>hypergeometric_luke_algorithms.cpp</in>
+                    <in>integer_examples.cpp</in>
+                    <in>logged_adaptor.cpp</in>
+                    <in>mixed_integer_arithmetic.cpp</in>
+                    <in>mpc_examples.cpp</in>
+                    <in>mpfi_snips.cpp</in>
+                    <in>mpfr_precision.cpp</in>
+                    <in>mpfr_snips.cpp</in>
+                    <in>numeric_limits_snips.cpp</in>
+                    <in>random_snips.cpp</in>
+                    <in>safe_prime.cpp</in>
+                    <in>scoped_precision_example.cpp</in>
+                    <in>tommath_snips.cpp</in>
+                  </df>
+                  <df name="performance">
+                    <df name="miller_rabin_performance_files">
+                      <in>test01.cpp</in>
+                      <in>test02.cpp</in>
+                      <in>test03.cpp</in>
+                      <in>test04.cpp</in>
+                      <in>test05.cpp</in>
+                      <in>test06.cpp</in>
+                      <in>test07.cpp</in>
+                      <in>test08.cpp</in>
+                      <in>test09.cpp</in>
+                      <in>test10.cpp</in>
+                      <in>test11.cpp</in>
+                      <in>test12.cpp</in>
+                    </df>
+                    <df name="performance_test_files">
+                      <in>test01.cpp</in>
+                      <in>test02.cpp</in>
+                      <in>test03.cpp</in>
+                      <in>test04.cpp</in>
+                      <in>test05.cpp</in>
+                      <in>test06.cpp</in>
+                      <in>test07.cpp</in>
+                      <in>test08.cpp</in>
+                      <in>test09.cpp</in>
+                      <in>test10.cpp</in>
+                      <in>test11.cpp</in>
+                      <in>test12.cpp</in>
+                      <in>test13.cpp</in>
+                      <in>test14.cpp</in>
+                      <in>test15.cpp</in>
+                      <in>test16.cpp</in>
+                      <in>test17.cpp</in>
+                      <in>test18.cpp</in>
+                      <in>test19.cpp</in>
+                      <in>test20.cpp</in>
+                      <in>test21.cpp</in>
+                      <in>test22.cpp</in>
+                      <in>test23.cpp</in>
+                      <in>test24.cpp</in>
+                      <in>test25.cpp</in>
+                      <in>test26.cpp</in>
+                      <in>test27.cpp</in>
+                      <in>test28.cpp</in>
+                      <in>test29.cpp</in>
+                      <in>test30.cpp</in>
+                      <in>test31.cpp</in>
+                      <in>test32.cpp</in>
+                      <in>test33.cpp</in>
+                      <in>test34.cpp</in>
+                      <in>test35.cpp</in>
+                      <in>test36.cpp</in>
+                      <in>test37.cpp</in>
+                      <in>test38.cpp</in>
+                      <in>test39.cpp</in>
+                      <in>test40.cpp</in>
+                      <in>test41.cpp</in>
+                      <in>test42.cpp</in>
+                      <in>test43.cpp</in>
+                      <in>test44.cpp</in>
+                      <in>test45.cpp</in>
+                      <in>test46.cpp</in>
+                      <in>test47.cpp</in>
+                      <in>test48.cpp</in>
+                      <in>test49.cpp</in>
+                      <in>test50.cpp</in>
+                      <in>test51.cpp</in>
+                    </df>
+                    <df name="sf_performance_files">
+                      <in>sf_performance_basic_1.cpp</in>
+                      <in>sf_performance_basic_2.cpp</in>
+                      <in>sf_performance_basic_3.cpp</in>
+                      <in>sf_performance_basic_4.cpp</in>
+                      <in>sf_performance_basic_5.cpp</in>
+                      <in>sf_performance_basic_6.cpp</in>
+                      <in>sf_performance_basic_7.cpp</in>
+                      <in>sf_performance_basic_8.cpp</in>
+                      <in>sf_performance_basic_9.cpp</in>
+                      <in>sf_performance_bessel_01.cpp</in>
+                      <in>sf_performance_bessel_02.cpp</in>
+                      <in>sf_performance_bessel_03.cpp</in>
+                      <in>sf_performance_bessel_04.cpp</in>
+                      <in>sf_performance_bessel_05.cpp</in>
+                      <in>sf_performance_bessel_06.cpp</in>
+                      <in>sf_performance_bessel_07.cpp</in>
+                      <in>sf_performance_bessel_08.cpp</in>
+                      <in>sf_performance_bessel_09.cpp</in>
+                      <in>sf_performance_bessel_10.cpp</in>
+                      <in>sf_performance_bessel_11.cpp</in>
+                      <in>sf_performance_bessel_12.cpp</in>
+                      <in>sf_performance_bessel_13.cpp</in>
+                      <in>sf_performance_bessel_14.cpp</in>
+                      <in>sf_performance_bessel_15.cpp</in>
+                      <in>sf_performance_bessel_16.cpp</in>
+                      <in>sf_performance_bessel_17.cpp</in>
+                      <in>sf_performance_bessel_18.cpp</in>
+                      <in>sf_performance_bessel_19.cpp</in>
+                      <in>sf_performance_nct_01.cpp</in>
+                      <in>sf_performance_nct_02.cpp</in>
+                      <in>sf_performance_nct_03.cpp</in>
+                      <in>sf_performance_nct_04.cpp</in>
+                      <in>sf_performance_nct_05.cpp</in>
+                      <in>sf_performance_nct_06.cpp</in>
+                      <in>sf_performance_nct_07.cpp</in>
+                      <in>sf_performance_nct_08.cpp</in>
+                      <in>sf_performance_nct_09.cpp</in>
+                      <in>sf_performance_nct_10.cpp</in>
+                      <in>sf_performance_nct_11.cpp</in>
+                      <in>sf_performance_nct_12.cpp</in>
+                      <in>sf_performance_nct_13.cpp</in>
+                      <in>sf_performance_nct_14.cpp</in>
+                      <in>sf_performance_nct_15.cpp</in>
+                      <in>sf_performance_nct_16.cpp</in>
+                      <in>sf_performance_nct_17.cpp</in>
+                      <in>sf_performance_nct_18.cpp</in>
+                      <in>sf_performance_nct_19.cpp</in>
+                      <in>sf_performance_nct_20.cpp</in>
+                      <in>sf_performance_poly_01.cpp</in>
+                      <in>sf_performance_poly_02.cpp</in>
+                      <in>sf_performance_poly_03.cpp</in>
+                      <in>sf_performance_poly_04.cpp</in>
+                      <in>sf_performance_poly_05.cpp</in>
+                      <in>sf_performance_poly_06.cpp</in>
+                      <in>sf_performance_poly_07.cpp</in>
+                      <in>sf_performance_poly_08.cpp</in>
+                      <in>sf_performance_poly_09.cpp</in>
+                      <in>sf_performance_poly_10.cpp</in>
+                      <in>sf_performance_poly_11.cpp</in>
+                      <in>sf_performance_poly_12.cpp</in>
+                      <in>sf_performance_poly_13.cpp</in>
+                      <in>sf_performance_poly_14.cpp</in>
+                      <in>sf_performance_poly_15.cpp</in>
+                      <in>sf_performance_poly_16.cpp</in>
+                      <in>sf_performance_poly_17.cpp</in>
+                      <in>sf_performance_poly_18.cpp</in>
+                    </df>
+                    <in>cpp_bin_float_conversion_performance.cpp</in>
+                    <in>delaunay_test.cpp</in>
+                    <in>gcd_bench.cpp</in>
+                    <in>linpack-benchmark.cpp</in>
+                    <in>miller_rabin_performance.cpp</in>
+                    <in>mixed_equivalent_types_bench.cpp</in>
+                    <in>performance_test.cpp</in>
+                    <in>rational_bernoulli_allocations.cpp</in>
+                    <in>rational_bernoulli_bench.cpp</in>
+                    <in>rational_determinant_bench.cpp</in>
+                    <in>rational_zeta18_bench.cpp</in>
+                    <in>sf_performance.cpp</in>
+                    <in>sf_performance_basic.cpp</in>
+                    <in>sf_performance_bessel.cpp</in>
+                    <in>sf_performance_nct.cpp</in>
+                    <in>sf_performance_poly.cpp</in>
+                    <in>sqrt_bench.cpp</in>
+                    <in>voronoi_performance.cpp</in>
+                  </df>
+                  <df name="plots">
+                    <in>cpp_bin_float_acos_errors.cpp</in>
+                    <in>cpp_bin_float_asin_errors.cpp</in>
+                    <in>cpp_bin_float_atan_errors.cpp</in>
+                    <in>cpp_bin_float_cos_errors.cpp</in>
+                    <in>cpp_bin_float_erf_errors.cpp</in>
+                    <in>cpp_bin_float_erfc_errors.cpp</in>
+                    <in>cpp_bin_float_exp_errors.cpp</in>
+                    <in>cpp_bin_float_log_errors.cpp</in>
+                    <in>cpp_bin_float_sin_errors.cpp</in>
+                    <in>cpp_bin_float_tan_errors.cpp</in>
+                    <in>cpp_bin_float_tgamma_errors.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="compile_fail">
+                      <in>conv_fail_01.cpp</in>
+                      <in>conv_fail_02.cpp</in>
+                      <in>conv_fail_03.cpp</in>
+                      <in>conv_fail_04.cpp</in>
+                      <in>conv_fail_05.cpp</in>
+                      <in>conv_fail_06.cpp</in>
+                      <in>conv_fail_07.cpp</in>
+                      <in>conv_fail_08.cpp</in>
+                      <in>conv_fail_09.cpp</in>
+                      <in>conv_fail_10.cpp</in>
+                      <in>conv_fail_11.cpp</in>
+                      <in>conv_fail_12.cpp</in>
+                      <in>conv_fail_13.cpp</in>
+                      <in>conv_fail_14.cpp</in>
+                      <in>conv_fail_15.cpp</in>
+                      <in>conv_fail_16.cpp</in>
+                      <in>conv_fail_18.cpp</in>
+                      <in>conv_fail_20.cpp</in>
+                      <in>conv_fail_21.cpp</in>
+                      <in>conv_fail_22.cpp</in>
+                      <in>conv_fail_23.cpp</in>
+                      <in>conv_fail_24.cpp</in>
+                      <in>conv_fail_25.cpp</in>
+                      <in>conv_fail_26.cpp</in>
+                      <in>conv_fail_27.cpp</in>
+                      <in>conv_fail_28.cpp</in>
+                      <in>conv_fail_29.cpp</in>
+                      <in>conv_fail_30.cpp</in>
+                      <in>conv_fail_31.cpp</in>
+                      <in>conv_fail_32.cpp</in>
+                      <in>conv_fail_33.cpp</in>
+                      <in>conv_fail_34.cpp</in>
+                      <in>conv_fail_35.cpp</in>
+                      <in>conv_fail_36.cpp</in>
+                      <in>conv_fail_37.cpp</in>
+                      <in>conv_fail_38.cpp</in>
+                      <in>conv_fail_39.cpp</in>
+                      <in>conv_fail_40.cpp</in>
+                      <in>conv_fail_41.cpp</in>
+                      <in>conv_fail_42.cpp</in>
+                      <in>conv_fail_43.cpp</in>
+                      <in>conv_fail_44.cpp</in>
+                      <in>conv_fail_45.cpp</in>
+                      <in>conv_fail_46.cpp</in>
+                      <in>conv_fail_47.cpp</in>
+                      <in>conv_fail_48.cpp</in>
+                      <in>conv_fail_49.cpp</in>
+                      <in>conv_fail_50.cpp</in>
+                      <in>conv_fail_51.cpp</in>
+                      <in>conv_fail_52.cpp</in>
+                      <in>conv_fail_53.cpp</in>
+                      <in>conv_fail_54.cpp</in>
+                      <in>conv_fail_55.cpp</in>
+                      <in>conv_fail_56.cpp</in>
+                      <in>conv_fail_57.cpp</in>
+                      <in>conv_fail_58.cpp</in>
+                      <in>conv_fail_59.cpp</in>
+                      <in>cpp_int_complement.cpp</in>
+                      <in>cpp_int_negate_1.cpp</in>
+                      <in>cpp_int_negate_2.cpp</in>
+                      <in>operator_fail_01.cpp</in>
+                      <in>operator_fail_02.cpp</in>
+                      <in>operator_fail_03.cpp</in>
+                      <in>operator_fail_04.cpp</in>
+                      <in>operator_fail_05.cpp</in>
+                      <in>operator_fail_06.cpp</in>
+                      <in>operator_fail_07.cpp</in>
+                      <in>operator_fail_08.cpp</in>
+                      <in>operator_fail_09.cpp</in>
+                      <in>operator_fail_10.cpp</in>
+                      <in>operator_fail_11.cpp</in>
+                      <in>operator_fail_12.cpp</in>
+                      <in>operator_fail_13.cpp</in>
+                      <in>operator_fail_14.cpp</in>
+                      <in>operator_fail_15.cpp</in>
+                      <in>operator_fail_16.cpp</in>
+                      <in>operator_fail_17.cpp</in>
+                      <in>operator_fail_18.cpp</in>
+                    </df>
+                    <df name="concepts">
+                      <in>number_concept_check.cpp</in>
+                      <in>sf_concept_check_basic.cpp</in>
+                      <in>sf_concept_check_bessel.cpp</in>
+                      <in>sf_concept_check_beta.cpp</in>
+                      <in>sf_concept_check_beta_2.cpp</in>
+                      <in>sf_concept_check_beta_3.cpp</in>
+                      <in>sf_concept_check_elliptic.cpp</in>
+                      <in>sf_concept_check_gamma.cpp</in>
+                      <in>sf_concept_check_poly.cpp</in>
+                    </df>
+                    <df name="include_test">
+                      <in>cpp_bin_float_include_test.cpp</in>
+                      <in>cpp_dec_float_include_test.cpp</in>
+                      <in>cpp_int_include_test.cpp</in>
+                      <in>gmp_include_test.cpp</in>
+                      <in>mpfr_include_test.cpp</in>
+                      <in>tommath_include_test.cpp</in>
+                    </df>
+                    <df name="math">
+                      <df name="high_prec">
+                        <in>test_gamma.cpp</in>
+                      </df>
+                      <df name="instances">
+                        <in>instances.cpp</in>
+                      </df>
+                      <in>log1p_expm1_test.cpp</in>
+                      <in>powm1_sqrtp1m1_test.cpp</in>
+                      <in>test_bessel_i.cpp</in>
+                      <in>test_bessel_j.cpp</in>
+                      <in>test_bessel_k.cpp</in>
+                      <in>test_bessel_y.cpp</in>
+                      <in>test_beta.cpp</in>
+                      <in>test_binomial_coeff.cpp</in>
+                      <in>test_carlson_1.cpp</in>
+                      <in>test_carlson_2.cpp</in>
+                      <in>test_carlson_3.cpp</in>
+                      <in>test_carlson_4.cpp</in>
+                      <in>test_cbrt.cpp</in>
+                      <in>test_digamma.cpp</in>
+                      <in>test_ellint_1.cpp</in>
+                      <in>test_ellint_2.cpp</in>
+                      <in>test_ellint_3.cpp</in>
+                      <in>test_erf.cpp</in>
+                      <in>test_expint.cpp</in>
+                      <in>test_gamma.cpp</in>
+                      <in>test_hermite.cpp</in>
+                      <in>test_ibeta.cpp</in>
+                      <in>test_ibeta_2.cpp</in>
+                      <in>test_ibeta_3.cpp</in>
+                      <in>test_ibeta_4.cpp</in>
+                      <in>test_ibeta_inv_1.cpp</in>
+                      <in>test_ibeta_inv_ab_4.cpp</in>
+                      <in>test_igamma.cpp</in>
+                      <in>test_igamma_inv.cpp</in>
+                      <in>test_igamma_inva.cpp</in>
+                      <in>test_laguerre.cpp</in>
+                      <in>test_legendre.cpp</in>
+                      <in>test_tgamma_ratio.cpp</in>
+                      <in>test_zeta.cpp</in>
+                    </df>
+                    <df name="ublas_interop">
+                      <in>test1.cpp</in>
+                      <in>test11.cpp</in>
+                      <in>test12.cpp</in>
+                      <in>test13.cpp</in>
+                      <in>test2.cpp</in>
+                      <in>test21.cpp</in>
+                      <in>test22.cpp</in>
+                      <in>test23.cpp</in>
+                      <in>test3.cpp</in>
+                      <in>test31.cpp</in>
+                      <in>test32.cpp</in>
+                      <in>test33.cpp</in>
+                      <in>test4.cpp</in>
+                      <in>test42.cpp</in>
+                      <in>test43.cpp</in>
+                      <in>test5.cpp</in>
+                      <in>test52.cpp</in>
+                      <in>test53.cpp</in>
+                      <in>test6.cpp</in>
+                      <in>test62.cpp</in>
+                      <in>test63.cpp</in>
+                      <in>test7.cpp</in>
+                      <in>test71.cpp</in>
+                      <in>test72.cpp</in>
+                      <in>test73.cpp</in>
+                    </df>
+                    <in>bug11922.cpp</in>
+                    <in>bug12039.cpp</in>
+                    <in>constexpr_test_arithmetic_backend.cpp</in>
+                    <in>constexpr_test_cpp_int.cpp</in>
+                    <in>constexpr_test_cpp_int_2.cpp</in>
+                    <in>constexpr_test_cpp_int_3.cpp</in>
+                    <in>constexpr_test_cpp_int_4.cpp</in>
+                    <in>constexpr_test_cpp_int_5.cpp</in>
+                    <in>constexpr_test_cpp_int_6.cpp</in>
+                    <in>constexpr_test_cpp_int_7.cpp</in>
+                    <in>constexpr_test_float128.cpp</in>
+                    <in>git_issue_167.cpp</in>
+                    <in>git_issue_175.cpp</in>
+                    <in>git_issue_248.cpp</in>
+                    <in>git_issue_265.cpp</in>
+                    <in>git_issue_277.cpp</in>
+                    <in>git_issue_30.cpp</in>
+                    <in>git_issue_313.cpp</in>
+                    <in>git_issue_370.cpp</in>
+                    <in>git_issue_98.cpp</in>
+                    <in>issue_13148.cpp</in>
+                    <in>issue_13301.cpp</in>
+                    <in>no_eh_test_support.cpp</in>
+                    <in>test_acos.cpp</in>
+                    <in>test_adapt_serial.cpp</in>
+                    <in>test_arithmetic_ab_1.cpp</in>
+                    <in>test_arithmetic_ab_2.cpp</in>
+                    <in>test_arithmetic_ab_3.cpp</in>
+                    <in>test_arithmetic_backend_concept.cpp</in>
+                    <in>test_arithmetic_complex128.cpp</in>
+                    <in>test_arithmetic_complex_adaptor.cpp</in>
+                    <in>test_arithmetic_complex_adaptor_2.cpp</in>
+                    <in>test_arithmetic_cpp_bin_float_1.cpp</in>
+                    <in>test_arithmetic_cpp_bin_float_2.cpp</in>
+                    <in>test_arithmetic_cpp_bin_float_2m.cpp</in>
+                    <in>test_arithmetic_cpp_bin_float_3.cpp</in>
+                    <in>test_arithmetic_cpp_bin_float_4.cpp</in>
+                    <in>test_arithmetic_cpp_bin_float_5.cpp</in>
+                    <in>test_arithmetic_cpp_complex_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_cpp_complex_logged_adptr.cpp</in>
+                    <in>test_arithmetic_cpp_dec_float_1.cpp</in>
+                    <in>test_arithmetic_cpp_dec_float_2.cpp</in>
+                    <in>test_arithmetic_cpp_dec_float_3.cpp</in>
+                    <in>test_arithmetic_cpp_dec_float_3m.cpp</in>
+                    <in>test_arithmetic_cpp_int_1.cpp</in>
+                    <in>test_arithmetic_cpp_int_10.cpp</in>
+                    <in>test_arithmetic_cpp_int_11.cpp</in>
+                    <in>test_arithmetic_cpp_int_12.cpp</in>
+                    <in>test_arithmetic_cpp_int_13.cpp</in>
+                    <in>test_arithmetic_cpp_int_14.cpp</in>
+                    <in>test_arithmetic_cpp_int_15.cpp</in>
+                    <in>test_arithmetic_cpp_int_16.cpp</in>
+                    <in>test_arithmetic_cpp_int_17.cpp</in>
+                    <in>test_arithmetic_cpp_int_18.cpp</in>
+                    <in>test_arithmetic_cpp_int_19.cpp</in>
+                    <in>test_arithmetic_cpp_int_2.cpp</in>
+                    <in>test_arithmetic_cpp_int_20.cpp</in>
+                    <in>test_arithmetic_cpp_int_21.cpp</in>
+                    <in>test_arithmetic_cpp_int_22.cpp</in>
+                    <in>test_arithmetic_cpp_int_23.cpp</in>
+                    <in>test_arithmetic_cpp_int_3.cpp</in>
+                    <in>test_arithmetic_cpp_int_4.cpp</in>
+                    <in>test_arithmetic_cpp_int_5.cpp</in>
+                    <in>test_arithmetic_cpp_int_6.cpp</in>
+                    <in>test_arithmetic_cpp_int_7.cpp</in>
+                    <in>test_arithmetic_cpp_int_8.cpp</in>
+                    <in>test_arithmetic_cpp_int_9.cpp</in>
+                    <in>test_arithmetic_cpp_int_br.cpp</in>
+                    <in>test_arithmetic_cpp_int_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_cpp_int_logged_adptr.cpp</in>
+                    <in>test_arithmetic_cpp_rat_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_cpp_rat_logged_adptr.cpp</in>
+                    <in>test_arithmetic_dbg_adptr1.cpp</in>
+                    <in>test_arithmetic_dbg_adptr1m.cpp</in>
+                    <in>test_arithmetic_dbg_adptr2.cpp</in>
+                    <in>test_arithmetic_float_128.cpp</in>
+                    <in>test_arithmetic_logged_1.cpp</in>
+                    <in>test_arithmetic_logged_2.cpp</in>
+                    <in>test_arithmetic_mpc.cpp</in>
+                    <in>test_arithmetic_mpc_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_mpc_logged_adptr.cpp</in>
+                    <in>test_arithmetic_mpf.cpp</in>
+                    <in>test_arithmetic_mpf_50.cpp</in>
+                    <in>test_arithmetic_mpf_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_mpf_logged_adptr.cpp</in>
+                    <in>test_arithmetic_mpfi_50.cpp</in>
+                    <in>test_arithmetic_mpfi_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_mpfi_logged_adptr.cpp</in>
+                    <in>test_arithmetic_mpfr.cpp</in>
+                    <in>test_arithmetic_mpfr_50.cpp</in>
+                    <in>test_arithmetic_mpfr_50_mixed.cpp</in>
+                    <in>test_arithmetic_mpfr_50_static.cpp</in>
+                    <in>test_arithmetic_mpfr_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_mpfr_logged_adptr.cpp</in>
+                    <in>test_arithmetic_mpq.cpp</in>
+                    <in>test_arithmetic_mpq_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_mpq_logged_adptr.cpp</in>
+                    <in>test_arithmetic_mpz.cpp</in>
+                    <in>test_arithmetic_mpz_br.cpp</in>
+                    <in>test_arithmetic_mpz_dbg_adptr.cpp</in>
+                    <in>test_arithmetic_mpz_logged_adptr.cpp</in>
+                    <in>test_arithmetic_mpz_rat.cpp</in>
+                    <in>test_arithmetic_skeleton.cpp</in>
+                    <in>test_arithmetic_tommath.cpp</in>
+                    <in>test_arithmetic_tommath_br.cpp</in>
+                    <in>test_arithmetic_tommath_rat.cpp</in>
+                    <in>test_asin.cpp</in>
+                    <in>test_assume_uniform_precision.cpp</in>
+                    <in>test_atan.cpp</in>
+                    <in>test_checked_cpp_int.cpp</in>
+                    <in>test_checked_mixed_cpp_int.cpp</in>
+                    <in>test_complex.cpp</in>
+                    <in>test_constants.cpp</in>
+                    <in>test_constexpr.cpp</in>
+                    <in>test_convert_from_cpp_bin_float.cpp</in>
+                    <in>test_convert_from_cpp_dec_float.cpp</in>
+                    <in>test_convert_from_cpp_int.cpp</in>
+                    <in>test_convert_from_cpp_rational.cpp</in>
+                    <in>test_convert_from_float128.cpp</in>
+                    <in>test_convert_from_gmp_rational.cpp</in>
+                    <in>test_convert_from_mpf_float.cpp</in>
+                    <in>test_convert_from_mpfi_float.cpp</in>
+                    <in>test_convert_from_mpfr_float.cpp</in>
+                    <in>test_convert_from_mpz_int.cpp</in>
+                    <in>test_convert_from_tom_int.cpp</in>
+                    <in>test_convert_from_tom_rational.cpp</in>
+                    <in>test_cos.cpp</in>
+                    <in>test_cos_near_half_pi.cpp</in>
+                    <in>test_cosh.cpp</in>
+                    <in>test_cpp_bin_float.cpp</in>
+                    <in>test_cpp_bin_float_conv.cpp</in>
+                    <in>test_cpp_bin_float_io.cpp</in>
+                    <in>test_cpp_bin_float_round.cpp</in>
+                    <in>test_cpp_bin_float_serial.cpp</in>
+                    <in>test_cpp_bin_float_tgamma.cpp</in>
+                    <in>test_cpp_dec_float_conv.cpp</in>
+                    <in>test_cpp_dec_float_round.cpp</in>
+                    <in>test_cpp_dec_float_serial.cpp</in>
+                    <in>test_cpp_dec_float_tgamma.cpp</in>
+                    <in>test_cpp_int.cpp</in>
+                    <in>test_cpp_int_conv.cpp</in>
+                    <in>test_cpp_int_deserial.cpp</in>
+                    <in>test_cpp_int_import_export.cpp</in>
+                    <in>test_cpp_int_karatsuba.cpp</in>
+                    <in>test_cpp_int_left_shift.cpp</in>
+                    <in>test_cpp_int_lit.cpp</in>
+                    <in>test_cpp_int_serial.cpp</in>
+                    <in>test_cpp_rat_serial.cpp</in>
+                    <in>test_cpp_rational.cpp</in>
+                    <in>test_eigen_interop.cpp</in>
+                    <in>test_eigen_interop_cpp_bin_float_1.cpp</in>
+                    <in>test_eigen_interop_cpp_bin_float_2.cpp</in>
+                    <in>test_eigen_interop_cpp_bin_float_3.cpp</in>
+                    <in>test_eigen_interop_cpp_dec_float.cpp</in>
+                    <in>test_eigen_interop_cpp_dec_float_2.cpp</in>
+                    <in>test_eigen_interop_cpp_dec_float_3.cpp</in>
+                    <in>test_eigen_interop_cpp_int.cpp</in>
+                    <in>test_eigen_interop_gmp.cpp</in>
+                    <in>test_eigen_interop_mpc.cpp</in>
+                    <in>test_eigen_interop_mpfr_1.cpp</in>
+                    <in>test_eigen_interop_mpfr_2.cpp</in>
+                    <in>test_eigen_interop_mpfr_3.cpp</in>
+                    <in>test_exp.cpp</in>
+                    <in>test_fixed_int.cpp</in>
+                    <in>test_float128_serial.cpp</in>
+                    <in>test_float_conversions.cpp</in>
+                    <in>test_float_io.cpp</in>
+                    <in>test_fpclassify.cpp</in>
+                    <in>test_gcd.cpp</in>
+                    <in>test_generic_conv.cpp</in>
+                    <in>test_gmp_conversions.cpp</in>
+                    <in>test_hash.cpp</in>
+                    <in>test_int_io.cpp</in>
+                    <in>test_int_sqrt.cpp</in>
+                    <in>test_log.cpp</in>
+                    <in>test_miller_rabin.cpp</in>
+                    <in>test_mixed_cpp_bin_float.cpp</in>
+                    <in>test_mixed_cpp_dec_float.cpp</in>
+                    <in>test_mixed_cpp_int.cpp</in>
+                    <in>test_mixed_float.cpp</in>
+                    <in>test_mixed_move_cpp_int.cpp</in>
+                    <in>test_mixed_mpf_float.cpp</in>
+                    <in>test_mixed_mpfr_float.cpp</in>
+                    <in>test_move.cpp</in>
+                    <in>test_mpc_conversions.cpp</in>
+                    <in>test_mpc_overloads.cpp</in>
+                    <in>test_mpf_precisions.cpp</in>
+                    <in>test_mpfi.cpp</in>
+                    <in>test_mpfi_precisions.cpp</in>
+                    <in>test_mpfr_conversions.cpp</in>
+                    <in>test_mpfr_mpc_precisions.cpp</in>
+                    <in>test_native_integer.cpp</in>
+                    <in>test_nothrow_cpp_bin_float.cpp</in>
+                    <in>test_nothrow_cpp_dec_float.cpp</in>
+                    <in>test_nothrow_cpp_int.cpp</in>
+                    <in>test_nothrow_cpp_rational.cpp</in>
+                    <in>test_nothrow_float128.cpp</in>
+                    <in>test_nothrow_gmp.cpp</in>
+                    <in>test_nothrow_mpfr.cpp</in>
+                    <in>test_numeric_limits.cpp</in>
+                    <in>test_optional_compat.cpp</in>
+                    <in>test_pow.cpp</in>
+                    <in>test_preserve_all_precision.cpp</in>
+                    <in>test_preserve_component_precision.cpp</in>
+                    <in>test_preserve_related_precision.cpp</in>
+                    <in>test_preserve_source_precision.cpp</in>
+                    <in>test_preserve_target_precision.cpp</in>
+                    <in>test_rat_float_interconv.cpp</in>
+                    <in>test_rational_io.cpp</in>
+                    <in>test_roots_10k_digits.cpp</in>
+                    <in>test_round.cpp</in>
+                    <in>test_sf_import_c99.cpp</in>
+                    <in>test_sin.cpp</in>
+                    <in>test_sin_near_half_pi.cpp</in>
+                    <in>test_sinh.cpp</in>
+                    <in>test_sqrt.cpp</in>
+                    <in>test_tan.cpp</in>
+                    <in>test_tanh.cpp</in>
+                    <in>test_test.cpp</in>
+                    <in>test_threaded_precision.cpp</in>
+                    <in>test_unchecked_cpp_int.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <in>sincos.cpp</in>
+                  </df>
+                </df>
+                <df name="nowide">
+                  <df name="config">
+                    <in>check_attribute_init_priority.cpp</in>
+                    <in>check_lfs_support.cpp</in>
+                    <in>check_movable_fstreams.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>console_buffer.cpp</in>
+                    <in>cstdio.cpp</in>
+                    <in>cstdlib.cpp</in>
+                    <in>filebuf.cpp</in>
+                    <in>iostream.cpp</in>
+                    <in>stat.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="cmake_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>benchmark_fstream.cpp</in>
+                    <in>file_test_helpers.cpp</in>
+                    <in>test_codecvt.cpp</in>
+                    <in>test_convert.cpp</in>
+                    <in>test_env.cpp</in>
+                    <in>test_filebuf.cpp</in>
+                    <in>test_fs.cpp</in>
+                    <in>test_fstream.cpp</in>
+                    <in>test_fstream_special.cpp</in>
+                    <in>test_ifstream.cpp</in>
+                    <in>test_iostream.cpp</in>
+                    <in>test_ofstream.cpp</in>
+                    <in>test_stackstring.cpp</in>
+                    <in>test_stat.cpp</in>
+                    <in>test_stdio.cpp</in>
+                    <in>test_system.cpp</in>
+                    <in>test_traits.cpp</in>
+                  </df>
+                </df>
+                <df name="numeric">
+                  <df name="conversion">
+                    <df name="test">
+                      <df name="compile_fail">
+                        <in>built_in_numeric_cast_traits.cpp</in>
+                      </df>
+                      <in>bounds_test.cpp</in>
+                      <in>converter_test.cpp</in>
+                      <in>numeric_cast_test.cpp</in>
+                      <in>numeric_cast_traits_test.cpp</in>
+                      <in>test_helpers.cpp</in>
+                      <in>test_helpers2.cpp</in>
+                      <in>test_helpers3.cpp</in>
+                      <in>traits_test.cpp</in>
+                      <in>udt_example_0.cpp</in>
+                      <in>udt_support_test.cpp</in>
+                    </df>
+                  </df>
+                  <df name="interval">
+                    <df name="examples">
+                      <in>filter.cpp</in>
+                      <in>findroot_demo.cpp</in>
+                      <in>horner.cpp</in>
+                      <in>io.cpp</in>
+                      <in>newton-raphson.cpp</in>
+                      <in>rational.cpp</in>
+                      <in>transc.cpp</in>
+                    </df>
+                    <df name="test">
+                      <in>add.cpp</in>
+                      <in>cmp.cpp</in>
+                      <in>cmp_exn.cpp</in>
+                      <in>cmp_exp.cpp</in>
+                      <in>cmp_lex.cpp</in>
+                      <in>cmp_set.cpp</in>
+                      <in>cmp_tribool.cpp</in>
+                      <in>det.cpp</in>
+                      <in>fmod.cpp</in>
+                      <in>integer.cpp</in>
+                      <in>msvc_x64_flags.cpp</in>
+                      <in>mul.cpp</in>
+                      <in>overflow.cpp</in>
+                      <in>pi.cpp</in>
+                      <in>pow.cpp</in>
+                      <in>test_float.cpp</in>
+                    </df>
+                  </df>
+                  <df name="odeint">
+                    <df name="examples">
+                      <df name="2d_lattice">
+                        <in>spreading.cpp</in>
+                      </df>
+                      <df name="gmpxx">
+                        <in>lorenz_gmpxx.cpp</in>
+                      </df>
+                      <df name="mpi">
+                        <in>phase_chain.cpp</in>
+                      </df>
+                      <df name="mtl">
+                        <in>gauss_packet.cpp</in>
+                        <in>implicit_euler_mtl.cpp</in>
+                      </df>
+                      <df name="multiprecision">
+                        <in>cmp_precision.cpp</in>
+                        <in>lorenz_mp.cpp</in>
+                      </df>
+                      <df name="nt2">
+                        <in>phase_oscillator_ensemble.cpp</in>
+                      </df>
+                      <df name="openmp">
+                        <in>lorenz_ensemble.cpp</in>
+                        <in>lorenz_ensemble_nested.cpp</in>
+                        <in>lorenz_ensemble_simple.cpp</in>
+                        <in>phase_chain.cpp</in>
+                        <in>phase_chain_omp_state.cpp</in>
+                      </df>
+                      <df name="quadmath">
+                        <in>black_hole.cpp</in>
+                      </df>
+                      <df name="ublas">
+                        <in>lorenz_ublas.cpp</in>
+                      </df>
+                      <df name="vexcl">
+                        <in>lorenz_ensemble.cpp</in>
+                      </df>
+                      <in>abm_precision.cpp</in>
+                      <in>adaptive_iterator.cpp</in>
+                      <in>bind_member_functions.cpp</in>
+                      <in>bind_member_functions_cpp11.cpp</in>
+                      <in>bulirsch_stoer.cpp</in>
+                      <in>chaotic_system.cpp</in>
+                      <in>const_step_iterator.cpp</in>
+                      <in>elliptic_functions.cpp</in>
+                      <in>find_crossing.cpp</in>
+                      <in>fpu.cpp</in>
+                      <in>generation_functions.cpp</in>
+                      <in>harmonic_oscillator.cpp</in>
+                      <in>harmonic_oscillator_units.cpp</in>
+                      <in>heun.cpp</in>
+                      <in>integrate_times.cpp</in>
+                      <in>list_lattice.cpp</in>
+                      <in>lorenz.cpp</in>
+                      <in>lorenz_point.cpp</in>
+                      <in>molecular_dynamics.cpp</in>
+                      <in>molecular_dynamics_cells.cpp</in>
+                      <in>my_vector.cpp</in>
+                      <in>phase_oscillator_ensemble.cpp</in>
+                      <in>resizing_lattice.cpp</in>
+                      <in>simple1d.cpp</in>
+                      <in>solar_system.cpp</in>
+                      <in>stepper_details.cpp</in>
+                      <in>stiff_system.cpp</in>
+                      <in>stochastic_euler.cpp</in>
+                      <in>stuart_landau.cpp</in>
+                      <in>two_dimensional_phase_lattice.cpp</in>
+                      <in>van_der_pol_stiff.cpp</in>
+                    </df>
+                    <df name="performance">
+                      <df name="SIMD">
+                        <in>roessler.cpp</in>
+                        <in>roessler_simd.cpp</in>
+                      </df>
+                      <in>c_lorenz.c</in>
+                      <in>odeint_rk4_array.cpp</in>
+                    </df>
+                    <df name="test">
+                      <df name="numeric">
+                        <in>abm_time_dependent.cpp</in>
+                        <in>adams_bashforth.cpp</in>
+                        <in>adams_bashforth_moulton.cpp</in>
+                        <in>adaptive_adams_bashforth_moulton.cpp</in>
+                        <in>order_quadrature_formula.cpp</in>
+                        <in>rosenbrock.cpp</in>
+                        <in>runge_kutta.cpp</in>
+                        <in>symplectic.cpp</in>
+                        <in>velocity_verlet.cpp</in>
+                      </df>
+                      <df name="regression">
+                        <in>regression_147.cpp</in>
+                        <in>regression_149.cpp</in>
+                        <in>regression_168.cpp</in>
+                        <in>regression_189.cpp</in>
+                      </df>
+                      <in>adams_bashforth.cpp</in>
+                      <in>adams_bashforth_moulton.cpp</in>
+                      <in>adams_moulton.cpp</in>
+                      <in>adaptive_adams_coefficients.cpp</in>
+                      <in>adaptive_iterator.cpp</in>
+                      <in>adaptive_time_iterator.cpp</in>
+                      <in>algebra_dispatcher.cpp</in>
+                      <in>bulirsch_stoer.cpp</in>
+                      <in>const_step_iterator.cpp</in>
+                      <in>const_step_time_iterator.cpp</in>
+                      <in>controlled_adams_bashforth_moulton.cpp</in>
+                      <in>default_operations.cpp</in>
+                      <in>euler_stepper.cpp</in>
+                      <in>fusion_algebra.cpp</in>
+                      <in>generation.cpp</in>
+                      <in>generic_error_stepper.cpp</in>
+                      <in>generic_stepper.cpp</in>
+                      <in>implicit_euler.cpp</in>
+                      <in>integrate.cpp</in>
+                      <in>integrate_implicit.cpp</in>
+                      <in>integrate_overflow.cpp</in>
+                      <in>integrate_stepper_refs.cpp</in>
+                      <in>integrate_times.cpp</in>
+                      <in>integrators_symplectic.cpp</in>
+                      <in>is_pair.cpp</in>
+                      <in>is_resizeable.cpp</in>
+                      <in>multi_array.cpp</in>
+                      <in>n_step_iterator.cpp</in>
+                      <in>n_step_time_iterator.cpp</in>
+                      <in>range_algebra.cpp</in>
+                      <in>resize.cpp</in>
+                      <in>resizing.cpp</in>
+                      <in>rosenbrock4.cpp</in>
+                      <in>rosenbrock4_mp.cpp</in>
+                      <in>runge_kutta_concepts.cpp</in>
+                      <in>runge_kutta_controlled_concepts.cpp</in>
+                      <in>runge_kutta_error_concepts.cpp</in>
+                      <in>same_size.cpp</in>
+                      <in>split.cpp</in>
+                      <in>std_array.cpp</in>
+                      <in>step_size_limitation.cpp</in>
+                      <in>stepper_copying.cpp</in>
+                      <in>stepper_with_ranges.cpp</in>
+                      <in>stepper_with_units.cpp</in>
+                      <in>symplectic_steppers.cpp</in>
+                      <in>times_iterator.cpp</in>
+                      <in>times_time_iterator.cpp</in>
+                      <in>trivial_state.cpp</in>
+                      <in>unwrap_boost_reference.cpp</in>
+                      <in>unwrap_reference.cpp</in>
+                      <in>velocity_verlet.cpp</in>
+                    </df>
+                    <df name="test_external">
+                      <df name="eigen">
+                        <in>integrate.cpp</in>
+                        <in>is_resizeable.cpp</in>
+                        <in>resize.cpp</in>
+                        <in>runge_kutta4.cpp</in>
+                        <in>runge_kutta_dopri5.cpp</in>
+                        <in>same_size.cpp</in>
+                      </df>
+                      <df name="gmp">
+                        <in>check_gmp.cpp</in>
+                        <in>gmp_integrate.cpp</in>
+                      </df>
+                      <df name="gsl">
+                        <in>check_gsl.cpp</in>
+                      </df>
+                      <df name="mkl">
+                        <in>check_mkl.cpp</in>
+                      </df>
+                      <df name="mpi">
+                        <in>norm_test.cpp</in>
+                        <in>split_test.cpp</in>
+                        <in>state_test.cpp</in>
+                      </df>
+                      <df name="mtl4">
+                        <in>mtl4_resize.cpp</in>
+                      </df>
+                      <df name="nt2">
+                        <in>algebra_dispatcher.cpp</in>
+                        <in>copy.cpp</in>
+                        <in>is_resizeable.cpp</in>
+                        <in>norm_inf.cpp</in>
+                        <in>resize.cpp</in>
+                      </df>
+                      <df name="vexcl">
+                        <in>lorenz.cpp</in>
+                        <in>norm_inf.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="ublas">
+                    <df name="benchmarks">
+                      <df name="opencl">
+                        <in>add.cpp</in>
+                        <in>inner_prod.cpp</in>
+                        <in>mm_prod.cpp</in>
+                        <in>mv_prod.cpp</in>
+                        <in>outer_prod.cpp</in>
+                      </df>
+                      <df name="reference">
+                        <in>add.cpp</in>
+                        <in>inner_prod.cpp</in>
+                        <in>mm_prod.cpp</in>
+                        <in>mv_prod.cpp</in>
+                        <in>outer_prod.cpp</in>
+                      </df>
+                      <in>add.cpp</in>
+                      <in>inner_prod.cpp</in>
+                      <in>mm_prod.cpp</in>
+                      <in>mv_prod.cpp</in>
+                      <in>outer_prod.cpp</in>
+                    </df>
+                    <df name="doc">
+                      <df name="samples">
+                        <in>assignment_examples.cpp</in>
+                        <in>banded_adaptor.cpp</in>
+                        <in>banded_matrix.cpp</in>
+                        <in>bounded_array.cpp</in>
+                        <in>compressed_matrix.cpp</in>
+                        <in>compressed_vector.cpp</in>
+                        <in>coordinate_matrix.cpp</in>
+                        <in>coordinate_vector.cpp</in>
+                        <in>ex_triangular.cpp</in>
+                        <in>hermitian_adaptor.cpp</in>
+                        <in>hermitian_matrix.cpp</in>
+                        <in>identity_matrix.cpp</in>
+                        <in>map_array.cpp</in>
+                        <in>mapped_matrix.cpp</in>
+                        <in>mapped_vector.cpp</in>
+                        <in>matrix.cpp</in>
+                        <in>matrix_binary.cpp</in>
+                        <in>matrix_binary_scalar.cpp</in>
+                        <in>matrix_column.cpp</in>
+                        <in>matrix_column_project.cpp</in>
+                        <in>matrix_matrix_binary.cpp</in>
+                        <in>matrix_matrix_solve.cpp</in>
+                        <in>matrix_range.cpp</in>
+                        <in>matrix_range_project.cpp</in>
+                        <in>matrix_row.cpp</in>
+                        <in>matrix_row_project.cpp</in>
+                        <in>matrix_slice.cpp</in>
+                        <in>matrix_slice_project.cpp</in>
+                        <in>matrix_unary.cpp</in>
+                        <in>matrix_vector_binary.cpp</in>
+                        <in>matrix_vector_range.cpp</in>
+                        <in>matrix_vector_slice.cpp</in>
+                        <in>matrix_vector_solve.cpp</in>
+                        <in>range.cpp</in>
+                        <in>slice.cpp</in>
+                        <in>symmetric_adaptor.cpp</in>
+                        <in>symmetric_matrix.cpp</in>
+                        <in>triangular_adaptor.cpp</in>
+                        <in>triangular_matrix.cpp</in>
+                        <in>unbounded_array.cpp</in>
+                        <in>unit_vector.cpp</in>
+                        <in>vector.cpp</in>
+                        <in>vector_binary.cpp</in>
+                        <in>vector_binary_outer.cpp</in>
+                        <in>vector_binary_redux.cpp</in>
+                        <in>vector_binary_scalar.cpp</in>
+                        <in>vector_range.cpp</in>
+                        <in>vector_range_project.cpp</in>
+                        <in>vector_slice.cpp</in>
+                        <in>vector_slice_project.cpp</in>
+                        <in>vector_unary.cpp</in>
+                        <in>vector_unary_redux.cpp</in>
+                        <in>zero_matrix.cpp</in>
+                        <in>zero_vector.cpp</in>
+                      </df>
+                    </df>
+                    <df name="examples">
+                      <df name="tensor">
+                        <in>construction_access.cpp</in>
+                        <in>einstein_notation.cpp</in>
+                        <in>prod_expressions.cpp</in>
+                        <in>simple_expressions.cpp</in>
+                      </df>
+                    </df>
+                    <df name="test">
+                      <df name="manual">
+                        <in>sp_resize.cpp</in>
+                        <in>test_move_semantics.cpp</in>
+                      </df>
+                      <df name="opencl">
+                        <in>elementwise_operations_test.cpp</in>
+                        <in>elementwise_operations_with_constants_test.cpp</in>
+                        <in>inner_prod_test.cpp</in>
+                        <in>norm2_test.cpp</in>
+                        <in>norm_test.cpp</in>
+                        <in>outer_prod_test.cpp</in>
+                        <in>prod_test.cpp</in>
+                        <in>transposition_test.cpp</in>
+                      </df>
+                      <df name="tensor">
+                        <in>test_algorithms.cpp</in>
+                        <in>test_einstein_notation.cpp</in>
+                        <in>test_expression.cpp</in>
+                        <in>test_expression_evaluation.cpp</in>
+                        <in>test_extents.cpp</in>
+                        <in>test_functions.cpp</in>
+                        <in>test_multi_index.cpp</in>
+                        <in>test_multi_index_utility.cpp</in>
+                        <in>test_multiplication.cpp</in>
+                        <in>test_operators_arithmetic.cpp</in>
+                        <in>test_operators_comparison.cpp</in>
+                        <in>test_strides.cpp</in>
+                        <in>test_tensor.cpp</in>
+                        <in>test_tensor_matrix_vector.cpp</in>
+                      </df>
+                      <in>begin_end.cpp</in>
+                      <in>comp_mat_erase.cpp</in>
+                      <in>concepts.cpp</in>
+                      <in>minimal_allocator_test.cpp</in>
+                      <in>num_columns.cpp</in>
+                      <in>num_rows.cpp</in>
+                      <in>placement_new.cpp</in>
+                      <in>size.cpp</in>
+                      <in>sparse_view_test.cpp</in>
+                      <in>test1.cpp</in>
+                      <in>test11.cpp</in>
+                      <in>test12.cpp</in>
+                      <in>test13.cpp</in>
+                      <in>test2.cpp</in>
+                      <in>test21.cpp</in>
+                      <in>test22.cpp</in>
+                      <in>test23.cpp</in>
+                      <in>test3.cpp</in>
+                      <in>test31.cpp</in>
+                      <in>test32.cpp</in>
+                      <in>test33.cpp</in>
+                      <in>test4.cpp</in>
+                      <in>test42.cpp</in>
+                      <in>test43.cpp</in>
+                      <in>test5.cpp</in>
+                      <in>test52.cpp</in>
+                      <in>test53.cpp</in>
+                      <in>test6.cpp</in>
+                      <in>test62.cpp</in>
+                      <in>test63.cpp</in>
+                      <in>test7.cpp</in>
+                      <in>test71.cpp</in>
+                      <in>test72.cpp</in>
+                      <in>test73.cpp</in>
+                      <in>test_assignment.cpp</in>
+                      <in>test_banded_storage_layout.cpp</in>
+                      <in>test_complex_norms.cpp</in>
+                      <in>test_coordinate_matrix_inplace_merge.cpp</in>
+                      <in>test_coordinate_matrix_sort.cpp</in>
+                      <in>test_coordinate_vector_inplace_merge.cpp</in>
+                      <in>test_fixed_containers.cpp</in>
+                      <in>test_inplace_solve.cpp</in>
+                      <in>test_lu.cpp</in>
+                      <in>test_matrix_vector.cpp</in>
+                      <in>test_scaled_norm.cpp</in>
+                      <in>test_ticket7296.cpp</in>
+                      <in>test_triangular.cpp</in>
+                      <in>triangular_access.cpp</in>
+                      <in>triangular_layout.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="optional">
+                  <df name="test">
+                    <in>optional_test.cpp</in>
+                    <in>optional_test_assign.cpp</in>
+                    <in>optional_test_constructible_from_other.cpp</in>
+                    <in>optional_test_conversions_from_U.cpp</in>
+                    <in>optional_test_convert_from_T.cpp</in>
+                    <in>optional_test_deleted_default_ctor.cpp</in>
+                    <in>optional_test_emplace.cpp</in>
+                    <in>optional_test_empty_braces.cpp</in>
+                    <in>optional_test_equals_none.cpp</in>
+                    <in>optional_test_experimental_traits.cpp</in>
+                    <in>optional_test_fail1.cpp</in>
+                    <in>optional_test_fail2.cpp</in>
+                    <in>optional_test_fail3.cpp</in>
+                    <in>optional_test_fail3a.cpp</in>
+                    <in>optional_test_fail3b.cpp</in>
+                    <in>optional_test_fail_const_swap.cpp</in>
+                    <in>optional_test_fail_convert_assign_of_enums.cpp</in>
+                    <in>optional_test_fail_convert_from_null.cpp</in>
+                    <in>optional_test_fail_copying_a_moveable_type.cpp</in>
+                    <in>optional_test_fail_explicit_convert_in_value_or.cpp</in>
+                    <in>optional_test_fail_explicit_convert_in_value_or_call.cpp</in>
+                    <in>optional_test_fail_implicit_bool_convert.cpp</in>
+                    <in>optional_test_fail_io_without_io.cpp</in>
+                    <in>optional_test_fail_none_io_without_io.cpp</in>
+                    <in>optional_test_fail_optional_rvalue_ref.cpp</in>
+                    <in>optional_test_flat_map.cpp</in>
+                    <in>optional_test_inplace_factory.cpp</in>
+                    <in>optional_test_inplace_fail.cpp</in>
+                    <in>optional_test_inplace_fail2.cpp</in>
+                    <in>optional_test_io.cpp</in>
+                    <in>optional_test_make_optional.cpp</in>
+                    <in>optional_test_map.cpp</in>
+                    <in>optional_test_maybe_uninitialized_warning.cpp</in>
+                    <in>optional_test_member_T.cpp</in>
+                    <in>optional_test_minimum_requirements.cpp</in>
+                    <in>optional_test_move.cpp</in>
+                    <in>optional_test_msvc_bug_workaround.cpp</in>
+                    <in>optional_test_noexcept_move.cpp</in>
+                    <in>optional_test_old_impl.cpp</in>
+                    <in>optional_test_path_assignment.cpp</in>
+                    <in>optional_test_ref_assign_const_int.cpp</in>
+                    <in>optional_test_ref_assign_mutable_int.cpp</in>
+                    <in>optional_test_ref_assign_portable_minimum.cpp</in>
+                    <in>optional_test_ref_convert_assign_const_int.cpp</in>
+                    <in>optional_test_ref_convert_assign_const_int_prevented.cpp</in>
+                    <in>optional_test_ref_convert_assign_mutable_int.cpp</in>
+                    <in>optional_test_ref_convert_assign_non_int.cpp</in>
+                    <in>optional_test_ref_converting_ctor.cpp</in>
+                    <in>optional_test_ref_fail1.cpp</in>
+                    <in>optional_test_ref_fail3.cpp</in>
+                    <in>optional_test_ref_fail4.cpp</in>
+                    <in>optional_test_ref_fail_assign_from_Trefref.cpp</in>
+                    <in>optional_test_ref_fail_assign_from_Urefref.cpp</in>
+                    <in>optional_test_ref_fail_init_from_Trefref.cpp</in>
+                    <in>optional_test_ref_fail_init_from_Urefref.cpp</in>
+                    <in>optional_test_ref_move.cpp</in>
+                    <in>optional_test_ref_portable_minimum.cpp</in>
+                    <in>optional_test_ref_to_val.cpp</in>
+                    <in>optional_test_sfinae_friendly_ctor.cpp</in>
+                    <in>optional_test_static_properties.cpp</in>
+                    <in>optional_test_swap.cpp</in>
+                    <in>optional_test_tc_base.cpp</in>
+                    <in>optional_test_tie.cpp</in>
+                    <in>optional_test_value_access.cpp</in>
+                    <in>optional_xconfig_HACK_TO_LIST_PREDEFINED_MACROS.cpp</in>
+                    <in>optional_xconfig_NO_LEGAL_CONVERT_FROM_REF_fail.cpp</in>
+                    <in>optional_xconfig_NO_LEGAL_CONVERT_FROM_REF_pass.cpp</in>
+                    <in>optional_xconfig_NO_PROPER_ASSIGN_FROM_CONST_INT_fail.cpp</in>
+                    <in>optional_xconfig_NO_PROPER_ASSIGN_FROM_CONST_INT_pass.cpp</in>
+                    <in>optional_xconfig_NO_PROPER_CONVERT_FROM_CONST_INT_fail.cpp</in>
+                    <in>optional_xconfig_NO_PROPER_CONVERT_FROM_CONST_INT_pass.cpp</in>
+                  </df>
+                </df>
+                <df name="outcome">
+                  <df name="doc">
+                    <df name="src">
+                      <df name="snippets">
+                        <df name="boost-only">
+                          <in>asio_integration.cpp</in>
+                          <in>asio_integration_1_70.cpp</in>
+                          <in>error_code_registration.cpp</in>
+                        </df>
+                        <in>c_api.c</in>
+                        <in>constructors.cpp</in>
+                        <in>cpp_api.cpp</in>
+                        <in>error_code_enums1.cpp</in>
+                        <in>error_code_enums2.cpp</in>
+                        <in>error_code_extended.cpp</in>
+                        <in>error_code_registration.cpp</in>
+                        <in>exception_ptr.cpp</in>
+                        <in>expected_implementation.cpp</in>
+                        <in>experimental_status_code.cpp</in>
+                        <in>finale.cpp</in>
+                        <in>foreign_try.cpp</in>
+                        <in>intro_example.cpp</in>
+                        <in>outcome_payload.cpp</in>
+                        <in>policies.cpp</in>
+                        <in>udts.cpp</in>
+                        <in>using_outcome.cpp</in>
+                        <in>using_result.cpp</in>
+                        <in>void_terminate.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="compile-fail">
+                      <in>issue0071-fail.cpp</in>
+                      <in>outcome-int-int-1.cpp</in>
+                      <in>result-int-int-1.cpp</in>
+                      <in>result-int-int-2.cpp</in>
+                    </df>
+                    <df name="tests">
+                      <in>comparison.cpp</in>
+                      <in>constexpr.cpp</in>
+                      <in>containers.cpp</in>
+                      <in>core-outcome.cpp</in>
+                      <in>core-result.cpp</in>
+                      <in>coroutine-support.cpp</in>
+                      <in>default-construction.cpp</in>
+                      <in>experimental-core-outcome-status.cpp</in>
+                      <in>experimental-core-result-status.cpp</in>
+                      <in>experimental-p0709a.cpp</in>
+                      <in>fileopen.cpp</in>
+                      <in>hooks.cpp</in>
+                      <in>issue0007.cpp</in>
+                      <in>issue0009.cpp</in>
+                      <in>issue0010.cpp</in>
+                      <in>issue0012.cpp</in>
+                      <in>issue0016.cpp</in>
+                      <in>issue0059.cpp</in>
+                      <in>issue0061.cpp</in>
+                      <in>issue0064.cpp</in>
+                      <in>issue0065.cpp</in>
+                      <in>issue0071.cpp</in>
+                      <in>issue0095.cpp</in>
+                      <in>issue0115.cpp</in>
+                      <in>issue0116.cpp</in>
+                      <in>issue0140.cpp</in>
+                      <in>issue0182.cpp</in>
+                      <in>issue0203.cpp</in>
+                      <in>issue0210.cpp</in>
+                      <in>issue0220.cpp</in>
+                      <in>issue0244.cpp</in>
+                      <in>issue0247.cpp</in>
+                      <in>issue0255.cpp</in>
+                      <in>noexcept-propagation.cpp</in>
+                      <in>propagate.cpp</in>
+                      <in>serialisation.cpp</in>
+                      <in>success-failure.cpp</in>
+                      <in>swap.cpp</in>
+                      <in>udts.cpp</in>
+                      <in>value-or-error.cpp</in>
+                    </df>
+                    <in>expected-pass.cpp</in>
+                  </df>
+                </df>
+                <df name="parameter">
+                  <df name="test">
+                    <df name="literate">
+                      <in>building-argumentpacks0.cpp</in>
+                      <in>class-template-skeleton0.cpp</in>
+                      <in>deduced-parameters0.cpp</in>
+                      <in>deduced-template-parameters0.cpp</in>
+                      <in>default-expression-evaluation0.cpp</in>
+                      <in>defining-the-keywords0.cpp</in>
+                      <in>defining-the-keywords1.cpp</in>
+                      <in>exercising-the-code-so-far0.cpp</in>
+                      <in>extracting-parameter-types0.cpp</in>
+                      <in>extracting-parameter-types1.cpp</in>
+                      <in>fine-grained-name-control0.cpp</in>
+                      <in>handling-out-parameters0.cpp</in>
+                      <in>headers-and-namespaces0.cpp</in>
+                      <in>lazy-default-computation0.cpp</in>
+                      <in>lazy-default-computation1.cpp</in>
+                      <in>namespaces0.cpp</in>
+                      <in>namespaces1.cpp</in>
+                      <in>namespaces2.cpp</in>
+                      <in>namespaces3.cpp</in>
+                      <in>optional-parameters0.cpp</in>
+                      <in>parameter-enabled-constructors0.cpp</in>
+                      <in>parameter-enabled-function-call-operators0.cpp</in>
+                      <in>parameter-enabled-member-functions0.cpp</in>
+                      <in>parameter-enabled-member-functions1.cpp</in>
+                      <in>predicate-requirements0.cpp</in>
+                      <in>required-parameters0.cpp</in>
+                      <in>static-member-functions0.cpp</in>
+                      <in>template-keywords0.cpp</in>
+                      <in>template-keywords1.cpp</in>
+                      <in>top-level0.cpp</in>
+                      <in>writing-the-function0.cpp</in>
+                    </df>
+                    <in>basics.cpp</in>
+                    <in>compose.cpp</in>
+                    <in>deduced.cpp</in>
+                    <in>deduced_dependent_predicate.cpp</in>
+                    <in>deduced_unmatched_arg.cpp</in>
+                    <in>duplicates.cpp</in>
+                    <in>earwicker.cpp</in>
+                    <in>efficiency.cpp</in>
+                    <in>evaluate_category.cpp</in>
+                    <in>evaluate_category_10.cpp</in>
+                    <in>evaluate_category_16.cpp</in>
+                    <in>function_type_tpl_param.cpp</in>
+                    <in>macros.cpp</in>
+                    <in>macros_eval_category.cpp</in>
+                    <in>maybe.cpp</in>
+                    <in>mpl.cpp</in>
+                    <in>normalized_argument_types.cpp</in>
+                    <in>ntp.cpp</in>
+                    <in>optional_deduced_sfinae.cpp</in>
+                    <in>parameterized_inheritance.cpp</in>
+                    <in>preprocessor.cpp</in>
+                    <in>preprocessor_deduced.cpp</in>
+                    <in>preprocessor_eval_cat_8.cpp</in>
+                    <in>preprocessor_eval_cat_no_spec.cpp</in>
+                    <in>preprocessor_eval_category.cpp</in>
+                    <in>python_test.cpp</in>
+                    <in>sfinae.cpp</in>
+                    <in>singular.cpp</in>
+                    <in>tutorial.cpp</in>
+                    <in>unwrap_cv_reference.cpp</in>
+                  </df>
+                </df>
+                <df name="parameter_python">
+                  <df name="test">
+                    <in>python_test.cpp</in>
+                  </df>
+                </df>
+                <df name="pfr">
+                  <df name="example">
+                    <in>get.cpp</in>
+                    <in>motivating_example0.cpp</in>
+                    <in>quick_examples.cpp</in>
+                    <in>sample_printing.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="compile-fail">
+                      <in>fields_count_on_reference.cpp</in>
+                      <in>inherited.cpp</in>
+                      <in>inherited_nonempty.cpp</in>
+                      <in>movable_and_lvalue_references.cpp</in>
+                      <in>non_aggregate.cpp</in>
+                      <in>ops_on_union.cpp</in>
+                      <in>ops_unions.cpp</in>
+                      <in>ops_unrestricted_unions.cpp</in>
+                      <in>pfr_review_test2.cpp</in>
+                      <in>private_fields.cpp</in>
+                      <in>protected_fields.cpp</in>
+                      <in>rvalue_tie.cpp</in>
+                      <in>virtual_functions.cpp</in>
+                    </df>
+                    <df name="run">
+                      <in>bitfields_count.cpp</in>
+                      <in>constexpr_ops.cpp</in>
+                      <in>destructuring_tie.cpp</in>
+                      <in>error_pfr_c1202.cpp</in>
+                      <in>fields_count_on_const.cpp</in>
+                      <in>for_each_field.cpp</in>
+                      <in>functions_for.cpp</in>
+                      <in>get_const_field.cpp</in>
+                      <in>get_non_default_constructible.cpp</in>
+                      <in>get_rvalue.cpp</in>
+                      <in>issue30.cpp</in>
+                      <in>issue33.cpp</in>
+                      <in>motivating_example.cpp</in>
+                      <in>motivating_example2.cpp</in>
+                      <in>non_copyable_but_movable.cpp</in>
+                      <in>non_dc_non_cop_but_mov.cpp</in>
+                      <in>non_default_constructible.cpp</in>
+                      <in>non_movable.cpp</in>
+                      <in>non_std_layout.cpp</in>
+                      <in>ops.cpp</in>
+                      <in>optional_chrono.cpp</in>
+                      <in>optional_like.cpp</in>
+                      <in>read_write.cpp</in>
+                      <in>read_write_non_literal.cpp</in>
+                      <in>std_interactions.cpp</in>
+                      <in>template_constructor.cpp</in>
+                      <in>template_forwarding_ref.cpp</in>
+                      <in>template_unconstrained.cpp</in>
+                      <in>tie_anonymous.cpp</in>
+                      <in>tie_anonymous_const_field.cpp</in>
+                      <in>tuple_size.cpp</in>
+                    </df>
+                    <in>loophole_detection.cpp</in>
+                    <in>offset_based_getter.cpp</in>
+                    <in>print_config.cpp</in>
+                    <in>test_tuple_sizes_on.cpp</in>
+                  </df>
+                </df>
+                <df name="phoenix">
+                  <df name="example">
+                    <in>adapted_echo_server.cpp</in>
+                    <in>all_odds.cpp</in>
+                    <in>arguments.cpp</in>
+                    <in>bind_goose.cpp</in>
+                    <in>callback.cpp</in>
+                    <in>container_actor.cpp</in>
+                    <in>define_expression.cpp</in>
+                    <in>factorial.cpp</in>
+                    <in>find_if.cpp</in>
+                    <in>function.cpp</in>
+                    <in>generator.cpp</in>
+                    <in>generator2.cpp</in>
+                    <in>identity_transform.cpp</in>
+                    <in>if.cpp</in>
+                    <in>invert.cpp</in>
+                    <in>lambda.cpp</in>
+                    <in>parallel_for.cpp</in>
+                    <in>references.cpp</in>
+                    <in>values.cpp</in>
+                  </df>
+                  <df name="preprocess">
+                    <in>preprocess_phoenix.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="algorithm">
+                      <in>for_each.cpp</in>
+                      <in>for_each2.cpp</in>
+                      <in>for_test.cpp</in>
+                      <in>for_test2.cpp</in>
+                      <in>iteration.cpp</in>
+                      <in>querying.cpp</in>
+                      <in>querying2.cpp</in>
+                      <in>querying_find.cpp</in>
+                      <in>querying_find2.cpp</in>
+                      <in>transformation1.cpp</in>
+                      <in>transformation2.cpp</in>
+                      <in>transformation3.cpp</in>
+                      <in>transformation4.cpp</in>
+                    </df>
+                    <df name="bind">
+                      <in>bind_function_object_tests.cpp</in>
+                      <in>bind_function_tests.cpp</in>
+                      <in>bind_member_function_tests.cpp</in>
+                      <in>bind_member_variable_tests.cpp</in>
+                      <in>bug5782.cpp</in>
+                    </df>
+                    <df name="bll_compatibility">
+                      <in>algorithm_test.cpp</in>
+                      <in>bind_tests_advanced.cpp</in>
+                      <in>bind_tests_simple.cpp</in>
+                      <in>bind_tests_simple_f_refs.cpp</in>
+                      <in>bll_and_function.cpp</in>
+                      <in>cast_test.cpp</in>
+                      <in>constructor_tests.cpp</in>
+                      <in>control_structures.cpp</in>
+                      <in>exception_test.cpp</in>
+                      <in>extending_rt_traits.cpp</in>
+                      <in>is_instance_of_test.cpp</in>
+                      <in>istreambuf_test.cpp</in>
+                      <in>member_pointer_test.cpp</in>
+                      <in>operator_tests_simple.cpp</in>
+                      <in>phoenix_control_structures.cpp</in>
+                      <in>result_of_tests.cpp</in>
+                      <in>ret_test.cpp</in>
+                      <in>rvalue_test.cpp</in>
+                      <in>switch_construct.cpp</in>
+                    </df>
+                    <df name="boost_bind_compatibility">
+                      <in>bind_and_or_test.cpp</in>
+                      <in>bind_cdecl_mf_test.cpp</in>
+                      <in>bind_const_test.cpp</in>
+                      <in>bind_cv_test.cpp</in>
+                      <in>bind_dm1_test.cpp</in>
+                      <in>bind_dm2_test.cpp</in>
+                      <in>bind_dm3_test.cpp</in>
+                      <in>bind_dm_test.cpp</in>
+                      <in>bind_eq2_test.cpp</in>
+                      <in>bind_eq3_test.cpp</in>
+                      <in>bind_eq_test.cpp</in>
+                      <in>bind_fastcall_mf_test.cpp</in>
+                      <in>bind_fastcall_test.cpp</in>
+                      <in>bind_fn2_test.cpp</in>
+                      <in>bind_fnobj2_test.cpp</in>
+                      <in>bind_function_test.cpp</in>
+                      <in>bind_interoperation_test.cpp</in>
+                      <in>bind_lookup_problem_test.cpp</in>
+                      <in>bind_mf2_test.cpp</in>
+                      <in>bind_not_test.cpp</in>
+                      <in>bind_placeholder_test.cpp</in>
+                      <in>bind_ref_test.cpp</in>
+                      <in>bind_rel_test.cpp</in>
+                      <in>bind_rv_sp1_test.cpp</in>
+                      <in>bind_rv_sp2_test.cpp</in>
+                      <in>bind_rv_sp3_test.cpp</in>
+                      <in>bind_rv_sp4_test.cpp</in>
+                      <in>bind_rv_sp5_test.cpp</in>
+                      <in>bind_rv_sp6_test.cpp</in>
+                      <in>bind_rv_sp7_test.cpp</in>
+                      <in>bind_rv_sp_test.cpp</in>
+                      <in>bind_rvalue_test.cpp</in>
+                      <in>bind_stateful_test.cpp</in>
+                      <in>bind_stdcall_mf_test.cpp</in>
+                      <in>bind_stdcall_test.cpp</in>
+                      <in>bind_test.cpp</in>
+                      <in>bind_unary_addr.cpp</in>
+                      <in>bind_void_dm_test.cpp</in>
+                      <in>bind_void_mf_test.cpp</in>
+                      <in>bind_void_test.cpp</in>
+                    </df>
+                    <df name="container">
+                      <in>container_tests10a.cpp</in>
+                      <in>container_tests10b.cpp</in>
+                      <in>container_tests11a.cpp</in>
+                      <in>container_tests11b.cpp</in>
+                      <in>container_tests12a.cpp</in>
+                      <in>container_tests12b.cpp</in>
+                      <in>container_tests1a.cpp</in>
+                      <in>container_tests1b.cpp</in>
+                      <in>container_tests2a.cpp</in>
+                      <in>container_tests2b.cpp</in>
+                      <in>container_tests3a.cpp</in>
+                      <in>container_tests3b.cpp</in>
+                      <in>container_tests4a.cpp</in>
+                      <in>container_tests4b.cpp</in>
+                      <in>container_tests5a.cpp</in>
+                      <in>container_tests5b.cpp</in>
+                      <in>container_tests6a.cpp</in>
+                      <in>container_tests6b.cpp</in>
+                      <in>container_tests7a.cpp</in>
+                      <in>container_tests7b.cpp</in>
+                      <in>container_tests8a.cpp</in>
+                      <in>container_tests8b.cpp</in>
+                      <in>container_tests9a.cpp</in>
+                      <in>container_tests9b.cpp</in>
+                    </df>
+                    <df name="core">
+                      <in>custom_terminal.cpp</in>
+                      <in>intel_test.cpp</in>
+                      <in>primitives_tests.cpp</in>
+                    </df>
+                    <df name="function">
+                      <in>adapt_function.cpp</in>
+                      <in>function_tests.cpp</in>
+                      <in>lazy_argument_tests.cpp</in>
+                      <in>lazy_compose_tests.cpp</in>
+                      <in>lazy_fold_tests.cpp</in>
+                      <in>lazy_list2_tests.cpp</in>
+                      <in>lazy_list3_tests.cpp</in>
+                      <in>lazy_list_tests.cpp</in>
+                      <in>lazy_make_pair_tests.cpp</in>
+                      <in>lazy_operator_tests.cpp</in>
+                      <in>lazy_ptr_tests.cpp</in>
+                      <in>lazy_scan_tests.cpp</in>
+                      <in>lazy_templated_struct_tests.cpp</in>
+                      <in>lazy_thunk_tests.cpp</in>
+                    </df>
+                    <df name="include">
+                      <df name="bind">
+                        <in>bind_member_function.cpp</in>
+                        <in>bind_member_variable.cpp</in>
+                      </df>
+                      <df name="core">
+                        <in>actor.cpp</in>
+                        <in>argument.cpp</in>
+                        <in>arity.cpp</in>
+                        <in>bug7730.cpp</in>
+                        <in>call.cpp</in>
+                        <in>debug.cpp</in>
+                        <in>domain.cpp</in>
+                        <in>environment.cpp</in>
+                        <in>expression.cpp</in>
+                        <in>function_equal.cpp</in>
+                        <in>is_actor.cpp</in>
+                        <in>is_nullary.cpp</in>
+                        <in>limits.cpp</in>
+                        <in>meta_grammar.cpp</in>
+                        <in>nothing.cpp</in>
+                        <in>reference.cpp</in>
+                        <in>terminal.cpp</in>
+                        <in>value.cpp</in>
+                      </df>
+                      <df name="function">
+                        <in>function.cpp</in>
+                        <in>lazy_headers.cpp</in>
+                      </df>
+                      <df name="fusion">
+                        <in>at.cpp</in>
+                      </df>
+                      <df name="object">
+                        <in>const_cast.cpp</in>
+                        <in>construct.cpp</in>
+                        <in>delete.cpp</in>
+                        <in>dynamic_cast.cpp</in>
+                        <in>new.cpp</in>
+                        <in>reinterpret_cast.cpp</in>
+                        <in>static_cast.cpp</in>
+                      </df>
+                      <df name="operator">
+                        <in>arithmetic.cpp</in>
+                        <in>bitwise.cpp</in>
+                        <in>comparison.cpp</in>
+                        <in>if_else.cpp</in>
+                        <in>io.cpp</in>
+                        <in>logical.cpp</in>
+                        <in>member.cpp</in>
+                        <in>self.cpp</in>
+                      </df>
+                      <df name="scope">
+                        <in>dynamic.cpp</in>
+                        <in>lambda.cpp</in>
+                        <in>let.cpp</in>
+                        <in>local_variable.cpp</in>
+                        <in>scoped_environment.cpp</in>
+                        <in>this.cpp</in>
+                      </df>
+                      <df name="statement">
+                        <in>do_while.cpp</in>
+                        <in>for.cpp</in>
+                        <in>if.cpp</in>
+                        <in>sequence.cpp</in>
+                        <in>switch.cpp</in>
+                        <in>throw.cpp</in>
+                        <in>try_catch.cpp</in>
+                        <in>while.cpp</in>
+                      </df>
+                      <df name="stl">
+                        <df name="algorithm">
+                          <in>iteration.cpp</in>
+                          <in>querying.cpp</in>
+                          <in>transformation.cpp</in>
+                        </df>
+                        <df name="container">
+                          <in>container.cpp</in>
+                        </df>
+                        <in>algorithm.cpp</in>
+                        <in>container.cpp</in>
+                      </df>
+                      <df name="support">
+                        <df name="preprocessor">
+                          <in>round.cpp</in>
+                        </df>
+                        <in>iterate.cpp</in>
+                      </df>
+                      <in>bind.cpp</in>
+                      <in>core.cpp</in>
+                      <in>function.cpp</in>
+                      <in>fusion.cpp</in>
+                      <in>fusion_at.cpp</in>
+                      <in>object.cpp</in>
+                      <in>operator.cpp</in>
+                      <in>phoenix.cpp</in>
+                      <in>scope.cpp</in>
+                      <in>spirit.cpp</in>
+                      <in>spirit_no_specialize.cpp</in>
+                      <in>statement.cpp</in>
+                      <in>stl.cpp</in>
+                      <in>version.cpp</in>
+                    </df>
+                    <df name="object">
+                      <in>cast_tests.cpp</in>
+                      <in>new_delete_tests.cpp</in>
+                    </df>
+                    <df name="operator">
+                      <in>arithmetic_tests.cpp</in>
+                      <in>bitwise_tests.cpp</in>
+                      <in>comparison_tests.cpp</in>
+                      <in>if_else_tests.cpp</in>
+                      <in>io_tests.cpp</in>
+                      <in>logical_tests.cpp</in>
+                      <in>member.cpp</in>
+                      <in>misc_binary_tests.cpp</in>
+                      <in>self_tests.cpp</in>
+                      <in>unary_tests.cpp</in>
+                    </df>
+                    <df name="regression">
+                      <in>actor_assignment.cpp</in>
+                      <in>bug4853.cpp</in>
+                      <in>bug5626.cpp</in>
+                      <in>bug5824.cpp</in>
+                      <in>bug5875.cpp</in>
+                      <in>bug5968.cpp</in>
+                      <in>bug6040.cpp</in>
+                      <in>bug6268.cpp</in>
+                      <in>bug7165.cpp</in>
+                      <in>bug7166.cpp</in>
+                      <in>bug7624.cpp</in>
+                      <in>from_array.cpp</in>
+                    </df>
+                    <df name="scope">
+                      <in>bug3289.cpp</in>
+                      <in>bug8298.cpp</in>
+                      <in>bug8298f.cpp</in>
+                      <in>bug_000008.cpp</in>
+                      <in>dynamic_tests.cpp</in>
+                      <in>lambda_tests1.cpp</in>
+                      <in>lambda_tests10.cpp</in>
+                      <in>lambda_tests11.cpp</in>
+                      <in>lambda_tests12.cpp</in>
+                      <in>lambda_tests13.cpp</in>
+                      <in>lambda_tests14.cpp</in>
+                      <in>lambda_tests15.cpp</in>
+                      <in>lambda_tests16.cpp</in>
+                      <in>lambda_tests17.cpp</in>
+                      <in>lambda_tests18.cpp</in>
+                      <in>lambda_tests19.cpp</in>
+                      <in>lambda_tests2.cpp</in>
+                      <in>lambda_tests20.cpp</in>
+                      <in>lambda_tests21.cpp</in>
+                      <in>lambda_tests22.cpp</in>
+                      <in>lambda_tests23.cpp</in>
+                      <in>lambda_tests3.cpp</in>
+                      <in>lambda_tests4.cpp</in>
+                      <in>lambda_tests5.cpp</in>
+                      <in>lambda_tests6.cpp</in>
+                      <in>lambda_tests7.cpp</in>
+                      <in>lambda_tests8.cpp</in>
+                      <in>lambda_tests9.cpp</in>
+                      <in>let_tests.cpp</in>
+                      <in>let_tests_113.cpp</in>
+                      <in>let_tests_113a.cpp</in>
+                      <in>let_tests_157.cpp</in>
+                      <in>let_tests_157a.cpp</in>
+                      <in>let_tests_rest.cpp</in>
+                      <in>more_lambda_tests.cpp</in>
+                      <in>more_let_tests.cpp</in>
+                      <in>more_let_tests1.cpp</in>
+                      <in>more_let_tests2.cpp</in>
+                      <in>more_let_tests2a.cpp</in>
+                      <in>more_let_tests2b.cpp</in>
+                      <in>this.cpp</in>
+                    </df>
+                    <df name="statement">
+                      <in>bug5715.cpp</in>
+                      <in>exceptions.cpp</in>
+                      <in>if_tests.cpp</in>
+                      <in>loops_tests.cpp</in>
+                      <in>switch_tests.cpp</in>
+                    </df>
+                    <df name="stdlib">
+                      <in>cmath.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="poly_collection">
+                  <df name="example">
+                    <in>algorithms.cpp</in>
+                    <in>basic_any.cpp</in>
+                    <in>basic_base.cpp</in>
+                    <in>basic_function.cpp</in>
+                    <in>exceptions.cpp</in>
+                    <in>insertion_emplacement.cpp</in>
+                    <in>perf.cpp</in>
+                    <in>segmented_structure.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>test_algorithm.cpp</in>
+                    <in>test_algorithm1.cpp</in>
+                    <in>test_algorithm2.cpp</in>
+                    <in>test_algorithm3.cpp</in>
+                    <in>test_algorithm_main.cpp</in>
+                    <in>test_all_main.cpp</in>
+                    <in>test_capacity.cpp</in>
+                    <in>test_capacity_main.cpp</in>
+                    <in>test_comparison.cpp</in>
+                    <in>test_comparison_main.cpp</in>
+                    <in>test_construction.cpp</in>
+                    <in>test_construction_main.cpp</in>
+                    <in>test_emplacement.cpp</in>
+                    <in>test_emplacement_main.cpp</in>
+                    <in>test_erasure.cpp</in>
+                    <in>test_erasure_main.cpp</in>
+                    <in>test_insertion.cpp</in>
+                    <in>test_insertion_main.cpp</in>
+                    <in>test_iterators.cpp</in>
+                    <in>test_iterators_main.cpp</in>
+                    <in>test_registration.cpp</in>
+                    <in>test_registration_main.cpp</in>
+                  </df>
+                </df>
+                <df name="polygon">
+                  <df name="benchmark">
+                    <in>voronoi_benchmark.cpp</in>
+                    <in>voronoi_benchmark_points.cpp</in>
+                    <in>voronoi_benchmark_segments.cpp</in>
+                  </df>
+                  <df name="doc">
+                    <df name="tutorial">
+                      <in>extract.cpp</in>
+                      <in>minkowski.cpp</in>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <in>gtl_custom_point.cpp</in>
+                    <in>gtl_custom_polygon.cpp</in>
+                    <in>gtl_custom_polygon_set.cpp</in>
+                    <in>voronoi_advanced_tutorial.cpp</in>
+                    <in>voronoi_basic_tutorial.cpp</in>
+                    <in>voronoi_visualizer.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>gtl_boost_unit_test.cpp</in>
+                    <in>polygon_90_data_test.cpp</in>
+                    <in>polygon_interval_test.cpp</in>
+                    <in>polygon_point_test.cpp</in>
+                    <in>polygon_rectangle_formation_test.cpp</in>
+                    <in>polygon_rectangle_test.cpp</in>
+                    <in>polygon_segment_test.cpp</in>
+                    <in>polygon_set_data_test.cpp</in>
+                    <in>voronoi_builder_test.cpp</in>
+                    <in>voronoi_ctypes_test.cpp</in>
+                    <in>voronoi_diagram_test.cpp</in>
+                    <in>voronoi_geometry_type_test.cpp</in>
+                    <in>voronoi_predicates_test.cpp</in>
+                    <in>voronoi_robust_fpt_test.cpp</in>
+                    <in>voronoi_structures_test.cpp</in>
+                  </df>
+                </df>
+                <df name="pool">
+                  <df name="example">
+                    <in>time_pool_alloc.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>pool_msvc_compiler_bug_test.cpp</in>
+                    <in>test_bug_1252.cpp</in>
+                    <in>test_bug_2696.cpp</in>
+                    <in>test_bug_3349.cpp</in>
+                    <in>test_bug_4960.cpp</in>
+                    <in>test_bug_5526.cpp</in>
+                    <in>test_msvc_mem_leak_detect.cpp</in>
+                    <in>test_poisoned_macros.cpp</in>
+                    <in>test_pool_alloc.cpp</in>
+                    <in>test_simple_seg_storage.cpp</in>
+                    <in>test_threading.cpp</in>
+                    <in>test_valgrind_fail_1.cpp</in>
+                    <in>test_valgrind_fail_2.cpp</in>
+                    <in>valgrind_config_check.cpp</in>
+                  </df>
+                </df>
+                <df name="predef">
+                  <df name="test">
+                    <df name="test_cmake">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>check_value.cpp</in>
+                    <in>info_as_c.c</in>
+                    <in>info_as_cpp.cpp</in>
+                    <in>info_as_objc.m</in>
+                    <in>info_as_objcpp.mm</in>
+                    <in>macos_endian.c</in>
+                    <in>macos_vs_bsd.c</in>
+                    <in>make.cpp</in>
+                    <in>platform_windows.cpp</in>
+                    <in>tested_at.cpp</in>
+                    <in>tested_at_outdated.cpp</in>
+                    <in>version.cpp</in>
+                    <in>workaround.cpp</in>
+                    <in>workaround_strict_config.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <df name="check">
+                      <in>predef_check_as_c.c</in>
+                      <in>predef_check_as_cpp.cpp</in>
+                      <in>predef_check_as_objc.m</in>
+                      <in>predef_check_as_objcpp.mm</in>
+                      <in>predef_check_cc_as_c.c</in>
+                      <in>predef_check_cc_as_cpp.cpp</in>
+                      <in>predef_check_cc_as_objc.m</in>
+                      <in>predef_check_cc_as_objcpp.mm</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="preprocessor">
+                  <df name="doc">
+                    <df name="examples">
+                      <in>array_arithmetic.c</in>
+                      <in>catch_builtin.cpp</in>
+                      <in>delay.c</in>
+                      <in>duffs_device.c</in>
+                      <in>is_integral.cpp</in>
+                      <in>linear_fib.c</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>arithmetic.c</in>
+                    <in>arithmetic.cpp</in>
+                    <in>arithmetic.cxx</in>
+                    <in>array.c</in>
+                    <in>array.cpp</in>
+                    <in>array.cxx</in>
+                    <in>checkempty.cpp</in>
+                    <in>checkempty.cxx</in>
+                    <in>comparison.c</in>
+                    <in>comparison.cpp</in>
+                    <in>comparison.cxx</in>
+                    <in>config_info.cpp</in>
+                    <in>control.c</in>
+                    <in>control.cpp</in>
+                    <in>control.cxx</in>
+                    <in>cpp_standard.cpp</in>
+                    <in>debug.c</in>
+                    <in>debug.cpp</in>
+                    <in>debug.cxx</in>
+                    <in>facilities.c</in>
+                    <in>facilities.cpp</in>
+                    <in>facilities.cxx</in>
+                    <in>isempty.c</in>
+                    <in>isempty.cpp</in>
+                    <in>isempty.cxx</in>
+                    <in>isempty_variadic_standard_failure.c</in>
+                    <in>isempty_variadic_standard_failure.cpp</in>
+                    <in>isempty_variadic_standard_failure.cxx</in>
+                    <in>isempty_variadic_standard_failure2.c</in>
+                    <in>isempty_variadic_standard_failure2.cpp</in>
+                    <in>isempty_variadic_standard_failure2.cxx</in>
+                    <in>iteration.cpp</in>
+                    <in>list.c</in>
+                    <in>list.cpp</in>
+                    <in>list.cxx</in>
+                    <in>logical.c</in>
+                    <in>logical.cpp</in>
+                    <in>logical.cxx</in>
+                    <in>punctuation.c</in>
+                    <in>punctuation.cpp</in>
+                    <in>punctuation.cxx</in>
+                    <in>quick.cpp</in>
+                    <in>repetition.cpp</in>
+                    <in>selection.c</in>
+                    <in>selection.cpp</in>
+                    <in>selection.cxx</in>
+                    <in>seq.c</in>
+                    <in>seq.cpp</in>
+                    <in>seq.cxx</in>
+                    <in>slot.c</in>
+                    <in>slot.cpp</in>
+                    <in>slot.cxx</in>
+                    <in>stringize.c</in>
+                    <in>stringize.cpp</in>
+                    <in>stringize.cxx</in>
+                    <in>tuple.c</in>
+                    <in>tuple.cpp</in>
+                    <in>tuple.cxx</in>
+                    <in>tuple_elem_bug_test.cxx</in>
+                    <in>vaopt.cpp</in>
+                    <in>vaopt.cxx</in>
+                    <in>variadic.c</in>
+                    <in>variadic.cpp</in>
+                    <in>variadic.cxx</in>
+                  </df>
+                </df>
+                <df name="process">
+                  <df name="example">
+                    <in>args.cpp</in>
+                    <in>async_io.cpp</in>
+                    <in>env.cpp</in>
+                    <in>error_handling.cpp</in>
+                    <in>intro.cpp</in>
+                    <in>io.cpp</in>
+                    <in>posix.cpp</in>
+                    <in>start_dir.cpp</in>
+                    <in>sync_io.cpp</in>
+                    <in>terminate.cpp</in>
+                    <in>wait.cpp</in>
+                    <in>windows.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>args_cmd.cpp</in>
+                    <in>args_handling.cpp</in>
+                    <in>asio_no_deprecated.cpp</in>
+                    <in>async.cpp</in>
+                    <in>async_fut.cpp</in>
+                    <in>async_pipe.cpp</in>
+                    <in>async_system_fail.cpp</in>
+                    <in>async_system_future.cpp</in>
+                    <in>async_system_stackful.cpp</in>
+                    <in>async_system_stackful_error.cpp</in>
+                    <in>async_system_stackful_except.cpp</in>
+                    <in>async_system_stackless.cpp</in>
+                    <in>bind_stderr.cpp</in>
+                    <in>bind_stdin.cpp</in>
+                    <in>bind_stdin_stdout.cpp</in>
+                    <in>bind_stdout.cpp</in>
+                    <in>bind_stdout_stderr.cpp</in>
+                    <in>close_stderr.cpp</in>
+                    <in>close_stdin.cpp</in>
+                    <in>close_stdout.cpp</in>
+                    <in>cmd_test.cpp</in>
+                    <in>env.cpp</in>
+                    <in>environment.cpp</in>
+                    <in>error.cpp</in>
+                    <in>exit_argc.cpp</in>
+                    <in>exit_code.cpp</in>
+                    <in>extensions.cpp</in>
+                    <in>group.cpp</in>
+                    <in>group_wait.cpp</in>
+                    <in>limit_fd.cpp</in>
+                    <in>multi_ref1.cpp</in>
+                    <in>multi_ref2.cpp</in>
+                    <in>no_ansi_apps.cpp</in>
+                    <in>on_exit.cpp</in>
+                    <in>on_exit2.cpp</in>
+                    <in>on_exit3.cpp</in>
+                    <in>pipe.cpp</in>
+                    <in>pipe_fwd.cpp</in>
+                    <in>posix_specific.cpp</in>
+                    <in>run_exe.cpp</in>
+                    <in>run_exe_path.cpp</in>
+                    <in>search_path.cpp</in>
+                    <in>shell.cpp</in>
+                    <in>shell_path.cpp</in>
+                    <in>sparring_partner.cpp</in>
+                    <in>spawn.cpp</in>
+                    <in>spawn_fail.cpp</in>
+                    <in>start_dir.cpp</in>
+                    <in>sub_launcher.cpp</in>
+                    <in>system_test1.cpp</in>
+                    <in>system_test2.cpp</in>
+                    <in>terminate.cpp</in>
+                    <in>throw_on_error.cpp</in>
+                    <in>vfork.cpp</in>
+                    <in>wait.cpp</in>
+                    <in>wait_for.cpp</in>
+                    <in>wargs_cmd.cpp</in>
+                    <in>windows_specific.cpp</in>
+                  </df>
+                </df>
+                <df name="program_options">
+                  <df name="example">
+                    <in>config_file_types.cpp</in>
+                    <in>custom_syntax.cpp</in>
+                    <in>env_options.cpp</in>
+                    <in>first.cpp</in>
+                    <in>multiple_sources.cpp</in>
+                    <in>option_groups.cpp</in>
+                    <in>options_description.cpp</in>
+                    <in>options_heirarchy.cpp</in>
+                    <in>real.cpp</in>
+                    <in>regex.cpp</in>
+                    <in>response_file.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>cmdline.cpp</in>
+                    <in>config_file.cpp</in>
+                    <in>convert.cpp</in>
+                    <in>options_description.cpp</in>
+                    <in>parsers.cpp</in>
+                    <in>positional_options.cpp</in>
+                    <in>split.cpp</in>
+                    <in>utf8_codecvt_facet.cpp</in>
+                    <in>value_semantic.cpp</in>
+                    <in>variables_map.cpp</in>
+                    <in>winmain.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>cmdline_test.cpp</in>
+                    <in>exception_test.cpp</in>
+                    <in>exception_txt_test.cpp</in>
+                    <in>optional_test.cpp</in>
+                    <in>options_description_test.cpp</in>
+                    <in>parsers_test.cpp</in>
+                    <in>positional_options_test.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>required_test.cpp</in>
+                    <in>split_test.cpp</in>
+                    <in>test_convert.cpp</in>
+                    <in>unicode_test.cpp</in>
+                    <in>unrecognized_test.cpp</in>
+                    <in>variable_map_test.cpp</in>
+                    <in>winmain.cpp</in>
+                  </df>
+                </df>
+                <df name="property_map">
+                  <df name="example">
+                    <in>compose_property_map_example.cpp</in>
+                    <in>example1.cpp</in>
+                    <in>example2.cpp</in>
+                    <in>example3.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>compose_property_map_test.cpp</in>
+                    <in>dynamic_properties_test.cpp</in>
+                    <in>function_property_map_test.cpp</in>
+                    <in>property_map_cc.cpp</in>
+                    <in>transform_value_property_map_test.cpp</in>
+                  </df>
+                </df>
+                <df name="property_tree">
+                  <df name="examples">
+                    <in>custom_data_type.cpp</in>
+                    <in>debug_settings.cpp</in>
+                    <in>empty_ptree_trick.cpp</in>
+                    <in>info_grammar_spirit.cpp</in>
+                    <in>speed_test.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>sandbox.cpp</in>
+                    <in>test_info_parser.cpp</in>
+                    <in>test_ini_parser.cpp</in>
+                    <in>test_json_parser.cpp</in>
+                    <in>test_json_parser2.cpp</in>
+                    <in>test_multi_module1.cpp</in>
+                    <in>test_multi_module2.cpp</in>
+                    <in>test_property_tree.cpp</in>
+                    <in>test_rapidxml.cpp</in>
+                    <in>test_xml_parser_rapidxml.cpp</in>
+                  </df>
+                </df>
+                <df name="proto">
+                  <df name="example">
+                    <in>calc1.cpp</in>
+                    <in>calc2.cpp</in>
+                    <in>calc3.cpp</in>
+                    <in>external_transforms.cpp</in>
+                    <in>futures.cpp</in>
+                    <in>hello.cpp</in>
+                    <in>lambda.cpp</in>
+                    <in>lazy_vector.cpp</in>
+                    <in>map_assign.cpp</in>
+                    <in>mini_lambda.cpp</in>
+                    <in>mixed.cpp</in>
+                    <in>rgb.cpp</in>
+                    <in>tarray.cpp</in>
+                    <in>vec3.cpp</in>
+                    <in>vector.cpp</in>
+                    <in>virtual_member.cpp</in>
+                  </df>
+                  <df name="preprocess">
+                    <in>preprocess_proto.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>bug2407.cpp</in>
+                    <in>calculator.cpp</in>
+                    <in>constrained_ops.cpp</in>
+                    <in>cpp-next_bug.cpp</in>
+                    <in>deduce_domain.cpp</in>
+                    <in>deep_copy.cpp</in>
+                    <in>display_expr.cpp</in>
+                    <in>env_var.cpp</in>
+                    <in>examples.cpp</in>
+                    <in>external_transforms.cpp</in>
+                    <in>flatten.cpp</in>
+                    <in>lambda.cpp</in>
+                    <in>make.cpp</in>
+                    <in>make_expr.cpp</in>
+                    <in>matches.cpp</in>
+                    <in>mem_ptr.cpp</in>
+                    <in>mpl.cpp</in>
+                    <in>noinvoke.cpp</in>
+                    <in>pack_expansion.cpp</in>
+                    <in>protect.cpp</in>
+                    <in>switch.cpp</in>
+                    <in>toy_spirit.cpp</in>
+                    <in>toy_spirit2.cpp</in>
+                  </df>
+                </df>
+                <df name="ptr_container">
+                  <df name="test">
+                    <in>const_element_containers.cpp</in>
+                    <in>incomplete_type_test.cpp</in>
+                    <in>indirect_fun.cpp</in>
+                    <in>issue_23.cpp</in>
+                    <in>iterator_test.cpp</in>
+                    <in>no_exceptions.cpp</in>
+                    <in>pointainer_speed.cpp</in>
+                    <in>ptr_array.cpp</in>
+                    <in>ptr_circular_buffer.cpp</in>
+                    <in>ptr_container_adapter.cpp</in>
+                    <in>ptr_deque.cpp</in>
+                    <in>ptr_inserter.cpp</in>
+                    <in>ptr_list.cpp</in>
+                    <in>ptr_map.cpp</in>
+                    <in>ptr_map_adapter.cpp</in>
+                    <in>ptr_set.cpp</in>
+                    <in>ptr_unordered_map.cpp</in>
+                    <in>ptr_unordered_set.cpp</in>
+                    <in>ptr_vector.cpp</in>
+                    <in>ptr_vector_size.cpp</in>
+                    <in>serialization.cpp</in>
+                    <in>simple_test.cpp</in>
+                    <in>tree_test.cpp</in>
+                    <in>tut1.cpp</in>
+                    <in>tut34.cpp</in>
+                    <in>view_example.cpp</in>
+                  </df>
+                </df>
+                <df name="python">
+                  <df name="example">
+                    <df name="numpy">
+                      <in>dtype.cpp</in>
+                      <in>fromdata.cpp</in>
+                      <in>gaussian.cpp</in>
+                      <in>ndarray.cpp</in>
+                      <in>simple.cpp</in>
+                      <in>ufunc.cpp</in>
+                      <in>wrap.cpp</in>
+                    </df>
+                    <df name="quickstart">
+                      <in>embedding.cpp</in>
+                      <in>extending.cpp</in>
+                    </df>
+                    <df name="tutorial">
+                      <in>hello.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <df name="converter">
+                      <in>arg_to_python_base.cpp</in>
+                      <in>builtin_converters.cpp</in>
+                      <in>from_python.cpp</in>
+                      <in>registry.cpp</in>
+                      <in>type_id.cpp</in>
+                    </df>
+                    <df name="numpy">
+                      <in>dtype.cpp</in>
+                      <in>matrix.cpp</in>
+                      <in>ndarray.cpp</in>
+                      <in>numpy.cpp</in>
+                      <in>scalars.cpp</in>
+                      <in>ufunc.cpp</in>
+                    </df>
+                    <df name="object">
+                      <in>class.cpp</in>
+                      <in>enum.cpp</in>
+                      <in>function.cpp</in>
+                      <in>function_doc_signature.cpp</in>
+                      <in>inheritance.cpp</in>
+                      <in>iterator.cpp</in>
+                      <in>life_support.cpp</in>
+                      <in>pickle_support.cpp</in>
+                      <in>stl_iterator.cpp</in>
+                    </df>
+                    <in>dict.cpp</in>
+                    <in>errors.cpp</in>
+                    <in>exec.cpp</in>
+                    <in>import.cpp</in>
+                    <in>list.cpp</in>
+                    <in>long.cpp</in>
+                    <in>module.cpp</in>
+                    <in>object_operators.cpp</in>
+                    <in>object_protocol.cpp</in>
+                    <in>slice.cpp</in>
+                    <in>str.cpp</in>
+                    <in>tuple.cpp</in>
+                    <in>wrapper.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="numpy">
+                      <in>dtype.cpp</in>
+                      <in>indexing.cpp</in>
+                      <in>ndarray.cpp</in>
+                      <in>shapes.cpp</in>
+                      <in>templates.cpp</in>
+                      <in>ufunc.cpp</in>
+                    </df>
+                    <in>a_map_indexing_suite.cpp</in>
+                    <in>aligned_class.cpp</in>
+                    <in>andreas_beyer.cpp</in>
+                    <in>args.cpp</in>
+                    <in>as_to_python_function.cpp</in>
+                    <in>auto_ptr.cpp</in>
+                    <in>back_reference.cpp</in>
+                    <in>bases.cpp</in>
+                    <in>ben_scott1.cpp</in>
+                    <in>bienstman1.cpp</in>
+                    <in>bienstman2.cpp</in>
+                    <in>bienstman3.cpp</in>
+                    <in>bienstman4.cpp</in>
+                    <in>bienstman5.cpp</in>
+                    <in>boost_shared_ptr.cpp</in>
+                    <in>borrowed.cpp</in>
+                    <in>builtin_converters.cpp</in>
+                    <in>callbacks.cpp</in>
+                    <in>calling_conventions.cpp</in>
+                    <in>calling_conventions_mf.cpp</in>
+                    <in>class.cpp</in>
+                    <in>cltree.cpp</in>
+                    <in>const_argument.cpp</in>
+                    <in>copy_ctor_mutates_rhs.cpp</in>
+                    <in>crossmod_exception_a.cpp</in>
+                    <in>crossmod_exception_b.cpp</in>
+                    <in>crossmod_opaque_a.cpp</in>
+                    <in>crossmod_opaque_b.cpp</in>
+                    <in>data_members.cpp</in>
+                    <in>defaults.cpp</in>
+                    <in>destroy_test.cpp</in>
+                    <in>dict.cpp</in>
+                    <in>docstring.cpp</in>
+                    <in>enable_shared_from_this.cpp</in>
+                    <in>enum_ext.cpp</in>
+                    <in>exception_translator.cpp</in>
+                    <in>exec.cpp</in>
+                    <in>extract.cpp</in>
+                    <in>if_else.cpp</in>
+                    <in>implicit.cpp</in>
+                    <in>import_.cpp</in>
+                    <in>indirect_traits_test.cpp</in>
+                    <in>injected.cpp</in>
+                    <in>input_iterator.cpp</in>
+                    <in>int_map_indexing_suite.cpp</in>
+                    <in>iterator.cpp</in>
+                    <in>keywords.cpp</in>
+                    <in>list.cpp</in>
+                    <in>long.cpp</in>
+                    <in>m1.cpp</in>
+                    <in>m2.cpp</in>
+                    <in>map_indexing_suite.cpp</in>
+                    <in>minimal.cpp</in>
+                    <in>module_init_exception.cpp</in>
+                    <in>module_tail.cpp</in>
+                    <in>multi_arg_constructor.cpp</in>
+                    <in>nested.cpp</in>
+                    <in>object.cpp</in>
+                    <in>object_fail1.cpp</in>
+                    <in>object_manager.cpp</in>
+                    <in>opaque.cpp</in>
+                    <in>operators.cpp</in>
+                    <in>operators_wrapper.cpp</in>
+                    <in>pickle1.cpp</in>
+                    <in>pickle2.cpp</in>
+                    <in>pickle3.cpp</in>
+                    <in>pickle4.cpp</in>
+                    <in>pointee.cpp</in>
+                    <in>pointer_type_id_test.cpp</in>
+                    <in>pointer_vector.cpp</in>
+                    <in>polymorphism.cpp</in>
+                    <in>polymorphism2.cpp</in>
+                    <in>polymorphism2_auto_ptr.cpp</in>
+                    <in>properties.cpp</in>
+                    <in>pytype_function.cpp</in>
+                    <in>raw_ctor.cpp</in>
+                    <in>raw_pyobject_fail1.cpp</in>
+                    <in>raw_pyobject_fail2.cpp</in>
+                    <in>register_ptr.cpp</in>
+                    <in>result.cpp</in>
+                    <in>return_arg.cpp</in>
+                    <in>select_arg_to_python_test.cpp</in>
+                    <in>select_from_python_test.cpp</in>
+                    <in>select_holder.cpp</in>
+                    <in>shared_ptr.cpp</in>
+                    <in>slice.cpp</in>
+                    <in>staticmethod.cpp</in>
+                    <in>stl_iterator.cpp</in>
+                    <in>str.cpp</in>
+                    <in>string_literal.cpp</in>
+                    <in>test_overload_resolution.cpp</in>
+                    <in>test_pointer_adoption.cpp</in>
+                    <in>tuple.cpp</in>
+                    <in>upcast.cpp</in>
+                    <in>vector_indexing_suite.cpp</in>
+                    <in>virtual_functions.cpp</in>
+                    <in>voidptr.cpp</in>
+                    <in>wrapper_held_type.cpp</in>
+                  </df>
+                </df>
+                <df name="qvm">
+                  <df name="gen">
+                    <in>gen.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>access_m_fail1.cpp</in>
+                    <in>access_m_fail2.cpp</in>
+                    <in>access_m_test.cpp</in>
+                    <in>access_q_fail.cpp</in>
+                    <in>access_q_test.cpp</in>
+                    <in>access_v_fail1.cpp</in>
+                    <in>access_v_fail2.cpp</in>
+                    <in>access_v_test.cpp</in>
+                    <in>assign_test.cpp</in>
+                    <in>cmp_mm_test.cpp</in>
+                    <in>cmp_qq_test.cpp</in>
+                    <in>cmp_vv_test.cpp</in>
+                    <in>col_mat_test.cpp</in>
+                    <in>col_test.cpp</in>
+                    <in>conjugate_test.cpp</in>
+                    <in>convert_to_test.cpp</in>
+                    <in>cross_test.cpp</in>
+                    <in>deduce_mat_test.cpp</in>
+                    <in>deduce_quat_test.cpp</in>
+                    <in>deduce_scalar_fail.cpp</in>
+                    <in>deduce_scalar_mq_test.cpp</in>
+                    <in>deduce_scalar_mv_test.cpp</in>
+                    <in>deduce_scalar_test.cpp</in>
+                    <in>deduce_vec_test.cpp</in>
+                    <in>del_col_test.cpp</in>
+                    <in>del_row_col_test.cpp</in>
+                    <in>del_row_test.cpp</in>
+                    <in>determinant_test.cpp</in>
+                    <in>diag_mat_test.cpp</in>
+                    <in>diag_test.cpp</in>
+                    <in>div_eq_ms_test.cpp</in>
+                    <in>div_eq_qs_test.cpp</in>
+                    <in>div_eq_vs_test.cpp</in>
+                    <in>div_ms_test.cpp</in>
+                    <in>div_qs_test.cpp</in>
+                    <in>div_vs_test.cpp</in>
+                    <in>dot_qq_test.cpp</in>
+                    <in>dot_vv_test.cpp</in>
+                    <in>eq_mm_test.cpp</in>
+                    <in>eq_qq_test.cpp</in>
+                    <in>eq_vv_test.cpp</in>
+                    <in>header-test.cpp</in>
+                    <in>identity_mat_test.cpp</in>
+                    <in>identity_quat_test.cpp</in>
+                    <in>interop_test.cpp</in>
+                    <in>inverse_m_test.cpp</in>
+                    <in>inverse_q_test.cpp</in>
+                    <in>mag_q_test.cpp</in>
+                    <in>mag_sqr_q_test.cpp</in>
+                    <in>mag_sqr_v_test.cpp</in>
+                    <in>mag_v_test.cpp</in>
+                    <in>mat_index_test.cpp</in>
+                    <in>mat_traits_array_test.cpp</in>
+                    <in>math_test.cpp</in>
+                    <in>minus_eq_mm_test.cpp</in>
+                    <in>minus_eq_qq_test.cpp</in>
+                    <in>minus_eq_vv_test.cpp</in>
+                    <in>minus_m_test.cpp</in>
+                    <in>minus_mm_test.cpp</in>
+                    <in>minus_q_test.cpp</in>
+                    <in>minus_qq_test.cpp</in>
+                    <in>minus_v_test.cpp</in>
+                    <in>minus_vv_test.cpp</in>
+                    <in>mul_eq_mm_test.cpp</in>
+                    <in>mul_eq_ms_test.cpp</in>
+                    <in>mul_eq_qq_test.cpp</in>
+                    <in>mul_eq_qs_test.cpp</in>
+                    <in>mul_eq_vs_test.cpp</in>
+                    <in>mul_mm_test.cpp</in>
+                    <in>mul_ms_test.cpp</in>
+                    <in>mul_mv_test.cpp</in>
+                    <in>mul_qq_test.cpp</in>
+                    <in>mul_qs_test.cpp</in>
+                    <in>mul_qv_test.cpp</in>
+                    <in>mul_sm_test.cpp</in>
+                    <in>mul_sv_test.cpp</in>
+                    <in>mul_vm_test.cpp</in>
+                    <in>mul_vs_test.cpp</in>
+                    <in>neg_col_test.cpp</in>
+                    <in>neg_row_test.cpp</in>
+                    <in>normalize_q_test.cpp</in>
+                    <in>normalize_v_test.cpp</in>
+                    <in>plus_eq_mm_test.cpp</in>
+                    <in>plus_eq_qq_test.cpp</in>
+                    <in>plus_eq_vv_test.cpp</in>
+                    <in>plus_mm_test.cpp</in>
+                    <in>plus_qq_test.cpp</in>
+                    <in>plus_vv_test.cpp</in>
+                    <in>projection_test.cpp</in>
+                    <in>quat_traits_array_test.cpp</in>
+                    <in>rot_mat_test.cpp</in>
+                    <in>rot_quat_test.cpp</in>
+                    <in>rotx_mat_test.cpp</in>
+                    <in>rotx_quat_test.cpp</in>
+                    <in>roty_mat_test.cpp</in>
+                    <in>roty_quat_test.cpp</in>
+                    <in>rotz_mat_test.cpp</in>
+                    <in>rotz_quat_test.cpp</in>
+                    <in>row_mat_test.cpp</in>
+                    <in>row_test.cpp</in>
+                    <in>scalar_cast_m_test.cpp</in>
+                    <in>scalar_cast_q_test.cpp</in>
+                    <in>scalar_cast_v_test.cpp</in>
+                    <in>scalar_traits_test.cpp</in>
+                    <in>slerp_test.cpp</in>
+                    <in>swap_cols_test.cpp</in>
+                    <in>swap_rows_test.cpp</in>
+                    <in>swizzle2_test.cpp</in>
+                    <in>swizzle2_test2.cpp</in>
+                    <in>swizzle2_test3.cpp</in>
+                    <in>swizzle2_test4.cpp</in>
+                    <in>swizzle3_test.cpp</in>
+                    <in>swizzle3_test2.cpp</in>
+                    <in>swizzle3_test3.cpp</in>
+                    <in>swizzle3_test4.cpp</in>
+                    <in>swizzle4_test.cpp</in>
+                    <in>swizzle4_test2.cpp</in>
+                    <in>swizzle4_test3.cpp</in>
+                    <in>swizzle4_test4.cpp</in>
+                    <in>swizzle_const_fail.cpp</in>
+                    <in>to_string_test.cpp</in>
+                    <in>transform_test.cpp</in>
+                    <in>translation_mat_test.cpp</in>
+                    <in>translation_test.cpp</in>
+                    <in>transpose_test.cpp</in>
+                    <in>vec_index_test.cpp</in>
+                    <in>vec_register_test.cpp</in>
+                    <in>vec_traits_array_test.cpp</in>
+                    <in>zero_mat_test.cpp</in>
+                    <in>zero_quat_test.cpp</in>
+                    <in>zero_vec_test.cpp</in>
+                  </df>
+                </df>
+                <df name="random">
+                  <df name="example">
+                    <in>die.cpp</in>
+                    <in>intersections.cpp</in>
+                    <in>password.cpp</in>
+                    <in>random_demo.cpp</in>
+                    <in>weighted_die.cpp</in>
+                  </df>
+                  <df name="extra">
+                    <in>test_haertel.cpp</in>
+                  </df>
+                  <df name="performance">
+                    <in>generate_table.cpp</in>
+                    <in>nondet_random_speed.cpp</in>
+                    <in>random_speed.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>random_device.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>faure_validate.cpp</in>
+                    <in>histogram.cpp</in>
+                    <in>multiprecision_float_test.cpp</in>
+                    <in>multiprecision_int_test.cpp</in>
+                    <in>niederreiter_base2_validate.cpp</in>
+                    <in>sobol_validate.cpp</in>
+                    <in>statistic_tests.cpp</in>
+                    <in>test_bernoulli.cpp</in>
+                    <in>test_bernoulli_distribution.cpp</in>
+                    <in>test_beta.cpp</in>
+                    <in>test_beta_distribution.cpp</in>
+                    <in>test_binomial.cpp</in>
+                    <in>test_binomial_distribution.cpp</in>
+                    <in>test_cauchy.cpp</in>
+                    <in>test_cauchy_distribution.cpp</in>
+                    <in>test_chi_squared.cpp</in>
+                    <in>test_chi_squared_distribution.cpp</in>
+                    <in>test_const_mod.cpp</in>
+                    <in>test_discrete.cpp</in>
+                    <in>test_discrete_distribution.cpp</in>
+                    <in>test_ecuyer1988.cpp</in>
+                    <in>test_exponential.cpp</in>
+                    <in>test_exponential_distribution.cpp</in>
+                    <in>test_extreme_value.cpp</in>
+                    <in>test_extreme_value_distribution.cpp</in>
+                    <in>test_fisher_f.cpp</in>
+                    <in>test_fisher_f_distribution.cpp</in>
+                    <in>test_gamma.cpp</in>
+                    <in>test_gamma_distribution.cpp</in>
+                    <in>test_generate_canonical.cpp</in>
+                    <in>test_geometric.cpp</in>
+                    <in>test_geometric_distribution.cpp</in>
+                    <in>test_hellekalek1995.cpp</in>
+                    <in>test_hyperexponential.cpp</in>
+                    <in>test_hyperexponential_distribution.cpp</in>
+                    <in>test_independent_bits31.cpp</in>
+                    <in>test_independent_bits32.cpp</in>
+                    <in>test_knuth_b.cpp</in>
+                    <in>test_kreutzer1986.cpp</in>
+                    <in>test_lagged_fibonacci.cpp</in>
+                    <in>test_lagged_fibonacci1279.cpp</in>
+                    <in>test_lagged_fibonacci19937.cpp</in>
+                    <in>test_lagged_fibonacci2281.cpp</in>
+                    <in>test_lagged_fibonacci23209.cpp</in>
+                    <in>test_lagged_fibonacci3217.cpp</in>
+                    <in>test_lagged_fibonacci4423.cpp</in>
+                    <in>test_lagged_fibonacci44497.cpp</in>
+                    <in>test_lagged_fibonacci607.cpp</in>
+                    <in>test_lagged_fibonacci9689.cpp</in>
+                    <in>test_laplace.cpp</in>
+                    <in>test_laplace_distribution.cpp</in>
+                    <in>test_linear_feedback_shift.cpp</in>
+                    <in>test_lognormal.cpp</in>
+                    <in>test_lognormal_distribution.cpp</in>
+                    <in>test_minstd_rand.cpp</in>
+                    <in>test_minstd_rand0.cpp</in>
+                    <in>test_mixmax.cpp</in>
+                    <in>test_mt11213b.cpp</in>
+                    <in>test_mt19937.cpp</in>
+                    <in>test_mt19937_64.cpp</in>
+                    <in>test_negative_binomial.cpp</in>
+                    <in>test_negative_binomial_distribution.cpp</in>
+                    <in>test_non_central_chi_squared.cpp</in>
+                    <in>test_non_central_chi_squared_distribution.cpp</in>
+                    <in>test_normal.cpp</in>
+                    <in>test_normal_distribution.cpp</in>
+                    <in>test_old_uniform_int.cpp</in>
+                    <in>test_old_uniform_int_distribution.cpp</in>
+                    <in>test_old_uniform_real.cpp</in>
+                    <in>test_old_uniform_real_distribution.cpp</in>
+                    <in>test_piecewise_constant.cpp</in>
+                    <in>test_piecewise_constant_distribution.cpp</in>
+                    <in>test_piecewise_linear.cpp</in>
+                    <in>test_piecewise_linear_distribution.cpp</in>
+                    <in>test_poisson.cpp</in>
+                    <in>test_poisson_distribution.cpp</in>
+                    <in>test_rand48.cpp</in>
+                    <in>test_random_device.cpp</in>
+                    <in>test_random_number_generator.cpp</in>
+                    <in>test_ranlux24.cpp</in>
+                    <in>test_ranlux24_base.cpp</in>
+                    <in>test_ranlux3.cpp</in>
+                    <in>test_ranlux3_01.cpp</in>
+                    <in>test_ranlux4.cpp</in>
+                    <in>test_ranlux48.cpp</in>
+                    <in>test_ranlux48_base.cpp</in>
+                    <in>test_ranlux4_01.cpp</in>
+                    <in>test_ranlux64_3.cpp</in>
+                    <in>test_ranlux64_3_01.cpp</in>
+                    <in>test_ranlux64_4.cpp</in>
+                    <in>test_ranlux64_4_01.cpp</in>
+                    <in>test_seed_seq.cpp</in>
+                    <in>test_student_t.cpp</in>
+                    <in>test_student_t_distribution.cpp</in>
+                    <in>test_taus88.cpp</in>
+                    <in>test_triangle.cpp</in>
+                    <in>test_triangle_distribution.cpp</in>
+                    <in>test_uniform_int.cpp</in>
+                    <in>test_uniform_int_distribution.cpp</in>
+                    <in>test_uniform_on_sphere.cpp</in>
+                    <in>test_uniform_on_sphere_distribution.cpp</in>
+                    <in>test_uniform_real.cpp</in>
+                    <in>test_uniform_real_distribution.cpp</in>
+                    <in>test_uniform_smallint.cpp</in>
+                    <in>test_uniform_smallint_distribution.cpp</in>
+                    <in>test_weibull.cpp</in>
+                    <in>test_weibull_distribution.cpp</in>
+                    <in>test_zero_seed.cpp</in>
+                  </df>
+                </df>
+                <df name="range">
+                  <df name="doc">
+                    <df name="reference">
+                      <df name="adaptors">
+                        <df name="examples">
+                          <in>indirected.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <in>example.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="adaptor_test">
+                      <in>adjacent_filtered.cpp</in>
+                      <in>adjacent_filtered_example.cpp</in>
+                      <in>chained.cpp</in>
+                      <in>copied.cpp</in>
+                      <in>copied_example.cpp</in>
+                      <in>filtered.cpp</in>
+                      <in>filtered_example.cpp</in>
+                      <in>formatted.cpp</in>
+                      <in>formatted_example.cpp</in>
+                      <in>indexed.cpp</in>
+                      <in>indexed_example.cpp</in>
+                      <in>indirected.cpp</in>
+                      <in>indirected_example.cpp</in>
+                      <in>map.cpp</in>
+                      <in>map_keys_example.cpp</in>
+                      <in>map_values_example.cpp</in>
+                      <in>ref_unwrapped.cpp</in>
+                      <in>ref_unwrapped_example.cpp</in>
+                      <in>replaced.cpp</in>
+                      <in>replaced_example.cpp</in>
+                      <in>replaced_if.cpp</in>
+                      <in>replaced_if_example.cpp</in>
+                      <in>reversed.cpp</in>
+                      <in>reversed_example.cpp</in>
+                      <in>sliced.cpp</in>
+                      <in>sliced_example.cpp</in>
+                      <in>strided.cpp</in>
+                      <in>strided2.cpp</in>
+                      <in>strided_example.cpp</in>
+                      <in>ticket_6742_transformed_c4789_warning.cpp</in>
+                      <in>ticket_8676_sliced_transformed.cpp</in>
+                      <in>ticket_9519_strided_reversed.cpp</in>
+                      <in>tokenized.cpp</in>
+                      <in>tokenized_example.cpp</in>
+                      <in>transformed.cpp</in>
+                      <in>transformed_example.cpp</in>
+                      <in>type_erased.cpp</in>
+                      <in>type_erased_abstract.cpp</in>
+                      <in>type_erased_bidirectional.cpp</in>
+                      <in>type_erased_brackets.cpp</in>
+                      <in>type_erased_example.cpp</in>
+                      <in>type_erased_forward.cpp</in>
+                      <in>type_erased_mix_values.cpp</in>
+                      <in>type_erased_random_access.cpp</in>
+                      <in>type_erased_single_pass.cpp</in>
+                      <in>type_erased_tparam_conv.cpp</in>
+                      <in>type_erased_transformed.cpp</in>
+                      <in>uniqued.cpp</in>
+                      <in>uniqued_example.cpp</in>
+                    </df>
+                    <df name="algorithm_ext_test">
+                      <in>copy_n.cpp</in>
+                      <in>erase.cpp</in>
+                      <in>for_each_ext.cpp</in>
+                      <in>insert.cpp</in>
+                      <in>iota.cpp</in>
+                      <in>is_sorted.cpp</in>
+                      <in>overwrite.cpp</in>
+                      <in>push_back.cpp</in>
+                      <in>push_front.cpp</in>
+                    </df>
+                    <df name="algorithm_test">
+                      <in>adjacent_find.cpp</in>
+                      <in>binary_search.cpp</in>
+                      <in>copy.cpp</in>
+                      <in>copy_backward.cpp</in>
+                      <in>copy_n.cpp</in>
+                      <in>count.cpp</in>
+                      <in>count_if.cpp</in>
+                      <in>equal.cpp</in>
+                      <in>equal_range.cpp</in>
+                      <in>fill.cpp</in>
+                      <in>find.cpp</in>
+                      <in>find_end.cpp</in>
+                      <in>find_first_of.cpp</in>
+                      <in>find_if.cpp</in>
+                      <in>for_each.cpp</in>
+                      <in>generate.cpp</in>
+                      <in>heap.cpp</in>
+                      <in>includes.cpp</in>
+                      <in>inplace_merge.cpp</in>
+                      <in>lexicographical_compare.cpp</in>
+                      <in>lower_bound.cpp</in>
+                      <in>max_element.cpp</in>
+                      <in>merge.cpp</in>
+                      <in>min_element.cpp</in>
+                      <in>mismatch.cpp</in>
+                      <in>next_permutation.cpp</in>
+                      <in>nth_element.cpp</in>
+                      <in>partial_sort.cpp</in>
+                      <in>partition.cpp</in>
+                      <in>prev_permutation.cpp</in>
+                      <in>random_shuffle.cpp</in>
+                      <in>remove.cpp</in>
+                      <in>remove_copy.cpp</in>
+                      <in>remove_copy_if.cpp</in>
+                      <in>remove_if.cpp</in>
+                      <in>replace.cpp</in>
+                      <in>replace_copy.cpp</in>
+                      <in>replace_copy_if.cpp</in>
+                      <in>replace_if.cpp</in>
+                      <in>reverse.cpp</in>
+                      <in>reverse_copy.cpp</in>
+                      <in>rotate.cpp</in>
+                      <in>rotate_copy.cpp</in>
+                      <in>search.cpp</in>
+                      <in>search_n.cpp</in>
+                      <in>set_difference.cpp</in>
+                      <in>set_intersection.cpp</in>
+                      <in>set_symmetric_difference.cpp</in>
+                      <in>set_union.cpp</in>
+                      <in>sort.cpp</in>
+                      <in>stable_partition.cpp</in>
+                      <in>stable_sort.cpp</in>
+                      <in>swap_ranges.cpp</in>
+                      <in>transform.cpp</in>
+                      <in>unique.cpp</in>
+                      <in>unique_copy.cpp</in>
+                      <in>upper_bound.cpp</in>
+                    </df>
+                    <df name="compile_fail">
+                      <df name="adaptor">
+                        <in>adjacent_filtered_concept.cpp</in>
+                        <in>adjacent_filtered_concept2.cpp</in>
+                        <in>adjacent_filtered_concept3.cpp</in>
+                        <in>adjacent_filtered_concept4.cpp</in>
+                        <in>copied_concept.cpp</in>
+                        <in>copied_concept2.cpp</in>
+                        <in>copied_concept3.cpp</in>
+                        <in>copied_concept4.cpp</in>
+                        <in>reversed_concept.cpp</in>
+                        <in>reversed_concept2.cpp</in>
+                        <in>reversed_concept3.cpp</in>
+                        <in>reversed_concept4.cpp</in>
+                        <in>sliced_concept.cpp</in>
+                        <in>sliced_concept2.cpp</in>
+                        <in>sliced_concept3.cpp</in>
+                        <in>sliced_concept4.cpp</in>
+                        <in>uniqued_concept.cpp</in>
+                        <in>uniqued_concept2.cpp</in>
+                        <in>uniqued_concept3.cpp</in>
+                        <in>uniqued_concept4.cpp</in>
+                      </df>
+                      <in>iterator_range1.cpp</in>
+                    </df>
+                    <in>adaptors.cpp</in>
+                    <in>adl_conformance.cpp</in>
+                    <in>adl_conformance_no_using.cpp</in>
+                    <in>algorithm.cpp</in>
+                    <in>algorithm_example.cpp</in>
+                    <in>array.cpp</in>
+                    <in>atl.cpp</in>
+                    <in>begin.cpp</in>
+                    <in>category.cpp</in>
+                    <in>combine.cpp</in>
+                    <in>compat2.cpp</in>
+                    <in>compat3.cpp</in>
+                    <in>const_iterator.cpp</in>
+                    <in>const_ranges.cpp</in>
+                    <in>const_reverse_iterator.cpp</in>
+                    <in>counting_range.cpp</in>
+                    <in>difference_type.cpp</in>
+                    <in>end.cpp</in>
+                    <in>extension_mechanism.cpp</in>
+                    <in>extension_size.cpp</in>
+                    <in>has_range_iterator.cpp</in>
+                    <in>irange.cpp</in>
+                    <in>istream_range.cpp</in>
+                    <in>iterator.cpp</in>
+                    <in>iterator_ext.cpp</in>
+                    <in>iterator_pair.cpp</in>
+                    <in>iterator_range.cpp</in>
+                    <in>iterator_range_drop.cpp</in>
+                    <in>iterator_range_equality_bug.cpp</in>
+                    <in>iterator_range_hash.cpp</in>
+                    <in>iterator_range_variant.cpp</in>
+                    <in>join.cpp</in>
+                    <in>mfc.cpp</in>
+                    <in>mutable_iterator.cpp</in>
+                    <in>partial_workaround.cpp</in>
+                    <in>pointer.cpp</in>
+                    <in>pointer_as_iterator.cpp</in>
+                    <in>reference.cpp</in>
+                    <in>result_iterator.cpp</in>
+                    <in>reverse_iterator.cpp</in>
+                    <in>reverse_result_iterator.cpp</in>
+                    <in>reversible_range.cpp</in>
+                    <in>size_type.cpp</in>
+                    <in>std_container.cpp</in>
+                    <in>string.cpp</in>
+                    <in>sub_range.cpp</in>
+                    <in>ticket_10336.cpp</in>
+                    <in>ticket_5486.cpp</in>
+                    <in>ticket_5544_terminate_irange.cpp</in>
+                    <in>ticket_5547.cpp</in>
+                    <in>ticket_5556_is_sorted_namespace.cpp</in>
+                    <in>ticket_5811_indirected_optional.cpp</in>
+                    <in>ticket_6715_iterator_range_equality.cpp</in>
+                    <in>ticket_6944.cpp</in>
+                    <in>value_type.cpp</in>
+                  </df>
+                </df>
+                <df name="ratio">
+                  <df name="example">
+                    <in>display_ex.cpp</in>
+                    <in>si_physics.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="ratio_arithmetic">
+                      <in>ratio_abs_pass.cpp</in>
+                      <in>ratio_add_2_fail.cpp</in>
+                      <in>ratio_add_3_fail.cpp</in>
+                      <in>ratio_add_fail.cpp</in>
+                      <in>ratio_add_pass.cpp</in>
+                      <in>ratio_divide_fail.cpp</in>
+                      <in>ratio_divide_pass.cpp</in>
+                      <in>ratio_multiply_fail.cpp</in>
+                      <in>ratio_multiply_pass.cpp</in>
+                      <in>ratio_negate_pass.cpp</in>
+                      <in>ratio_power_pass.cpp</in>
+                      <in>ratio_sign_pass.cpp</in>
+                      <in>ratio_subtract_fail.cpp</in>
+                      <in>ratio_subtract_pass.cpp</in>
+                    </df>
+                    <df name="ratio_comparison">
+                      <in>ratio_equal_pass.cpp</in>
+                      <in>ratio_greater_equal_pass.cpp</in>
+                      <in>ratio_greater_pass.cpp</in>
+                      <in>ratio_less_equal_pass.cpp</in>
+                      <in>ratio_less_pass.cpp</in>
+                      <in>ratio_not_equal_pass.cpp</in>
+                    </df>
+                    <df name="ratio_extensions">
+                      <in>mpl_abs_pass.cpp</in>
+                      <in>mpl_arithmetic_pass.cpp</in>
+                      <in>mpl_comparison_pass.cpp</in>
+                      <in>mpl_divides_pass.cpp</in>
+                      <in>mpl_equal_to_pass.cpp</in>
+                      <in>mpl_greater_equal_pass.cpp</in>
+                      <in>mpl_greater_pass.cpp</in>
+                      <in>mpl_less_equal_pass.cpp</in>
+                      <in>mpl_less_pass.cpp</in>
+                      <in>mpl_minus_pass.cpp</in>
+                      <in>mpl_negate_pass.cpp</in>
+                      <in>mpl_not_equal_to_pass.cpp</in>
+                      <in>mpl_plus_pass.cpp</in>
+                      <in>mpl_rational_constant_pass.cpp</in>
+                      <in>mpl_sign_pass.cpp</in>
+                      <in>mpl_times_pass.cpp</in>
+                      <in>ratio_ext_pass.cpp</in>
+                    </df>
+                    <df name="ratio_io">
+                      <in>ratio_io_fail.cpp</in>
+                      <in>ratio_io_pass.cpp</in>
+                    </df>
+                    <df name="ratio_ratio">
+                      <in>ratio1_fail.cpp</in>
+                      <in>ratio2_fail.cpp</in>
+                      <in>ratio3_fail.cpp</in>
+                      <in>ratio4_fail.cpp</in>
+                      <in>ratio_pass.cpp</in>
+                    </df>
+                    <in>ratio_test.cpp</in>
+                    <in>typedefs_pass.cpp</in>
+                  </df>
+                </df>
+                <df name="rational">
+                  <df name="test">
+                    <in>constexpr_test.cpp</in>
+                    <in>expected_compile_12.cpp</in>
+                    <in>expected_fail_01.cpp</in>
+                    <in>expected_fail_02.cpp</in>
+                    <in>expected_fail_03.cpp</in>
+                    <in>expected_fail_04.cpp</in>
+                    <in>expected_fail_05.cpp</in>
+                    <in>expected_fail_06.cpp</in>
+                    <in>expected_fail_07.cpp</in>
+                    <in>expected_fail_08.cpp</in>
+                    <in>expected_fail_09.cpp</in>
+                    <in>expected_fail_10.cpp</in>
+                    <in>expected_fail_11.cpp</in>
+                    <in>rational_example.cpp</in>
+                    <in>rational_test.cpp</in>
+                  </df>
+                </df>
+                <df name="regex">
+                  <df name="build">
+                    <in>has_icu_test.cpp</in>
+                    <in>is_legacy_03.cpp</in>
+                  </df>
+                  <df name="example">
+                    <df name="grep">
+                      <in>grep.cpp</in>
+                    </df>
+                    <df name="snippets">
+                      <in>captures_example.cpp</in>
+                      <in>credit_card_example.cpp</in>
+                      <in>icu_example.cpp</in>
+                      <in>mfc_example.cpp</in>
+                      <in>partial_regex_grep.cpp</in>
+                      <in>partial_regex_iterate.cpp</in>
+                      <in>partial_regex_match.cpp</in>
+                      <in>regex_grep_example_1.cpp</in>
+                      <in>regex_grep_example_2.cpp</in>
+                      <in>regex_grep_example_3.cpp</in>
+                      <in>regex_grep_example_4.cpp</in>
+                      <in>regex_iterator_example.cpp</in>
+                      <in>regex_match_example.cpp</in>
+                      <in>regex_merge_example.cpp</in>
+                      <in>regex_replace_example.cpp</in>
+                      <in>regex_search_example.cpp</in>
+                      <in>regex_split_example_1.cpp</in>
+                      <in>regex_split_example_2.cpp</in>
+                      <in>regex_token_iterator_eg_1.cpp</in>
+                      <in>regex_token_iterator_eg_2.cpp</in>
+                    </df>
+                    <df name="timer">
+                      <in>regex_timer.cpp</in>
+                    </df>
+                  </df>
+                  <df name="performance">
+                    <df name="config">
+                      <in>pcre.cpp</in>
+                      <in>posix.cpp</in>
+                      <in>re2.cpp</in>
+                    </df>
+                    <in>boost.cpp</in>
+                    <in>pcre.cpp</in>
+                    <in>performance.cpp</in>
+                    <in>posix.cpp</in>
+                    <in>re2.cpp</in>
+                    <in>std.cpp</in>
+                    <in>table_helper.cpp</in>
+                    <in>xpressive.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>posix_api.cpp</in>
+                    <in>regex.cpp</in>
+                    <in>regex_debug.cpp</in>
+                    <in>static_mutex.cpp</in>
+                    <in>wide_posix_api.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="c_compiler_checks">
+                      <in>posix_api_check.c</in>
+                      <in>posix_api_check.cpp</in>
+                      <in>wide_posix_api_check.c</in>
+                      <in>wide_posix_api_check.cpp</in>
+                    </df>
+                    <df name="captures">
+                      <in>captures_test.cpp</in>
+                    </df>
+                    <df name="collate_info">
+                      <in>collate_info.cpp</in>
+                    </df>
+                    <df name="concepts">
+                      <in>concept_check.cpp</in>
+                      <in>icu_concept_check.cpp</in>
+                      <in>range_concept_check.cpp</in>
+                      <in>test_bug_11988.cpp</in>
+                    </df>
+                    <df name="config_info">
+                      <in>regex_config_info.cpp</in>
+                    </df>
+                    <df name="de_fuzz">
+                      <in>narrow.cpp</in>
+                      <in>wide.cpp</in>
+                    </df>
+                    <df name="named_subexpressions">
+                      <in>named_subexpressions_test.cpp</in>
+                    </df>
+                    <df name="object_cache">
+                      <in>object_cache_test.cpp</in>
+                    </df>
+                    <df name="pathology">
+                      <in>bad_expression_test.cpp</in>
+                      <in>recursion_test.cpp</in>
+                    </df>
+                    <df name="regress">
+                      <in>basic_tests.cpp</in>
+                      <in>main.cpp</in>
+                      <in>test_alt.cpp</in>
+                      <in>test_anchors.cpp</in>
+                      <in>test_asserts.cpp</in>
+                      <in>test_backrefs.cpp</in>
+                      <in>test_deprecated.cpp</in>
+                      <in>test_emacs.cpp</in>
+                      <in>test_escapes.cpp</in>
+                      <in>test_grep.cpp</in>
+                      <in>test_icu.cpp</in>
+                      <in>test_locale.cpp</in>
+                      <in>test_mfc.cpp</in>
+                      <in>test_non_greedy_repeats.cpp</in>
+                      <in>test_operators.cpp</in>
+                      <in>test_overloads.cpp</in>
+                      <in>test_perl_ex.cpp</in>
+                      <in>test_replace.cpp</in>
+                      <in>test_sets.cpp</in>
+                      <in>test_simple_repeats.cpp</in>
+                      <in>test_tricky_cases.cpp</in>
+                      <in>test_unicode.cpp</in>
+                      <in>wmain.cpp</in>
+                    </df>
+                    <df name="static_mutex">
+                      <in>static_mutex_test.cpp</in>
+                    </df>
+                    <df name="unicode">
+                      <in>unicode_casefold_test.cpp</in>
+                      <in>unicode_iterator_test.cpp</in>
+                    </df>
+                    <in>issue153.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>quick_icu.cpp</in>
+                    <in>test_consolidated.cpp</in>
+                    <in>test_warnings.cpp</in>
+                    <in>test_windows_defs_1.cpp</in>
+                    <in>test_windows_defs_2.cpp</in>
+                    <in>test_windows_defs_3.cpp</in>
+                    <in>test_windows_defs_4.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <df name="generate">
+                      <in>tables.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="safe_numerics">
+                  <df name="example">
+                    <in>Motor.c</in>
+                    <in>example1.cpp</in>
+                    <in>example10.cpp</in>
+                    <in>example11.cpp</in>
+                    <in>example13.cpp</in>
+                    <in>example14.cpp</in>
+                    <in>example15.cpp</in>
+                    <in>example16.cpp</in>
+                    <in>example17.cpp</in>
+                    <in>example18.cpp</in>
+                    <in>example19.cpp</in>
+                    <in>example2.cpp</in>
+                    <in>example20.cpp</in>
+                    <in>example3.cpp</in>
+                    <in>example4.cpp</in>
+                    <in>example5.cpp</in>
+                    <in>example6.cpp</in>
+                    <in>example7.cpp</in>
+                    <in>example8.cpp</in>
+                    <in>example81.cpp</in>
+                    <in>example82.cpp</in>
+                    <in>example83.cpp</in>
+                    <in>example84.cpp</in>
+                    <in>example91.cpp</in>
+                    <in>example92.cpp</in>
+                    <in>example93.cpp</in>
+                    <in>motor1.c</in>
+                    <in>motor2.c</in>
+                    <in>motor3.c</in>
+                    <in>motor_test1.c</in>
+                    <in>motor_test2.c</in>
+                    <in>motor_test3.c</in>
+                  </df>
+                  <df name="test">
+                    <in>test0.cpp</in>
+                    <in>test_add_automatic.cpp</in>
+                    <in>test_add_automatic_constexpr.cpp</in>
+                    <in>test_add_native.cpp</in>
+                    <in>test_add_native_constexpr.cpp</in>
+                    <in>test_and_automatic.cpp</in>
+                    <in>test_and_automatic_constexpr.cpp</in>
+                    <in>test_and_native.cpp</in>
+                    <in>test_and_native_constexpr.cpp</in>
+                    <in>test_assignment.cpp</in>
+                    <in>test_auto.cpp</in>
+                    <in>test_cast.cpp</in>
+                    <in>test_cast_constexpr.cpp</in>
+                    <in>test_checked_add.cpp</in>
+                    <in>test_checked_add_constexpr.cpp</in>
+                    <in>test_checked_and.cpp</in>
+                    <in>test_checked_and_constexpr.cpp</in>
+                    <in>test_checked_cast.cpp</in>
+                    <in>test_checked_cast_constexpr.cpp</in>
+                    <in>test_checked_divide.cpp</in>
+                    <in>test_checked_divide_constexpr.cpp</in>
+                    <in>test_checked_equal_to.cpp</in>
+                    <in>test_checked_equal_to_constexpr.cpp</in>
+                    <in>test_checked_left_shift.cpp</in>
+                    <in>test_checked_left_shift_constexpr.cpp</in>
+                    <in>test_checked_less_than.cpp</in>
+                    <in>test_checked_less_than_constexpr.cpp</in>
+                    <in>test_checked_modulus.cpp</in>
+                    <in>test_checked_modulus_constexpr.cpp</in>
+                    <in>test_checked_multiply.cpp</in>
+                    <in>test_checked_multiply_constexpr.cpp</in>
+                    <in>test_checked_or.cpp</in>
+                    <in>test_checked_or_constexpr.cpp</in>
+                    <in>test_checked_right_shift.cpp</in>
+                    <in>test_checked_right_shift_constexpr.cpp</in>
+                    <in>test_checked_subtract.cpp</in>
+                    <in>test_checked_subtract_constexpr.cpp</in>
+                    <in>test_checked_xor.cpp</in>
+                    <in>test_checked_xor_constexpr.cpp</in>
+                    <in>test_concept_integer.cpp</in>
+                    <in>test_concept_numeric.cpp</in>
+                    <in>test_constexpr.cpp</in>
+                    <in>test_construction.cpp</in>
+                    <in>test_cpp.cpp</in>
+                    <in>test_custom_exception.cpp</in>
+                    <in>test_divide_automatic.cpp</in>
+                    <in>test_divide_automatic_constexpr.cpp</in>
+                    <in>test_divide_native.cpp</in>
+                    <in>test_divide_native_constexpr.cpp</in>
+                    <in>test_equal_automatic.cpp</in>
+                    <in>test_equal_automatic_constexpr.cpp</in>
+                    <in>test_equal_native.cpp</in>
+                    <in>test_equal_native_constexpr.cpp</in>
+                    <in>test_float.cpp</in>
+                    <in>test_interval.cpp</in>
+                    <in>test_left_shift_automatic.cpp</in>
+                    <in>test_left_shift_automatic_constexpr.cpp</in>
+                    <in>test_left_shift_native.cpp</in>
+                    <in>test_left_shift_native_constexpr.cpp</in>
+                    <in>test_less_than_automatic.cpp</in>
+                    <in>test_less_than_automatic_constexpr.cpp</in>
+                    <in>test_less_than_native.cpp</in>
+                    <in>test_less_than_native_constexpr.cpp</in>
+                    <in>test_modulus_automatic.cpp</in>
+                    <in>test_modulus_automatic_constexpr.cpp</in>
+                    <in>test_modulus_native.cpp</in>
+                    <in>test_modulus_native_constexpr.cpp</in>
+                    <in>test_multiply_automatic.cpp</in>
+                    <in>test_multiply_automatic_constexpr.cpp</in>
+                    <in>test_multiply_native.cpp</in>
+                    <in>test_multiply_native_constexpr.cpp</in>
+                    <in>test_or_automatic.cpp</in>
+                    <in>test_or_automatic_constexpr.cpp</in>
+                    <in>test_or_native.cpp</in>
+                    <in>test_or_native_constexpr.cpp</in>
+                    <in>test_performance.cpp</in>
+                    <in>test_range.cpp</in>
+                    <in>test_rational.cpp</in>
+                    <in>test_right_shift_automatic.cpp</in>
+                    <in>test_right_shift_automatic_constexpr.cpp</in>
+                    <in>test_right_shift_native.cpp</in>
+                    <in>test_right_shift_native_constexpr.cpp</in>
+                    <in>test_safe_compare.cpp</in>
+                    <in>test_stream_overload.cpp</in>
+                    <in>test_subtract_automatic.cpp</in>
+                    <in>test_subtract_automatic_constexpr.cpp</in>
+                    <in>test_subtract_native.cpp</in>
+                    <in>test_subtract_native_constexpr.cpp</in>
+                    <in>test_trap.cpp</in>
+                    <in>test_xor_automatic.cpp</in>
+                    <in>test_xor_automatic_constexpr.cpp</in>
+                    <in>test_xor_native.cpp</in>
+                    <in>test_xor_native_constexpr.cpp</in>
+                    <in>test_z.cpp</in>
+                  </df>
+                </df>
+                <df name="scope_exit">
+                  <df name="example">
+                    <in>scope_guard.cpp</in>
+                    <in>scope_guard_seq.cpp</in>
+                    <in>scope_guard_seq_nova.cpp</in>
+                    <in>try_catch.cpp</in>
+                    <in>try_catch_seq.cpp</in>
+                    <in>try_catch_seq_nova.cpp</in>
+                    <in>world_cxx11_lambda.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>native.cpp</in>
+                    <in>native_const_error.cpp</in>
+                    <in>native_cv_error.cpp</in>
+                    <in>native_this.cpp</in>
+                    <in>native_this_tpl.cpp</in>
+                    <in>native_tpl.cpp</in>
+                    <in>native_tu1.cpp</in>
+                    <in>native_tu2.cpp</in>
+                    <in>native_tu_test.cpp</in>
+                    <in>same_line.cpp</in>
+                    <in>same_line_seq.cpp</in>
+                    <in>same_line_seq_nova.cpp</in>
+                    <in>world.cpp</in>
+                    <in>world_checkpoint.cpp</in>
+                    <in>world_checkpoint_all.cpp</in>
+                    <in>world_checkpoint_all_seq.cpp</in>
+                    <in>world_checkpoint_all_seq_nova.cpp</in>
+                    <in>world_checkpoint_seq.cpp</in>
+                    <in>world_checkpoint_seq_nova.cpp</in>
+                    <in>world_seq.cpp</in>
+                    <in>world_seq_nova.cpp</in>
+                    <in>world_this.cpp</in>
+                    <in>world_this_seq.cpp</in>
+                    <in>world_this_seq_nova.cpp</in>
+                    <in>world_tpl.cpp</in>
+                    <in>world_tpl_seq.cpp</in>
+                    <in>world_tpl_seq_nova.cpp</in>
+                    <in>world_void.cpp</in>
+                    <in>world_void_nova.cpp</in>
+                  </df>
+                </df>
+                <df name="serialization">
+                  <df name="example">
+                    <in>demo.cpp</in>
+                    <in>demo_auto_ptr.cpp</in>
+                    <in>demo_exception.cpp</in>
+                    <in>demo_fast_archive.cpp</in>
+                    <in>demo_log.cpp</in>
+                    <in>demo_pimpl.cpp</in>
+                    <in>demo_pimpl_A.cpp</in>
+                    <in>demo_polymorphic.cpp</in>
+                    <in>demo_polymorphic_A.cpp</in>
+                    <in>demo_portable_archive.cpp</in>
+                    <in>demo_shared_ptr.cpp</in>
+                    <in>demo_simple_log.cpp</in>
+                    <in>demo_trivial_archive.cpp</in>
+                    <in>demo_xml.cpp</in>
+                    <in>demo_xml_load.cpp</in>
+                    <in>demo_xml_save.cpp</in>
+                    <in>fix_six.cpp</in>
+                    <in>log_archive.cpp</in>
+                    <in>polymorphic_portable_binary_iarchive.cpp</in>
+                    <in>polymorphic_portable_binary_oarchive.cpp</in>
+                    <in>portable_binary_iarchive.cpp</in>
+                    <in>portable_binary_oarchive.cpp</in>
+                  </df>
+                  <df name="performance">
+                    <df name="xml">
+                      <in>int16_test.cpp</in>
+                      <in>int256_test.cpp</in>
+                      <in>int4_test.cpp</in>
+                      <in>int64_test.cpp</in>
+                      <in>string16_test.cpp</in>
+                      <in>string256_test.cpp</in>
+                      <in>string4_test.cpp</in>
+                      <in>string64_test.cpp</in>
+                    </df>
+                    <in>peformance_array.cpp</in>
+                    <in>performance_binary.cpp</in>
+                    <in>performance_codecvt_null.cpp</in>
+                    <in>performance_iterators.cpp</in>
+                    <in>performance_iterators_base64.cpp</in>
+                    <in>performance_no_rtti.cpp</in>
+                    <in>performance_polymorphic.cpp</in>
+                    <in>performance_simple_class.cpp</in>
+                    <in>performance_utf8_codecvt.cpp</in>
+                    <in>performance_vector.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>archive_exception.cpp</in>
+                    <in>basic_archive.cpp</in>
+                    <in>basic_iarchive.cpp</in>
+                    <in>basic_iserializer.cpp</in>
+                    <in>basic_oarchive.cpp</in>
+                    <in>basic_oserializer.cpp</in>
+                    <in>basic_pointer_iserializer.cpp</in>
+                    <in>basic_pointer_oserializer.cpp</in>
+                    <in>basic_serializer_map.cpp</in>
+                    <in>basic_text_iprimitive.cpp</in>
+                    <in>basic_text_oprimitive.cpp</in>
+                    <in>basic_text_wiprimitive.cpp</in>
+                    <in>basic_text_woprimitive.cpp</in>
+                    <in>basic_xml_archive.cpp</in>
+                    <in>binary_iarchive.cpp</in>
+                    <in>binary_oarchive.cpp</in>
+                    <in>binary_wiarchive.cpp</in>
+                    <in>binary_woarchive.cpp</in>
+                    <in>codecvt_null.cpp</in>
+                    <in>extended_type_info.cpp</in>
+                    <in>extended_type_info_no_rtti.cpp</in>
+                    <in>extended_type_info_typeid.cpp</in>
+                    <in>polymorphic_binary_iarchive.cpp</in>
+                    <in>polymorphic_binary_oarchive.cpp</in>
+                    <in>polymorphic_iarchive.cpp</in>
+                    <in>polymorphic_oarchive.cpp</in>
+                    <in>polymorphic_text_iarchive.cpp</in>
+                    <in>polymorphic_text_oarchive.cpp</in>
+                    <in>polymorphic_text_wiarchive.cpp</in>
+                    <in>polymorphic_text_woarchive.cpp</in>
+                    <in>polymorphic_xml_iarchive.cpp</in>
+                    <in>polymorphic_xml_oarchive.cpp</in>
+                    <in>polymorphic_xml_wiarchive.cpp</in>
+                    <in>polymorphic_xml_woarchive.cpp</in>
+                    <in>stl_port.cpp</in>
+                    <in>text_iarchive.cpp</in>
+                    <in>text_oarchive.cpp</in>
+                    <in>text_wiarchive.cpp</in>
+                    <in>text_woarchive.cpp</in>
+                    <in>utf8_codecvt_facet.cpp</in>
+                    <in>void_cast.cpp</in>
+                    <in>xml_archive_exception.cpp</in>
+                    <in>xml_grammar.cpp</in>
+                    <in>xml_iarchive.cpp</in>
+                    <in>xml_oarchive.cpp</in>
+                    <in>xml_wgrammar.cpp</in>
+                    <in>xml_wiarchive.cpp</in>
+                    <in>xml_woarchive.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>A.cpp</in>
+                    <in>config_test.cpp</in>
+                    <in>dll_a.cpp</in>
+                    <in>dll_base.cpp</in>
+                    <in>dll_derived2.cpp</in>
+                    <in>dll_polymorphic_base.cpp</in>
+                    <in>dll_polymorphic_derived2.cpp</in>
+                    <in>multi_shared1.cpp</in>
+                    <in>multi_shared2.cpp</in>
+                    <in>polymorphic_base.cpp</in>
+                    <in>polymorphic_derived1.cpp</in>
+                    <in>polymorphic_derived2.cpp</in>
+                    <in>test__helper.cpp</in>
+                    <in>test_array.cpp</in>
+                    <in>test_binary.cpp</in>
+                    <in>test_bitset.cpp</in>
+                    <in>test_boost_array.cpp</in>
+                    <in>test_check.cpp</in>
+                    <in>test_class_info_load.cpp</in>
+                    <in>test_class_info_save.cpp</in>
+                    <in>test_codecvt_null.cpp</in>
+                    <in>test_complex.cpp</in>
+                    <in>test_const_load_fail1.cpp</in>
+                    <in>test_const_load_fail1_nvp.cpp</in>
+                    <in>test_const_load_fail2.cpp</in>
+                    <in>test_const_load_fail2_nvp.cpp</in>
+                    <in>test_const_load_fail3.cpp</in>
+                    <in>test_const_load_fail3_nvp.cpp</in>
+                    <in>test_const_pass.cpp</in>
+                    <in>test_const_save_warn1.cpp</in>
+                    <in>test_const_save_warn1_nvp.cpp</in>
+                    <in>test_const_save_warn2.cpp</in>
+                    <in>test_const_save_warn2_nvp.cpp</in>
+                    <in>test_const_save_warn3.cpp</in>
+                    <in>test_const_save_warn3_nvp.cpp</in>
+                    <in>test_const_save_warn4.cpp</in>
+                    <in>test_const_save_warn4_nvp.cpp</in>
+                    <in>test_contained_class.cpp</in>
+                    <in>test_cyclic_ptrs.cpp</in>
+                    <in>test_delete_pointer.cpp</in>
+                    <in>test_deque.cpp</in>
+                    <in>test_derived.cpp</in>
+                    <in>test_derived_class.cpp</in>
+                    <in>test_derived_class_ptr.cpp</in>
+                    <in>test_diamond.cpp</in>
+                    <in>test_diamond_complex.cpp</in>
+                    <in>test_dll_exported.cpp</in>
+                    <in>test_dll_plugin.cpp</in>
+                    <in>test_dll_simple.cpp</in>
+                    <in>test_enable_shared_from_this.cpp</in>
+                    <in>test_exported.cpp</in>
+                    <in>test_forward_list.cpp</in>
+                    <in>test_forward_list_ptrs.cpp</in>
+                    <in>test_helper_support.cpp</in>
+                    <in>test_inclusion.cpp</in>
+                    <in>test_inclusion2.cpp</in>
+                    <in>test_interators.cpp</in>
+                    <in>test_interrupts.cpp</in>
+                    <in>test_iterators.cpp</in>
+                    <in>test_iterators_base64.cpp</in>
+                    <in>test_list.cpp</in>
+                    <in>test_list_ptrs.cpp</in>
+                    <in>test_map.cpp</in>
+                    <in>test_map_boost_unordered.cpp</in>
+                    <in>test_map_hashed.cpp</in>
+                    <in>test_map_unordered.cpp</in>
+                    <in>test_mi.cpp</in>
+                    <in>test_mult_archive_types.cpp</in>
+                    <in>test_multi_shared_lib.cpp</in>
+                    <in>test_multiple_inheritance.cpp</in>
+                    <in>test_multiple_ptrs.cpp</in>
+                    <in>test_native_array.cpp</in>
+                    <in>test_new_operator.cpp</in>
+                    <in>test_no_rtti.cpp</in>
+                    <in>test_non_default_ctor.cpp</in>
+                    <in>test_non_default_ctor2.cpp</in>
+                    <in>test_non_intrusive.cpp</in>
+                    <in>test_not_serializable.cpp</in>
+                    <in>test_null_ptr.cpp</in>
+                    <in>test_nvp.cpp</in>
+                    <in>test_object.cpp</in>
+                    <in>test_optional.cpp</in>
+                    <in>test_p_helper.cpp</in>
+                    <in>test_pimpl.cpp</in>
+                    <in>test_polymorphic.cpp</in>
+                    <in>test_polymorphic2.cpp</in>
+                    <in>test_polymorphic2imp.cpp</in>
+                    <in>test_polymorphic_A.cpp</in>
+                    <in>test_primitive.cpp</in>
+                    <in>test_priority_queue.cpp</in>
+                    <in>test_private_base.cpp</in>
+                    <in>test_private_base2.cpp</in>
+                    <in>test_private_ctor.cpp</in>
+                    <in>test_queue.cpp</in>
+                    <in>test_recursion.cpp</in>
+                    <in>test_registered.cpp</in>
+                    <in>test_reset_object_address.cpp</in>
+                    <in>test_set.cpp</in>
+                    <in>test_set_boost_unordered.cpp</in>
+                    <in>test_set_hashed.cpp</in>
+                    <in>test_set_unordered.cpp</in>
+                    <in>test_shared_ptr.cpp</in>
+                    <in>test_shared_ptr_132.cpp</in>
+                    <in>test_shared_ptr_multi_base.cpp</in>
+                    <in>test_simple_class.cpp</in>
+                    <in>test_simple_class_ptr.cpp</in>
+                    <in>test_singleton.cpp</in>
+                    <in>test_singleton_inherited.cpp</in>
+                    <in>test_singleton_plain.cpp</in>
+                    <in>test_slist.cpp</in>
+                    <in>test_slist_ptrs.cpp</in>
+                    <in>test_smart_cast.cpp</in>
+                    <in>test_split.cpp</in>
+                    <in>test_stack.cpp</in>
+                    <in>test_static_warning.cpp</in>
+                    <in>test_strong_typedef.cpp</in>
+                    <in>test_tracking.cpp</in>
+                    <in>test_traits_fail.cpp</in>
+                    <in>test_traits_pass.cpp</in>
+                    <in>test_unique_ptr.cpp</in>
+                    <in>test_unregistered.cpp</in>
+                    <in>test_valarray.cpp</in>
+                    <in>test_variant.cpp</in>
+                    <in>test_vector.cpp</in>
+                    <in>test_void_cast.cpp</in>
+                    <in>test_z.cpp</in>
+                  </df>
+                </df>
+                <df name="signals2">
+                  <df name="doc">
+                    <in>snippet_extractor.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>custom_combiners.cpp</in>
+                    <in>disconnect_and_block.cpp</in>
+                    <in>doc_view.cpp</in>
+                    <in>doc_view_acm.cpp</in>
+                    <in>doc_view_acm_deconstruct.cpp</in>
+                    <in>extended_slot.cpp</in>
+                    <in>hello_world_multi_slot.cpp</in>
+                    <in>hello_world_slot.cpp</in>
+                    <in>ordering_slots.cpp</in>
+                    <in>passing_slots.cpp</in>
+                    <in>postconstructor_ex1.cpp</in>
+                    <in>postconstructor_ex2.cpp</in>
+                    <in>predestructor_example.cpp</in>
+                    <in>signal_return_value.cpp</in>
+                    <in>slot_arguments.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>connection_test.cpp</in>
+                    <in>dead_slot_test.cpp</in>
+                    <in>deadlock_regression_test.cpp</in>
+                    <in>deconstruct_test.cpp</in>
+                    <in>deletion_test.cpp</in>
+                    <in>invocation_benchmark.cpp</in>
+                    <in>mutex_test.cpp</in>
+                    <in>ordering_test.cpp</in>
+                    <in>regression_test.cpp</in>
+                    <in>shared_connection_block_test.cpp</in>
+                    <in>signal_n_test.cpp</in>
+                    <in>signal_test.cpp</in>
+                    <in>signal_type_test.cpp</in>
+                    <in>slot_compile_test.cpp</in>
+                    <in>threading_models_test.cpp</in>
+                    <in>track_test.cpp</in>
+                    <in>trackable_test.cpp</in>
+                  </df>
+                </df>
+                <df name="smart_ptr">
+                  <df name="example">
+                    <in>scoped_ptr_example.cpp</in>
+                    <in>scoped_ptr_example_test.cpp</in>
+                    <in>shared_ptr_example.cpp</in>
+                    <in>shared_ptr_example2.cpp</in>
+                    <in>shared_ptr_example2_test.cpp</in>
+                  </df>
+                  <df name="extras">
+                    <df name="src">
+                      <in>sp_collector.cpp</in>
+                      <in>sp_debug_hooks.cpp</in>
+                    </df>
+                    <df name="test">
+                      <in>shared_ptr_mt_test.cpp</in>
+                      <in>shared_ptr_timing_test.cpp</in>
+                      <in>sp_atomic_mt2_test.cpp</in>
+                      <in>sp_atomic_mt_test.cpp</in>
+                      <in>weak_ptr_mt_test.cpp</in>
+                      <in>weak_ptr_timing_test.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>abi_test_lib.cpp</in>
+                    <in>abi_test_main.cpp</in>
+                    <in>allocate_local_shared_array_construct_test.cpp</in>
+                    <in>allocate_local_shared_array_esft_test.cpp</in>
+                    <in>allocate_local_shared_array_noinit_test.cpp</in>
+                    <in>allocate_local_shared_array_test.cpp</in>
+                    <in>allocate_local_shared_array_throws_test.cpp</in>
+                    <in>allocate_local_shared_array_value_test.cpp</in>
+                    <in>allocate_local_shared_arrays_test.cpp</in>
+                    <in>allocate_local_shared_esft_test.cpp</in>
+                    <in>allocate_local_shared_test.cpp</in>
+                    <in>allocate_shared_alloc11_test.cpp</in>
+                    <in>allocate_shared_array_construct_test.cpp</in>
+                    <in>allocate_shared_array_esft_test.cpp</in>
+                    <in>allocate_shared_array_noinit_test.cpp</in>
+                    <in>allocate_shared_array_test.cpp</in>
+                    <in>allocate_shared_array_throws_test.cpp</in>
+                    <in>allocate_shared_array_value_test.cpp</in>
+                    <in>allocate_shared_arrays_test.cpp</in>
+                    <in>allocate_shared_construct11_test.cpp</in>
+                    <in>allocate_shared_esft_test.cpp</in>
+                    <in>allocate_shared_test.cpp</in>
+                    <in>allocate_unique_aggregate_test.cpp</in>
+                    <in>allocate_unique_args_test.cpp</in>
+                    <in>allocate_unique_array_construct_test.cpp</in>
+                    <in>allocate_unique_array_noinit_test.cpp</in>
+                    <in>allocate_unique_array_test.cpp</in>
+                    <in>allocate_unique_array_throws_test.cpp</in>
+                    <in>allocate_unique_array_value_test.cpp</in>
+                    <in>allocate_unique_arrays_test.cpp</in>
+                    <in>allocate_unique_construct_test.cpp</in>
+                    <in>allocate_unique_noinit_test.cpp</in>
+                    <in>allocate_unique_test.cpp</in>
+                    <in>allocate_unique_throws_test.cpp</in>
+                    <in>allocate_unique_value_test.cpp</in>
+                    <in>array_fail_ap_spa_a.cpp</in>
+                    <in>array_fail_ap_spa_c.cpp</in>
+                    <in>array_fail_ap_spa_ma.cpp</in>
+                    <in>array_fail_ap_spa_mc.cpp</in>
+                    <in>array_fail_array_access.cpp</in>
+                    <in>array_fail_dereference.cpp</in>
+                    <in>array_fail_member_access.cpp</in>
+                    <in>array_fail_sp_spa_a.cpp</in>
+                    <in>array_fail_sp_spa_c.cpp</in>
+                    <in>array_fail_sp_spa_ma.cpp</in>
+                    <in>array_fail_sp_spa_mc.cpp</in>
+                    <in>array_fail_sp_wpa_a.cpp</in>
+                    <in>array_fail_sp_wpa_c.cpp</in>
+                    <in>array_fail_sp_wpa_ma.cpp</in>
+                    <in>array_fail_sp_wpa_mc.cpp</in>
+                    <in>array_fail_spa_sp_a.cpp</in>
+                    <in>array_fail_spa_sp_c.cpp</in>
+                    <in>array_fail_spa_sp_ma.cpp</in>
+                    <in>array_fail_spa_sp_mc.cpp</in>
+                    <in>array_fail_spa_spa_a.cpp</in>
+                    <in>array_fail_spa_spa_c.cpp</in>
+                    <in>array_fail_spa_spa_ma.cpp</in>
+                    <in>array_fail_spa_spa_mc.cpp</in>
+                    <in>array_fail_spa_wp_a.cpp</in>
+                    <in>array_fail_spa_wp_c.cpp</in>
+                    <in>array_fail_spa_wp_ma.cpp</in>
+                    <in>array_fail_spa_wp_mc.cpp</in>
+                    <in>array_fail_spa_wpa_a.cpp</in>
+                    <in>array_fail_spa_wpa_c.cpp</in>
+                    <in>array_fail_spa_wpa_ma.cpp</in>
+                    <in>array_fail_spa_wpa_mc.cpp</in>
+                    <in>array_fail_up_spa_a.cpp</in>
+                    <in>array_fail_up_spa_c.cpp</in>
+                    <in>array_fail_up_spa_ma.cpp</in>
+                    <in>array_fail_up_spa_mc.cpp</in>
+                    <in>array_fail_upa_sp_a.cpp</in>
+                    <in>array_fail_upa_sp_c.cpp</in>
+                    <in>array_fail_upa_sp_ma.cpp</in>
+                    <in>array_fail_upa_sp_mc.cpp</in>
+                    <in>array_fail_wp_wpa_a.cpp</in>
+                    <in>array_fail_wp_wpa_c.cpp</in>
+                    <in>array_fail_wp_wpa_ma.cpp</in>
+                    <in>array_fail_wp_wpa_mc.cpp</in>
+                    <in>array_fail_wpa_wp_a.cpp</in>
+                    <in>array_fail_wpa_wp_c.cpp</in>
+                    <in>array_fail_wpa_wp_ma.cpp</in>
+                    <in>array_fail_wpa_wp_mc.cpp</in>
+                    <in>array_fail_wpa_wpa_a.cpp</in>
+                    <in>array_fail_wpa_wpa_c.cpp</in>
+                    <in>array_fail_wpa_wpa_ma.cpp</in>
+                    <in>array_fail_wpa_wpa_mc.cpp</in>
+                    <in>atomic_count_mt_test.cpp</in>
+                    <in>atomic_count_test.cpp</in>
+                    <in>atomic_count_test2.cpp</in>
+                    <in>atomic_sp_constexpr_test.cpp</in>
+                    <in>atomic_sp_test.cpp</in>
+                    <in>auto_ptr_lv_fail.cpp</in>
+                    <in>auto_ptr_rv_test.cpp</in>
+                    <in>collector_test.cpp</in>
+                    <in>cpp11_pointer_cast_test.cpp</in>
+                    <in>dll_test_lib.cpp</in>
+                    <in>dll_test_main.cpp</in>
+                    <in>esft_regtest.cpp</in>
+                    <in>esft_second_ptr_test.cpp</in>
+                    <in>esft_void_test.cpp</in>
+                    <in>get_deleter_array_test.cpp</in>
+                    <in>get_deleter_array_test2.cpp</in>
+                    <in>get_deleter_array_test3.cpp</in>
+                    <in>get_deleter_test.cpp</in>
+                    <in>get_deleter_test2.cpp</in>
+                    <in>get_deleter_test3.cpp</in>
+                    <in>get_local_deleter_array_test.cpp</in>
+                    <in>get_local_deleter_array_test2.cpp</in>
+                    <in>get_local_deleter_test.cpp</in>
+                    <in>get_local_deleter_test2.cpp</in>
+                    <in>get_local_deleter_test3.cpp</in>
+                    <in>intrusive_ptr_move_test.cpp</in>
+                    <in>intrusive_ptr_test.cpp</in>
+                    <in>intrusive_ref_counter_test.cpp</in>
+                    <in>ip_convertible_test.cpp</in>
+                    <in>ip_hash_test.cpp</in>
+                    <in>ip_hash_test2.cpp</in>
+                    <in>local_sp_fn_test.cpp</in>
+                    <in>local_sp_test.cpp</in>
+                    <in>lsp_array_cast_test.cpp</in>
+                    <in>lsp_array_cv_test.cpp</in>
+                    <in>lsp_array_n_test.cpp</in>
+                    <in>lsp_array_test.cpp</in>
+                    <in>lsp_convertible_test.cpp</in>
+                    <in>lsp_convertible_test2.cpp</in>
+                    <in>lsp_hash_test.cpp</in>
+                    <in>lsp_hash_test2.cpp</in>
+                    <in>lsp_owner_before_test.cpp</in>
+                    <in>lsp_owner_equals_test.cpp</in>
+                    <in>lw_mutex_test.cpp</in>
+                    <in>lw_thread_test.cpp</in>
+                    <in>lwm_win32_cs_test.cpp</in>
+                    <in>make_local_shared_array_esft_test.cpp</in>
+                    <in>make_local_shared_array_noinit_test.cpp</in>
+                    <in>make_local_shared_array_test.cpp</in>
+                    <in>make_local_shared_array_throws_test.cpp</in>
+                    <in>make_local_shared_array_value_test.cpp</in>
+                    <in>make_local_shared_arrays_test.cpp</in>
+                    <in>make_local_shared_const_test.cpp</in>
+                    <in>make_local_shared_esft_test.cpp</in>
+                    <in>make_local_shared_test.cpp</in>
+                    <in>make_shared_array_esft_test.cpp</in>
+                    <in>make_shared_array_noinit_test.cpp</in>
+                    <in>make_shared_array_test.cpp</in>
+                    <in>make_shared_array_throws_test.cpp</in>
+                    <in>make_shared_array_tmp_test.cpp</in>
+                    <in>make_shared_array_value_test.cpp</in>
+                    <in>make_shared_arrays_test.cpp</in>
+                    <in>make_shared_const_test.cpp</in>
+                    <in>make_shared_esft_test.cpp</in>
+                    <in>make_shared_fp_test.cpp</in>
+                    <in>make_shared_move_emulation_test.cpp</in>
+                    <in>make_shared_msvc_test.cpp</in>
+                    <in>make_shared_perfect_forwarding_test.cpp</in>
+                    <in>make_shared_test.cpp</in>
+                    <in>make_unique_args_test.cpp</in>
+                    <in>make_unique_array_noinit_test.cpp</in>
+                    <in>make_unique_array_test.cpp</in>
+                    <in>make_unique_array_throws_test.cpp</in>
+                    <in>make_unique_noinit_test.cpp</in>
+                    <in>make_unique_test.cpp</in>
+                    <in>make_unique_throws_test.cpp</in>
+                    <in>make_unique_value_test.cpp</in>
+                    <in>owner_equal_to_test.cpp</in>
+                    <in>owner_equal_to_test2.cpp</in>
+                    <in>owner_hash_test.cpp</in>
+                    <in>owner_less_test.cpp</in>
+                    <in>owner_less_test2.cpp</in>
+                    <in>pointer_cast_co_fail.cpp</in>
+                    <in>pointer_cast_co_fail2.cpp</in>
+                    <in>pointer_cast_co_fail3.cpp</in>
+                    <in>pointer_cast_dy_fail.cpp</in>
+                    <in>pointer_cast_dy_fail2.cpp</in>
+                    <in>pointer_cast_dy_fail3.cpp</in>
+                    <in>pointer_cast_st_fail.cpp</in>
+                    <in>pointer_cast_st_fail2.cpp</in>
+                    <in>pointer_cast_st_fail3.cpp</in>
+                    <in>pointer_cast_test.cpp</in>
+                    <in>pointer_cast_test2.cpp</in>
+                    <in>pointer_to_other_test.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>sa_nullptr_test.cpp</in>
+                    <in>scoped_array_eq_fail.cpp</in>
+                    <in>scoped_ptr_eq_fail.cpp</in>
+                    <in>shared_from_fail.cpp</in>
+                    <in>shared_from_raw_test.cpp</in>
+                    <in>shared_from_raw_test2.cpp</in>
+                    <in>shared_from_raw_test3.cpp</in>
+                    <in>shared_from_raw_test4.cpp</in>
+                    <in>shared_from_raw_test5.cpp</in>
+                    <in>shared_from_raw_test6.cpp</in>
+                    <in>shared_from_test.cpp</in>
+                    <in>shared_from_this_test.cpp</in>
+                    <in>shared_ptr_alias_move_test.cpp</in>
+                    <in>shared_ptr_alias_test.cpp</in>
+                    <in>shared_ptr_alloc11_test.cpp</in>
+                    <in>shared_ptr_alloc2_test.cpp</in>
+                    <in>shared_ptr_alloc3_test.cpp</in>
+                    <in>shared_ptr_alloc_construct11_test.cpp</in>
+                    <in>shared_ptr_alloc_test.cpp</in>
+                    <in>shared_ptr_assign_fail.cpp</in>
+                    <in>shared_ptr_basic_test.cpp</in>
+                    <in>shared_ptr_compare_fail.cpp</in>
+                    <in>shared_ptr_convertible_test.cpp</in>
+                    <in>shared_ptr_delete_fail.cpp</in>
+                    <in>shared_ptr_fn_test.cpp</in>
+                    <in>shared_ptr_move_test.cpp</in>
+                    <in>shared_ptr_mt_test.cpp</in>
+                    <in>shared_ptr_pv_fail.cpp</in>
+                    <in>shared_ptr_reinterpret_pointer_cast_test.cpp</in>
+                    <in>shared_ptr_rv_pointer_cast_test.cpp</in>
+                    <in>shared_ptr_rv_test.cpp</in>
+                    <in>shared_ptr_test.cpp</in>
+                    <in>smart_ptr_test.cpp</in>
+                    <in>sp_array_cast_test.cpp</in>
+                    <in>sp_array_cv_test.cpp</in>
+                    <in>sp_array_n_test.cpp</in>
+                    <in>sp_array_test.cpp</in>
+                    <in>sp_atomic_test.cpp</in>
+                    <in>sp_bml_unique_ptr_test.cpp</in>
+                    <in>sp_constexpr_test.cpp</in>
+                    <in>sp_constexpr_test2.cpp</in>
+                    <in>sp_convertible_test.cpp</in>
+                    <in>sp_convertible_test2.cpp</in>
+                    <in>sp_explicit_inst_test.cpp</in>
+                    <in>sp_guides_test.cpp</in>
+                    <in>sp_guides_test2.cpp</in>
+                    <in>sp_hash_test.cpp</in>
+                    <in>sp_hash_test2.cpp</in>
+                    <in>sp_hash_test3.cpp</in>
+                    <in>sp_hash_test4.cpp</in>
+                    <in>sp_interlocked_test.cpp</in>
+                    <in>sp_move_only_deleter.cpp</in>
+                    <in>sp_nothrow_test.cpp</in>
+                    <in>sp_nullptr_test.cpp</in>
+                    <in>sp_override_test.cpp</in>
+                    <in>sp_owner_before_test.cpp</in>
+                    <in>sp_owner_equals_test.cpp</in>
+                    <in>sp_owner_hash_value_test.cpp</in>
+                    <in>sp_pedantic_test.cpp</in>
+                    <in>sp_recursive_assign2_rv_test.cpp</in>
+                    <in>sp_recursive_assign2_test.cpp</in>
+                    <in>sp_recursive_assign_rv_test.cpp</in>
+                    <in>sp_recursive_assign_test.cpp</in>
+                    <in>sp_report_implementation.cpp</in>
+                    <in>sp_typeinfo_test.cpp</in>
+                    <in>sp_unary_addr_test.cpp</in>
+                    <in>sp_unique_ptr_test.cpp</in>
+                    <in>sp_unique_ptr_test2.cpp</in>
+                    <in>sp_unordered_test.cpp</in>
+                    <in>sp_windows_h_test.cpp</in>
+                    <in>sp_zero_compare_test.cpp</in>
+                    <in>spinlock_mt_test.cpp</in>
+                    <in>spinlock_pool_mt_test.cpp</in>
+                    <in>spinlock_pool_test.cpp</in>
+                    <in>spinlock_test.cpp</in>
+                    <in>spinlock_try_test.cpp</in>
+                    <in>spinlock_windows_h_test.cpp</in>
+                    <in>weak_from_fail.cpp</in>
+                    <in>weak_from_raw_test.cpp</in>
+                    <in>weak_from_raw_test2.cpp</in>
+                    <in>weak_from_raw_test3.cpp</in>
+                    <in>weak_from_raw_test4.cpp</in>
+                    <in>weak_from_raw_test5.cpp</in>
+                    <in>weak_from_test.cpp</in>
+                    <in>weak_from_test2.cpp</in>
+                    <in>weak_from_this_test.cpp</in>
+                    <in>weak_from_this_test2.cpp</in>
+                    <in>weak_ptr_alias_move_test.cpp</in>
+                    <in>weak_ptr_alias_test.cpp</in>
+                    <in>weak_ptr_move_test.cpp</in>
+                    <in>weak_ptr_mt_test.cpp</in>
+                    <in>weak_ptr_test.cpp</in>
+                    <in>wp_convertible_test.cpp</in>
+                    <in>wp_guides_test.cpp</in>
+                    <in>wp_hash_test.cpp</in>
+                    <in>wp_hash_test2.cpp</in>
+                    <in>wp_unordered_test.cpp</in>
+                    <in>yield_k_test.cpp</in>
+                    <in>yield_k_windows_h_test.cpp</in>
+                  </df>
+                </df>
+                <df name="sort">
+                  <df name="benchmark">
+                    <df name="parallel">
+                      <in>benchmark_numbers.cpp</in>
+                      <in>benchmark_objects.cpp</in>
+                      <in>benchmark_strings.cpp</in>
+                      <in>file_generator.cpp</in>
+                    </df>
+                    <df name="single">
+                      <in>benchmark_numbers.cpp</in>
+                      <in>benchmark_objects.cpp</in>
+                      <in>benchmark_strings.cpp</in>
+                      <in>file_generator.cpp</in>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <in>alrbreaker.cpp</in>
+                    <in>alreadysorted.cpp</in>
+                    <in>binaryalrbreaker.cpp</in>
+                    <in>boostrandomgen.cpp</in>
+                    <in>caseinsensitive.cpp</in>
+                    <in>charstringsample.cpp</in>
+                    <in>double.cpp</in>
+                    <in>floatfunctorsample.cpp</in>
+                    <in>floatsample.cpp</in>
+                    <in>generalizedstruct.cpp</in>
+                    <in>int64.cpp</in>
+                    <in>keyplusdatasample.cpp</in>
+                    <in>mostlysorted.cpp</in>
+                    <in>parallelint.cpp</in>
+                    <in>parallelstring.cpp</in>
+                    <in>randomgen.cpp</in>
+                    <in>reverseintsample.cpp</in>
+                    <in>reversestringfunctorsample.cpp</in>
+                    <in>reversestringsample.cpp</in>
+                    <in>rightshiftsample.cpp</in>
+                    <in>sample.cpp</in>
+                    <in>shiftfloatsample.cpp</in>
+                    <in>stringfunctorsample.cpp</in>
+                    <in>stringsample.cpp</in>
+                    <in>wstringsample.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>float_sort_test.cpp</in>
+                    <in>integer_sort_test.cpp</in>
+                    <in>sort_detail_test.cpp</in>
+                    <in>string_sort_test.cpp</in>
+                    <in>test_block_indirect_sort.cpp</in>
+                    <in>test_flat_stable_sort.cpp</in>
+                    <in>test_insert_sort.cpp</in>
+                    <in>test_parallel_stable_sort.cpp</in>
+                    <in>test_pdqsort.cpp</in>
+                    <in>test_sample_sort.cpp</in>
+                    <in>test_spinsort.cpp</in>
+                  </df>
+                </df>
+                <df name="spirit">
+                  <df name="classic">
+                    <df name="example">
+                      <df name="fundamental">
+                        <df name="distinct">
+                          <in>distinct_parser.cpp</in>
+                          <in>distinct_parser_dynamic.cpp</in>
+                        </df>
+                        <df name="more_calculators">
+                          <in>ast_calc2.cpp</in>
+                          <in>calc_with_variables.cpp</in>
+                          <in>phoenix_subrule_calc.cpp</in>
+                          <in>primitive_calc.cpp</in>
+                          <in>rpn_calc.cpp</in>
+                          <in>vmachine_calc.cpp</in>
+                        </df>
+                        <df name="position_iterator">
+                          <in>position_iterator.cpp</in>
+                        </df>
+                        <in>ast_calc.cpp</in>
+                        <in>bind.cpp</in>
+                        <in>boiler_plate.cpp</in>
+                        <in>calc_debug.cpp</in>
+                        <in>calc_plain.cpp</in>
+                        <in>comments.cpp</in>
+                        <in>complex_number.cpp</in>
+                        <in>error_handling.cpp</in>
+                        <in>error_reporting.cpp</in>
+                        <in>file_parser.cpp</in>
+                        <in>full_calc.cpp</in>
+                        <in>functor_parser.cpp</in>
+                        <in>list_parser.cpp</in>
+                        <in>matching_tags.cpp</in>
+                        <in>no_actions.cpp</in>
+                        <in>number_list.cpp</in>
+                        <in>parse_tree_calc1.cpp</in>
+                        <in>parser_context.cpp</in>
+                        <in>phoenix_calc.cpp</in>
+                        <in>refactoring.cpp</in>
+                        <in>regular_expression.cpp</in>
+                        <in>roman_numerals.cpp</in>
+                        <in>stuff_vector.cpp</in>
+                        <in>stuff_vector2.cpp</in>
+                        <in>subrule_calc.cpp</in>
+                        <in>sum.cpp</in>
+                        <in>thousand_separated.cpp</in>
+                      </df>
+                      <df name="intermediate">
+                        <df name="simple_xml">
+                          <in>driver.cpp</in>
+                          <in>tag.cpp</in>
+                        </df>
+                        <in>ipv4.cpp</in>
+                        <in>ipv4_opt.cpp</in>
+                        <in>lazy_parser.cpp</in>
+                        <in>parameters.cpp</in>
+                        <in>regex_convert.cpp</in>
+                      </df>
+                      <df name="techniques">
+                        <df name="no_rules">
+                          <in>no_rule1.cpp</in>
+                          <in>no_rule2.cpp</in>
+                          <in>no_rule3.cpp</in>
+                        </df>
+                        <df name="no_rules_with_typeof">
+                          <in>opaque_rule_parser.cpp</in>
+                          <in>rule_parser_1_1.cpp</in>
+                          <in>rule_parser_1_2.cpp</in>
+                          <in>rule_parser_2_1.cpp</in>
+                          <in>rule_parser_2_2.cpp</in>
+                        </df>
+                        <in>dynamic_rule.cpp</in>
+                        <in>epsilon.cpp</in>
+                        <in>multiple_scanners.cpp</in>
+                        <in>nabialek.cpp</in>
+                        <in>right_recursion.cpp</in>
+                        <in>typeof.cpp</in>
+                      </df>
+                    </df>
+                    <df name="phoenix">
+                      <df name="example">
+                        <df name="fundamental">
+                          <in>closures.cpp</in>
+                          <in>sample10.cpp</in>
+                          <in>sample2.cpp</in>
+                          <in>sample3.cpp</in>
+                          <in>sample4.cpp</in>
+                          <in>sample5.cpp</in>
+                          <in>sample6.cpp</in>
+                          <in>sample7.cpp</in>
+                          <in>sample8.cpp</in>
+                          <in>sample9.cpp</in>
+                        </df>
+                      </df>
+                      <df name="test">
+                        <in>binary_tests.cpp</in>
+                        <in>binders_tests.cpp</in>
+                        <in>functors_tests.cpp</in>
+                        <in>iostream_tests.cpp</in>
+                        <in>mixed_binary_tests.cpp</in>
+                        <in>more_expressions_tests.cpp</in>
+                        <in>new_test.cpp</in>
+                        <in>primitives_tests.cpp</in>
+                        <in>statements_tests.cpp</in>
+                        <in>stl_tests.cpp</in>
+                        <in>tuples_tests.cpp</in>
+                        <in>unary_tests.cpp</in>
+                      </df>
+                    </df>
+                    <df name="test">
+                      <df name="actor">
+                        <in>action_tests.cpp</in>
+                        <in>assign_key_test.cpp</in>
+                        <in>assign_test.cpp</in>
+                        <in>clear_test.cpp</in>
+                        <in>decrement_test.cpp</in>
+                        <in>erase_at_test.cpp</in>
+                        <in>increment_test.cpp</in>
+                        <in>insert_at_test.cpp</in>
+                        <in>insert_key_test.cpp</in>
+                        <in>push_back_test.cpp</in>
+                        <in>push_front_test.cpp</in>
+                        <in>swap_test.cpp</in>
+                        <in>unit_test.cpp</in>
+                      </df>
+                      <df name="typeof_support">
+                        <in>typeof_actor.cpp</in>
+                        <in>typeof_attribute.cpp</in>
+                        <in>typeof_core.cpp</in>
+                        <in>typeof_debug.cpp</in>
+                        <in>typeof_dynamic.cpp</in>
+                        <in>typeof_error_handling.cpp</in>
+                        <in>typeof_iterator.cpp</in>
+                        <in>typeof_symbols.cpp</in>
+                        <in>typeof_tree.cpp</in>
+                        <in>typeof_utility.cpp</in>
+                      </df>
+                      <in>ast_calc_tests.cpp</in>
+                      <in>bug_000008.cpp</in>
+                      <in>bug_fixes.cpp</in>
+                      <in>char_strings_test.cpp</in>
+                      <in>char_strings_test_fail.cpp</in>
+                      <in>chset_tests.cpp</in>
+                      <in>closure_tests.cpp</in>
+                      <in>confix_tests.cpp</in>
+                      <in>custom_real_parser.cpp</in>
+                      <in>directives_tests.cpp</in>
+                      <in>distinct_tests.cpp</in>
+                      <in>epsilon_tests.cpp</in>
+                      <in>escape_char_parser_tests.cpp</in>
+                      <in>exception_tests.cpp</in>
+                      <in>file_iterator_tests.cpp</in>
+                      <in>fixed_size_queue_fail_tests.cpp</in>
+                      <in>fixed_size_queue_tests.cpp</in>
+                      <in>for_p_as_parser_tests.cpp</in>
+                      <in>for_tests.cpp</in>
+                      <in>fundamental_tests.cpp</in>
+                      <in>grammar_def_test.cpp</in>
+                      <in>grammar_mt_tests.cpp</in>
+                      <in>grammar_multi_instance_tst.cpp</in>
+                      <in>grammar_tests.cpp</in>
+                      <in>group_match_bug.cpp</in>
+                      <in>if_p_as_parser_tests.cpp</in>
+                      <in>if_p_int_as_condition_test.cpp</in>
+                      <in>if_tests.cpp</in>
+                      <in>lazy_tests.cpp</in>
+                      <in>loops_tests.cpp</in>
+                      <in>match_tests.cpp</in>
+                      <in>mix_and_match_trees.cpp</in>
+                      <in>multi_pass_compile_tests.cpp</in>
+                      <in>multi_pass_tests.cpp</in>
+                      <in>negated_eps_p_test.cpp</in>
+                      <in>numerics_tests.cpp</in>
+                      <in>operators_tests.cpp</in>
+                      <in>owi_mt_tests.cpp</in>
+                      <in>owi_st_tests.cpp</in>
+                      <in>parametric_tests.cpp</in>
+                      <in>parser_context_test.cpp</in>
+                      <in>parser_traits_tests.cpp</in>
+                      <in>position_iterator_tests.cpp</in>
+                      <in>post_skips.cpp</in>
+                      <in>primitives_tests.cpp</in>
+                      <in>repeat_ast_tests.cpp</in>
+                      <in>rule_tests.cpp</in>
+                      <in>scanner_tests.cpp</in>
+                      <in>scanner_value_type_tests.cpp</in>
+                      <in>scoped_lock_tests.cpp</in>
+                      <in>select_p_with_rule.cpp</in>
+                      <in>sf_bug_720917.cpp</in>
+                      <in>shortest_alternative_tests.cpp</in>
+                      <in>subrule_tests.cpp</in>
+                      <in>switch_problem.cpp</in>
+                      <in>switch_tests_eps_default.cpp</in>
+                      <in>switch_tests_general_def.cpp</in>
+                      <in>switch_tests_single.cpp</in>
+                      <in>switch_tests_wo_default.cpp</in>
+                      <in>symbols_add_null.cpp</in>
+                      <in>symbols_find_null.cpp</in>
+                      <in>symbols_tests.cpp</in>
+                      <in>threads_disabled_compile.cpp</in>
+                      <in>traverse_tests.cpp</in>
+                      <in>tree_tests.cpp</in>
+                      <in>tree_to_xml.cpp</in>
+                      <in>while_p_as_parser_tests.cpp</in>
+                      <in>while_tests.cpp</in>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <df name="karma">
+                      <in>actions.cpp</in>
+                      <in>auto_facilities.cpp</in>
+                      <in>basic_facilities.cpp</in>
+                      <in>calc2_ast_dump.cpp</in>
+                      <in>calc2_ast_rpn.cpp</in>
+                      <in>calc2_ast_vm.cpp</in>
+                      <in>classify_char.cpp</in>
+                      <in>complex_number.cpp</in>
+                      <in>complex_number_adapt.cpp</in>
+                      <in>complex_number_easier.cpp</in>
+                      <in>customize_counter.cpp</in>
+                      <in>customize_embedded_container.cpp</in>
+                      <in>customize_use_as_container.cpp</in>
+                      <in>escaped_string.cpp</in>
+                      <in>generate_code.cpp</in>
+                      <in>key_value_sequence.cpp</in>
+                      <in>mini_xml_karma.cpp</in>
+                      <in>num_list1.cpp</in>
+                      <in>num_list2.cpp</in>
+                      <in>num_list3.cpp</in>
+                      <in>num_matrix.cpp</in>
+                      <in>printf_style_double_format.cpp</in>
+                      <in>quick_start1.cpp</in>
+                      <in>quoted_strings.cpp</in>
+                      <in>reference.cpp</in>
+                      <in>reorder_struct.cpp</in>
+                      <in>simple_columns_directive.cpp</in>
+                    </df>
+                    <df name="lex">
+                      <df name="static_lexer">
+                        <in>word_count_generate.cpp</in>
+                        <in>word_count_lexer_generate.cpp</in>
+                        <in>word_count_lexer_static.cpp</in>
+                        <in>word_count_static.cpp</in>
+                      </df>
+                      <in>custom_token_attribute.cpp</in>
+                      <in>example1.cpp</in>
+                      <in>example2.cpp</in>
+                      <in>example3.cpp</in>
+                      <in>example4.cpp</in>
+                      <in>example5.cpp</in>
+                      <in>example6.cpp</in>
+                      <in>lexer_debug_support.cpp</in>
+                      <in>print_number_tokenids.cpp</in>
+                      <in>print_numbers.cpp</in>
+                      <in>reference.cpp</in>
+                      <in>strip_comments.cpp</in>
+                      <in>strip_comments_lexer.cpp</in>
+                      <in>word_count.cpp</in>
+                      <in>word_count_functor.cpp</in>
+                      <in>word_count_functor_flex.cpp</in>
+                      <in>word_count_lexer.cpp</in>
+                    </df>
+                    <df name="qi">
+                      <df name="compiler_tutorial">
+                        <df name="calc7">
+                          <in>compiler.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>main.cpp</in>
+                          <in>statement.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <df name="calc8">
+                          <in>compiler.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>main.cpp</in>
+                          <in>statement.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <df name="conjure1">
+                          <in>compiler.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>function.cpp</in>
+                          <in>main.cpp</in>
+                          <in>statement.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <df name="conjure2">
+                          <in>compiler.cpp</in>
+                          <in>conjure_static_lexer_generate.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>function.cpp</in>
+                          <in>lexer.cpp</in>
+                          <in>main.cpp</in>
+                          <in>statement.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <df name="conjure3">
+                          <in>compiler.cpp</in>
+                          <in>conjure_static_lexer_generate.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>function.cpp</in>
+                          <in>lexer.cpp</in>
+                          <in>main.cpp</in>
+                          <in>statement.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <df name="mini_c">
+                          <in>compiler.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>function.cpp</in>
+                          <in>main.cpp</in>
+                          <in>statement.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <in>calc1.cpp</in>
+                        <in>calc2.cpp</in>
+                        <in>calc3.cpp</in>
+                        <in>calc4.cpp</in>
+                        <in>calc5.cpp</in>
+                        <in>calc6.cpp</in>
+                      </df>
+                      <in>actions.cpp</in>
+                      <in>adapt_template_struct.cpp</in>
+                      <in>boost_array.cpp</in>
+                      <in>calc_utree.cpp</in>
+                      <in>calc_utree_ast.cpp</in>
+                      <in>calc_utree_naive.cpp</in>
+                      <in>complex_number.cpp</in>
+                      <in>custom_string.cpp</in>
+                      <in>display_attribute_type.cpp</in>
+                      <in>employee.cpp</in>
+                      <in>expect.cpp</in>
+                      <in>german_floating_point.cpp</in>
+                      <in>iter_pos_parser.cpp</in>
+                      <in>key_value_sequence.cpp</in>
+                      <in>key_value_sequence_empty_value.cpp</in>
+                      <in>key_value_sequence_ordered.cpp</in>
+                      <in>mini_xml1.cpp</in>
+                      <in>mini_xml2.cpp</in>
+                      <in>mini_xml3.cpp</in>
+                      <in>nabialek.cpp</in>
+                      <in>num_list1.cpp</in>
+                      <in>num_list2.cpp</in>
+                      <in>num_list3.cpp</in>
+                      <in>num_list4.cpp</in>
+                      <in>parse_date.cpp</in>
+                      <in>porting_guide_classic.cpp</in>
+                      <in>porting_guide_qi.cpp</in>
+                      <in>reference.cpp</in>
+                      <in>reorder_struct.cpp</in>
+                      <in>roman.cpp</in>
+                      <in>sum.cpp</in>
+                      <in>typeof.cpp</in>
+                      <in>unescaped_string.cpp</in>
+                    </df>
+                    <df name="support">
+                      <df name="utree">
+                        <in>parse_sexpr.cpp</in>
+                      </df>
+                      <in>multi_pass.cpp</in>
+                    </df>
+                    <df name="x3">
+                      <df name="attributes">
+                        <in>tuple.cpp</in>
+                      </df>
+                      <df name="calc">
+                        <df name="calc4c">
+                          <in>calc4c.cpp</in>
+                          <in>grammar.cpp</in>
+                        </df>
+                        <df name="calc7">
+                          <in>compiler.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>main.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <df name="calc8">
+                          <in>compiler.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>main.cpp</in>
+                          <in>statement.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <df name="calc9">
+                          <in>compiler.cpp</in>
+                          <in>expression.cpp</in>
+                          <in>main.cpp</in>
+                          <in>statement.cpp</in>
+                          <in>vm.cpp</in>
+                        </df>
+                        <in>calc1.cpp</in>
+                        <in>calc2.cpp</in>
+                        <in>calc4.cpp</in>
+                        <in>calc4b.cpp</in>
+                        <in>calc5.cpp</in>
+                        <in>calc6.cpp</in>
+                      </df>
+                      <df name="minimal">
+                        <in>employee.cpp</in>
+                        <in>main.cpp</in>
+                      </df>
+                      <df name="num_list">
+                        <in>num_list1.cpp</in>
+                        <in>num_list2.cpp</in>
+                        <in>num_list3.cpp</in>
+                        <in>num_list4.cpp</in>
+                      </df>
+                      <df name="rexpr">
+                        <df name="rexpr_full">
+                          <df name="src">
+                            <in>rexpr.cpp</in>
+                          </df>
+                          <df name="test">
+                            <in>parse_rexpr_test.cpp</in>
+                          </df>
+                        </df>
+                        <df name="rexpr_min">
+                          <in>rexpr.cpp</in>
+                        </df>
+                      </df>
+                      <in>actions.cpp</in>
+                      <in>annotation.cpp</in>
+                      <in>complex_number.cpp</in>
+                      <in>employee.cpp</in>
+                      <in>error_handling.cpp</in>
+                      <in>roman.cpp</in>
+                      <in>sum.cpp</in>
+                    </df>
+                  </df>
+                  <df name="repository">
+                    <df name="example">
+                      <df name="karma">
+                        <in>calc2_ast_dump_sr.cpp</in>
+                        <in>confix.cpp</in>
+                        <in>mini_xml_karma_sr.cpp</in>
+                      </df>
+                      <df name="qi">
+                        <in>advance.cpp</in>
+                        <in>calc1_sr.cpp</in>
+                        <in>confix.cpp</in>
+                        <in>derived.cpp</in>
+                        <in>distinct.cpp</in>
+                        <in>flush_multi_pass.cpp</in>
+                        <in>iter_pos_parser.cpp</in>
+                        <in>keywords.cpp</in>
+                        <in>mini_xml2_sr.cpp</in>
+                        <in>options.cpp</in>
+                        <in>seek.cpp</in>
+                      </df>
+                    </df>
+                    <df name="test">
+                      <df name="karma">
+                        <in>confix.cpp</in>
+                        <in>subrule.cpp</in>
+                      </df>
+                      <df name="qi">
+                        <in>advance.cpp</in>
+                        <in>confix.cpp</in>
+                        <in>distinct.cpp</in>
+                        <in>keywords.cpp</in>
+                        <in>seek.cpp</in>
+                        <in>subrule.cpp</in>
+                      </df>
+                      <df name="test_headers">
+                        <in>main.cpp</in>
+                        <in>test.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="karma">
+                      <in>actions.cpp</in>
+                      <in>alternative1.cpp</in>
+                      <in>alternative2.cpp</in>
+                      <in>and_predicate.cpp</in>
+                      <in>attribute.cpp</in>
+                      <in>auto1.cpp</in>
+                      <in>auto2.cpp</in>
+                      <in>auto3.cpp</in>
+                      <in>binary1.cpp</in>
+                      <in>binary2.cpp</in>
+                      <in>binary3.cpp</in>
+                      <in>bool.cpp</in>
+                      <in>buffer.cpp</in>
+                      <in>case_handling1.cpp</in>
+                      <in>case_handling2.cpp</in>
+                      <in>case_handling3.cpp</in>
+                      <in>center_alignment.cpp</in>
+                      <in>char1.cpp</in>
+                      <in>char2.cpp</in>
+                      <in>char3.cpp</in>
+                      <in>char_class.cpp</in>
+                      <in>columns.cpp</in>
+                      <in>debug.cpp</in>
+                      <in>delimiter.cpp</in>
+                      <in>duplicate.cpp</in>
+                      <in>encoding.cpp</in>
+                      <in>eol.cpp</in>
+                      <in>eps.cpp</in>
+                      <in>format_manip.cpp</in>
+                      <in>format_manip_attr.cpp</in>
+                      <in>format_pointer_container.cpp</in>
+                      <in>generate_attr.cpp</in>
+                      <in>grammar.cpp</in>
+                      <in>grammar_fail.cpp</in>
+                      <in>int1.cpp</in>
+                      <in>int2.cpp</in>
+                      <in>int3.cpp</in>
+                      <in>kleene.cpp</in>
+                      <in>lazy.cpp</in>
+                      <in>left_alignment.cpp</in>
+                      <in>list.cpp</in>
+                      <in>lit.cpp</in>
+                      <in>maxwidth.cpp</in>
+                      <in>not_predicate.cpp</in>
+                      <in>omit.cpp</in>
+                      <in>optional.cpp</in>
+                      <in>pattern1.cpp</in>
+                      <in>pattern2.cpp</in>
+                      <in>pattern3.cpp</in>
+                      <in>pattern4.cpp</in>
+                      <in>plus.cpp</in>
+                      <in>real1.cpp</in>
+                      <in>real2.cpp</in>
+                      <in>real3.cpp</in>
+                      <in>regression_adapt_adt.cpp</in>
+                      <in>regression_center_alignment.cpp</in>
+                      <in>regression_const_real_policies.cpp</in>
+                      <in>regression_container_variant_sequence.cpp</in>
+                      <in>regression_iterator.cpp</in>
+                      <in>regression_optional_double.cpp</in>
+                      <in>regression_real_0.cpp</in>
+                      <in>regression_real_policy_sign.cpp</in>
+                      <in>regression_real_scientific.cpp</in>
+                      <in>regression_semantic_action_attribute.cpp</in>
+                      <in>regression_unicode_char.cpp</in>
+                      <in>repeat1.cpp</in>
+                      <in>repeat2.cpp</in>
+                      <in>right_alignment.cpp</in>
+                      <in>rule_fail.cpp</in>
+                      <in>sequence1.cpp</in>
+                      <in>sequence2.cpp</in>
+                      <in>stream.cpp</in>
+                      <in>symbols1.cpp</in>
+                      <in>symbols2.cpp</in>
+                      <in>symbols3.cpp</in>
+                      <in>tricky_alignment.cpp</in>
+                      <in>uint_radix.cpp</in>
+                      <in>utree1.cpp</in>
+                      <in>utree2.cpp</in>
+                      <in>utree3.cpp</in>
+                      <in>wstream.cpp</in>
+                    </df>
+                    <df name="lex">
+                      <in>auto_switch_lexerstate.cpp</in>
+                      <in>dedent_handling_phoenix.cpp</in>
+                      <in>id_type_enum.cpp</in>
+                      <in>lexer_state_switcher.cpp</in>
+                      <in>lexertl1.cpp</in>
+                      <in>lexertl2.cpp</in>
+                      <in>lexertl3.cpp</in>
+                      <in>lexertl4.cpp</in>
+                      <in>lexertl5.cpp</in>
+                      <in>plain_token.cpp</in>
+                      <in>regression_basic_lexer.cpp</in>
+                      <in>regression_file_iterator1.cpp</in>
+                      <in>regression_file_iterator2.cpp</in>
+                      <in>regression_file_iterator3.cpp</in>
+                      <in>regression_file_iterator4.cpp</in>
+                      <in>regression_less_8563.cpp</in>
+                      <in>regression_matlib_dynamic.cpp</in>
+                      <in>regression_matlib_generate.cpp</in>
+                      <in>regression_matlib_generate_switch.cpp</in>
+                      <in>regression_matlib_static.cpp</in>
+                      <in>regression_matlib_switch.cpp</in>
+                      <in>regression_static_wide_6253.cpp</in>
+                      <in>regression_syntax_error.cpp</in>
+                      <in>regression_wide.cpp</in>
+                      <in>regression_word_count.cpp</in>
+                      <in>semantic_actions.cpp</in>
+                      <in>set_token_value.cpp</in>
+                      <in>set_token_value_phoenix.cpp</in>
+                      <in>state_switcher.cpp</in>
+                      <in>string_token_id.cpp</in>
+                      <in>token_iterpair.cpp</in>
+                      <in>token_moretypes.cpp</in>
+                      <in>token_omit.cpp</in>
+                      <in>token_onetype.cpp</in>
+                    </df>
+                    <df name="qi">
+                      <in>actions.cpp</in>
+                      <in>actions2.cpp</in>
+                      <in>alternative.cpp</in>
+                      <in>and_predicate.cpp</in>
+                      <in>attr.cpp</in>
+                      <in>attribute1.cpp</in>
+                      <in>attribute2.cpp</in>
+                      <in>auto.cpp</in>
+                      <in>binary.cpp</in>
+                      <in>bool1.cpp</in>
+                      <in>bool2.cpp</in>
+                      <in>char1.cpp</in>
+                      <in>char2.cpp</in>
+                      <in>char_class.cpp</in>
+                      <in>debug.cpp</in>
+                      <in>difference.cpp</in>
+                      <in>encoding.cpp</in>
+                      <in>end.cpp</in>
+                      <in>eps.cpp</in>
+                      <in>expect.cpp</in>
+                      <in>expectd.cpp</in>
+                      <in>extract_int.cpp</in>
+                      <in>grammar.cpp</in>
+                      <in>grammar_fail.cpp</in>
+                      <in>hold.cpp</in>
+                      <in>int1.cpp</in>
+                      <in>int2.cpp</in>
+                      <in>int3.cpp</in>
+                      <in>iterator_check.cpp</in>
+                      <in>kleene.cpp</in>
+                      <in>lazy.cpp</in>
+                      <in>lexeme.cpp</in>
+                      <in>list.cpp</in>
+                      <in>lit1.cpp</in>
+                      <in>lit2.cpp</in>
+                      <in>match_manip1.cpp</in>
+                      <in>match_manip2.cpp</in>
+                      <in>match_manip3.cpp</in>
+                      <in>match_manip_attr.cpp</in>
+                      <in>matches.cpp</in>
+                      <in>no_case.cpp</in>
+                      <in>no_skip.cpp</in>
+                      <in>not_predicate.cpp</in>
+                      <in>omit.cpp</in>
+                      <in>optional.cpp</in>
+                      <in>parse_attr.cpp</in>
+                      <in>pass_container1.cpp</in>
+                      <in>pass_container2.cpp</in>
+                      <in>pass_container3.cpp</in>
+                      <in>permutation.cpp</in>
+                      <in>plus.cpp</in>
+                      <in>range_run.cpp</in>
+                      <in>raw.cpp</in>
+                      <in>real1.cpp</in>
+                      <in>real2.cpp</in>
+                      <in>real3.cpp</in>
+                      <in>real4.cpp</in>
+                      <in>real5.cpp</in>
+                      <in>regression_adapt_adt.cpp</in>
+                      <in>regression_attr_with_action.cpp</in>
+                      <in>regression_binary_action.cpp</in>
+                      <in>regression_clear.cpp</in>
+                      <in>regression_container_attribute.cpp</in>
+                      <in>regression_debug_optional.cpp</in>
+                      <in>regression_float_fraction.cpp</in>
+                      <in>regression_fusion_proto_spirit.cpp</in>
+                      <in>regression_lazy_repeat.cpp</in>
+                      <in>regression_numeric_alternatives.cpp</in>
+                      <in>regression_one_element_fusion_sequence.cpp</in>
+                      <in>regression_one_element_sequence_attribute.cpp</in>
+                      <in>regression_reorder.cpp</in>
+                      <in>regression_repeat.cpp</in>
+                      <in>regression_stream_eof.cpp</in>
+                      <in>regression_transform_assignment.cpp</in>
+                      <in>repeat.cpp</in>
+                      <in>rule1.cpp</in>
+                      <in>rule2.cpp</in>
+                      <in>rule3.cpp</in>
+                      <in>rule4.cpp</in>
+                      <in>rule_fail.cpp</in>
+                      <in>sequence.cpp</in>
+                      <in>sequential_or.cpp</in>
+                      <in>skip.cpp</in>
+                      <in>stream.cpp</in>
+                      <in>symbols1.cpp</in>
+                      <in>symbols2.cpp</in>
+                      <in>terminal_ex.cpp</in>
+                      <in>to_utf8.cpp</in>
+                      <in>tst.cpp</in>
+                      <in>uint1.cpp</in>
+                      <in>uint2.cpp</in>
+                      <in>uint3.cpp</in>
+                      <in>uint_radix.cpp</in>
+                      <in>utree1.cpp</in>
+                      <in>utree2.cpp</in>
+                      <in>utree3.cpp</in>
+                      <in>utree4.cpp</in>
+                    </df>
+                    <df name="support">
+                      <in>char_encoding.cpp</in>
+                      <in>istream_iterator_basic.cpp</in>
+                      <in>regression_line_pos_iterator.cpp</in>
+                      <in>regression_multi_pass_error_handler.cpp</in>
+                      <in>regression_multi_pass_functor.cpp</in>
+                      <in>regression_multi_pass_parse.cpp</in>
+                      <in>regression_multi_pass_position_iterator.cpp</in>
+                      <in>unused_type.cpp</in>
+                      <in>utree.cpp</in>
+                      <in>utree_debug.cpp</in>
+                    </df>
+                    <df name="test_headers">
+                      <in>main.cpp</in>
+                      <in>test.cpp</in>
+                    </df>
+                    <df name="x3">
+                      <in>actions.cpp</in>
+                      <in>alternative.cpp</in>
+                      <in>and_predicate.cpp</in>
+                      <in>any_parser.cpp</in>
+                      <in>attr.cpp</in>
+                      <in>attribute_type_check.cpp</in>
+                      <in>binary.cpp</in>
+                      <in>bool.cpp</in>
+                      <in>char1.cpp</in>
+                      <in>char_class.cpp</in>
+                      <in>confix.cpp</in>
+                      <in>container_support.cpp</in>
+                      <in>debug.cpp</in>
+                      <in>difference.cpp</in>
+                      <in>eoi.cpp</in>
+                      <in>eol.cpp</in>
+                      <in>eps.cpp</in>
+                      <in>error_handler.cpp</in>
+                      <in>expect.cpp</in>
+                      <in>extract_int.cpp</in>
+                      <in>fusion_map.cpp</in>
+                      <in>grammar.cpp</in>
+                      <in>grammar_linker.cpp</in>
+                      <in>int1.cpp</in>
+                      <in>iterator_check.cpp</in>
+                      <in>kleene.cpp</in>
+                      <in>lexeme.cpp</in>
+                      <in>list.cpp</in>
+                      <in>lit.cpp</in>
+                      <in>lit1.cpp</in>
+                      <in>lit2.cpp</in>
+                      <in>matches.cpp</in>
+                      <in>no_case.cpp</in>
+                      <in>no_skip.cpp</in>
+                      <in>not_predicate.cpp</in>
+                      <in>omit.cpp</in>
+                      <in>optional.cpp</in>
+                      <in>plus.cpp</in>
+                      <in>raw.cpp</in>
+                      <in>real1.cpp</in>
+                      <in>real2.cpp</in>
+                      <in>real3.cpp</in>
+                      <in>real4.cpp</in>
+                      <in>repeat.cpp</in>
+                      <in>rule1.cpp</in>
+                      <in>rule2.cpp</in>
+                      <in>rule3.cpp</in>
+                      <in>rule4.cpp</in>
+                      <in>rule_separate_tu.cpp</in>
+                      <in>rule_separate_tu_grammar.cpp</in>
+                      <in>seek.cpp</in>
+                      <in>sequence.cpp</in>
+                      <in>skip.cpp</in>
+                      <in>symbols1.cpp</in>
+                      <in>symbols2.cpp</in>
+                      <in>symbols3.cpp</in>
+                      <in>to_utf8.cpp</in>
+                      <in>tst.cpp</in>
+                      <in>uint1.cpp</in>
+                      <in>uint_radix.cpp</in>
+                      <in>unused_type.cpp</in>
+                      <in>with.cpp</in>
+                      <in>x3_variant.cpp</in>
+                    </df>
+                  </df>
+                  <df name="workbench">
+                    <df name="karma">
+                      <in>double_performance.cpp</in>
+                      <in>format_performance.cpp</in>
+                      <in>int_generator.cpp</in>
+                      <in>real_generator.cpp</in>
+                      <in>sequence_performance.cpp</in>
+                    </df>
+                    <df name="qi">
+                      <in>attr_vs_actions.cpp</in>
+                      <in>int_parser.cpp</in>
+                      <in>keywords.cpp</in>
+                      <in>real_parser.cpp</in>
+                    </df>
+                    <df name="unicode">
+                      <in>create_tables.cpp</in>
+                    </df>
+                    <df name="x3">
+                      <df name="toy">
+                        <in>toy.cpp</in>
+                      </df>
+                      <in>context.cpp</in>
+                    </df>
+                    <in>boilerplate.cpp</in>
+                  </df>
+                </df>
+                <df name="stacktrace">
+                  <df name="build">
+                    <in>has_addr2line.cpp</in>
+                    <in>has_backtrace.cpp</in>
+                    <in>has_windbg.cpp</in>
+                    <in>has_windbg_cached.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>assert_handler.cpp</in>
+                    <in>debug_function.cpp</in>
+                    <in>terminate_handler.cpp</in>
+                    <in>throwing_st.cpp</in>
+                    <in>trace_addresses.cpp</in>
+                    <in>user_config.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>addr2line.cpp</in>
+                    <in>backtrace.cpp</in>
+                    <in>basic.cpp</in>
+                    <in>noop.cpp</in>
+                    <in>windbg.cpp</in>
+                    <in>windbg_cached.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>test.cpp</in>
+                    <in>test_impl.cpp</in>
+                    <in>test_noop.cpp</in>
+                    <in>test_num_conv.cpp</in>
+                    <in>test_void_ptr_cast.cpp</in>
+                    <in>thread_safety_checking.cpp</in>
+                    <in>torture.cpp</in>
+                  </df>
+                </df>
+                <df name="statechart">
+                  <df name="example">
+                    <df name="BitMachine">
+                      <in>BitMachine.cpp</in>
+                    </df>
+                    <df name="Camera">
+                      <in>Camera.cpp</in>
+                      <in>Configuring.cpp</in>
+                      <in>Main.cpp</in>
+                      <in>Precompiled.cpp</in>
+                      <in>Shooting.cpp</in>
+                    </df>
+                    <df name="Handcrafted">
+                      <in>Handcrafted.cpp</in>
+                    </df>
+                    <df name="Keyboard">
+                      <in>Keyboard.cpp</in>
+                    </df>
+                    <df name="Performance">
+                      <in>Performance.cpp</in>
+                    </df>
+                    <df name="PingPong">
+                      <in>PingPong.cpp</in>
+                      <in>Player.cpp</in>
+                    </df>
+                    <df name="StopWatch">
+                      <in>StopWatch.cpp</in>
+                      <in>StopWatch2.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>CustomReactionTest.cpp</in>
+                    <in>DeferralBug.cpp</in>
+                    <in>DeferralTest.cpp</in>
+                    <in>FifoSchedulerTest.cpp</in>
+                    <in>HistoryTest.cpp</in>
+                    <in>InStateReactionTest.cpp</in>
+                    <in>InconsistentHistoryTest1.cpp</in>
+                    <in>InconsistentHistoryTest2.cpp</in>
+                    <in>InconsistentHistoryTest3.cpp</in>
+                    <in>InconsistentHistoryTest4.cpp</in>
+                    <in>InconsistentHistoryTest5.cpp</in>
+                    <in>InconsistentHistoryTest6.cpp</in>
+                    <in>InconsistentHistoryTest7.cpp</in>
+                    <in>InconsistentHistoryTest8.cpp</in>
+                    <in>InvalidChartTest1.cpp</in>
+                    <in>InvalidChartTest2.cpp</in>
+                    <in>InvalidChartTest3.cpp</in>
+                    <in>InvalidResultAssignTest.cpp</in>
+                    <in>InvalidResultCopyTest.cpp</in>
+                    <in>InvalidResultDefCtorTest.cpp</in>
+                    <in>InvalidTransitionTest1.cpp</in>
+                    <in>InvalidTransitionTest2.cpp</in>
+                    <in>StateCastTest.cpp</in>
+                    <in>StateIterationTest.cpp</in>
+                    <in>TerminationTest.cpp</in>
+                    <in>TransitionTest.cpp</in>
+                    <in>TriggeringEventTest.cpp</in>
+                    <in>TuTest.cpp</in>
+                    <in>TuTestMain.cpp</in>
+                    <in>TypeInfoTest.cpp</in>
+                    <in>UnconsumedResultTest.cpp</in>
+                    <in>UnsuppDeepHistoryTest.cpp</in>
+                  </df>
+                </df>
+                <df name="static_assert">
+                  <df name="example">
+                    <in>static_assert_example_1.cpp</in>
+                    <in>static_assert_example_2.cpp</in>
+                    <in>static_assert_example_3.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="cmake_install_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="cmake_subdir_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>static_assert_test.cpp</in>
+                    <in>static_assert_test_fail_1.cpp</in>
+                    <in>static_assert_test_fail_10.cpp</in>
+                    <in>static_assert_test_fail_2.cpp</in>
+                    <in>static_assert_test_fail_3.cpp</in>
+                    <in>static_assert_test_fail_4.cpp</in>
+                    <in>static_assert_test_fail_5.cpp</in>
+                    <in>static_assert_test_fail_6.cpp</in>
+                    <in>static_assert_test_fail_7.cpp</in>
+                    <in>static_assert_test_fail_8.cpp</in>
+                    <in>static_assert_test_fail_9.cpp</in>
+                  </df>
+                </df>
+                <df name="static_string">
+                  <df name="test">
+                    <in>static_string.cpp</in>
+                  </df>
+                </df>
+                <df name="stl_interfaces">
+                  <df name="example">
+                    <in>back_insert_iterator.cpp</in>
+                    <in>drop_while_view.cpp</in>
+                    <in>filtered_int_iterator.cpp</in>
+                    <in>interoperability.cpp</in>
+                    <in>node_iterator.cpp</in>
+                    <in>random_access_iterator.cpp</in>
+                    <in>repeated_chars_iterator.cpp</in>
+                    <in>reverse_iterator.cpp</in>
+                    <in>static_vector.cpp</in>
+                    <in>zip_proxy_iterator.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>array.cpp</in>
+                    <in>bidirectional.cpp</in>
+                    <in>compile_seq_cont_rvalue_constrained_pop_back.cpp</in>
+                    <in>compile_tests_main.cpp</in>
+                    <in>detail.cpp</in>
+                    <in>forward.cpp</in>
+                    <in>input.cpp</in>
+                    <in>output.cpp</in>
+                    <in>random_access.cpp</in>
+                    <in>reverse_iter.cpp</in>
+                    <in>static_vec.cpp</in>
+                    <in>static_vec_noncopyable.cpp</in>
+                  </df>
+                </df>
+                <df name="system">
+                  <df name="src">
+                    <in>error_code.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="cmake_install_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>after_main_test.cpp</in>
+                    <in>before_main_test.cpp</in>
+                    <in>config_test.cpp</in>
+                    <in>constexpr_test.cpp</in>
+                    <in>cygwin_error_test.cpp</in>
+                    <in>dynamic_link_test.cpp</in>
+                    <in>ec_location_test.cpp</in>
+                    <in>ec_location_test2.cpp</in>
+                    <in>ec_what_test.cpp</in>
+                    <in>errc_test.cpp</in>
+                    <in>errc_test2.cpp</in>
+                    <in>errc_test3.cpp</in>
+                    <in>error_category_test.cpp</in>
+                    <in>error_category_test2.cpp</in>
+                    <in>error_code_test.cpp</in>
+                    <in>error_code_test2.cpp</in>
+                    <in>error_code_user_test.cpp</in>
+                    <in>error_condition_test.cpp</in>
+                    <in>error_condition_test2.cpp</in>
+                    <in>error_condition_test3.cpp</in>
+                    <in>failed_constexpr_test.cpp</in>
+                    <in>failed_test.cpp</in>
+                    <in>generic_category_test.cpp</in>
+                    <in>generic_category_test2.cpp</in>
+                    <in>generic_category_test3.cpp</in>
+                    <in>header_only_test.cpp</in>
+                    <in>initialization_test.cpp</in>
+                    <in>is_error_code_enum_test.cpp</in>
+                    <in>is_error_condition_enum_test.cpp</in>
+                    <in>linux_error_test.cpp</in>
+                    <in>quick.cpp</in>
+                    <in>result_copy_assign.cpp</in>
+                    <in>result_copy_construct.cpp</in>
+                    <in>result_default_construct.cpp</in>
+                    <in>result_eq.cpp</in>
+                    <in>result_error_access.cpp</in>
+                    <in>result_error_construct.cpp</in>
+                    <in>result_error_construct2.cpp</in>
+                    <in>result_move_assign.cpp</in>
+                    <in>result_move_construct.cpp</in>
+                    <in>result_range_for.cpp</in>
+                    <in>result_swap.cpp</in>
+                    <in>result_value_access.cpp</in>
+                    <in>result_value_construct.cpp</in>
+                    <in>result_value_construct2.cpp</in>
+                    <in>single_instance_1.cpp</in>
+                    <in>single_instance_2.cpp</in>
+                    <in>single_instance_test.cpp</in>
+                    <in>snprintf_test.cpp</in>
+                    <in>std_interop_test.cpp</in>
+                    <in>std_interop_test10.cpp</in>
+                    <in>std_interop_test11.cpp</in>
+                    <in>std_interop_test2.cpp</in>
+                    <in>std_interop_test3.cpp</in>
+                    <in>std_interop_test4.cpp</in>
+                    <in>std_interop_test5.cpp</in>
+                    <in>std_interop_test6.cpp</in>
+                    <in>std_interop_test7.cpp</in>
+                    <in>std_interop_test8.cpp</in>
+                    <in>std_interop_test9.cpp</in>
+                    <in>std_mismatch_test.cpp</in>
+                    <in>std_single_instance_1.cpp</in>
+                    <in>std_single_instance_2.cpp</in>
+                    <in>std_single_instance_test.cpp</in>
+                    <in>system_category_test.cpp</in>
+                    <in>system_category_test2.cpp</in>
+                    <in>system_category_test3.cpp</in>
+                    <in>system_error_test.cpp</in>
+                    <in>system_error_test2.cpp</in>
+                    <in>system_error_test3.cpp</in>
+                    <in>throw_test.cpp</in>
+                    <in>throws_assign_fail.cpp</in>
+                    <in>warnings_test.cpp</in>
+                    <in>win32_hresult_test.cpp</in>
+                    <in>windows_error_test.cpp</in>
+                  </df>
+                </df>
+                <df name="test">
+                  <df name="doc">
+                    <df name="examples">
+                      <in>boost_runtime_list_content.run.cpp</in>
+                      <in>boost_test_bitwise.run-fail.cpp</in>
+                      <in>boost_test_container_default.run-fail.cpp</in>
+                      <in>boost_test_container_lex.run-fail.cpp</in>
+                      <in>boost_test_container_lex_default.run-fail.cpp</in>
+                      <in>boost_test_macro2.run-fail.cpp</in>
+                      <in>boost_test_macro3.run-fail.cpp</in>
+                      <in>boost_test_macro_container_c_array.run-fail.cpp</in>
+                      <in>boost_test_macro_overview.run-fail.cpp</in>
+                      <in>boost_test_macro_workaround.run.cpp</in>
+                      <in>boost_test_message.run-fail.cpp</in>
+                      <in>boost_test_sequence_per_element.run-fail.cpp</in>
+                      <in>boost_test_string.run-fail.cpp</in>
+                      <in>custom_init.run-fail.cpp</in>
+                      <in>custom_main.run-fail.cpp</in>
+                      <in>custom_obsolete_init.run-fail.cpp</in>
+                      <in>dataset_example59.run-fail.cpp</in>
+                      <in>dataset_example61.run.cpp</in>
+                      <in>dataset_example62.run.cpp</in>
+                      <in>dataset_example63.run-fail.cpp</in>
+                      <in>dataset_example64.run-fail.cpp</in>
+                      <in>dataset_example65.run.cpp</in>
+                      <in>dataset_example66.run.cpp</in>
+                      <in>dataset_example67.run.cpp</in>
+                      <in>dataset_example68.run-fail.cpp</in>
+                      <in>decorator_00.run.cpp</in>
+                      <in>decorator_01.run.cpp</in>
+                      <in>decorator_02.run.cpp</in>
+                      <in>decorator_03.run.cpp</in>
+                      <in>decorator_04.run-fail.cpp</in>
+                      <in>decorator_05.run-fail.cpp</in>
+                      <in>decorator_06.run-fail.cpp</in>
+                      <in>decorator_07.run-fail.cpp</in>
+                      <in>decorator_08.run-fail.cpp</in>
+                      <in>decorator_09.run.cpp</in>
+                      <in>decorator_10.run-fail.cpp</in>
+                      <in>decorator_11.run-fail.cpp</in>
+                      <in>decorator_12.run.cpp</in>
+                      <in>decorator_13.run-fail.cpp</in>
+                      <in>decorator_20.run-fail.cpp</in>
+                      <in>decorator_21.run-fail.cpp</in>
+                      <in>decorator_22.run.cpp</in>
+                      <in>decorator_23.run.cpp</in>
+                      <in>example01.run.cpp</in>
+                      <in>example03.run-fail.cpp</in>
+                      <in>example06.run.cpp</in>
+                      <in>example07.run-fail.cpp</in>
+                      <in>example08.run-fail.cpp</in>
+                      <in>example09.run-fail.cpp</in>
+                      <in>example10.run-fail.cpp</in>
+                      <in>example11.run.cpp</in>
+                      <in>example12.run-fail.cpp</in>
+                      <in>example13.run.cpp</in>
+                      <in>example14.run.cpp</in>
+                      <in>example15.run.cpp</in>
+                      <in>example16.run.cpp</in>
+                      <in>example17.run.cpp</in>
+                      <in>example18.run-fail.cpp</in>
+                      <in>example20.run.cpp</in>
+                      <in>example21.run.cpp</in>
+                      <in>example22.run-fail.cpp</in>
+                      <in>example23.run-fail.cpp</in>
+                      <in>example24.run.cpp</in>
+                      <in>example25.run-fail.cpp</in>
+                      <in>example26.run-fail.cpp</in>
+                      <in>example28.run-fail.cpp</in>
+                      <in>example29.run-fail.cpp</in>
+                      <in>example30.run-fail.cpp</in>
+                      <in>example31.run-fail.cpp</in>
+                      <in>example32.run-fail.cpp</in>
+                      <in>example33.run-fail.cpp</in>
+                      <in>example34.run-fail.cpp</in>
+                      <in>example35.run-fail.cpp</in>
+                      <in>example36.run-fail.cpp</in>
+                      <in>example38.run.cpp</in>
+                      <in>example40.run.cpp</in>
+                      <in>example41.run-fail.cpp</in>
+                      <in>example42.run-fail.cpp</in>
+                      <in>example43.run.cpp</in>
+                      <in>example44.run-fail.cpp</in>
+                      <in>example46.run-fail.cpp</in>
+                      <in>example47.run-fail.cpp</in>
+                      <in>example48.run-fail.cpp</in>
+                      <in>example49.run.cpp</in>
+                      <in>example50.run-fail.cpp</in>
+                      <in>example51.run.cpp</in>
+                      <in>example52.run-fail.cpp</in>
+                      <in>example53.run-fail.cpp</in>
+                      <in>example54.run-fail.cpp</in>
+                      <in>example55.run-fail.cpp</in>
+                      <in>example56.run-fail.cpp</in>
+                      <in>example57.run-fail.cpp</in>
+                      <in>example58.run-fail.cpp</in>
+                      <in>example80_contexts.run-fail.cpp</in>
+                      <in>example81_contexts.run-fail.cpp</in>
+                      <in>example82_contexts.run-fail.cpp</in>
+                      <in>example83_contexts.run-fail.cpp</in>
+                      <in>example84_contexts.run-fail.cpp</in>
+                      <in>exception_api.run-fail.cpp</in>
+                      <in>exception_check.run-fail.cpp</in>
+                      <in>exception_check_predicate.run-fail.cpp</in>
+                      <in>exception_nothrow.run-fail.cpp</in>
+                      <in>exception_uncaught.run-fail.cpp</in>
+                      <in>fixture_02.run.cpp</in>
+                      <in>fixture_03.run.cpp</in>
+                      <in>fixture_04.run-fail.cpp</in>
+                      <in>logger-customization-point.run-fail.cpp</in>
+                      <in>runtime-configuration_1.run-fail.cpp</in>
+                      <in>runtime-configuration_2.run-fail.cpp</in>
+                      <in>runtime-configuration_3.run-fail.cpp</in>
+                      <in>runtime-configuration_4.run-fail.cpp</in>
+                      <in>tolerance_01.run-fail.cpp</in>
+                      <in>tolerance_02.run-fail.cpp</in>
+                      <in>tolerance_03.run-fail.cpp</in>
+                      <in>tolerance_04.run-fail.cpp</in>
+                      <in>tolerance_05.run-fail.cpp</in>
+                      <in>tolerance_06.run-fail.cpp</in>
+                    </df>
+                    <df name="snippet">
+                      <df name="dataset_1">
+                        <in>test_file.cpp</in>
+                      </df>
+                      <in>const_string_test.cpp</in>
+                      <in>snippet12.cpp</in>
+                      <in>snippet13.cpp</in>
+                      <in>snippet14.cpp</in>
+                      <in>snippet15.cpp</in>
+                      <in>snippet16.cpp</in>
+                      <in>snippet17.cpp</in>
+                      <in>snippet8.cpp</in>
+                    </df>
+                  </df>
+                  <df name="example">
+                    <in>const_string_test.cpp</in>
+                    <in>exec_mon_example.cpp</in>
+                    <in>external_main_example_1.cpp</in>
+                    <in>external_main_example_2.cpp</in>
+                    <in>external_main_example_3.cpp</in>
+                    <in>filtering_example.cpp</in>
+                    <in>named_param_example.cpp</in>
+                    <in>prg_exec_example.cpp</in>
+                    <in>test_case_template_example.cpp</in>
+                    <in>unit_test_example_01.cpp</in>
+                    <in>unit_test_example_02.cpp</in>
+                    <in>unit_test_example_03.cpp</in>
+                    <in>unit_test_example_04.cpp</in>
+                    <in>unit_test_example_05.cpp</in>
+                    <in>unit_test_example_06.cpp</in>
+                    <in>unit_test_example_07.cpp</in>
+                    <in>unit_test_example_08.cpp</in>
+                    <in>unit_test_example_09_1.cpp</in>
+                    <in>unit_test_example_09_2.cpp</in>
+                    <in>unit_test_example_10.cpp</in>
+                    <in>unit_test_example_11.cpp</in>
+                    <in>unit_test_example_12.cpp</in>
+                    <in>unit_test_example_13.cpp</in>
+                    <in>unit_test_example_15.cpp</in>
+                    <in>unit_test_example_16.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>compiler_log_formatter.cpp</in>
+                    <in>cpp_main.cpp</in>
+                    <in>debug.cpp</in>
+                    <in>decorator.cpp</in>
+                    <in>execution_monitor.cpp</in>
+                    <in>framework.cpp</in>
+                    <in>junit_log_formatter.cpp</in>
+                    <in>plain_report_formatter.cpp</in>
+                    <in>progress_monitor.cpp</in>
+                    <in>results_collector.cpp</in>
+                    <in>results_reporter.cpp</in>
+                    <in>test_framework_init_observer.cpp</in>
+                    <in>test_main.cpp</in>
+                    <in>test_tools.cpp</in>
+                    <in>test_tree.cpp</in>
+                    <in>unit_test_log.cpp</in>
+                    <in>unit_test_main.cpp</in>
+                    <in>unit_test_monitor.cpp</in>
+                    <in>unit_test_parameters.cpp</in>
+                    <in>xml_log_formatter.cpp</in>
+                    <in>xml_report_formatter.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="execution_monitor-ts">
+                      <in>boost_exception-test.cpp</in>
+                      <in>custom-exception-test.cpp</in>
+                      <in>errors-handling-test.cpp</in>
+                    </df>
+                    <df name="framework-ts">
+                      <in>check-streams-on-exit.cpp</in>
+                      <in>decorators-datatestcase-test.cpp</in>
+                      <in>log-count-skipped-test.cpp</in>
+                      <in>log-formatter-test.cpp</in>
+                      <in>master-test-suite-non-copyable-test.cpp</in>
+                      <in>message-in-datatestcase-test.cpp</in>
+                      <in>result-report-test.cpp</in>
+                      <in>run-by-name-or-label-test.cpp</in>
+                      <in>test-macro-global-fixture.cpp</in>
+                      <in>version-uses-module-name.cpp</in>
+                    </df>
+                    <df name="multithreading-ts">
+                      <in>sync-access-test.cpp</in>
+                    </df>
+                    <df name="prg_exec_monitor-ts">
+                      <in>result-code-test.cpp</in>
+                      <in>system-exception-test.cpp</in>
+                      <in>uncatched-exception-test.cpp</in>
+                      <in>user-fatal-exception-test.cpp</in>
+                    </df>
+                    <df name="smoke-ts">
+                      <in>basic-smoke-test.cpp</in>
+                      <in>basic-smoke-test2.cpp</in>
+                      <in>basic-smoke-test3.cpp</in>
+                      <in>basic-smoke-test4.cpp</in>
+                    </df>
+                    <df name="test-organization-ts">
+                      <df name="datasets-test">
+                        <in>array-test.cpp</in>
+                        <in>collection-test.cpp</in>
+                        <in>implicit-test.cpp</in>
+                        <in>initializer_list-test.cpp</in>
+                        <in>mono-grid-test.cpp</in>
+                        <in>mono-join-test.cpp</in>
+                        <in>mono-zip-test.cpp</in>
+                        <in>random-test.cpp</in>
+                        <in>seed-test.cpp</in>
+                        <in>singleton-test.cpp</in>
+                        <in>test_case_interface-test.cpp</in>
+                        <in>xrange-test.cpp</in>
+                      </df>
+                      <in>dataset-master-test-suite-accessible-test.cpp</in>
+                      <in>dataset-variadic_and_move_semantic-test.cpp</in>
+                      <in>parameterized_test-test.cpp</in>
+                      <in>test-tree-management-test.cpp</in>
+                      <in>test-tree-several-suite-decl.cpp</in>
+                      <in>test_case_template-test.cpp</in>
+                      <in>test_case_template-with-tuples-test.cpp</in>
+                      <in>test_case_template-with-variadic-typelist.cpp</in>
+                      <in>test_unit-nested-suite-dependency.cpp</in>
+                      <in>test_unit-order-shuffled-test.cpp</in>
+                      <in>test_unit-order-test.cpp</in>
+                      <in>test_unit-report-clashing-names.cpp</in>
+                      <in>test_unit-sanitize-names.cpp</in>
+                      <in>test_unit-several-ts-same-name.cpp</in>
+                    </df>
+                    <df name="usage-variants-ts">
+                      <in>shared-library-custom-init-test.cpp</in>
+                      <in>shared-library-custom-main-test.cpp</in>
+                      <in>shared-library-test.cpp</in>
+                      <in>single-header-custom-init-test.cpp</in>
+                      <in>single-header-custom-main-test.cpp</in>
+                      <in>single-header-multiunit-1-test.cpp</in>
+                      <in>single-header-multiunit-2-test.cpp</in>
+                      <in>single-header-test.cpp</in>
+                      <in>static-library-custom-init-test.cpp</in>
+                      <in>static-library-test.cpp</in>
+                    </df>
+                    <df name="utils-ts">
+                      <in>algorithm-test.cpp</in>
+                      <in>basic_cstring-test.cpp</in>
+                      <in>class_properties-test.cpp</in>
+                      <in>foreach-test.cpp</in>
+                      <in>named_params-test.cpp</in>
+                      <in>runtime-param-test.cpp</in>
+                      <in>string_cast-test.cpp</in>
+                      <in>token_iterator-test.cpp</in>
+                    </df>
+                    <df name="writing-test-ts">
+                      <in>assertion-construction-test.cpp</in>
+                      <in>boost_check_equal-str-test.cpp</in>
+                      <in>collection-comparison-test.cpp</in>
+                      <in>dont_print_log_value-test.cpp</in>
+                      <in>fp-comparisons-test.cpp</in>
+                      <in>fp-multiprecision-comparison-test.cpp</in>
+                      <in>fp-no-comparison-for-incomplete-types-test.cpp</in>
+                      <in>fp-relational-operator.cpp</in>
+                      <in>nullptr-support-test.cpp</in>
+                      <in>output_test_stream-test.cpp</in>
+                      <in>test-dataset-over-tuples.cpp</in>
+                      <in>test-fixture-detect-setup-teardown-cpp11.cpp</in>
+                      <in>test-fixture-detect-setup-teardown.cpp</in>
+                      <in>test-timeout-fail.cpp</in>
+                      <in>test-timeout-suite-fail.cpp</in>
+                      <in>test-timeout-suite.cpp</in>
+                      <in>test-timeout.cpp</in>
+                      <in>test-with-precondition.cpp</in>
+                      <in>test_tools-test.cpp</in>
+                      <in>tools-debuggable-test.cpp</in>
+                      <in>tools-under-debugger-test.cpp</in>
+                      <in>user-defined-types-logging-customization-points.cpp</in>
+                      <in>windows-headers-test.cpp</in>
+                    </df>
+                    <in>selfcontained.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <df name="console_test_runner">
+                      <df name="src">
+                        <in>console_test_runner.cpp</in>
+                      </df>
+                      <df name="test">
+                        <in>test_runner_test.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                </df>
+                <df name="thread">
+                  <df name="build">
+                    <in>has_atomic_flag_lockfree_test.cpp</in>
+                  </df>
+                  <df name="example">
+                    <in>ba_externallly_locked.cpp</in>
+                    <in>condition.cpp</in>
+                    <in>default_executor.cpp</in>
+                    <in>executor.cpp</in>
+                    <in>fib_task_region.cpp</in>
+                    <in>future_fallback_to.cpp</in>
+                    <in>future_then.cpp</in>
+                    <in>future_unwrap.cpp</in>
+                    <in>future_when_all.cpp</in>
+                    <in>generic_executor_ref.cpp</in>
+                    <in>lambda_future.cpp</in>
+                    <in>make_future.cpp</in>
+                    <in>monitor.cpp</in>
+                    <in>mutex.cpp</in>
+                    <in>not_interleaved.cpp</in>
+                    <in>not_interleaved2.cpp</in>
+                    <in>once.cpp</in>
+                    <in>parallel_accumulate.cpp</in>
+                    <in>parallel_quick_sort.cpp</in>
+                    <in>perf_condition_variable.cpp</in>
+                    <in>perf_shared_mutex.cpp</in>
+                    <in>producer_consumer.cpp</in>
+                    <in>producer_consumer2.cpp</in>
+                    <in>producer_consumer_bounded.cpp</in>
+                    <in>recursive_mutex.cpp</in>
+                    <in>scoped_thread.cpp</in>
+                    <in>serial_executor.cpp</in>
+                    <in>serial_executor_cont.cpp</in>
+                    <in>shared_monitor.cpp</in>
+                    <in>shared_mutex.cpp</in>
+                    <in>starvephil.cpp</in>
+                    <in>std_scoped_thread.cpp</in>
+                    <in>std_thread_guard.cpp</in>
+                    <in>strict_lock.cpp</in>
+                    <in>synchronized_person.cpp</in>
+                    <in>synchronized_value.cpp</in>
+                    <in>tennis.cpp</in>
+                    <in>this_executor.cpp</in>
+                    <in>thread.cpp</in>
+                    <in>thread_group.cpp</in>
+                    <in>thread_guard.cpp</in>
+                    <in>thread_pool.cpp</in>
+                    <in>tss.cpp</in>
+                    <in>user_scheduler.cpp</in>
+                    <in>with_lock_guard.cpp</in>
+                    <in>xtime.cpp</in>
+                  </df>
+                  <df name="src">
+                    <df name="pthread">
+                      <in>once.cpp</in>
+                      <in>once_atomic.cpp</in>
+                      <in>thread.cpp</in>
+                    </df>
+                    <df name="win32">
+                      <in>thread.cpp</in>
+                      <in>thread_primitives.cpp</in>
+                      <in>tss_dll.cpp</in>
+                      <in>tss_pe.cpp</in>
+                    </df>
+                    <in>future.cpp</in>
+                    <in>tss_null.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="experimental">
+                      <df name="parallel">
+                        <df name="v1">
+                          <in>exception_list_pass.cpp</in>
+                        </df>
+                        <df name="v2">
+                          <in>task_region_pass.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="functional">
+                      <df name="invoke">
+                        <in>invoke_int_0_pass.cpp</in>
+                        <in>invoke_lvalue_pass.cpp</in>
+                        <in>invoke_rvalue_pass.cpp</in>
+                      </df>
+                      <df name="invoker">
+                        <in>invoker_int_0_pass.cpp</in>
+                        <in>invoker_lvalue_pass.cpp</in>
+                        <in>invoker_rvalue_pass.cpp</in>
+                      </df>
+                    </df>
+                    <df name="sync">
+                      <df name="conditions">
+                        <df name="condition_variable">
+                          <in>assign_fail.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>dtor_pass.cpp</in>
+                          <in>lost_notif_pass.cpp</in>
+                          <in>native_handle_pass.cpp</in>
+                          <in>wait_for_pass.cpp</in>
+                          <in>wait_for_pred_pass.cpp</in>
+                          <in>wait_pass.cpp</in>
+                          <in>wait_until_pass.cpp</in>
+                          <in>wait_until_pred_pass.cpp</in>
+                        </df>
+                        <df name="condition_variable_any">
+                          <in>assign_fail.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>dtor_pass.cpp</in>
+                          <in>lost_notif_pass.cpp</in>
+                          <in>wait_for_pass.cpp</in>
+                          <in>wait_for_pred_pass.cpp</in>
+                          <in>wait_until_pass.cpp</in>
+                          <in>wait_until_pred_pass.cpp</in>
+                        </df>
+                        <df name="cv_status">
+                          <in>cv_status_pass.cpp</in>
+                        </df>
+                        <in>notify_all_at_thread_exit_pass.cpp</in>
+                      </df>
+                      <df name="futures">
+                        <df name="async">
+                          <in>async_executor_pass.cpp</in>
+                          <in>async_pass.cpp</in>
+                        </df>
+                        <df name="future">
+                          <in>async_deferred_then_pass.cpp</in>
+                          <in>copy_assign_fail.cpp</in>
+                          <in>copy_ctor_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>dtor_pass.cpp</in>
+                          <in>get_or_pass.cpp</in>
+                          <in>get_pass.cpp</in>
+                          <in>move_assign_pass.cpp</in>
+                          <in>move_ctor_pass.cpp</in>
+                          <in>share_pass.cpp</in>
+                          <in>then_deferred_pass.cpp</in>
+                          <in>then_executor_pass.cpp</in>
+                          <in>then_pass.cpp</in>
+                          <in>wait_for_pass.cpp</in>
+                          <in>wait_pass.cpp</in>
+                          <in>wait_until_pass.cpp</in>
+                        </df>
+                        <df name="packaged_task">
+                          <in>alloc_ctor_pass.cpp</in>
+                          <in>copy_assign_fail.cpp</in>
+                          <in>copy_ctor_fail.cpp</in>
+                          <in>default_ctor_pass.cpp</in>
+                          <in>dtor_pass.cpp</in>
+                          <in>func_ctor_pass.cpp</in>
+                          <in>get_future_pass.cpp</in>
+                          <in>make_ready_at_thread_exit_pass.cpp</in>
+                          <in>member_swap_pass.cpp</in>
+                          <in>move_assign_pass.cpp</in>
+                          <in>move_ctor_pass.cpp</in>
+                          <in>non_member_swap_pass.cpp</in>
+                          <in>operator_pass.cpp</in>
+                          <in>reset_pass.cpp</in>
+                          <in>types_pass.cpp</in>
+                          <in>use_allocator_pass.cpp</in>
+                        </df>
+                        <df name="promise">
+                          <in>alloc_ctor_pass.cpp</in>
+                          <in>copy_assign_fail.cpp</in>
+                          <in>copy_ctor_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>dtor_pass.cpp</in>
+                          <in>emplace_pass.cpp</in>
+                          <in>get_future_pass.cpp</in>
+                          <in>move_assign_pass.cpp</in>
+                          <in>move_ctor_pass.cpp</in>
+                          <in>set_exception_at_thread_exit_pass.cpp</in>
+                          <in>set_exception_pass.cpp</in>
+                          <in>set_lvalue_at_thread_exit_pass.cpp</in>
+                          <in>set_lvalue_pass.cpp</in>
+                          <in>set_rvalue_at_thread_exit_pass.cpp</in>
+                          <in>set_rvalue_pass.cpp</in>
+                          <in>set_value_at_thread_exit_const_pass.cpp</in>
+                          <in>set_value_at_thread_exit_void_pass.cpp</in>
+                          <in>set_value_const_pass.cpp</in>
+                          <in>set_value_void_pass.cpp</in>
+                          <in>use_allocator_pass.cpp</in>
+                        </df>
+                        <df name="shared_future">
+                          <in>copy_assign_pass.cpp</in>
+                          <in>copy_ctor_pass.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>dtor_pass.cpp</in>
+                          <in>get_pass.cpp</in>
+                          <in>move_assign_pass.cpp</in>
+                          <in>move_ctor_pass.cpp</in>
+                          <in>then_executor_pass.cpp</in>
+                          <in>then_pass.cpp</in>
+                          <in>wait_for_pass.cpp</in>
+                          <in>wait_pass.cpp</in>
+                          <in>wait_until_pass.cpp</in>
+                        </df>
+                        <df name="when_all">
+                          <in>iterators_pass.cpp</in>
+                          <in>none_pass.cpp</in>
+                          <in>one_pass.cpp</in>
+                          <in>variadic_pass.cpp</in>
+                        </df>
+                        <df name="when_any">
+                          <in>iterators_pass.cpp</in>
+                          <in>none_pass.cpp</in>
+                          <in>one_pass.cpp</in>
+                          <in>variadic_pass.cpp</in>
+                        </df>
+                        <in>make_ready_future_pass.cpp</in>
+                      </df>
+                      <df name="mutual_exclusion">
+                        <df name="deque_views">
+                          <in>single_thread_pass.cpp</in>
+                        </df>
+                        <df name="locks">
+                          <df name="lock_guard">
+                            <in>adopt_lock_pass.cpp</in>
+                            <in>copy_assign_fail.cpp</in>
+                            <in>copy_ctor_fail.cpp</in>
+                            <in>default_pass.cpp</in>
+                            <in>lock_guard_adopt_lock_compile_fail.cpp</in>
+                            <in>lock_guard_adopt_lock_compile_pass.cpp</in>
+                            <in>lock_guard_compile_fail.cpp</in>
+                            <in>lock_guard_compile_pass.cpp</in>
+                            <in>make_lock_guard_adopt_lock_pass.cpp</in>
+                            <in>make_lock_guard_pass.cpp</in>
+                            <in>types_pass.cpp</in>
+                          </df>
+                          <df name="nested_strict_lock">
+                            <in>copy_assign_fail.cpp</in>
+                            <in>copy_ctor_fail.cpp</in>
+                            <in>default_pass.cpp</in>
+                            <in>make_nested_strict_lock_pass.cpp</in>
+                            <in>owns_lock_pass.cpp</in>
+                            <in>types_pass.cpp</in>
+                          </df>
+                          <df name="reverse_lock">
+                            <in>copy_assign_fail.cpp</in>
+                            <in>copy_ctor_fail.cpp</in>
+                            <in>types_pass.cpp</in>
+                            <in>unique_lock_ctor_pass.cpp</in>
+                          </df>
+                          <df name="shared_lock">
+                            <df name="cons">
+                              <in>adopt_lock_pass.cpp</in>
+                              <in>copy_assign_fail.cpp</in>
+                              <in>copy_ctor_fail.cpp</in>
+                              <in>default_pass.cpp</in>
+                              <in>defer_lock_pass.cpp</in>
+                              <in>duration_pass.cpp</in>
+                              <in>move_assign_pass.cpp</in>
+                              <in>move_ctor_pass.cpp</in>
+                              <in>move_ctor_unique_lock_pass.cpp</in>
+                              <in>move_ctor_upgrade_lock_pass.cpp</in>
+                              <in>mutex_pass.cpp</in>
+                              <in>time_point_pass.cpp</in>
+                              <in>try_to_lock_pass.cpp</in>
+                            </df>
+                            <df name="locking">
+                              <in>lock_pass.cpp</in>
+                              <in>try_lock_for_pass.cpp</in>
+                              <in>try_lock_pass.cpp</in>
+                              <in>try_lock_until_pass.cpp</in>
+                              <in>unlock_pass.cpp</in>
+                            </df>
+                            <df name="mod">
+                              <in>member_swap_pass.cpp</in>
+                              <in>non_member_swap_pass.cpp</in>
+                              <in>release_pass.cpp</in>
+                            </df>
+                            <df name="obs">
+                              <in>mutex_pass.cpp</in>
+                              <in>op_bool_pass.cpp</in>
+                              <in>owns_lock_pass.cpp</in>
+                            </df>
+                            <in>types_pass.cpp</in>
+                          </df>
+                          <df name="shared_lock_guard">
+                            <in>adopt_lock_pass.cpp</in>
+                            <in>copy_assign_fail.cpp</in>
+                            <in>copy_ctor_fail.cpp</in>
+                            <in>default_pass.cpp</in>
+                            <in>types_pass.cpp</in>
+                          </df>
+                          <df name="strict_lock">
+                            <in>copy_assign_fail.cpp</in>
+                            <in>copy_ctor_fail.cpp</in>
+                            <in>default_pass.cpp</in>
+                            <in>make_strict_lock_pass.cpp</in>
+                            <in>owns_lock_pass.cpp</in>
+                            <in>types_pass.cpp</in>
+                          </df>
+                          <df name="unique_lock">
+                            <df name="cons">
+                              <in>adopt_lock_pass.cpp</in>
+                              <in>copy_assign_fail.cpp</in>
+                              <in>copy_ctor_fail.cpp</in>
+                              <in>default_pass.cpp</in>
+                              <in>defer_lock_pass.cpp</in>
+                              <in>duration_pass.cpp</in>
+                              <in>make_unique_lock_adopt_lock_pass.cpp</in>
+                              <in>make_unique_lock_defer_lock_pass.cpp</in>
+                              <in>make_unique_lock_mutex_pass.cpp</in>
+                              <in>make_unique_lock_try_to_lock_pass.cpp</in>
+                              <in>make_unique_locks_mutex_pass.cpp</in>
+                              <in>move_assign_pass.cpp</in>
+                              <in>move_ctor_pass.cpp</in>
+                              <in>move_ctor_shared_lock_for_pass.cpp</in>
+                              <in>move_ctor_shared_lock_try_pass.cpp</in>
+                              <in>move_ctor_shared_lock_until_pass.cpp</in>
+                              <in>move_ctor_upgrade_lock_for_pass.cpp</in>
+                              <in>move_ctor_upgrade_lock_pass.cpp</in>
+                              <in>move_ctor_upgrade_lock_try_pass.cpp</in>
+                              <in>move_ctor_upgrade_lock_until_pass.cpp</in>
+                              <in>mutex_pass.cpp</in>
+                              <in>time_point_pass.cpp</in>
+                              <in>try_to_lock_pass.cpp</in>
+                            </df>
+                            <df name="locking">
+                              <in>lock_pass.cpp</in>
+                              <in>try_lock_for_pass.cpp</in>
+                              <in>try_lock_pass.cpp</in>
+                              <in>try_lock_until_pass.cpp</in>
+                              <in>unlock_pass.cpp</in>
+                            </df>
+                            <df name="mod">
+                              <in>member_swap_pass.cpp</in>
+                              <in>non_member_swap_pass.cpp</in>
+                              <in>release_pass.cpp</in>
+                            </df>
+                            <df name="obs">
+                              <in>mutex_pass.cpp</in>
+                              <in>op_bool_pass.cpp</in>
+                              <in>op_int_fail.cpp</in>
+                              <in>owns_lock_pass.cpp</in>
+                            </df>
+                            <in>types_pass.cpp</in>
+                          </df>
+                          <df name="upgrade_lock">
+                            <df name="cons">
+                              <in>adopt_lock_pass.cpp</in>
+                              <in>copy_assign_fail.cpp</in>
+                              <in>copy_ctor_fail.cpp</in>
+                              <in>default_pass.cpp</in>
+                              <in>defer_lock_pass.cpp</in>
+                              <in>duration_pass.cpp</in>
+                              <in>move_assign_pass.cpp</in>
+                              <in>move_ctor_pass.cpp</in>
+                              <in>move_ctor_shared_lock_for_pass.cpp</in>
+                              <in>move_ctor_shared_lock_try_pass.cpp</in>
+                              <in>move_ctor_shared_lock_until_pass.cpp</in>
+                              <in>move_ctor_unique_lock_pass.cpp</in>
+                              <in>mutex_pass.cpp</in>
+                              <in>time_point_pass.cpp</in>
+                              <in>try_to_lock_pass.cpp</in>
+                            </df>
+                            <df name="locking">
+                              <in>lock_pass.cpp</in>
+                              <in>try_lock_for_pass.cpp</in>
+                              <in>try_lock_pass.cpp</in>
+                              <in>try_lock_until_pass.cpp</in>
+                              <in>unlock_pass.cpp</in>
+                            </df>
+                            <df name="mod">
+                              <in>member_swap_pass.cpp</in>
+                              <in>non_member_swap_pass.cpp</in>
+                              <in>release_pass.cpp</in>
+                            </df>
+                            <df name="obs">
+                              <in>mutex_pass.cpp</in>
+                              <in>op_bool_pass.cpp</in>
+                              <in>owns_lock_pass.cpp</in>
+                            </df>
+                            <in>types_pass.cpp</in>
+                          </df>
+                        </df>
+                        <df name="mutex">
+                          <in>assign_fail.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>lock_compile_fail.cpp</in>
+                          <in>lock_compile_pass.cpp</in>
+                          <in>lock_pass.cpp</in>
+                          <in>native_handle_pass.cpp</in>
+                          <in>try_lock_compile_fail.cpp</in>
+                          <in>try_lock_compile_pass.cpp</in>
+                          <in>try_lock_pass.cpp</in>
+                        </df>
+                        <df name="null_mutex">
+                          <in>assign_fail.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>lock_pass.cpp</in>
+                          <in>try_lock_for_pass.cpp</in>
+                          <in>try_lock_pass.cpp</in>
+                          <in>try_lock_until_pass.cpp</in>
+                        </df>
+                        <df name="once">
+                          <df name="call_once">
+                            <in>call_once_pass.cpp</in>
+                          </df>
+                        </df>
+                        <df name="queue_views">
+                          <in>single_thread_pass.cpp</in>
+                        </df>
+                        <df name="recursive_mutex">
+                          <in>assign_fail.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>lock_pass.cpp</in>
+                          <in>native_handle_pass.cpp</in>
+                          <in>try_lock_pass.cpp</in>
+                        </df>
+                        <df name="recursive_timed_mutex">
+                          <in>assign_fail.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>lock_pass.cpp</in>
+                          <in>native_handle_pass.cpp</in>
+                          <in>try_lock_for_pass.cpp</in>
+                          <in>try_lock_pass.cpp</in>
+                          <in>try_lock_until_pass.cpp</in>
+                        </df>
+                        <df name="shared_mutex">
+                          <in>assign_fail.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>lock_pass.cpp</in>
+                          <in>try_lock_for_pass.cpp</in>
+                          <in>try_lock_pass.cpp</in>
+                          <in>try_lock_until_pass.cpp</in>
+                        </df>
+                        <df name="sync_bounded_queue">
+                          <in>multi_thread_pass.cpp</in>
+                          <in>single_thread_pass.cpp</in>
+                        </df>
+                        <df name="sync_deque">
+                          <in>multi_thread_pass.cpp</in>
+                          <in>single_thread_pass.cpp</in>
+                        </df>
+                        <df name="sync_pq">
+                          <in>pq_multi_thread_pass.cpp</in>
+                          <in>pq_single_thread_pass.cpp</in>
+                          <in>tq_multi_thread_pass.cpp</in>
+                          <in>tq_single_thread_pass.cpp</in>
+                        </df>
+                        <df name="sync_queue">
+                          <in>multi_thread_pass.cpp</in>
+                          <in>single_thread_pass.cpp</in>
+                        </df>
+                        <df name="synchronized_value">
+                          <in>call_pass.cpp</in>
+                          <in>copy_T_assign_pass.cpp</in>
+                          <in>copy_T_ctor_pass.cpp</in>
+                          <in>copy_assign_pass.cpp</in>
+                          <in>copy_ctor_pass.cpp</in>
+                          <in>default_ctor_pass.cpp</in>
+                          <in>indirect_pass.cpp</in>
+                          <in>move_T_assign_pass.cpp</in>
+                          <in>move_T_ctor_pass.cpp</in>
+                          <in>move_assign_pass.cpp</in>
+                          <in>move_ctor_pass.cpp</in>
+                          <in>swap_T_pass.cpp</in>
+                          <in>swap_pass.cpp</in>
+                          <in>synchronize_pass.cpp</in>
+                        </df>
+                        <df name="timed_mutex">
+                          <in>assign_fail.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>lock_pass.cpp</in>
+                          <in>native_handle_pass.cpp</in>
+                          <in>try_lock_for_pass.cpp</in>
+                          <in>try_lock_pass.cpp</in>
+                          <in>try_lock_until_pass.cpp</in>
+                        </df>
+                        <df name="with_lock_guard">
+                          <in>with_lock_guard_bind.cpp</in>
+                          <in>with_lock_guard_lambda.cpp</in>
+                          <in>with_lock_guard_move.cpp</in>
+                          <in>with_lock_guard_simple.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="threads">
+                      <df name="container">
+                        <in>thread_ptr_list_pass.cpp</in>
+                        <in>thread_vector_pass.cpp</in>
+                      </df>
+                      <df name="this_thread">
+                        <df name="get_id">
+                          <in>get_id_pass.cpp</in>
+                        </df>
+                        <df name="sleep_for">
+                          <in>sleep_for_pass.cpp</in>
+                        </df>
+                        <df name="sleep_until">
+                          <in>sleep_until_pass.cpp</in>
+                        </df>
+                      </df>
+                      <df name="thread">
+                        <df name="assign">
+                          <in>copy_fail.cpp</in>
+                          <in>move_pass.cpp</in>
+                        </df>
+                        <df name="constr">
+                          <in>FArgs_pass.cpp</in>
+                          <in>F_pass.cpp</in>
+                          <in>FrvalueArgs_pass.cpp</in>
+                          <in>Frvalue_pass.cpp</in>
+                          <in>copy_fail.cpp</in>
+                          <in>default_pass.cpp</in>
+                          <in>lambda_pass.cpp</in>
+                          <in>move_pass.cpp</in>
+                        </df>
+                        <df name="destr">
+                          <in>dtor_pass.cpp</in>
+                        </df>
+                        <df name="id">
+                          <in>hash_pass.cpp</in>
+                        </df>
+                        <df name="members">
+                          <in>detach_pass.cpp</in>
+                          <in>get_id_pass.cpp</in>
+                          <in>join_pass.cpp</in>
+                          <in>joinable_pass.cpp</in>
+                          <in>native_handle_pass.cpp</in>
+                          <in>swap_pass.cpp</in>
+                          <in>try_join_for_pass.cpp</in>
+                          <in>try_join_until_pass.cpp</in>
+                        </df>
+                        <df name="non_members">
+                          <in>swap_pass.cpp</in>
+                        </df>
+                        <df name="static">
+                          <in>hardware_concurrency_pass.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <in>no_implicit_assign_from_lvalue_thread.cpp</in>
+                    <in>no_implicit_move_from_lvalue_thread.cpp</in>
+                    <in>self_contained_header.cpp</in>
+                    <in>test_10340.cpp</in>
+                    <in>test_10963.cpp</in>
+                    <in>test_10964.cpp</in>
+                    <in>test_11053.cpp</in>
+                    <in>test_11256.cpp</in>
+                    <in>test_11266.cpp</in>
+                    <in>test_11499.cpp</in>
+                    <in>test_11611.cpp</in>
+                    <in>test_11796.cpp</in>
+                    <in>test_11818.cpp</in>
+                    <in>test_12293.cpp</in>
+                    <in>test_12949.cpp</in>
+                    <in>test_13480b.cpp</in>
+                    <in>test_13561.cpp</in>
+                    <in>test_2309.cpp</in>
+                    <in>test_2501.cpp</in>
+                    <in>test_2741.cpp</in>
+                    <in>test_3628.cpp</in>
+                    <in>test_3837.cpp</in>
+                    <in>test_4521.cpp</in>
+                    <in>test_4648.cpp</in>
+                    <in>test_4882.cpp</in>
+                    <in>test_5351.cpp</in>
+                    <in>test_5502.cpp</in>
+                    <in>test_5542_1.cpp</in>
+                    <in>test_5542_2.cpp</in>
+                    <in>test_5542_3.cpp</in>
+                    <in>test_5891.cpp</in>
+                    <in>test_6130.cpp</in>
+                    <in>test_6170.cpp</in>
+                    <in>test_6174.cpp</in>
+                    <in>test_7160.cpp</in>
+                    <in>test_7328.cpp</in>
+                    <in>test_7571.cpp</in>
+                    <in>test_7665.cpp</in>
+                    <in>test_7666.cpp</in>
+                    <in>test_7720.cpp</in>
+                    <in>test_7755.cpp</in>
+                    <in>test_8455.cpp</in>
+                    <in>test_8508.cpp</in>
+                    <in>test_8557.cpp</in>
+                    <in>test_8586.cpp</in>
+                    <in>test_8596.cpp</in>
+                    <in>test_8600.cpp</in>
+                    <in>test_8674.cpp</in>
+                    <in>test_8943.cpp</in>
+                    <in>test_8960.cpp</in>
+                    <in>test_9079_a.cpp</in>
+                    <in>test_9079_b.cpp</in>
+                    <in>test_9192.cpp</in>
+                    <in>test_9303.cpp</in>
+                    <in>test_9319.cpp</in>
+                    <in>test_9711.cpp</in>
+                    <in>test_9856.cpp</in>
+                    <in>test_barrier.cpp</in>
+                    <in>test_barrier_size_fct.cpp</in>
+                    <in>test_barrier_void_fct.cpp</in>
+                    <in>test_completion_latch.cpp</in>
+                    <in>test_condition.cpp</in>
+                    <in>test_condition_notify_all.cpp</in>
+                    <in>test_condition_notify_one.cpp</in>
+                    <in>test_condition_timed_wait_times_out.cpp</in>
+                    <in>test_futures.cpp</in>
+                    <in>test_generic_locks.cpp</in>
+                    <in>test_hardware_concurrency.cpp</in>
+                    <in>test_latch.cpp</in>
+                    <in>test_lock_concept.cpp</in>
+                    <in>test_ml.cpp</in>
+                    <in>test_ml2.cpp</in>
+                    <in>test_move_function.cpp</in>
+                    <in>test_mutex.cpp</in>
+                    <in>test_once.cpp</in>
+                    <in>test_physical_concurrency.cpp</in>
+                    <in>test_scheduled_tp.cpp</in>
+                    <in>test_scheduler.cpp</in>
+                    <in>test_scheduling_adaptor.cpp</in>
+                    <in>test_shared_mutex.cpp</in>
+                    <in>test_shared_mutex_part_2.cpp</in>
+                    <in>test_shared_mutex_timed_locks.cpp</in>
+                    <in>test_shared_mutex_timed_locks_chrono.cpp</in>
+                    <in>test_thread.cpp</in>
+                    <in>test_thread_exit.cpp</in>
+                    <in>test_thread_id.cpp</in>
+                    <in>test_thread_launching.cpp</in>
+                    <in>test_thread_mf.cpp</in>
+                    <in>test_thread_move.cpp</in>
+                    <in>test_thread_move_return.cpp</in>
+                    <in>test_thread_return_local.cpp</in>
+                    <in>test_time_jumps.cpp</in>
+                    <in>test_tss.cpp</in>
+                    <in>test_xtime.cpp</in>
+                    <in>winrt_init.cpp</in>
+                  </df>
+                  <df name="tutorial">
+                    <in>bounded_buffer.cpp</in>
+                    <in>counter.cpp</in>
+                    <in>factorial.cpp</in>
+                    <in>factorial2.cpp</in>
+                    <in>factorial3.cpp</in>
+                    <in>helloworld.cpp</in>
+                    <in>helloworld2.cpp</in>
+                    <in>helloworld3.cpp</in>
+                    <in>once.cpp</in>
+                    <in>tss.cpp</in>
+                  </df>
+                </df>
+                <df name="throw_exception">
+                  <df name="test">
+                    <df name="cmake_install_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="cmake_subdir_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>lib1_throw.cpp</in>
+                    <in>lib2_throw.cpp</in>
+                    <in>lib3_throw.cpp</in>
+                    <in>make_exception_ptr_nx_test.cpp</in>
+                    <in>make_exception_ptr_nx_test2.cpp</in>
+                    <in>make_exception_ptr_test.cpp</in>
+                    <in>make_exception_ptr_test2.cpp</in>
+                    <in>throw_exception_fail.cpp</in>
+                    <in>throw_exception_no_both_test.cpp</in>
+                    <in>throw_exception_no_exceptions_test.cpp</in>
+                    <in>throw_exception_no_integration_test.cpp</in>
+                    <in>throw_exception_nx_test.cpp</in>
+                    <in>throw_exception_nx_test2.cpp</in>
+                    <in>throw_exception_nx_test3.cpp</in>
+                    <in>throw_exception_test.cpp</in>
+                    <in>throw_exception_test2.cpp</in>
+                    <in>throw_exception_test3.cpp</in>
+                    <in>throw_exception_test4.cpp</in>
+                    <in>throw_exception_test5.cpp</in>
+                    <in>throw_from_library_test.cpp</in>
+                  </df>
+                </df>
+                <df name="timer">
+                  <df name="example">
+                    <in>auto_cpu_timer_example.cpp</in>
+                    <in>timex.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>auto_timers_construction.cpp</in>
+                    <in>cpu_timer.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="cmake_install_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="cmake_subdir_test">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>chrono_conflict_test.cpp</in>
+                    <in>cpu_timer_info.cpp</in>
+                    <in>cpu_timer_test.cpp</in>
+                    <in>original_timer_test.cpp</in>
+                    <in>progress_display_test.cpp</in>
+                  </df>
+                </df>
+                <df name="tokenizer">
+                  <df name="example">
+                    <in>char_sep_example_1.cpp</in>
+                    <in>char_sep_example_2.cpp</in>
+                    <in>char_sep_example_3.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>examples.cpp</in>
+                    <in>simple_example_1.cpp</in>
+                    <in>simple_example_2.cpp</in>
+                    <in>simple_example_3.cpp</in>
+                    <in>simple_example_4.cpp</in>
+                    <in>simple_example_5.cpp</in>
+                  </df>
+                </df>
+                <df name="tti">
+                  <df name="test">
+                    <in>test_function_template_works.cpp</in>
+                    <in>test_has_class.cpp</in>
+                    <in>test_has_data.cpp</in>
+                    <in>test_has_data_compile.cpp</in>
+                    <in>test_has_data_fail.cpp</in>
+                    <in>test_has_data_fail2.cpp</in>
+                    <in>test_has_data_fail3.cpp</in>
+                    <in>test_has_data_fail4.cpp</in>
+                    <in>test_has_data_fail5.cpp</in>
+                    <in>test_has_data_fail6.cpp</in>
+                    <in>test_has_enum.cpp</in>
+                    <in>test_has_fun.cpp</in>
+                    <in>test_has_fun_compile.cpp</in>
+                    <in>test_has_fun_fail.cpp</in>
+                    <in>test_has_fun_fail2.cpp</in>
+                    <in>test_has_fun_fail3.cpp</in>
+                    <in>test_has_fun_fail4.cpp</in>
+                    <in>test_has_fun_fail5.cpp</in>
+                    <in>test_has_fun_template.cpp</in>
+                    <in>test_has_fun_template_compile.cpp</in>
+                    <in>test_has_fun_template_fail.cpp</in>
+                    <in>test_has_fun_template_fail2.cpp</in>
+                    <in>test_has_fun_template_fail3.cpp</in>
+                    <in>test_has_mem_data.cpp</in>
+                    <in>test_has_mem_data2.cpp</in>
+                    <in>test_has_mem_data_compile.cpp</in>
+                    <in>test_has_mem_data_fail.cpp</in>
+                    <in>test_has_mem_data_fail2.cpp</in>
+                    <in>test_has_mem_data_fail3.cpp</in>
+                    <in>test_has_mem_fun.cpp</in>
+                    <in>test_has_mem_fun_compile.cpp</in>
+                    <in>test_has_mem_fun_cv.cpp</in>
+                    <in>test_has_mem_fun_cv_compile.cpp</in>
+                    <in>test_has_mem_fun_cv_fail.cpp</in>
+                    <in>test_has_mem_fun_cv_fail2.cpp</in>
+                    <in>test_has_mem_fun_cv_fail3.cpp</in>
+                    <in>test_has_mem_fun_cv_fail4.cpp</in>
+                    <in>test_has_mem_fun_cv_fail5.cpp</in>
+                    <in>test_has_mem_fun_cv_fail6.cpp</in>
+                    <in>test_has_mem_fun_fail.cpp</in>
+                    <in>test_has_mem_fun_fail2.cpp</in>
+                    <in>test_has_mem_fun_fail3.cpp</in>
+                    <in>test_has_mem_fun_template.cpp</in>
+                    <in>test_has_mem_fun_template_compile.cpp</in>
+                    <in>test_has_mem_fun_template_cv.cpp</in>
+                    <in>test_has_mem_fun_template_cv_compile.cpp</in>
+                    <in>test_has_mem_fun_template_cv_fail.cpp</in>
+                    <in>test_has_mem_fun_template_cv_fail2.cpp</in>
+                    <in>test_has_mem_fun_template_cv_fail3.cpp</in>
+                    <in>test_has_mem_fun_template_fail.cpp</in>
+                    <in>test_has_mem_fun_template_fail2.cpp</in>
+                    <in>test_has_mem_fun_template_fail3.cpp</in>
+                    <in>test_has_member.cpp</in>
+                    <in>test_has_member_compile.cpp</in>
+                    <in>test_has_member_cv.cpp</in>
+                    <in>test_has_member_cv_compile.cpp</in>
+                    <in>test_has_member_cv_fail.cpp</in>
+                    <in>test_has_member_cv_fail2.cpp</in>
+                    <in>test_has_member_cv_fail3.cpp</in>
+                    <in>test_has_member_cv_fail4.cpp</in>
+                    <in>test_has_member_cv_fail5.cpp</in>
+                    <in>test_has_member_fail.cpp</in>
+                    <in>test_has_member_fail2.cpp</in>
+                    <in>test_has_member_fail3.cpp</in>
+                    <in>test_has_member_template.cpp</in>
+                    <in>test_has_member_template_compile.cpp</in>
+                    <in>test_has_member_template_cv.cpp</in>
+                    <in>test_has_member_template_cv_compile.cpp</in>
+                    <in>test_has_member_template_cv_fail.cpp</in>
+                    <in>test_has_member_template_cv_fail2.cpp</in>
+                    <in>test_has_member_template_cv_fail3.cpp</in>
+                    <in>test_has_member_template_fail.cpp</in>
+                    <in>test_has_member_template_fail2.cpp</in>
+                    <in>test_has_member_template_fail3.cpp</in>
+                    <in>test_has_static_mem_data.cpp</in>
+                    <in>test_has_static_mem_data_compile.cpp</in>
+                    <in>test_has_static_mem_data_fail.cpp</in>
+                    <in>test_has_static_mem_data_fail2.cpp</in>
+                    <in>test_has_static_mem_data_fail3.cpp</in>
+                    <in>test_has_static_mem_fun.cpp</in>
+                    <in>test_has_static_mem_fun_compile.cpp</in>
+                    <in>test_has_static_mem_fun_fail.cpp</in>
+                    <in>test_has_static_mem_fun_fail2.cpp</in>
+                    <in>test_has_static_mem_fun_template.cpp</in>
+                    <in>test_has_static_mem_fun_template_compile.cpp</in>
+                    <in>test_has_static_mem_fun_template_fail.cpp</in>
+                    <in>test_has_static_mem_fun_template_fail2.cpp</in>
+                    <in>test_has_static_member.cpp</in>
+                    <in>test_has_static_member_compile.cpp</in>
+                    <in>test_has_static_member_fail.cpp</in>
+                    <in>test_has_static_member_fail2.cpp</in>
+                    <in>test_has_static_member_template.cpp</in>
+                    <in>test_has_static_member_template_compile.cpp</in>
+                    <in>test_has_static_member_template_fail.cpp</in>
+                    <in>test_has_static_member_template_fail2.cpp</in>
+                    <in>test_has_template.cpp</in>
+                    <in>test_has_template_compile.cpp</in>
+                    <in>test_has_template_cp.cpp</in>
+                    <in>test_has_template_cp_compile.cpp</in>
+                    <in>test_has_template_cp_fail.cpp</in>
+                    <in>test_has_template_cp_fail2.cpp</in>
+                    <in>test_has_template_cp_fail3.cpp</in>
+                    <in>test_has_template_cp_fail4.cpp</in>
+                    <in>test_has_template_fail.cpp</in>
+                    <in>test_has_template_fail2.cpp</in>
+                    <in>test_has_template_fail3.cpp</in>
+                    <in>test_has_template_fail4.cpp</in>
+                    <in>test_has_type.cpp</in>
+                    <in>test_has_type_compile.cpp</in>
+                    <in>test_has_type_ct.cpp</in>
+                    <in>test_has_type_ct_compile.cpp</in>
+                    <in>test_has_type_ct_fail.cpp</in>
+                    <in>test_has_type_ct_fail2.cpp</in>
+                    <in>test_has_type_ct_fail3.cpp</in>
+                    <in>test_has_type_ct_fail4.cpp</in>
+                    <in>test_has_type_ct_fail5.cpp</in>
+                    <in>test_has_type_fail.cpp</in>
+                    <in>test_has_type_fail2.cpp</in>
+                    <in>test_has_type_fail3.cpp</in>
+                    <in>test_has_union.cpp</in>
+                    <in>test_mem_type.cpp</in>
+                    <in>test_mem_type_compile.cpp</in>
+                    <in>test_vm_has_template_cp.cpp</in>
+                    <in>test_vm_has_template_cp_compile.cpp</in>
+                    <in>test_vm_has_template_cp_fail.cpp</in>
+                    <in>test_vm_has_template_cp_fail2.cpp</in>
+                    <in>test_vm_has_template_cp_fail3.cpp</in>
+                    <in>test_vm_has_template_cp_fail4.cpp</in>
+                  </df>
+                </df>
+                <df name="tuple">
+                  <df name="test">
+                    <in>another_tuple_test_bench.cpp</in>
+                    <in>io_test.cpp</in>
+                    <in>std_tuple_element.cpp</in>
+                    <in>std_tuple_size.cpp</in>
+                    <in>structured_bindings.cpp</in>
+                    <in>tuple_test_bench.cpp</in>
+                  </df>
+                </df>
+                <df name="type_erasure">
+                  <df name="example">
+                    <in>associated.cpp</in>
+                    <in>basic.cpp</in>
+                    <in>compose.cpp</in>
+                    <in>concept_map.cpp</in>
+                    <in>construction.cpp</in>
+                    <in>convert.cpp</in>
+                    <in>custom.cpp</in>
+                    <in>multi.cpp</in>
+                    <in>multifunction.cpp</in>
+                    <in>overload.cpp</in>
+                    <in>print_sequence.cpp</in>
+                    <in>printf.cpp</in>
+                    <in>references.cpp</in>
+                  </df>
+                  <df name="src">
+                    <in>dynamic_binding.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>fail_any_cast_discard_const1.cpp</in>
+                    <in>fail_any_cast_discard_const2.cpp</in>
+                    <in>fail_any_cast_discard_const3.cpp</in>
+                    <in>fail_any_cast_discard_const4.cpp</in>
+                    <in>fail_any_cast_discard_const5.cpp</in>
+                    <in>fail_any_cast_discard_const6.cpp</in>
+                    <in>fail_any_cast_pointer_to_ref.cpp</in>
+                    <in>fail_any_cast_pointer_to_val.cpp</in>
+                    <in>fail_binding_convert_no_mapping.cpp</in>
+                    <in>fail_construct_mismatch.cpp</in>
+                    <in>fail_construct_mismatch_cref.cpp</in>
+                    <in>fail_construct_mismatch_ref.cpp</in>
+                    <in>fail_construct_mismatch_rref.cpp</in>
+                    <in>fail_cref_assign.cpp</in>
+                    <in>fail_default_construct.cpp</in>
+                    <in>fail_increment_discard_const.cpp</in>
+                    <in>fail_not_incrementable.cpp</in>
+                    <in>fail_ref_assign.cpp</in>
+                    <in>fail_ref_discard_const.cpp</in>
+                    <in>fail_ref_discard_const_convert.cpp</in>
+                    <in>fail_ref_discard_const_convert_cref.cpp</in>
+                    <in>fail_ref_discard_const_convert_ref.cpp</in>
+                    <in>fail_ref_discard_const_init.cpp</in>
+                    <in>fail_rref_assign.cpp</in>
+                    <in>test_add.cpp</in>
+                    <in>test_add_assign.cpp</in>
+                    <in>test_any_cast.cpp</in>
+                    <in>test_assign.cpp</in>
+                    <in>test_binding.cpp</in>
+                    <in>test_binding_of.cpp</in>
+                    <in>test_callable.cpp</in>
+                    <in>test_construct.cpp</in>
+                    <in>test_construct_cref.cpp</in>
+                    <in>test_construct_ref.cpp</in>
+                    <in>test_deduced.cpp</in>
+                    <in>test_dereference.cpp</in>
+                    <in>test_dynamic_any_cast.cpp</in>
+                    <in>test_equal.cpp</in>
+                    <in>test_forward_iterator.cpp</in>
+                    <in>test_free.cpp</in>
+                    <in>test_increment.cpp</in>
+                    <in>test_interface_order.cpp</in>
+                    <in>test_is_empty.cpp</in>
+                    <in>test_is_placeholder.cpp</in>
+                    <in>test_is_subconcept.cpp</in>
+                    <in>test_less.cpp</in>
+                    <in>test_limits.cpp</in>
+                    <in>test_member.cpp</in>
+                    <in>test_negate.cpp</in>
+                    <in>test_nested.cpp</in>
+                    <in>test_null.cpp</in>
+                    <in>test_param.cpp</in>
+                    <in>test_reference.cpp</in>
+                    <in>test_relaxed.cpp</in>
+                    <in>test_same_type.cpp</in>
+                    <in>test_sfinae.cpp</in>
+                    <in>test_stream.cpp</in>
+                    <in>test_subscript.cpp</in>
+                    <in>test_tuple.cpp</in>
+                    <in>test_typeid_of.cpp</in>
+                  </df>
+                </df>
+                <df name="type_index">
+                  <df name="examples">
+                    <in>constexpr14_namespace_check.cpp</in>
+                    <in>constexpr14_sort_check.cpp</in>
+                    <in>demangled_names.cpp</in>
+                    <in>exact_types_match.cpp</in>
+                    <in>inheritance.cpp</in>
+                    <in>registry.cpp</in>
+                    <in>runtime_cast.cpp</in>
+                    <in>table_of_names.cpp</in>
+                    <in>user_defined_typeinfo.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>compare_ctti_stl.cpp</in>
+                    <in>ctti_print_name.cpp</in>
+                    <in>test_lib.cpp</in>
+                    <in>test_lib_anonymous.cpp</in>
+                    <in>testing_crossmodule.cpp</in>
+                    <in>testing_crossmodule_anonymous.cpp</in>
+                    <in>track_13621.cpp</in>
+                    <in>type_index_constexpr_test.cpp</in>
+                    <in>type_index_runtime_cast_test.cpp</in>
+                    <in>type_index_test.cpp</in>
+                    <in>type_index_test_ctti_alignment.cpp</in>
+                    <in>type_index_test_ctti_construct_fail.cpp</in>
+                    <in>type_index_test_ctti_copy_fail.cpp</in>
+                  </df>
+                </df>
+                <df name="type_traits">
+                  <df name="examples">
+                    <in>copy_example.cpp</in>
+                    <in>fill_example.cpp</in>
+                    <in>iter_swap_example.cpp</in>
+                    <in>trivial_destructor_example.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="compile_fail">
+                      <in>common_type2_fail.cpp</in>
+                      <in>common_type_fail.cpp</in>
+                      <in>has_nothrow_assign_fail.cpp</in>
+                      <in>has_nothrow_cons_fail.cpp</in>
+                      <in>has_nothrow_copy_fail.cpp</in>
+                      <in>has_nothrow_destruct_fail.cpp</in>
+                      <in>is_assignable_fail.cpp</in>
+                      <in>is_base_of_fail.cpp</in>
+                      <in>is_constructible_fail.cpp</in>
+                      <in>is_convertible2_fail.cpp</in>
+                      <in>is_convertible_fail.cpp</in>
+                      <in>is_copy_assignable_fail.cpp</in>
+                      <in>is_copy_constructible_fail.cpp</in>
+                      <in>is_default_constructible_fail.cpp</in>
+                      <in>is_destructible_fail.cpp</in>
+                      <in>is_empty_fail.cpp</in>
+                      <in>is_list_constructible_fail.cpp</in>
+                      <in>is_nothrow_move_assignable_fail.cpp</in>
+                      <in>is_nothrow_move_constructible_fail.cpp</in>
+                      <in>is_polymorphic_fail.cpp</in>
+                      <in>is_stateless_fail.cpp</in>
+                      <in>is_virtual_base_of_fail.cpp</in>
+                    </df>
+                    <in>add_const_test.cpp</in>
+                    <in>add_cv_test.cpp</in>
+                    <in>add_lvalue_reference_test.cpp</in>
+                    <in>add_pointer_test.cpp</in>
+                    <in>add_reference_test.cpp</in>
+                    <in>add_rvalue_reference_test.cpp</in>
+                    <in>add_volatile_test.cpp</in>
+                    <in>aligned_storage_a2_test.cpp</in>
+                    <in>aligned_storage_empy_test.cpp</in>
+                    <in>aligned_storage_test.cpp</in>
+                    <in>alignment_of_a2_test.cpp</in>
+                    <in>alignment_of_test.cpp</in>
+                    <in>common_type_2_test.cpp</in>
+                    <in>common_type_3_test.cpp</in>
+                    <in>common_type_4_test.cpp</in>
+                    <in>common_type_5_test.cpp</in>
+                    <in>common_type_6_test.cpp</in>
+                    <in>common_type_fail.cpp</in>
+                    <in>common_type_sfinae2_test.cpp</in>
+                    <in>common_type_sfinae_test.cpp</in>
+                    <in>common_type_test.cpp</in>
+                    <in>conditional_test.cpp</in>
+                    <in>conjunction_test.cpp</in>
+                    <in>copy_cv_ref_test.cpp</in>
+                    <in>copy_cv_test.cpp</in>
+                    <in>copy_reference_test.cpp</in>
+                    <in>cxx14_aliases_test.cpp</in>
+                    <in>decay_test.cpp</in>
+                    <in>detected_or_test.cpp</in>
+                    <in>detected_test.cpp</in>
+                    <in>disjunction_test.cpp</in>
+                    <in>enable_if_test.cpp</in>
+                    <in>extent_test.cpp</in>
+                    <in>floating_point_promotion_test.cpp</in>
+                    <in>function_traits_test.cpp</in>
+                    <in>has_binary_classes0_test.cpp</in>
+                    <in>has_binary_classes1_test.cpp</in>
+                    <in>has_binary_classes2_test.cpp</in>
+                    <in>has_binary_classes3_test.cpp</in>
+                    <in>has_binary_classes4_test.cpp</in>
+                    <in>has_binary_classes5_test.cpp</in>
+                    <in>has_binary_classes6_test.cpp</in>
+                    <in>has_binary_classes7_test.cpp</in>
+                    <in>has_binary_classes8_test.cpp</in>
+                    <in>has_binary_classes9_test.cpp</in>
+                    <in>has_bit_and_assign_test.cpp</in>
+                    <in>has_bit_and_test.cpp</in>
+                    <in>has_bit_or_assign_test.cpp</in>
+                    <in>has_bit_or_test.cpp</in>
+                    <in>has_bit_xor_assign_test.cpp</in>
+                    <in>has_bit_xor_test.cpp</in>
+                    <in>has_complement_test.cpp</in>
+                    <in>has_dereference_test.cpp</in>
+                    <in>has_divides_assign_test.cpp</in>
+                    <in>has_divides_test.cpp</in>
+                    <in>has_equal_to_test.cpp</in>
+                    <in>has_greater_equal_test.cpp</in>
+                    <in>has_greater_test.cpp</in>
+                    <in>has_left_shift_assign_test.cpp</in>
+                    <in>has_left_shift_test.cpp</in>
+                    <in>has_less_equal_test.cpp</in>
+                    <in>has_less_test.cpp</in>
+                    <in>has_logical_and_test.cpp</in>
+                    <in>has_logical_not_test.cpp</in>
+                    <in>has_logical_or_test.cpp</in>
+                    <in>has_minus_assign_test.cpp</in>
+                    <in>has_minus_test.cpp</in>
+                    <in>has_modulus_assign_test.cpp</in>
+                    <in>has_modulus_test.cpp</in>
+                    <in>has_multiplies_assign_test.cpp</in>
+                    <in>has_multiplies_test.cpp</in>
+                    <in>has_negate_test.cpp</in>
+                    <in>has_not_equal_to_test.cpp</in>
+                    <in>has_nothrow_assign_test.cpp</in>
+                    <in>has_nothrow_constr_test.cpp</in>
+                    <in>has_nothrow_copy_test.cpp</in>
+                    <in>has_nothrow_destructor_test.cpp</in>
+                    <in>has_operator_new_test.cpp</in>
+                    <in>has_plus_assign_test.cpp</in>
+                    <in>has_plus_test.cpp</in>
+                    <in>has_post_decrement_test.cpp</in>
+                    <in>has_post_increment_test.cpp</in>
+                    <in>has_postfix_classes0_test.cpp</in>
+                    <in>has_postfix_classes1_test.cpp</in>
+                    <in>has_postfix_classes2_test.cpp</in>
+                    <in>has_postfix_classes3_test.cpp</in>
+                    <in>has_pre_decrement_test.cpp</in>
+                    <in>has_pre_increment_test.cpp</in>
+                    <in>has_prefix_classes0_test.cpp</in>
+                    <in>has_prefix_classes1_test.cpp</in>
+                    <in>has_prefix_classes2_test.cpp</in>
+                    <in>has_prefix_classes3_test.cpp</in>
+                    <in>has_right_shift_assign_test.cpp</in>
+                    <in>has_right_shift_test.cpp</in>
+                    <in>has_trivial_assign_test.cpp</in>
+                    <in>has_trivial_constr_test.cpp</in>
+                    <in>has_trivial_copy_test.cpp</in>
+                    <in>has_trivial_destructor_test.cpp</in>
+                    <in>has_trivial_move_assign_test.cpp</in>
+                    <in>has_trivial_move_constructor_test.cpp</in>
+                    <in>has_unary_minus_test.cpp</in>
+                    <in>has_unary_plus_test.cpp</in>
+                    <in>has_virtual_destructor_test.cpp</in>
+                    <in>is_abstract_test.cpp</in>
+                    <in>is_arithmetic_test.cpp</in>
+                    <in>is_array_test.cpp</in>
+                    <in>is_assignable_test.cpp</in>
+                    <in>is_base_and_derived_test.cpp</in>
+                    <in>is_base_of_test.cpp</in>
+                    <in>is_bounded_array_test.cpp</in>
+                    <in>is_class_test.cpp</in>
+                    <in>is_complete_test.cpp</in>
+                    <in>is_complex_test.cpp</in>
+                    <in>is_compound_test.cpp</in>
+                    <in>is_const_test.cpp</in>
+                    <in>is_constructible_test.cpp</in>
+                    <in>is_convertible_test.cpp</in>
+                    <in>is_copy_assignable_test.cpp</in>
+                    <in>is_copy_constructible_test.cpp</in>
+                    <in>is_default_constr_test.cpp</in>
+                    <in>is_destructible_test.cpp</in>
+                    <in>is_detected_convertible.cpp</in>
+                    <in>is_detected_exact_test.cpp</in>
+                    <in>is_detected_test.cpp</in>
+                    <in>is_empty_test.cpp</in>
+                    <in>is_enum_test.cpp</in>
+                    <in>is_final_test.cpp</in>
+                    <in>is_float_test.cpp</in>
+                    <in>is_floating_point_test.cpp</in>
+                    <in>is_function_test.cpp</in>
+                    <in>is_fundamental_test.cpp</in>
+                    <in>is_integral_test.cpp</in>
+                    <in>is_list_constructible_test.cpp</in>
+                    <in>is_lvalue_reference_test.cpp</in>
+                    <in>is_member_func_test.cpp</in>
+                    <in>is_member_obj_test.cpp</in>
+                    <in>is_member_pointer_test.cpp</in>
+                    <in>is_noncopyable_test.cpp</in>
+                    <in>is_nothrow_move_assignable_test.cpp</in>
+                    <in>is_nothrow_move_constructible_test.cpp</in>
+                    <in>is_nothrow_swappable_test.cpp</in>
+                    <in>is_object_test.cpp</in>
+                    <in>is_pod_test.cpp</in>
+                    <in>is_pointer_test.cpp</in>
+                    <in>is_polymorphic_test.cpp</in>
+                    <in>is_reference_test.cpp</in>
+                    <in>is_rvalue_reference_test.cpp</in>
+                    <in>is_same_test.cpp</in>
+                    <in>is_scalar_test.cpp</in>
+                    <in>is_scoped_enum_test.cpp</in>
+                    <in>is_signed_test.cpp</in>
+                    <in>is_stateless_test.cpp</in>
+                    <in>is_trivially_copyable_test.cpp</in>
+                    <in>is_unbounded_array_test.cpp</in>
+                    <in>is_union_test.cpp</in>
+                    <in>is_unscoped_enum_test.cpp</in>
+                    <in>is_unsigned_test.cpp</in>
+                    <in>is_virtual_base_of_test.cpp</in>
+                    <in>is_void_test.cpp</in>
+                    <in>is_volatile_test.cpp</in>
+                    <in>make_signed_test.cpp</in>
+                    <in>make_unsigned_test.cpp</in>
+                    <in>make_void_test.cpp</in>
+                    <in>mpl_interop_test1.cpp</in>
+                    <in>mpl_interop_test2.cpp</in>
+                    <in>mpl_interop_test3.cpp</in>
+                    <in>negation_test.cpp</in>
+                    <in>promote_basic_test.cpp</in>
+                    <in>promote_enum_msvc_bug_test.cpp</in>
+                    <in>promote_enum_test.cpp</in>
+                    <in>promote_mpl_test.cpp</in>
+                    <in>rank_test.cpp</in>
+                    <in>remove_all_extents_test.cpp</in>
+                    <in>remove_bounds_test.cpp</in>
+                    <in>remove_const_test.cpp</in>
+                    <in>remove_cv_ref_test.cpp</in>
+                    <in>remove_cv_test.cpp</in>
+                    <in>remove_extent_test.cpp</in>
+                    <in>remove_pointer_test.cpp</in>
+                    <in>remove_reference_test.cpp</in>
+                    <in>remove_volatile_test.cpp</in>
+                    <in>tricky_abstract_type_test.cpp</in>
+                    <in>tricky_add_pointer_test.cpp</in>
+                    <in>tricky_function_type_test.cpp</in>
+                    <in>tricky_incomplete_type_test.cpp</in>
+                    <in>tricky_is_enum_test.cpp</in>
+                    <in>tricky_partial_spec_test.cpp</in>
+                    <in>tricky_rvalue_test.cpp</in>
+                    <in>type_identity_test.cpp</in>
+                    <in>type_traits_test.cpp</in>
+                    <in>type_with_alignment_test.cpp</in>
+                    <in>udt_specialisations.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <in>specialisations.cpp</in>
+                  </df>
+                </df>
+                <df name="typeof">
+                  <df name="test">
+                    <in>data_member.cpp</in>
+                    <in>function.cpp</in>
+                    <in>function_binding.cpp</in>
+                    <in>function_ptr.cpp</in>
+                    <in>function_ptr_from_tpl.cpp</in>
+                    <in>function_ref.cpp</in>
+                    <in>member_function.cpp</in>
+                    <in>modifiers.cpp</in>
+                    <in>msvc_typeof_in_lambda.cpp</in>
+                    <in>nested_typedef.cpp</in>
+                    <in>noncopyable.cpp</in>
+                    <in>odr1.cpp</in>
+                    <in>odr2.cpp</in>
+                    <in>odr_no_uns1.cpp</in>
+                    <in>odr_no_uns2.cpp</in>
+                    <in>std.cpp</in>
+                    <in>template_dependent.cpp</in>
+                    <in>template_enum.cpp</in>
+                    <in>template_int.cpp</in>
+                    <in>template_multiword.cpp</in>
+                    <in>template_tpl.cpp</in>
+                    <in>template_type.cpp</in>
+                    <in>type.cpp</in>
+                  </df>
+                </df>
+                <df name="units">
+                  <df name="example">
+                    <in>autoprefixes.cpp</in>
+                    <in>complex.cpp</in>
+                    <in>composite_output.cpp</in>
+                    <in>conversion.cpp</in>
+                    <in>conversion_factor.cpp</in>
+                    <in>dimension.cpp</in>
+                    <in>heterogeneous_unit.cpp</in>
+                    <in>information.cpp</in>
+                    <in>kitchen_sink.cpp</in>
+                    <in>lambda.cpp</in>
+                    <in>non_base_dimension.cpp</in>
+                    <in>performance.cpp</in>
+                    <in>quantity.cpp</in>
+                    <in>quaternion.cpp</in>
+                    <in>radar_beam_height.cpp</in>
+                    <in>runtime_conversion_factor.cpp</in>
+                    <in>runtime_unit.cpp</in>
+                    <in>systems.cpp</in>
+                    <in>temperature.cpp</in>
+                    <in>tutorial.cpp</in>
+                    <in>unit.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>check_conversion_defs.cpp</in>
+                    <in>fail_add_temperature.cpp</in>
+                    <in>fail_adl_detail.cpp</in>
+                    <in>fail_base_dimension.cpp</in>
+                    <in>fail_heterogeneous_unit.cpp</in>
+                    <in>fail_implicit_conversion.cpp</in>
+                    <in>fail_quantity_add.cpp</in>
+                    <in>fail_quantity_add_assign.cpp</in>
+                    <in>fail_quantity_assign.cpp</in>
+                    <in>fail_quantity_construct.cpp</in>
+                    <in>fail_quantity_non_unit.cpp</in>
+                    <in>fail_quantity_scalar_add.cpp</in>
+                    <in>fail_quantity_scalar_sub.cpp</in>
+                    <in>fail_quantity_sub_assign.cpp</in>
+                    <in>fail_quantity_subtract.cpp</in>
+                    <in>fail_quantity_unit_add.cpp</in>
+                    <in>fail_quantity_unit_subtract.cpp</in>
+                    <in>fail_scalar_quantity_add.cpp</in>
+                    <in>fail_scalar_quantity_sub.cpp</in>
+                    <in>fail_unit_quantity_add.cpp</in>
+                    <in>fail_unit_quantity_subtract.cpp</in>
+                    <in>test_absolute.cpp</in>
+                    <in>test_base_dimension.cpp</in>
+                    <in>test_cmath.cpp</in>
+                    <in>test_complicated_system.cpp</in>
+                    <in>test_constants.cpp</in>
+                    <in>test_conversion.cpp</in>
+                    <in>test_custom_unit.cpp</in>
+                    <in>test_default_conversion.cpp</in>
+                    <in>test_dimensionless_ice1.cpp</in>
+                    <in>test_dimensionless_ice2.cpp</in>
+                    <in>test_dimensionless_quantity.cpp</in>
+                    <in>test_implicit_conversion.cpp</in>
+                    <in>test_information_units.cpp</in>
+                    <in>test_lambda.cpp</in>
+                    <in>test_limits.cpp</in>
+                    <in>test_mixed_value_types.cpp</in>
+                    <in>test_negative_denominator.cpp</in>
+                    <in>test_output.cpp</in>
+                    <in>test_predicates.cpp</in>
+                    <in>test_quantity.cpp</in>
+                    <in>test_reduce_unit.cpp</in>
+                    <in>test_scaled_conversion.cpp</in>
+                    <in>test_scaled_unit.cpp</in>
+                    <in>test_sqrt_scaled_unit.cpp</in>
+                    <in>test_trig.cpp</in>
+                    <in>test_unit.cpp</in>
+                    <in>test_unscale.cpp</in>
+                  </df>
+                  <df name="test_headers">
+                    <in>main.cpp</in>
+                    <in>test.cpp</in>
+                  </df>
+                  <df name="tutorial">
+                    <in>tutorial_1.cpp</in>
+                  </df>
+                </df>
+                <df name="unordered">
+                  <df name="doc">
+                    <df name="src_code">
+                      <in>dictionary.cpp</in>
+                      <in>intro.cpp</in>
+                      <in>point1.cpp</in>
+                      <in>point2.cpp</in>
+                    </df>
+                  </df>
+                  <df name="examples">
+                    <in>case_insensitive_test.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="exception">
+                      <in>assign_exception_tests.cpp</in>
+                      <in>constructor_exception_tests.cpp</in>
+                      <in>copy_exception_tests.cpp</in>
+                      <in>erase_exception_tests.cpp</in>
+                      <in>insert_exception_tests.cpp</in>
+                      <in>merge_exception_tests.cpp</in>
+                      <in>move_assign_exception_tests.cpp</in>
+                      <in>rehash_exception_tests.cpp</in>
+                      <in>swap_exception_tests.cpp</in>
+                    </df>
+                    <df name="unordered">
+                      <in>allocator_traits.cpp</in>
+                      <in>assign_tests.cpp</in>
+                      <in>at_tests.cpp</in>
+                      <in>bucket_tests.cpp</in>
+                      <in>compile_map.cpp</in>
+                      <in>compile_set.cpp</in>
+                      <in>constructor_tests.cpp</in>
+                      <in>copy_tests.cpp</in>
+                      <in>deduction_tests.cpp</in>
+                      <in>detail_tests.cpp</in>
+                      <in>emplace_tests.cpp</in>
+                      <in>equality_tests.cpp</in>
+                      <in>equivalent_keys_tests.cpp</in>
+                      <in>erase_equiv_tests.cpp</in>
+                      <in>erase_tests.cpp</in>
+                      <in>extract_tests.cpp</in>
+                      <in>find_tests.cpp</in>
+                      <in>fwd_map_test.cpp</in>
+                      <in>fwd_set_test.cpp</in>
+                      <in>incomplete_test.cpp</in>
+                      <in>insert_hint_tests.cpp</in>
+                      <in>insert_node_type_fail.cpp</in>
+                      <in>insert_stable_tests.cpp</in>
+                      <in>insert_tests.cpp</in>
+                      <in>link_test_1.cpp</in>
+                      <in>link_test_2.cpp</in>
+                      <in>load_factor_tests.cpp</in>
+                      <in>merge_tests.cpp</in>
+                      <in>minimal_allocator.cpp</in>
+                      <in>move_tests.cpp</in>
+                      <in>node_handle_tests.cpp</in>
+                      <in>noexcept_tests.cpp</in>
+                      <in>rehash_tests.cpp</in>
+                      <in>simple_tests.cpp</in>
+                      <in>swap_tests.cpp</in>
+                      <in>unnecessary_copy_tests.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="utility">
+                  <df name="identity_type">
+                    <df name="test">
+                      <in>abstract.cpp</in>
+                      <in>noncopyable.cpp</in>
+                      <in>paren.cpp</in>
+                      <in>template.cpp</in>
+                      <in>var.cpp</in>
+                      <in>var_error.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <in>base_from_member_ref_test.cpp</in>
+                    <in>base_from_member_test.cpp</in>
+                    <in>binary_test.cpp</in>
+                    <in>call_traits_test.cpp</in>
+                    <in>compressed_pair_final_test.cpp</in>
+                    <in>compressed_pair_test.cpp</in>
+                    <in>initialized_test.cpp</in>
+                    <in>initialized_test_fail1.cpp</in>
+                    <in>initialized_test_fail2.cpp</in>
+                    <in>iterators_test.cpp</in>
+                    <in>operators_constexpr_test.cpp</in>
+                    <in>operators_test.cpp</in>
+                    <in>result_of_test.cpp</in>
+                    <in>string_ref_from_rvalue.cpp</in>
+                    <in>string_ref_test1.cpp</in>
+                    <in>string_ref_test2.cpp</in>
+                    <in>string_ref_test_io.cpp</in>
+                    <in>string_view_constexpr_test1.cpp</in>
+                    <in>string_view_from_rvalue.cpp</in>
+                    <in>string_view_test1.cpp</in>
+                    <in>string_view_test2.cpp</in>
+                    <in>string_view_test_io.cpp</in>
+                    <in>value_init_test.cpp</in>
+                    <in>value_init_test2.cpp</in>
+                    <in>value_init_test3.cpp</in>
+                    <in>value_init_test_fail1.cpp</in>
+                    <in>value_init_test_fail2.cpp</in>
+                    <in>value_init_test_fail3.cpp</in>
+                    <in>value_init_workaround_test.cpp</in>
+                  </df>
+                </df>
+                <df name="uuid">
+                  <df name="test">
+                    <df name="compile">
+                      <in>decl_header.cpp</in>
+                    </df>
+                    <df name="compile-fail">
+                      <in>basic_random_generator_no_copy_assign.cpp</in>
+                      <in>basic_random_generator_no_copy_ctor.cpp</in>
+                      <in>random_generator_no_copy_assign.cpp</in>
+                      <in>random_generator_no_copy_ctor.cpp</in>
+                    </df>
+                    <in>compile_uuid.cpp</in>
+                    <in>mock_random.cpp</in>
+                    <in>test_bench_random.cpp</in>
+                    <in>test_detail_random_provider.cpp</in>
+                    <in>test_entropy_error.cpp</in>
+                    <in>test_generators.cpp</in>
+                    <in>test_hash.cpp</in>
+                    <in>test_include1.cpp</in>
+                    <in>test_include2.cpp</in>
+                    <in>test_io.cpp</in>
+                    <in>test_md5.cpp</in>
+                    <in>test_msvc_simd_bug981648_foo.cpp</in>
+                    <in>test_msvc_simd_bug981648_main.cpp</in>
+                    <in>test_name_generator.cpp</in>
+                    <in>test_nil_generator.cpp</in>
+                    <in>test_random_generator.cpp</in>
+                    <in>test_serialization.cpp</in>
+                    <in>test_sha1.cpp</in>
+                    <in>test_string_generator.cpp</in>
+                    <in>test_tagging.cpp</in>
+                    <in>test_uuid.cpp</in>
+                    <in>test_uuid_class.cpp</in>
+                    <in>test_uuid_in_map.cpp</in>
+                    <in>test_uuid_no_simd.cpp</in>
+                    <in>test_wserialization.cpp</in>
+                  </df>
+                </df>
+                <df name="variant">
+                  <df name="perf">
+                    <in>move_perf.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>auto_visitors.cpp</in>
+                    <in>class_a.cpp</in>
+                    <in>const_ref_apply_visitor.cpp</in>
+                    <in>fusion_interop.cpp</in>
+                    <in>hash_recursive_variant_test.cpp</in>
+                    <in>hash_variant_test.cpp</in>
+                    <in>issue42.cpp</in>
+                    <in>issue53.cpp</in>
+                    <in>no_rvalue_to_nonconst_visitation.cpp</in>
+                    <in>overload_selection.cpp</in>
+                    <in>recursive_variant_test.cpp</in>
+                    <in>recursive_wrapper_move_test.cpp</in>
+                    <in>rvalue_test.cpp</in>
+                    <in>test1.cpp</in>
+                    <in>test2.cpp</in>
+                    <in>test3.cpp</in>
+                    <in>test4.cpp</in>
+                    <in>test5.cpp</in>
+                    <in>test6.cpp</in>
+                    <in>test7.cpp</in>
+                    <in>test8.cpp</in>
+                    <in>test9.cpp</in>
+                    <in>variant_comparison_test.cpp</in>
+                    <in>variant_get_test.cpp</in>
+                    <in>variant_multivisit_test.cpp</in>
+                    <in>variant_nonempty_check.cpp</in>
+                    <in>variant_over_joint_view_test.cpp</in>
+                    <in>variant_polymorphic_get_test.cpp</in>
+                    <in>variant_reference_test.cpp</in>
+                    <in>variant_rvalue_get_with_ampersand_test.cpp</in>
+                    <in>variant_swap_test.cpp</in>
+                    <in>variant_visit_internal_linkage.cpp</in>
+                    <in>variant_visit_test.cpp</in>
+                  </df>
+                </df>
+                <df name="variant2">
+                  <df name="benchmark">
+                    <in>benchmark1.cpp</in>
+                    <in>benchmark2.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>quick.cpp</in>
+                    <in>throw_exception.cpp</in>
+                    <in>variant_alternative.cpp</in>
+                    <in>variant_convert_construct.cpp</in>
+                    <in>variant_convert_construct_throw.cpp</in>
+                    <in>variant_copy_assign.cpp</in>
+                    <in>variant_copy_assign_cx.cpp</in>
+                    <in>variant_copy_assign_throw.cpp</in>
+                    <in>variant_copy_construct.cpp</in>
+                    <in>variant_copy_construct_cx.cpp</in>
+                    <in>variant_copy_construct_throw.cpp</in>
+                    <in>variant_default_construct.cpp</in>
+                    <in>variant_default_construct_cx.cpp</in>
+                    <in>variant_derived_construct.cpp</in>
+                    <in>variant_destroy.cpp</in>
+                    <in>variant_emplace_index.cpp</in>
+                    <in>variant_emplace_index_cx.cpp</in>
+                    <in>variant_emplace_type.cpp</in>
+                    <in>variant_emplace_type_cx.cpp</in>
+                    <in>variant_eq_ne.cpp</in>
+                    <in>variant_eq_ne_cx.cpp</in>
+                    <in>variant_get_by_index.cpp</in>
+                    <in>variant_get_by_index_cx.cpp</in>
+                    <in>variant_get_by_type.cpp</in>
+                    <in>variant_get_by_type_cx.cpp</in>
+                    <in>variant_hash.cpp</in>
+                    <in>variant_holds_alternative.cpp</in>
+                    <in>variant_holds_alternative_cx.cpp</in>
+                    <in>variant_in_place_index_construct.cpp</in>
+                    <in>variant_in_place_index_construct_cx.cpp</in>
+                    <in>variant_in_place_type_construct.cpp</in>
+                    <in>variant_in_place_type_construct_cx.cpp</in>
+                    <in>variant_lt_gt.cpp</in>
+                    <in>variant_lt_gt_cx.cpp</in>
+                    <in>variant_many_types.cpp</in>
+                    <in>variant_move_assign.cpp</in>
+                    <in>variant_move_assign_cx.cpp</in>
+                    <in>variant_move_assign_throw.cpp</in>
+                    <in>variant_move_construct.cpp</in>
+                    <in>variant_move_construct_cx.cpp</in>
+                    <in>variant_move_construct_throw.cpp</in>
+                    <in>variant_ostream_insert.cpp</in>
+                    <in>variant_size.cpp</in>
+                    <in>variant_special.cpp</in>
+                    <in>variant_subset.cpp</in>
+                    <in>variant_swap.cpp</in>
+                    <in>variant_trivial.cpp</in>
+                    <in>variant_value_assign.cpp</in>
+                    <in>variant_value_assign_cx.cpp</in>
+                    <in>variant_value_construct.cpp</in>
+                    <in>variant_value_construct_cx.cpp</in>
+                    <in>variant_valueless.cpp</in>
+                    <in>variant_visit.cpp</in>
+                    <in>variant_visit_by_index.cpp</in>
+                    <in>variant_visit_derived.cpp</in>
+                    <in>variant_visit_r.cpp</in>
+                  </df>
+                </df>
+                <df name="vmd">
+                  <df name="test">
+                    <df name="test_cmake">
+                      <in>main.cpp</in>
+                    </df>
+                    <in>test_after_array_elem.cpp</in>
+                    <in>test_after_array_elem.cxx</in>
+                    <in>test_after_identifier_elem.cpp</in>
+                    <in>test_after_identifier_elem.cxx</in>
+                    <in>test_after_list_elem.cpp</in>
+                    <in>test_after_list_elem.cxx</in>
+                    <in>test_after_number_elem.cpp</in>
+                    <in>test_after_number_elem.cxx</in>
+                    <in>test_after_seq_elem.cpp</in>
+                    <in>test_after_seq_elem.cxx</in>
+                    <in>test_after_tuple_elem.cpp</in>
+                    <in>test_after_tuple_elem.cxx</in>
+                    <in>test_after_type_elem.cpp</in>
+                    <in>test_after_type_elem.cxx</in>
+                    <in>test_android.cpp</in>
+                    <in>test_android.cxx</in>
+                    <in>test_array_elem.cpp</in>
+                    <in>test_array_elem.cxx</in>
+                    <in>test_array_empty.cpp</in>
+                    <in>test_array_empty.cxx</in>
+                    <in>test_array_equal.cpp</in>
+                    <in>test_array_equal.cxx</in>
+                    <in>test_array_to_seq.cpp</in>
+                    <in>test_array_to_seq.cxx</in>
+                    <in>test_array_to_tuple.cpp</in>
+                    <in>test_array_to_tuple.cxx</in>
+                    <in>test_ary.cpp</in>
+                    <in>test_ary.cxx</in>
+                    <in>test_assert.cpp</in>
+                    <in>test_assert.cxx</in>
+                    <in>test_assert_fail.cpp</in>
+                    <in>test_assert_fail.cxx</in>
+                    <in>test_assert_fail_array.cpp</in>
+                    <in>test_assert_fail_array.cxx</in>
+                    <in>test_assert_fail_identifier.cpp</in>
+                    <in>test_assert_fail_identifier.cxx</in>
+                    <in>test_assert_fail_is_empty.cpp</in>
+                    <in>test_assert_fail_is_empty.cxx</in>
+                    <in>test_assert_fail_is_identifier.cpp</in>
+                    <in>test_assert_fail_is_identifier.cxx</in>
+                    <in>test_assert_fail_is_number.cpp</in>
+                    <in>test_assert_fail_is_number.cxx</in>
+                    <in>test_assert_fail_list.cpp</in>
+                    <in>test_assert_fail_list.cxx</in>
+                    <in>test_assert_fail_number.cpp</in>
+                    <in>test_assert_fail_number.cxx</in>
+                    <in>test_assert_fail_number2.cpp</in>
+                    <in>test_assert_fail_number2.cxx</in>
+                    <in>test_assert_fail_seq.cpp</in>
+                    <in>test_assert_fail_seq.cxx</in>
+                    <in>test_assert_fail_tuple.cpp</in>
+                    <in>test_assert_fail_tuple.cxx</in>
+                    <in>test_assert_fail_vcstring.cpp</in>
+                    <in>test_assert_fail_vcstring.cxx</in>
+                    <in>test_assert_is_array.cpp</in>
+                    <in>test_assert_is_array.cxx</in>
+                    <in>test_assert_is_array_fail.cpp</in>
+                    <in>test_assert_is_array_fail.cxx</in>
+                    <in>test_assert_is_array_fail2.cpp</in>
+                    <in>test_assert_is_array_fail2.cxx</in>
+                    <in>test_assert_is_array_fail3.cpp</in>
+                    <in>test_assert_is_array_fail3.cxx</in>
+                    <in>test_assert_is_array_fail4.cpp</in>
+                    <in>test_assert_is_array_fail4.cxx</in>
+                    <in>test_assert_is_empty.cpp</in>
+                    <in>test_assert_is_empty.cxx</in>
+                    <in>test_assert_is_empty_fail.cpp</in>
+                    <in>test_assert_is_empty_fail.cxx</in>
+                    <in>test_assert_is_empty_fail2.cpp</in>
+                    <in>test_assert_is_empty_fail2.cxx</in>
+                    <in>test_assert_is_empty_fail3.cpp</in>
+                    <in>test_assert_is_empty_fail3.cxx</in>
+                    <in>test_assert_is_identifier.cpp</in>
+                    <in>test_assert_is_identifier.cxx</in>
+                    <in>test_assert_is_identifier_fail.cpp</in>
+                    <in>test_assert_is_identifier_fail.cxx</in>
+                    <in>test_assert_is_list.cpp</in>
+                    <in>test_assert_is_list.cxx</in>
+                    <in>test_assert_is_list_fail.cpp</in>
+                    <in>test_assert_is_list_fail.cxx</in>
+                    <in>test_assert_is_list_fail2.cpp</in>
+                    <in>test_assert_is_list_fail2.cxx</in>
+                    <in>test_assert_is_list_fail3.cpp</in>
+                    <in>test_assert_is_list_fail3.cxx</in>
+                    <in>test_assert_is_list_fail4.cpp</in>
+                    <in>test_assert_is_list_fail4.cxx</in>
+                    <in>test_assert_is_number.cpp</in>
+                    <in>test_assert_is_number.cxx</in>
+                    <in>test_assert_is_number_fail.cpp</in>
+                    <in>test_assert_is_number_fail.cxx</in>
+                    <in>test_assert_is_seq.cpp</in>
+                    <in>test_assert_is_seq.cxx</in>
+                    <in>test_assert_is_seq_fail.cpp</in>
+                    <in>test_assert_is_seq_fail.cxx</in>
+                    <in>test_assert_is_seq_fail2.cpp</in>
+                    <in>test_assert_is_seq_fail2.cxx</in>
+                    <in>test_assert_is_seq_fail3.cpp</in>
+                    <in>test_assert_is_seq_fail3.cxx</in>
+                    <in>test_assert_is_seq_fail4.cpp</in>
+                    <in>test_assert_is_seq_fail4.cxx</in>
+                    <in>test_assert_is_tuple.cpp</in>
+                    <in>test_assert_is_tuple.cxx</in>
+                    <in>test_assert_is_tuple_fail.cpp</in>
+                    <in>test_assert_is_tuple_fail.cxx</in>
+                    <in>test_assert_is_tuple_fail2.cpp</in>
+                    <in>test_assert_is_tuple_fail2.cxx</in>
+                    <in>test_assert_is_tuple_fail3.cpp</in>
+                    <in>test_assert_is_tuple_fail3.cxx</in>
+                    <in>test_assert_is_tuple_fail4.cpp</in>
+                    <in>test_assert_is_tuple_fail4.cxx</in>
+                    <in>test_assert_is_type.cpp</in>
+                    <in>test_assert_is_type.cxx</in>
+                    <in>test_assert_is_type_fail.cpp</in>
+                    <in>test_assert_is_type_fail.cxx</in>
+                    <in>test_doc_assert.cpp</in>
+                    <in>test_doc_assert.cxx</in>
+                    <in>test_doc_assert_fail.cpp</in>
+                    <in>test_doc_assert_fail.cxx</in>
+                    <in>test_doc_empty.cpp</in>
+                    <in>test_doc_empty.cxx</in>
+                    <in>test_doc_empty_fail.cpp</in>
+                    <in>test_doc_empty_fail.cxx</in>
+                    <in>test_doc_empty_fail2.cpp</in>
+                    <in>test_doc_empty_fail2.cxx</in>
+                    <in>test_doc_empty_fail3.cpp</in>
+                    <in>test_doc_empty_fail3.cxx</in>
+                    <in>test_doc_empty_fail4.cpp</in>
+                    <in>test_doc_empty_fail4.cxx</in>
+                    <in>test_doc_empty_fail6.cpp</in>
+                    <in>test_doc_empty_fail6.cxx</in>
+                    <in>test_doc_empty_fail7.cpp</in>
+                    <in>test_doc_empty_fail7.cxx</in>
+                    <in>test_doc_empty_fail8.cpp</in>
+                    <in>test_doc_empty_fail8.cxx</in>
+                    <in>test_doc_equality.cpp</in>
+                    <in>test_doc_equality.cxx</in>
+                    <in>test_doc_example_switch.cpp</in>
+                    <in>test_doc_example_switch.cxx</in>
+                    <in>test_doc_get_type.cpp</in>
+                    <in>test_doc_get_type.cxx</in>
+                    <in>test_doc_identifier.cpp</in>
+                    <in>test_doc_identifier.cxx</in>
+                    <in>test_doc_identifier_subtyping.cpp</in>
+                    <in>test_doc_identifier_subtyping.cxx</in>
+                    <in>test_doc_modifiers_filter.cpp</in>
+                    <in>test_doc_modifiers_filter.cxx</in>
+                    <in>test_doc_modifiers_identifier.cpp</in>
+                    <in>test_doc_modifiers_identifier.cxx</in>
+                    <in>test_doc_modifiers_index.cpp</in>
+                    <in>test_doc_modifiers_index.cxx</in>
+                    <in>test_doc_modifiers_return_type.cpp</in>
+                    <in>test_doc_modifiers_return_type.cxx</in>
+                    <in>test_doc_modifiers_splitting.cpp</in>
+                    <in>test_doc_modifiers_splitting.cxx</in>
+                    <in>test_doc_number.cpp</in>
+                    <in>test_doc_number.cxx</in>
+                    <in>test_doc_pp_data_types.cpp</in>
+                    <in>test_doc_pp_data_types.cxx</in>
+                    <in>test_doc_sequence.cpp</in>
+                    <in>test_doc_sequence.cxx</in>
+                    <in>test_doc_sequence_access.cpp</in>
+                    <in>test_doc_sequence_access.cxx</in>
+                    <in>test_doc_sequence_convert.cpp</in>
+                    <in>test_doc_sequence_convert.cxx</in>
+                    <in>test_doc_type.cpp</in>
+                    <in>test_doc_type.cxx</in>
+                    <in>test_doc_whyhow.cpp</in>
+                    <in>test_doc_whyhow.cxx</in>
+                    <in>test_equal.cpp</in>
+                    <in>test_equal.cxx</in>
+                    <in>test_equal_array.cpp</in>
+                    <in>test_equal_array.cxx</in>
+                    <in>test_equal_identifier.cpp</in>
+                    <in>test_equal_identifier.cxx</in>
+                    <in>test_equal_list.cpp</in>
+                    <in>test_equal_list.cxx</in>
+                    <in>test_equal_multi.cpp</in>
+                    <in>test_equal_multi.cxx</in>
+                    <in>test_equal_number.cpp</in>
+                    <in>test_equal_number.cxx</in>
+                    <in>test_equal_seq.cpp</in>
+                    <in>test_equal_seq.cxx</in>
+                    <in>test_equal_tuple.cpp</in>
+                    <in>test_equal_tuple.cxx</in>
+                    <in>test_equal_type.cpp</in>
+                    <in>test_equal_type.cxx</in>
+                    <in>test_identifier_elem.cpp</in>
+                    <in>test_identifier_elem.cxx</in>
+                    <in>test_identifier_equal.cpp</in>
+                    <in>test_identifier_equal.cxx</in>
+                    <in>test_is_array.cpp</in>
+                    <in>test_is_array.cxx</in>
+                    <in>test_is_array_fail.cpp</in>
+                    <in>test_is_array_fail.cxx</in>
+                    <in>test_is_array_fail2.cpp</in>
+                    <in>test_is_array_fail2.cxx</in>
+                    <in>test_is_array_fail3.cpp</in>
+                    <in>test_is_array_fail3.cxx</in>
+                    <in>test_is_array_fail4.cpp</in>
+                    <in>test_is_array_fail4.cxx</in>
+                    <in>test_is_empty.cpp</in>
+                    <in>test_is_empty.cxx</in>
+                    <in>test_is_empty_fail.cpp</in>
+                    <in>test_is_empty_fail.cxx</in>
+                    <in>test_is_empty_tuple_succeed.cpp</in>
+                    <in>test_is_empty_tuple_succeed.cxx</in>
+                    <in>test_is_general_identifier.cpp</in>
+                    <in>test_is_general_identifier.cxx</in>
+                    <in>test_is_identifier.cpp</in>
+                    <in>test_is_identifier.cxx</in>
+                    <in>test_is_list.cpp</in>
+                    <in>test_is_list.cxx</in>
+                    <in>test_is_list_fail.cpp</in>
+                    <in>test_is_list_fail.cxx</in>
+                    <in>test_is_list_fail2.cpp</in>
+                    <in>test_is_list_fail2.cxx</in>
+                    <in>test_is_list_fail3.cpp</in>
+                    <in>test_is_list_fail3.cxx</in>
+                    <in>test_is_list_fail4.cpp</in>
+                    <in>test_is_list_fail4.cxx</in>
+                    <in>test_is_number.cpp</in>
+                    <in>test_is_number.cxx</in>
+                    <in>test_is_parens_empty.cpp</in>
+                    <in>test_is_parens_empty.cxx</in>
+                    <in>test_is_seq.cpp</in>
+                    <in>test_is_seq.cxx</in>
+                    <in>test_is_seq_fail.cpp</in>
+                    <in>test_is_seq_fail.cxx</in>
+                    <in>test_is_seq_fail2.cpp</in>
+                    <in>test_is_seq_fail2.cxx</in>
+                    <in>test_is_seq_fail3.cpp</in>
+                    <in>test_is_seq_fail3.cxx</in>
+                    <in>test_is_seq_fail4.cpp</in>
+                    <in>test_is_seq_fail4.cxx</in>
+                    <in>test_is_tuple.cpp</in>
+                    <in>test_is_tuple.cxx</in>
+                    <in>test_is_tuple_fail.cpp</in>
+                    <in>test_is_tuple_fail.cxx</in>
+                    <in>test_is_tuple_fail2.cpp</in>
+                    <in>test_is_tuple_fail2.cxx</in>
+                    <in>test_is_tuple_fail3.cpp</in>
+                    <in>test_is_tuple_fail3.cxx</in>
+                    <in>test_is_tuple_fail4.cpp</in>
+                    <in>test_is_tuple_fail4.cxx</in>
+                    <in>test_is_type.cpp</in>
+                    <in>test_is_type.cxx</in>
+                    <in>test_is_vmd_seq.cpp</in>
+                    <in>test_is_vmd_seq.cxx</in>
+                    <in>test_is_vmd_tuple.cpp</in>
+                    <in>test_is_vmd_tuple.cxx</in>
+                    <in>test_list_elem.cpp</in>
+                    <in>test_list_elem.cxx</in>
+                    <in>test_list_empty.cpp</in>
+                    <in>test_list_empty.cxx</in>
+                    <in>test_list_equal.cpp</in>
+                    <in>test_list_equal.cxx</in>
+                    <in>test_list_to_seq.cpp</in>
+                    <in>test_list_to_seq.cxx</in>
+                    <in>test_list_to_tuple.cpp</in>
+                    <in>test_list_to_tuple.cxx</in>
+                    <in>test_number_elem.cpp</in>
+                    <in>test_number_elem.cxx</in>
+                    <in>test_number_equal.cpp</in>
+                    <in>test_number_equal.cxx</in>
+                    <in>test_seq_elem.cpp</in>
+                    <in>test_seq_elem.cxx</in>
+                    <in>test_seq_equal.cpp</in>
+                    <in>test_seq_equal.cxx</in>
+                    <in>test_seq_pop_back.cpp</in>
+                    <in>test_seq_pop_back.cxx</in>
+                    <in>test_seq_pop_front.cpp</in>
+                    <in>test_seq_pop_front.cxx</in>
+                    <in>test_seq_push_back.cpp</in>
+                    <in>test_seq_push_back.cxx</in>
+                    <in>test_seq_push_front.cpp</in>
+                    <in>test_seq_push_front.cxx</in>
+                    <in>test_seq_remove.cpp</in>
+                    <in>test_seq_remove.cxx</in>
+                    <in>test_seq_size.cpp</in>
+                    <in>test_seq_size.cxx</in>
+                    <in>test_seq_to_array.cpp</in>
+                    <in>test_seq_to_array.cxx</in>
+                    <in>test_seq_to_list.cpp</in>
+                    <in>test_seq_to_list.cxx</in>
+                    <in>test_seq_to_tuple.cpp</in>
+                    <in>test_seq_to_tuple.cxx</in>
+                    <in>test_sequence_after_elem.cpp</in>
+                    <in>test_sequence_after_elem.cxx</in>
+                    <in>test_sequence_elem.cpp</in>
+                    <in>test_sequence_elem.cxx</in>
+                    <in>test_sequence_enum.cpp</in>
+                    <in>test_sequence_enum.cxx</in>
+                    <in>test_sequence_size.cpp</in>
+                    <in>test_sequence_size.cxx</in>
+                    <in>test_sequence_to_array.cpp</in>
+                    <in>test_sequence_to_array.cxx</in>
+                    <in>test_sequence_to_list.cpp</in>
+                    <in>test_sequence_to_list.cxx</in>
+                    <in>test_sequence_to_seq.cpp</in>
+                    <in>test_sequence_to_seq.cxx</in>
+                    <in>test_sequence_to_tuple.cpp</in>
+                    <in>test_sequence_to_tuple.cxx</in>
+                    <in>test_tuple_elem.cpp</in>
+                    <in>test_tuple_elem.cxx</in>
+                    <in>test_tuple_equal.cpp</in>
+                    <in>test_tuple_equal.cxx</in>
+                    <in>test_tuple_pop_back.cpp</in>
+                    <in>test_tuple_pop_back.cxx</in>
+                    <in>test_tuple_pop_front.cpp</in>
+                    <in>test_tuple_pop_front.cxx</in>
+                    <in>test_tuple_push_back.cpp</in>
+                    <in>test_tuple_push_back.cxx</in>
+                    <in>test_tuple_push_front.cpp</in>
+                    <in>test_tuple_push_front.cxx</in>
+                    <in>test_tuple_remove.cpp</in>
+                    <in>test_tuple_remove.cxx</in>
+                    <in>test_tuple_size.cpp</in>
+                    <in>test_tuple_size.cxx</in>
+                    <in>test_tuple_to_array.cpp</in>
+                    <in>test_tuple_to_array.cxx</in>
+                    <in>test_tuple_to_list.cpp</in>
+                    <in>test_tuple_to_list.cxx</in>
+                    <in>test_tuple_to_seq.cpp</in>
+                    <in>test_tuple_to_seq.cxx</in>
+                    <in>test_type.cpp</in>
+                    <in>test_type.cxx</in>
+                    <in>test_type_elem.cpp</in>
+                    <in>test_type_elem.cxx</in>
+                    <in>test_type_equal.cpp</in>
+                    <in>test_type_equal.cxx</in>
+                    <in>test_variadic_macro.cpp</in>
+                    <in>test_variadic_macro.cxx</in>
+                  </df>
+                </df>
+                <df name="wave">
+                  <df name="samples">
+                    <df name="advanced_hooks">
+                      <in>advanced_hooks.cpp</in>
+                    </df>
+                    <df name="check_macro_naming">
+                      <in>check_macro_naming.cpp</in>
+                    </df>
+                    <df name="cpp_tokens">
+                      <in>cpp_tokens.cpp</in>
+                      <in>instantiate_cpp_exprgrammar.cpp</in>
+                      <in>instantiate_cpp_grammar.cpp</in>
+                      <in>instantiate_cpp_literalgrs.cpp</in>
+                      <in>instantiate_defined_grammar.cpp</in>
+                      <in>instantiate_has_include_grammar.cpp</in>
+                      <in>instantiate_slex_lexer.cpp</in>
+                    </df>
+                    <df name="custom_directives">
+                      <in>custom_directives.cpp</in>
+                    </df>
+                    <df name="emit_custom_line_directives">
+                      <in>emit_custom_line_directives.cpp</in>
+                    </df>
+                    <df name="hannibal">
+                      <in>hannibal.cpp</in>
+                    </df>
+                    <df name="lexed_tokens">
+                      <in>lexed_tokens.cpp</in>
+                    </df>
+                    <df name="list_includes">
+                      <in>instantiate_cpp_exprgrammar.cpp</in>
+                      <in>instantiate_cpp_grammar.cpp</in>
+                      <in>instantiate_cpp_literalgrs.cpp</in>
+                      <in>instantiate_defined_grammar.cpp</in>
+                      <in>instantiate_has_include_grammar.cpp</in>
+                      <in>instantiate_lexertl_lexer.cpp</in>
+                      <in>list_includes.cpp</in>
+                    </df>
+                    <df name="preprocess_pragma_output">
+                      <in>example.cpp</in>
+                      <in>preprocess_pragma_output.cpp</in>
+                    </df>
+                    <df name="quick_start">
+                      <in>quick_start.cpp</in>
+                    </df>
+                    <df name="real_positions">
+                      <in>instantiate_cpp_exprgrammar.cpp</in>
+                      <in>instantiate_cpp_grammar.cpp</in>
+                      <in>instantiate_cpp_literalgrs.cpp</in>
+                      <in>instantiate_defined_grammar.cpp</in>
+                      <in>instantiate_has_include_grammar.cpp</in>
+                      <in>instantiate_re2c_lexer.cpp</in>
+                      <in>instantiate_re2c_lexer_str.cpp</in>
+                      <in>real_positions.cpp</in>
+                    </df>
+                    <df name="token_statistics">
+                      <in>instantiate_cpp_grammar.cpp</in>
+                      <in>instantiate_defined_grammar.cpp</in>
+                      <in>instantiate_has_include_grammar.cpp</in>
+                      <in>instantiate_xlex_lexer.cpp</in>
+                      <in>token_statistics.cpp</in>
+                    </df>
+                    <df name="waveidl">
+                      <df name="idllexer">
+                        <in>idl_re.cpp</in>
+                      </df>
+                      <in>idl.cpp</in>
+                      <in>instantiate_cpp_grammar.cpp</in>
+                      <in>instantiate_defined_grammar.cpp</in>
+                      <in>instantiate_has_include_grammar.cpp</in>
+                      <in>instantiate_predef_macros.cpp</in>
+                      <in>instantiate_re2c_lexer.cpp</in>
+                      <in>instantiate_re2c_lexer_str.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <df name="cpplexer">
+                      <df name="re2clex">
+                        <in>aq.cpp</in>
+                        <in>cpp_re.cpp</in>
+                      </df>
+                    </df>
+                    <in>instantiate_cpp_exprgrammar.cpp</in>
+                    <in>instantiate_cpp_grammar.cpp</in>
+                    <in>instantiate_cpp_literalgrs.cpp</in>
+                    <in>instantiate_defined_grammar.cpp</in>
+                    <in>instantiate_has_include_grammar.cpp</in>
+                    <in>instantiate_predef_macros.cpp</in>
+                    <in>instantiate_re2c_lexer.cpp</in>
+                    <in>instantiate_re2c_lexer_str.cpp</in>
+                    <in>token_ids.cpp</in>
+                    <in>wave_config_constant.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="testlexers">
+                      <in>test_lexertl_lexer.cpp</in>
+                      <in>test_re2c_lexer.cpp</in>
+                      <in>test_slex_lexer.cpp</in>
+                      <in>test_xlex_lexer.cpp</in>
+                    </df>
+                    <df name="testwave">
+                      <df name="testfiles">
+                        <in>t_1_001.cpp</in>
+                        <in>t_1_002.cpp</in>
+                        <in>t_1_003.cpp</in>
+                        <in>t_1_004.cpp</in>
+                        <in>t_1_005.cpp</in>
+                        <in>t_1_006.cpp</in>
+                        <in>t_1_007.cpp</in>
+                        <in>t_1_008.cpp</in>
+                        <in>t_1_009.cpp</in>
+                        <in>t_1_010.cpp</in>
+                        <in>t_1_011.cpp</in>
+                        <in>t_1_012.cpp</in>
+                        <in>t_1_013.cpp</in>
+                        <in>t_1_014.cpp</in>
+                        <in>t_1_015.cpp</in>
+                        <in>t_1_016.cpp</in>
+                        <in>t_1_017.cpp</in>
+                        <in>t_1_018.cpp</in>
+                        <in>t_1_019.cpp</in>
+                        <in>t_1_020.cpp</in>
+                        <in>t_1_021.cpp</in>
+                        <in>t_1_022.cpp</in>
+                        <in>t_1_023.cpp</in>
+                        <in>t_1_024.cpp</in>
+                        <in>t_1_025.cpp</in>
+                        <in>t_1_026.cpp</in>
+                        <in>t_1_027.cpp</in>
+                        <in>t_1_028.cpp</in>
+                        <in>t_1_029.cpp</in>
+                        <in>t_1_030.cpp</in>
+                        <in>t_1_031.cpp</in>
+                        <in>t_1_032.cpp</in>
+                        <in>t_1_033.cpp</in>
+                        <in>t_1_034.cpp</in>
+                        <in>t_1_035.cpp</in>
+                        <in>t_1_036.cpp</in>
+                        <in>t_1_037.cpp</in>
+                        <in>t_1_038.cpp</in>
+                        <in>t_2_001.cpp</in>
+                        <in>t_2_002.cpp</in>
+                        <in>t_2_003.cpp</in>
+                        <in>t_2_004.cpp</in>
+                        <in>t_2_005.cpp</in>
+                        <in>t_2_006.cpp</in>
+                        <in>t_2_007.cpp</in>
+                        <in>t_2_008.cpp</in>
+                        <in>t_2_009.cpp</in>
+                        <in>t_2_010.cpp</in>
+                        <in>t_2_011.cpp</in>
+                        <in>t_2_012.cpp</in>
+                        <in>t_2_013.cpp</in>
+                        <in>t_2_014.cpp</in>
+                        <in>t_2_015.cpp</in>
+                        <in>t_2_016.cpp</in>
+                        <in>t_2_017.cpp</in>
+                        <in>t_2_018.cpp</in>
+                        <in>t_2_019.cpp</in>
+                        <in>t_2_020.cpp</in>
+                        <in>t_2_021.cpp</in>
+                        <in>t_2_022.cpp</in>
+                        <in>t_2_023.cpp</in>
+                        <in>t_2_024.cpp</in>
+                        <in>t_2_025.cpp</in>
+                        <in>t_2_026.cpp</in>
+                        <in>t_2_027.cpp</in>
+                        <in>t_2_028.cpp</in>
+                        <in>t_2_029.cpp</in>
+                        <in>t_2_030.cpp</in>
+                        <in>t_3_001.cpp</in>
+                        <in>t_3_002.cpp</in>
+                        <in>t_3_003.cpp</in>
+                        <in>t_3_004.cpp</in>
+                        <in>t_4_001.cpp</in>
+                        <in>t_4_002.cpp</in>
+                        <in>t_4_003.cpp</in>
+                        <in>t_4_004.cpp</in>
+                        <in>t_5_001.cpp</in>
+                        <in>t_5_002.cpp</in>
+                        <in>t_5_003.cpp</in>
+                        <in>t_5_004.cpp</in>
+                        <in>t_5_005.cpp</in>
+                        <in>t_5_006.cpp</in>
+                        <in>t_5_007.cpp</in>
+                        <in>t_5_008.cpp</in>
+                        <in>t_5_009.cpp</in>
+                        <in>t_5_010.cpp</in>
+                        <in>t_5_011.cpp</in>
+                        <in>t_5_012.cpp</in>
+                        <in>t_5_013.cpp</in>
+                        <in>t_5_014.cpp</in>
+                        <in>t_5_015.cpp</in>
+                        <in>t_5_016.cpp</in>
+                        <in>t_5_017.cpp</in>
+                        <in>t_5_018.cpp</in>
+                        <in>t_5_019.cpp</in>
+                        <in>t_5_020.cpp</in>
+                        <in>t_5_021.cpp</in>
+                        <in>t_5_022.cpp</in>
+                        <in>t_5_023.cpp</in>
+                        <in>t_5_024.cpp</in>
+                        <in>t_5_025.cpp</in>
+                        <in>t_5_026.cpp</in>
+                        <in>t_5_027.cpp</in>
+                        <in>t_5_028.cpp</in>
+                        <in>t_5_029.cpp</in>
+                        <in>t_5_030.cpp</in>
+                        <in>t_5_031.cpp</in>
+                        <in>t_5_032.cpp</in>
+                        <in>t_5_033.cpp</in>
+                        <in>t_5_034.cpp</in>
+                        <in>t_5_035.cpp</in>
+                        <in>t_5_036.cpp</in>
+                        <in>t_5_037.cpp</in>
+                        <in>t_6_001.cpp</in>
+                        <in>t_6_002.cpp</in>
+                        <in>t_6_003.cpp</in>
+                        <in>t_6_004.cpp</in>
+                        <in>t_6_005.cpp</in>
+                        <in>t_6_006.cpp</in>
+                        <in>t_6_007.cpp</in>
+                        <in>t_6_008.cpp</in>
+                        <in>t_6_009.cpp</in>
+                        <in>t_6_010.cpp</in>
+                        <in>t_6_011.cpp</in>
+                        <in>t_6_012.cpp</in>
+                        <in>t_6_013.cpp</in>
+                        <in>t_6_014.cpp</in>
+                        <in>t_6_015.cpp</in>
+                        <in>t_6_016.cpp</in>
+                        <in>t_6_017.cpp</in>
+                        <in>t_6_018.cpp</in>
+                        <in>t_6_019.cpp</in>
+                        <in>t_6_020.cpp</in>
+                        <in>t_6_021.cpp</in>
+                        <in>t_6_022.cpp</in>
+                        <in>t_6_023.cpp</in>
+                        <in>t_6_024.cpp</in>
+                        <in>t_6_025.cpp</in>
+                        <in>t_6_026.cpp</in>
+                        <in>t_6_027.cpp</in>
+                        <in>t_6_028.cpp</in>
+                        <in>t_6_029.cpp</in>
+                        <in>t_6_030.cpp</in>
+                        <in>t_6_031.cpp</in>
+                        <in>t_6_032.cpp</in>
+                        <in>t_6_033.cpp</in>
+                        <in>t_6_034.cpp</in>
+                        <in>t_6_035.cpp</in>
+                        <in>t_6_036.cpp</in>
+                        <in>t_6_037.cpp</in>
+                        <in>t_6_038.cpp</in>
+                        <in>t_6_039.cpp</in>
+                        <in>t_6_040.cpp</in>
+                        <in>t_6_041.cpp</in>
+                        <in>t_6_042.cpp</in>
+                        <in>t_6_043.cpp</in>
+                        <in>t_6_044.cpp</in>
+                        <in>t_6_045.cpp</in>
+                        <in>t_6_046.cpp</in>
+                        <in>t_6_047.cpp</in>
+                        <in>t_6_048.cpp</in>
+                        <in>t_6_049.cpp</in>
+                        <in>t_6_050.cpp</in>
+                        <in>t_6_051.cpp</in>
+                        <in>t_6_052.cpp</in>
+                        <in>t_6_053.cpp</in>
+                        <in>t_6_054.cpp</in>
+                        <in>t_6_055.cpp</in>
+                        <in>t_6_056.cpp</in>
+                        <in>t_6_057.cpp</in>
+                        <in>t_6_058.cpp</in>
+                        <in>t_6_059.cpp</in>
+                        <in>t_6_060.cpp</in>
+                        <in>t_6_061.cpp</in>
+                        <in>t_6_062.cpp</in>
+                        <in>t_6_063.cpp</in>
+                        <in>t_6_064.cpp</in>
+                        <in>t_6_065.cpp</in>
+                        <in>t_6_066.cpp</in>
+                        <in>t_6_067.cpp</in>
+                        <in>t_6_068.cpp</in>
+                        <in>t_6_069.cpp</in>
+                        <in>t_7_001.cpp</in>
+                        <in>t_7_002.cpp</in>
+                        <in>t_7_003.cpp</in>
+                        <in>t_7_004.cpp</in>
+                        <in>t_7_005.cpp</in>
+                        <in>t_7_006.cpp</in>
+                        <in>t_8_001.cpp</in>
+                        <in>t_8_002.cpp</in>
+                        <in>t_8_003.cpp</in>
+                        <in>t_8_004.cpp</in>
+                        <in>t_8_005.cpp</in>
+                        <in>t_8_006.cpp</in>
+                        <in>t_8_007.cpp</in>
+                        <in>t_8_008.cpp</in>
+                        <in>t_8_009.cpp</in>
+                        <in>t_8_010.cpp</in>
+                        <in>t_8_011.cpp</in>
+                        <in>t_9_001.cpp</in>
+                        <in>t_9_002.cpp</in>
+                        <in>t_9_003.cpp</in>
+                        <in>t_9_004.cpp</in>
+                        <in>t_9_005.cpp</in>
+                        <in>t_9_006.cpp</in>
+                        <in>t_9_007.cpp</in>
+                        <in>t_9_008.cpp</in>
+                        <in>t_9_009.cpp</in>
+                        <in>t_9_010.cpp</in>
+                        <in>t_9_011.cpp</in>
+                        <in>t_9_012.cpp</in>
+                        <in>t_9_013.cpp</in>
+                        <in>t_9_014.cpp</in>
+                        <in>t_9_015.cpp</in>
+                        <in>t_9_016.cpp</in>
+                        <in>t_9_017.cpp</in>
+                        <in>t_9_018.cpp</in>
+                        <in>t_9_019.cpp</in>
+                        <in>t_9_020.cpp</in>
+                        <in>t_9_021.cpp</in>
+                        <in>t_9_022.cpp</in>
+                        <in>t_9_023.cpp</in>
+                        <in>t_9_024.cpp</in>
+                        <in>t_9_025.cpp</in>
+                        <in>t_9_026.cpp</in>
+                        <in>t_9_027.cpp</in>
+                        <in>t_9_028.cpp</in>
+                      </df>
+                      <in>quick.cpp</in>
+                      <in>testwave.cpp</in>
+                      <in>testwave_app.cpp</in>
+                      <in>testwave_app_dll.cpp</in>
+                      <in>testwave_dll.cpp</in>
+                    </df>
+                  </df>
+                  <df name="tool">
+                    <in>cpp.cpp</in>
+                  </df>
+                </df>
+                <df name="winapi">
+                  <df name="test">
+                    <df name="compile">
+                      <in>decl_header.cpp</in>
+                      <in>windows_h_post.cpp</in>
+                      <in>windows_h_pre.cpp</in>
+                    </df>
+                    <df name="config">
+                      <df name="has-bcrypt">
+                        <in>has_bcrypt.cpp</in>
+                      </df>
+                    </df>
+                    <df name="run">
+                      <in>access_rights_abi.cpp</in>
+                      <in>apc_abi.cpp</in>
+                      <in>basic_types_abi.cpp</in>
+                      <in>bcrypt_abi.cpp</in>
+                      <in>character_code_conversion_abi.cpp</in>
+                      <in>condition_variable_abi.cpp</in>
+                      <in>critical_section_abi.cpp</in>
+                      <in>crypt_abi.cpp</in>
+                      <in>dbghelp_abi.cpp</in>
+                      <in>debugapi_abi.cpp</in>
+                      <in>directory_management_abi.cpp</in>
+                      <in>dll_abi.cpp</in>
+                      <in>environment_abi.cpp</in>
+                      <in>error_codes_abi.cpp</in>
+                      <in>error_handling_abi.cpp</in>
+                      <in>event_abi.cpp</in>
+                      <in>file_management_abi.cpp</in>
+                      <in>file_mapping_abi.cpp</in>
+                      <in>get_current_process_abi.cpp</in>
+                      <in>get_current_process_id_abi.cpp</in>
+                      <in>get_current_thread_abi.cpp</in>
+                      <in>get_current_thread_id_abi.cpp</in>
+                      <in>get_last_error_abi.cpp</in>
+                      <in>get_system_directory_abi.cpp</in>
+                      <in>handle_info_abi.cpp</in>
+                      <in>handles_abi.cpp</in>
+                      <in>heap_memory_abi.cpp</in>
+                      <in>init_once_abi.cpp</in>
+                      <in>interlocked.cpp</in>
+                      <in>limits_abi.cpp</in>
+                      <in>local_memory_abi.cpp</in>
+                      <in>mutex_abi.cpp</in>
+                      <in>overlapped_abi.cpp</in>
+                      <in>page_protection_flags_abi.cpp</in>
+                      <in>pipes_abi.cpp</in>
+                      <in>priority_class_abi.cpp</in>
+                      <in>process_abi.cpp</in>
+                      <in>security_abi.cpp</in>
+                      <in>semaphore_abi.cpp</in>
+                      <in>shell_abi.cpp</in>
+                      <in>show_window_abi.cpp</in>
+                      <in>srw_lock_abi.cpp</in>
+                      <in>stack_backtrace_abi.cpp</in>
+                      <in>system_abi.cpp</in>
+                      <in>thread_abi.cpp</in>
+                      <in>thread_pool_abi.cpp</in>
+                      <in>time_abi.cpp</in>
+                      <in>tls_abi.cpp</in>
+                      <in>wait_abi.cpp</in>
+                      <in>wait_on_address_abi.cpp</in>
+                      <in>waitable_timer_abi.cpp</in>
+                      <in>winapi_info.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="xpressive">
+                  <df name="example">
+                    <in>main.cpp</in>
+                    <in>numbers.cpp</in>
+                  </df>
+                  <df name="perf">
+                    <in>command_line.cpp</in>
+                    <in>main.cpp</in>
+                    <in>time_boost.cpp</in>
+                    <in>time_dynamic_xpressive.cpp</in>
+                    <in>time_static_xpressive.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>c_traits.cpp</in>
+                    <in>c_traits_u.cpp</in>
+                    <in>misc1.cpp</in>
+                    <in>misc2.cpp</in>
+                    <in>multiple_defs1.cpp</in>
+                    <in>multiple_defs2.cpp</in>
+                    <in>regress.cpp</in>
+                    <in>regress_u.cpp</in>
+                    <in>test1.cpp</in>
+                    <in>test10.cpp</in>
+                    <in>test10u.cpp</in>
+                    <in>test11.cpp</in>
+                    <in>test11u.cpp</in>
+                    <in>test1u.cpp</in>
+                    <in>test2.cpp</in>
+                    <in>test2u.cpp</in>
+                    <in>test3.cpp</in>
+                    <in>test3u.cpp</in>
+                    <in>test4.cpp</in>
+                    <in>test4u.cpp</in>
+                    <in>test5.cpp</in>
+                    <in>test5u.cpp</in>
+                    <in>test6.cpp</in>
+                    <in>test6u.cpp</in>
+                    <in>test7.cpp</in>
+                    <in>test7u.cpp</in>
+                    <in>test8.cpp</in>
+                    <in>test8u.cpp</in>
+                    <in>test9.cpp</in>
+                    <in>test9u.cpp</in>
+                    <in>test_actions.cpp</in>
+                    <in>test_assert.cpp</in>
+                    <in>test_assert_with_placeholder.cpp</in>
+                    <in>test_basic_regex.cpp</in>
+                    <in>test_cycles.cpp</in>
+                    <in>test_dynamic.cpp</in>
+                    <in>test_dynamic_grammar.cpp</in>
+                    <in>test_format.cpp</in>
+                    <in>test_match_results.cpp</in>
+                    <in>test_non_char.cpp</in>
+                    <in>test_partial_match.cpp</in>
+                    <in>test_regex_algorithms.cpp</in>
+                    <in>test_regex_compiler.cpp</in>
+                    <in>test_regex_constants.cpp</in>
+                    <in>test_regex_error.cpp</in>
+                    <in>test_regex_iterator.cpp</in>
+                    <in>test_regex_primitives.cpp</in>
+                    <in>test_regex_token_iterator.cpp</in>
+                    <in>test_regex_traits.cpp</in>
+                    <in>test_skip.cpp</in>
+                    <in>test_static.cpp</in>
+                    <in>test_sub_match.cpp</in>
+                    <in>test_symbols.cpp</in>
+                    <in>test_typeof.cpp</in>
+                    <in>test_typeof2.cpp</in>
+                  </df>
+                  <df name="tools">
+                    <in>perl2xpr.cpp</in>
+                  </df>
+                </df>
+                <df name="yap">
+                  <df name="cmake">
+                    <in>constexpr_if.cpp</in>
+                  </df>
+                  <df name="doc">
+                    <in>other_snippets.cpp</in>
+                    <in>user_macros_snippets.cpp</in>
+                  </df>
+                  <df name="example">
+                    <df name="autodiff_library">
+                      <in>ActNode.cpp</in>
+                      <in>BinaryOPNode.cpp</in>
+                      <in>Edge.cpp</in>
+                      <in>EdgeSet.cpp</in>
+                      <in>Node.cpp</in>
+                      <in>OPNode.cpp</in>
+                      <in>PNode.cpp</in>
+                      <in>Stack.cpp</in>
+                      <in>Tape.cpp</in>
+                      <in>UaryOPNode.cpp</in>
+                      <in>VNode.cpp</in>
+                      <in>autodiff.cpp</in>
+                    </df>
+                    <in>autodiff_example.cpp</in>
+                    <in>calc1.cpp</in>
+                    <in>calc2a.cpp</in>
+                    <in>calc2b.cpp</in>
+                    <in>calc3.cpp</in>
+                    <in>future_group.cpp</in>
+                    <in>hello_world.cpp</in>
+                    <in>hello_world_redux.cpp</in>
+                    <in>lazy_vector.cpp</in>
+                    <in>let.cpp</in>
+                    <in>map_assign.cpp</in>
+                    <in>minimal.cpp</in>
+                    <in>mixed.cpp</in>
+                    <in>pipable_algorithms.cpp</in>
+                    <in>self_evaluation.cpp</in>
+                    <in>tarray.cpp</in>
+                    <in>transform_terminals.cpp</in>
+                    <in>vec3.cpp</in>
+                    <in>vector.cpp</in>
+                  </df>
+                  <df name="perf">
+                    <in>arithmetic_perf.cpp</in>
+                    <in>code_gen_samples.cpp</in>
+                    <in>lazy_vector_perf.cpp</in>
+                    <in>map_assign_code_gen.cpp</in>
+                    <in>map_assign_perf.cpp</in>
+                  </df>
+                  <df name="test">
+                    <in>call_expr.cpp</in>
+                    <in>comma.cpp</in>
+                    <in>compile_const_term.cpp</in>
+                    <in>compile_is_expr.cpp</in>
+                    <in>compile_move_only_types.cpp</in>
+                    <in>compile_placeholders.cpp</in>
+                    <in>compile_term_plus_expr.cpp</in>
+                    <in>compile_term_plus_term.cpp</in>
+                    <in>compile_term_plus_x.cpp</in>
+                    <in>compile_term_plus_x_this_ref_overloads.cpp</in>
+                    <in>compile_tests_main.cpp</in>
+                    <in>compile_user_macros.cpp</in>
+                    <in>compile_x_plus_term.cpp</in>
+                    <in>default_eval.cpp</in>
+                    <in>depth_stress_test_left.cpp</in>
+                    <in>depth_stress_test_right.cpp</in>
+                    <in>deref.cpp</in>
+                    <in>expression_function.cpp</in>
+                    <in>fail_argument.cpp</in>
+                    <in>fail_callable.cpp</in>
+                    <in>fail_cond.cpp</in>
+                    <in>fail_else.cpp</in>
+                    <in>fail_get.cpp</in>
+                    <in>fail_left.cpp</in>
+                    <in>fail_make_expression.cpp</in>
+                    <in>fail_make_terminal.cpp</in>
+                    <in>fail_right.cpp</in>
+                    <in>fail_then.cpp</in>
+                    <in>fail_transform.cpp</in>
+                    <in>if_else.cpp</in>
+                    <in>lazy_vector_alloc_test.cpp</in>
+                    <in>left.cpp</in>
+                    <in>operators_unary.cpp</in>
+                    <in>placeholder_eval.cpp</in>
+                    <in>print.cpp</in>
+                    <in>reference_returns.cpp</in>
+                    <in>right.cpp</in>
+                    <in>supplied_transforms.cpp</in>
+                    <in>transform.cpp</in>
+                    <in>user_expression_transform_1.cpp</in>
+                    <in>user_expression_transform_2.cpp</in>
+                    <in>value.cpp</in>
+                    <in>vector_alloc_test.cpp</in>
+                  </df>
+                </df>
+              </df>
+              <df name="tools">
+                <df name="auto_index">
+                  <df name="src">
+                    <in>auto_index.cpp</in>
+                    <in>file_scanning.cpp</in>
+                    <in>index_generator.cpp</in>
+                    <in>tiny_xml.cpp</in>
+                  </df>
+                </df>
+                <df name="bcp">
+                  <in>add_dependent_lib.cpp</in>
+                  <in>add_path.cpp</in>
+                  <in>bcp_imp.cpp</in>
+                  <in>copy_path.cpp</in>
+                  <in>file_types.cpp</in>
+                  <in>fileview.cpp</in>
+                  <in>licence_info.cpp</in>
+                  <in>main.cpp</in>
+                  <in>output_licence_info.cpp</in>
+                  <in>path_operations.cpp</in>
+                  <in>scan_cvs_path.cpp</in>
+                  <in>scan_licence.cpp</in>
+                </df>
+                <df name="boost_install">
+                  <df name="test">
+                    <df name="atomic">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="chrono">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="container">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="filesystem">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="headers">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="iostreams">
+                      <df name="bzip2-1.0.8">
+                        <in>blocksort.c</in>
+                        <in>bzip2.c</in>
+                        <in>bzip2recover.c</in>
+                        <in>bzlib.c</in>
+                        <in>compress.c</in>
+                        <in>crctable.c</in>
+                        <in>decompress.c</in>
+                        <in>dlltest.c</in>
+                        <in>huffman.c</in>
+                        <in>mk251.c</in>
+                        <in>randtable.c</in>
+                        <in>spewG.c</in>
+                        <in>unzcrash.c</in>
+                      </df>
+                      <df name="zlib-1.2.11">
+                        <df name="contrib">
+                          <df name="blast">
+                            <in>blast.c</in>
+                          </df>
+                          <df name="infback9">
+                            <in>infback9.c</in>
+                            <in>inftree9.c</in>
+                          </df>
+                          <df name="inflate86">
+                            <in>inffas86.c</in>
+                          </df>
+                          <df name="iostream">
+                            <in>test.cpp</in>
+                            <in>zfstream.cpp</in>
+                          </df>
+                          <df name="iostream2">
+                            <in>zstream_test.cpp</in>
+                          </df>
+                          <df name="iostream3">
+                            <in>test.cc</in>
+                            <in>zfstream.cc</in>
+                          </df>
+                          <df name="masmx64">
+                            <in>inffas8664.c</in>
+                          </df>
+                          <df name="minizip">
+                            <in>ioapi.c</in>
+                            <in>iowin32.c</in>
+                            <in>miniunz.c</in>
+                            <in>minizip.c</in>
+                            <in>mztools.c</in>
+                            <in>unzip.c</in>
+                            <in>zip.c</in>
+                          </df>
+                          <df name="puff">
+                            <in>puff.c</in>
+                            <in>pufftest.c</in>
+                          </df>
+                          <df name="testzlib">
+                            <in>testzlib.c</in>
+                          </df>
+                          <df name="untgz">
+                            <in>untgz.c</in>
+                          </df>
+                        </df>
+                        <df name="examples">
+                          <in>enough.c</in>
+                          <in>fitblk.c</in>
+                          <in>gun.c</in>
+                          <in>gzappend.c</in>
+                          <in>gzjoin.c</in>
+                          <in>gzlog.c</in>
+                          <in>zpipe.c</in>
+                          <in>zran.c</in>
+                        </df>
+                        <df name="test">
+                          <in>example.c</in>
+                          <in>infcover.c</in>
+                          <in>minigzip.c</in>
+                        </df>
+                        <in>adler32.c</in>
+                        <in>compress.c</in>
+                        <in>crc32.c</in>
+                        <in>deflate.c</in>
+                        <in>gzclose.c</in>
+                        <in>gzlib.c</in>
+                        <in>gzread.c</in>
+                        <in>gzwrite.c</in>
+                        <in>infback.c</in>
+                        <in>inffast.c</in>
+                        <in>inflate.c</in>
+                        <in>inftrees.c</in>
+                        <in>trees.c</in>
+                        <in>uncompr.c</in>
+                        <in>zutil.c</in>
+                      </df>
+                      <in>test_bzip2.cpp</in>
+                      <in>test_gzip.cpp</in>
+                    </df>
+                    <df name="log">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="mpi">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="program_options">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="python">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="random">
+                      <in>lib.cpp</in>
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="regex">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="serialization">
+                      <in>quick.cpp</in>
+                      <in>wquick.cpp</in>
+                    </df>
+                    <df name="system">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="test">
+                      <in>test_mon.cpp</in>
+                      <in>test_utf.cpp</in>
+                    </df>
+                    <df name="thread">
+                      <in>quick.cpp</in>
+                    </df>
+                    <df name="wave">
+                      <in>quick.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="boostdep">
+                  <df name="src">
+                    <in>boostdep.cpp</in>
+                  </df>
+                </df>
+                <df name="build">
+                  <df name="example">
+                    <df name="built_tool">
+                      <df name="core">
+                        <in>core.cpp</in>
+                      </df>
+                      <df name="tblgen">
+                        <in>tblgen.cpp</in>
+                      </df>
+                    </df>
+                    <df name="complex-testing">
+                      <in>compile-fail.cpp</in>
+                      <in>fail.cpp</in>
+                      <in>post.cpp</in>
+                      <in>success.cpp</in>
+                    </df>
+                    <df name="customization">
+                      <in>codegen.cpp</in>
+                    </df>
+                    <df name="generate">
+                      <in>a.cpp</in>
+                    </df>
+                    <df name="gettext">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="hello">
+                      <in>hello.cpp</in>
+                    </df>
+                    <df name="libraries">
+                      <df name="app">
+                        <in>app.cpp</in>
+                      </df>
+                      <df name="util">
+                        <df name="foo">
+                          <in>bar.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="pch">
+                      <df name="source">
+                        <in>hello_world.cpp</in>
+                      </df>
+                    </df>
+                    <df name="pch-multi">
+                      <df name="source">
+                        <in>hello_world.cpp</in>
+                      </df>
+                    </df>
+                    <df name="pkg-config">
+                      <in>test1.cpp</in>
+                      <in>test2.cpp</in>
+                      <in>test3.cpp</in>
+                      <in>test4.cpp</in>
+                      <in>test5.cpp</in>
+                    </df>
+                    <df name="qt">
+                      <df name="qt3">
+                        <df name="hello">
+                          <in>canvas.cpp</in>
+                          <in>main.cpp</in>
+                        </df>
+                        <df name="moccable-cpp">
+                          <in>main.cpp</in>
+                        </df>
+                        <df name="uic">
+                          <in>main.cpp</in>
+                        </df>
+                      </df>
+                      <df name="qt4">
+                        <df name="hello">
+                          <in>arrow.cpp</in>
+                          <in>main.cpp</in>
+                        </df>
+                        <df name="moccable-cpp">
+                          <in>main.cpp</in>
+                        </df>
+                        <df name="uic">
+                          <in>main.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="sanitizers">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="testing">
+                      <in>compile-fail.cpp</in>
+                      <in>fail.cpp</in>
+                      <in>success.cpp</in>
+                    </df>
+                    <df name="time">
+                      <in>hello.cpp</in>
+                    </df>
+                    <df name="try_compile">
+                      <in>foo.cpp</in>
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="variant">
+                      <df name="libs">
+                        <in>l.cpp</in>
+                      </df>
+                      <in>a.cpp</in>
+                    </df>
+                  </df>
+                  <df name="src">
+                    <df name="engine">
+                      <df name="modules">
+                        <in>order.cpp</in>
+                        <in>path.cpp</in>
+                        <in>property-set.cpp</in>
+                        <in>regex.cpp</in>
+                        <in>sequence.cpp</in>
+                        <in>set.cpp</in>
+                      </df>
+                      <in>builtins.cpp</in>
+                      <in>check_clib.cpp</in>
+                      <in>check_cxx11.cpp</in>
+                      <in>class.cpp</in>
+                      <in>command.cpp</in>
+                      <in>compile.cpp</in>
+                      <in>constants.cpp</in>
+                      <in>cwd.cpp</in>
+                      <in>debug.cpp</in>
+                      <in>debugger.cpp</in>
+                      <in>execcmd.cpp</in>
+                      <in>execnt.cpp</in>
+                      <in>execunix.cpp</in>
+                      <in>execvms.cpp</in>
+                      <in>filent.cpp</in>
+                      <in>filesys.cpp</in>
+                      <in>fileunix.cpp</in>
+                      <in>filevms.cpp</in>
+                      <in>frames.cpp</in>
+                      <in>function.cpp</in>
+                      <in>glob.cpp</in>
+                      <in>hash.cpp</in>
+                      <in>hcache.cpp</in>
+                      <in>hdrmacro.cpp</in>
+                      <in>headers.cpp</in>
+                      <in>jam.cpp</in>
+                      <in>jam_strings.cpp</in>
+                      <in>jamgram.cpp</in>
+                      <in>lists.cpp</in>
+                      <in>make.cpp</in>
+                      <in>make1.cpp</in>
+                      <in>md5.cpp</in>
+                      <in>mem.cpp</in>
+                      <in>modules.cpp</in>
+                      <in>native.cpp</in>
+                      <in>object.cpp</in>
+                      <in>option.cpp</in>
+                      <in>output.cpp</in>
+                      <in>parse.cpp</in>
+                      <in>pathnt.cpp</in>
+                      <in>pathsys.cpp</in>
+                      <in>pathunix.cpp</in>
+                      <in>pathvms.cpp</in>
+                      <in>regexp.cpp</in>
+                      <in>rules.cpp</in>
+                      <in>scan.cpp</in>
+                      <in>search.cpp</in>
+                      <in>startup.cpp</in>
+                      <in>subst.cpp</in>
+                      <in>sysinfo.cpp</in>
+                      <in>timestamp.cpp</in>
+                      <in>variable.cpp</in>
+                      <in>w32_getreg.cpp</in>
+                      <in>yyacc.cpp</in>
+                    </df>
+                  </df>
+                  <df name="test">
+                    <df name="prebuilt">
+                      <df name="ext">
+                        <in>a.cpp</in>
+                      </df>
+                      <in>hello.cpp</in>
+                    </df>
+                    <df name="project-test3">
+                      <df name="lib">
+                        <in>b.cpp</in>
+                      </df>
+                      <df name="lib2">
+                        <df name="helper">
+                          <in>e.cpp</in>
+                        </df>
+                        <in>c.cpp</in>
+                        <in>d.cpp</in>
+                      </df>
+                      <df name="lib3">
+                        <in>f.cpp</in>
+                      </df>
+                      <in>a.cpp</in>
+                    </df>
+                    <df name="project-test4">
+                      <df name="lib">
+                        <in>b.cpp</in>
+                      </df>
+                      <in>a.cpp</in>
+                      <in>a_gcc.cpp</in>
+                    </df>
+                    <df name="qt4">
+                      <in>mock.cpp</in>
+                      <in>phonon.cpp</in>
+                      <in>qt3support.cpp</in>
+                      <in>qtassistant.cpp</in>
+                      <in>qtcore.cpp</in>
+                      <in>qtcorefail.cpp</in>
+                      <in>qtdeclarative.cpp</in>
+                      <in>qtgui.cpp</in>
+                      <in>qthelp.cpp</in>
+                      <in>qtmultimedia.cpp</in>
+                      <in>qtnetwork.cpp</in>
+                      <in>qtscript.cpp</in>
+                      <in>qtscripttools.cpp</in>
+                      <in>qtsql.cpp</in>
+                      <in>qtsvg.cpp</in>
+                      <in>qttest.cpp</in>
+                      <in>qtwebkit.cpp</in>
+                      <in>qtxml.cpp</in>
+                      <in>qtxmlpatterns.cpp</in>
+                      <in>rcc.cpp</in>
+                    </df>
+                    <df name="qt5">
+                      <in>initialization.cpp</in>
+                      <in>mock.cpp</in>
+                      <in>qt3dcore.cpp</in>
+                      <in>qt3dinput.cpp</in>
+                      <in>qt3dlogic.cpp</in>
+                      <in>qt3drender.cpp</in>
+                      <in>qtassistant.cpp</in>
+                      <in>qtbluetooth.cpp</in>
+                      <in>qtcharts.cpp</in>
+                      <in>qtcore.cpp</in>
+                      <in>qtcorefail.cpp</in>
+                      <in>qtdatavisualization.cpp</in>
+                      <in>qtdeclarative.cpp</in>
+                      <in>qtgamepad.cpp</in>
+                      <in>qthelp.cpp</in>
+                      <in>qtlocation.cpp</in>
+                      <in>qtmultimedia.cpp</in>
+                      <in>qtnetwork.cpp</in>
+                      <in>qtnfc.cpp</in>
+                      <in>qtpositioning.cpp</in>
+                      <in>qtpurchasing.cpp</in>
+                      <in>qtquick.cpp</in>
+                      <in>qtscript.cpp</in>
+                      <in>qtscripttools.cpp</in>
+                      <in>qtscxml.cpp</in>
+                      <in>qtserialbus.cpp</in>
+                      <in>qtserialport.cpp</in>
+                      <in>qtsql.cpp</in>
+                      <in>qtsvg.cpp</in>
+                      <in>qttest.cpp</in>
+                      <in>qtwebchannel.cpp</in>
+                      <in>qtwebengine.cpp</in>
+                      <in>qtwebenginewidgets.cpp</in>
+                      <in>qtwebkit.cpp</in>
+                      <in>qtwebkitwidgets.cpp</in>
+                      <in>qtwebsocket.cpp</in>
+                      <in>qtwebsockets.cpp</in>
+                      <in>qtwebview.cpp</in>
+                      <in>qtwidgets.cpp</in>
+                      <in>qtxml.cpp</in>
+                      <in>qtxmlpatterns.cpp</in>
+                      <in>rcc.cpp</in>
+                    </df>
+                    <df name="rootless">
+                      <df name="test1">
+                        <df name="sub_root">
+                          <in>a.cpp</in>
+                        </df>
+                      </df>
+                      <df name="test2">
+                        <df name="sub_root">
+                          <in>a.cpp</in>
+                        </df>
+                      </df>
+                      <df name="test3">
+                        <df name="sub">
+                          <df name="inner">
+                            <in>a.cpp</in>
+                          </df>
+                        </df>
+                      </df>
+                    </df>
+                    <df name="test2">
+                      <in>foo.cpp</in>
+                    </df>
+                    <df name="toolset-mock">
+                      <df name="src">
+                        <in>mock-program.cpp</in>
+                      </df>
+                      <in>lib.cpp</in>
+                      <in>main.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="check_build">
+                  <df name="test">
+                    <in>main.cpp</in>
+                  </df>
+                </df>
+                <df name="cmake">
+                  <df name="test">
+                    <df name="add_subdir">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="add_subdir_exc">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="assert">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="atomic">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="boost_fetch">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="boost_test">
+                      <in>arguments.cpp</in>
+                      <in>compile.cpp</in>
+                      <in>compile_fail.cpp</in>
+                      <in>emits_warning.cpp</in>
+                      <in>link.cpp</in>
+                      <in>link_fail.cpp</in>
+                      <in>requires_no_exceptions.cpp</in>
+                      <in>requires_no_rtti.cpp</in>
+                      <in>requires_variadic_templates.cpp</in>
+                      <in>return_exit_code.cpp</in>
+                      <in>run.cpp</in>
+                      <in>run_fail.cpp</in>
+                    </df>
+                    <df name="iostreams">
+                      <in>test_fd.cpp</in>
+                    </df>
+                    <df name="locale">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="mp11">
+                      <in>main.cpp</in>
+                    </df>
+                    <df name="timer">
+                      <in>main.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="inspect">
+                  <in>apple_macro_check.cpp</in>
+                  <in>ascii_check.cpp</in>
+                  <in>assert_macro_check.cpp</in>
+                  <in>copyright_check.cpp</in>
+                  <in>crlf_check.cpp</in>
+                  <in>deprecated_macro_check.cpp</in>
+                  <in>end_check.cpp</in>
+                  <in>inspect.cpp</in>
+                  <in>license_check.cpp</in>
+                  <in>link_check.cpp</in>
+                  <in>minmax_check.cpp</in>
+                  <in>path_name_check.cpp</in>
+                  <in>tab_check.cpp</in>
+                  <in>unnamed_namespace_check.cpp</in>
+                  <in>wrong_line_ends_test.cpp</in>
+                </df>
+                <df name="quickbook">
+                  <df name="src">
+                    <in>actions.cpp</in>
+                    <in>bb2html.cpp</in>
+                    <in>block_element_grammar.cpp</in>
+                    <in>boostbook_chunker.cpp</in>
+                    <in>code_snippet.cpp</in>
+                    <in>collector.cpp</in>
+                    <in>dependency_tracker.cpp</in>
+                    <in>doc_info_actions.cpp</in>
+                    <in>doc_info_grammar.cpp</in>
+                    <in>document_state.cpp</in>
+                    <in>files.cpp</in>
+                    <in>glob.cpp</in>
+                    <in>grammar.cpp</in>
+                    <in>html_printer.cpp</in>
+                    <in>id_generation.cpp</in>
+                    <in>id_xml.cpp</in>
+                    <in>include_paths.cpp</in>
+                    <in>main_grammar.cpp</in>
+                    <in>markups.cpp</in>
+                    <in>native_text.cpp</in>
+                    <in>path.cpp</in>
+                    <in>phrase_element_grammar.cpp</in>
+                    <in>post_process.cpp</in>
+                    <in>quickbook.cpp</in>
+                    <in>state.cpp</in>
+                    <in>stream.cpp</in>
+                    <in>syntax_highlight.cpp</in>
+                    <in>template_stack.cpp</in>
+                    <in>tree.cpp</in>
+                    <in>utils.cpp</in>
+                    <in>values.cpp</in>
+                    <in>xml_parse.cpp</in>
+                  </df>
+                  <df name="test">
+                    <df name="snippets">
+                      <in>pass_thru.cpp</in>
+                      <in>unbalanced_snippet1.cpp</in>
+                      <in>unbalanced_snippet2.cpp</in>
+                    </df>
+                    <df name="src">
+                      <in>text_diff.cpp</in>
+                    </df>
+                    <df name="unit">
+                      <in>cleanup_test.cpp</in>
+                      <in>glob_test.cpp</in>
+                      <in>path_test.cpp</in>
+                      <in>post_process_test.cpp</in>
+                      <in>source_map_test.cpp</in>
+                      <in>symbols_find_null.cpp</in>
+                      <in>symbols_tests.cpp</in>
+                      <in>utils_test.cpp</in>
+                      <in>values_test.cpp</in>
+                    </df>
+                    <in>callouts.cpp</in>
+                    <in>stub.c</in>
+                    <in>stub.cpp</in>
+                  </df>
+                </df>
+              </df>
+            </df>
+          </df>
+        </df>
+        <df name="CMakeFiles">
+          <df name="3.22.2">
+            <df name="CompilerIdC">
+              <in>CMakeCCompilerId.c</in>
+            </df>
+            <df name="CompilerIdCXX">
+              <in>CMakeCXXCompilerId.cpp</in>
+            </df>
+          </df>
+        </df>
+        <df name="doctest">
+          <df name="src">
+            <df name="doctest">
+              <df name="doctest">
+                <df name="parts">
+                  <in>doctest.cpp</in>
+                </df>
+              </df>
+              <df name="examples">
+                <df name="all_features">
+                  <in>alternative_macros.cpp</in>
+                  <in>assertion_macros.cpp</in>
+                  <in>asserts_used_outside_of_tests.cpp</in>
+                  <in>concurrency.cpp</in>
+                  <in>enums.cpp</in>
+                  <in>logging.cpp</in>
+                  <in>main.cpp</in>
+                  <in>namespace1.cpp</in>
+                  <in>namespace2.cpp</in>
+                  <in>namespace3.cpp</in>
+                  <in>namespace4.cpp</in>
+                  <in>namespace5.cpp</in>
+                  <in>namespace6.cpp</in>
+                  <in>namespace7.cpp</in>
+                  <in>namespace8.cpp</in>
+                  <in>namespace9.cpp</in>
+                  <in>no_failures.cpp</in>
+                  <in>reporters_and_listeners.cpp</in>
+                  <in>stringification.cpp</in>
+                  <in>subcases.cpp</in>
+                  <in>templated_test_cases.cpp</in>
+                  <in>test_cases_and_suites.cpp</in>
+                </df>
+                <df name="combining_the_same_tests_built_differently_in_multiple_shared_objects">
+                  <in>default.cpp</in>
+                  <in>main.cpp</in>
+                  <in>return42.cpp</in>
+                  <in>test_runner.cpp</in>
+                </df>
+                <df name="exe_with_static_libs">
+                  <in>lib_1_src1.cpp</in>
+                  <in>lib_1_src2.cpp</in>
+                  <in>lib_2_src.cpp</in>
+                  <in>main.cpp</in>
+                </df>
+                <df name="executable_dll_and_plugin">
+                  <in>dll.cpp</in>
+                  <in>implementation.cpp</in>
+                  <in>implementation_2.cpp</in>
+                  <in>main.cpp</in>
+                  <in>plugin.cpp</in>
+                </df>
+                <df name="installed_doctest_cmake">
+                  <df name="dll">
+                    <in>dll.cpp</in>
+                    <in>main.cpp</in>
+                  </df>
+                  <df name="executable">
+                    <in>main.cpp</in>
+                  </df>
+                </df>
+                <df name="mpi">
+                  <in>main.cpp</in>
+                  <in>mpi.cpp</in>
+                </df>
+              </df>
+              <df name="scripts">
+                <df name="how_stuff_works">
+                  <in>how_exception_translators_work.cpp</in>
+                  <in>how_subcases_work.cpp</in>
+                  <in>testing_crash_scenarios.cpp</in>
+                </df>
+                <df name="playground">
+                  <in>main.cpp</in>
+                  <in>test.cpp</in>
+                </df>
+                <in>coverage_maxout.cpp</in>
+                <in>hello_world.cpp</in>
+              </df>
+            </df>
+          </df>
+        </df>
+        <df name="documentation">
+          <df name="tutorial">
+            <in>tutorial.actor.g.cpp</in>
+          </df>
+        </df>
+        <df name="fdbbackup">
+          <in>FileConverter.actor.g.cpp</in>
+          <in>FileDecoder.actor.g.cpp</in>
+          <in>backup.actor.g.cpp</in>
+        </df>
+        <df name="fdbcli">
+          <in>AdvanceVersionCommand.actor.g.cpp</in>
+          <in>BlobRangeCommand.actor.g.cpp</in>
+          <in>CacheRangeCommand.actor.g.cpp</in>
+          <in>ChangeFeedCommand.actor.g.cpp</in>
+          <in>ConfigureCommand.actor.g.cpp</in>
+          <in>ConsistencyCheckCommand.actor.g.cpp</in>
+          <in>CoordinatorsCommand.actor.g.cpp</in>
+          <in>DataDistributionCommand.actor.g.cpp</in>
+          <in>ExcludeCommand.actor.g.cpp</in>
+          <in>ExpensiveDataCheckCommand.actor.g.cpp</in>
+          <in>FileConfigureCommand.actor.g.cpp</in>
+          <in>FlowLineNoise.actor.g.cpp</in>
+          <in>ForceRecoveryWithDataLossCommand.actor.g.cpp</in>
+          <in>IncludeCommand.actor.g.cpp</in>
+          <in>KillCommand.actor.g.cpp</in>
+          <in>LockCommand.actor.g.cpp</in>
+          <in>MaintenanceCommand.actor.g.cpp</in>
+          <in>ProfileCommand.actor.g.cpp</in>
+          <in>SetClassCommand.actor.g.cpp</in>
+          <in>SnapshotCommand.actor.g.cpp</in>
+          <in>StatusCommand.actor.g.cpp</in>
+          <in>SuspendCommand.actor.g.cpp</in>
+          <in>TenantCommands.actor.g.cpp</in>
+          <in>ThrottleCommand.actor.g.cpp</in>
+          <in>TriggerDDTeamInfoLogCommand.actor.g.cpp</in>
+          <in>TssqCommand.actor.g.cpp</in>
+          <in>Util.actor.g.cpp</in>
+          <in>VersionEpochCommand.actor.g.cpp</in>
+          <in>fdbcli.actor.g.cpp</in>
+        </df>
+        <df name="fdbclient">
+          <in>AsyncFileBlobStore.actor.g.cpp</in>
+          <in>AsyncFileS3BlobStore.actor.g.cpp</in>
+          <in>AsyncTaskThread.actor.g.cpp</in>
+          <in>BackupAgentBase.actor.g.cpp</in>
+          <in>BackupContainer.actor.g.cpp</in>
+          <in>BackupContainerFileSystem.actor.g.cpp</in>
+          <in>BackupContainerLocalDirectory.actor.g.cpp</in>
+          <in>BackupContainerS3BlobStore.actor.g.cpp</in>
+          <in>BlobGranuleReader.actor.g.cpp</in>
+          <in>BlobStore.actor.g.cpp</in>
+          <in>ClusterConnectionFile.actor.g.cpp</in>
+          <in>ClusterConnectionKey.actor.g.cpp</in>
+          <in>ClusterConnectionMemoryRecord.actor.g.cpp</in>
+          <in>DatabaseBackupAgent.actor.g.cpp</in>
+          <in>FDBOptions.g.cpp</in>
+          <in>FileBackupAgent.actor.g.cpp</in>
+          <in>GlobalConfig.actor.g.cpp</in>
+          <in>HTTP.actor.g.cpp</in>
+          <in>KeyRangeMap.actor.g.cpp</in>
+          <in>ManagementAPI.actor.g.cpp</in>
+          <in>MetricLogger.actor.g.cpp</in>
+          <in>MonitorLeader.actor.g.cpp</in>
+          <in>MultiVersionTransaction.actor.g.cpp</in>
+          <in>MutationLogReader.actor.g.cpp</in>
+          <in>NativeAPI.actor.g.cpp</in>
+          <in>ParallelStream.actor.g.cpp</in>
+          <in>PaxosConfigTransaction.actor.g.cpp</in>
+          <in>ReadYourWrites.actor.g.cpp</in>
+          <in>S3BlobStore.actor.g.cpp</in>
+          <in>SimpleConfigTransaction.actor.g.cpp</in>
+          <in>SpecialKeySpace.actor.g.cpp</in>
+          <in>StatusClient.actor.g.cpp</in>
+          <in>TagThrottle.actor.g.cpp</in>
+          <in>TaskBucket.actor.g.cpp</in>
+          <in>ThreadSafeTransaction.actor.g.cpp</in>
+        </df>
+        <df name="fdbrpc">
+          <in>ActorFuzz.actor.g.cpp</in>
+          <in>AsyncFileCached.actor.g.cpp</in>
+          <in>AsyncFileNonDurable.actor.g.cpp</in>
+          <in>FailureMonitor.actor.g.cpp</in>
+          <in>FlowTests.actor.g.cpp</in>
+          <in>FlowTransport.actor.g.cpp</in>
+          <in>HealthMonitor.actor.g.cpp</in>
+          <in>IAsyncFile.actor.g.cpp</in>
+          <in>LoadBalance.actor.g.cpp</in>
+          <in>SimExternalConnection.actor.g.cpp</in>
+          <in>Stats.actor.g.cpp</in>
+          <in>dsltest.actor.g.cpp</in>
+          <in>genericactors.actor.g.cpp</in>
+          <in>sim2.actor.g.cpp</in>
+        </df>
+        <df name="fdbserver">
+          <df name="rocksdb-prefix">
+            <df name="src">
+              <df name="rocksdb">
+                <df name="cache">
+                  <in>cache.cc</in>
+                  <in>cache_bench.cc</in>
+                  <in>cache_bench_tool.cc</in>
+                  <in>cache_entry_roles.cc</in>
+                  <in>cache_reservation_manager.cc</in>
+                  <in>cache_reservation_manager_test.cc</in>
+                  <in>cache_test.cc</in>
+                  <in>clock_cache.cc</in>
+                  <in>lru_cache.cc</in>
+                  <in>lru_cache_test.cc</in>
+                  <in>sharded_cache.cc</in>
+                </df>
+                <df name="db">
+                  <df name="blob">
+                    <in>blob_counting_iterator_test.cc</in>
+                    <in>blob_fetcher.cc</in>
+                    <in>blob_file_addition.cc</in>
+                    <in>blob_file_addition_test.cc</in>
+                    <in>blob_file_builder.cc</in>
+                    <in>blob_file_builder_test.cc</in>
+                    <in>blob_file_cache.cc</in>
+                    <in>blob_file_cache_test.cc</in>
+                    <in>blob_file_garbage.cc</in>
+                    <in>blob_file_garbage_test.cc</in>
+                    <in>blob_file_meta.cc</in>
+                    <in>blob_file_reader.cc</in>
+                    <in>blob_file_reader_test.cc</in>
+                    <in>blob_garbage_meter.cc</in>
+                    <in>blob_garbage_meter_test.cc</in>
+                    <in>blob_log_format.cc</in>
+                    <in>blob_log_sequential_reader.cc</in>
+                    <in>blob_log_writer.cc</in>
+                    <in>db_blob_basic_test.cc</in>
+                    <in>db_blob_compaction_test.cc</in>
+                    <in>db_blob_corruption_test.cc</in>
+                    <in>db_blob_index_test.cc</in>
+                    <in>prefetch_buffer_collection.cc</in>
+                  </df>
+                  <df name="compaction">
+                    <in>clipping_iterator_test.cc</in>
+                    <in>compaction.cc</in>
+                    <in>compaction_iterator.cc</in>
+                    <in>compaction_iterator_test.cc</in>
+                    <in>compaction_job.cc</in>
+                    <in>compaction_job_stats_test.cc</in>
+                    <in>compaction_job_test.cc</in>
+                    <in>compaction_picker.cc</in>
+                    <in>compaction_picker_fifo.cc</in>
+                    <in>compaction_picker_level.cc</in>
+                    <in>compaction_picker_test.cc</in>
+                    <in>compaction_picker_universal.cc</in>
+                    <in>compaction_service_test.cc</in>
+                    <in>sst_partitioner.cc</in>
+                  </df>
+                  <df name="db_impl">
+                    <in>compacted_db_impl.cc</in>
+                    <in>db_impl.cc</in>
+                    <in>db_impl_compaction_flush.cc</in>
+                    <in>db_impl_debug.cc</in>
+                    <in>db_impl_experimental.cc</in>
+                    <in>db_impl_files.cc</in>
+                    <in>db_impl_open.cc</in>
+                    <in>db_impl_readonly.cc</in>
+                    <in>db_impl_secondary.cc</in>
+                    <in>db_impl_write.cc</in>
+                  </df>
+                  <in>arena_wrapped_db_iter.cc</in>
+                  <in>builder.cc</in>
+                  <in>c.cc</in>
+                  <in>c_test.c</in>
+                  <in>column_family.cc</in>
+                  <in>column_family_test.cc</in>
+                  <in>compact_files_test.cc</in>
+                  <in>comparator_db_test.cc</in>
+                  <in>convenience.cc</in>
+                  <in>corruption_test.cc</in>
+                  <in>cuckoo_table_db_test.cc</in>
+                  <in>db_basic_test.cc</in>
+                  <in>db_block_cache_test.cc</in>
+                  <in>db_bloom_filter_test.cc</in>
+                  <in>db_compaction_filter_test.cc</in>
+                  <in>db_compaction_test.cc</in>
+                  <in>db_dynamic_level_test.cc</in>
+                  <in>db_encryption_test.cc</in>
+                  <in>db_filesnapshot.cc</in>
+                  <in>db_flush_test.cc</in>
+                  <in>db_info_dumper.cc</in>
+                  <in>db_inplace_update_test.cc</in>
+                  <in>db_io_failure_test.cc</in>
+                  <in>db_iter.cc</in>
+                  <in>db_iter_stress_test.cc</in>
+                  <in>db_iter_test.cc</in>
+                  <in>db_iterator_test.cc</in>
+                  <in>db_kv_checksum_test.cc</in>
+                  <in>db_log_iter_test.cc</in>
+                  <in>db_logical_block_size_cache_test.cc</in>
+                  <in>db_memtable_test.cc</in>
+                  <in>db_merge_operand_test.cc</in>
+                  <in>db_merge_operator_test.cc</in>
+                  <in>db_options_test.cc</in>
+                  <in>db_properties_test.cc</in>
+                  <in>db_range_del_test.cc</in>
+                  <in>db_secondary_test.cc</in>
+                  <in>db_sst_test.cc</in>
+                  <in>db_statistics_test.cc</in>
+                  <in>db_table_properties_test.cc</in>
+                  <in>db_tailing_iter_test.cc</in>
+                  <in>db_test.cc</in>
+                  <in>db_test2.cc</in>
+                  <in>db_test_util.cc</in>
+                  <in>db_universal_compaction_test.cc</in>
+                  <in>db_wal_test.cc</in>
+                  <in>db_with_timestamp_basic_test.cc</in>
+                  <in>db_with_timestamp_compaction_test.cc</in>
+                  <in>db_write_buffer_manager_test.cc</in>
+                  <in>db_write_test.cc</in>
+                  <in>dbformat.cc</in>
+                  <in>dbformat_test.cc</in>
+                  <in>deletefile_test.cc</in>
+                  <in>error_handler.cc</in>
+                  <in>error_handler_fs_test.cc</in>
+                  <in>event_helpers.cc</in>
+                  <in>experimental.cc</in>
+                  <in>external_sst_file_basic_test.cc</in>
+                  <in>external_sst_file_ingestion_job.cc</in>
+                  <in>external_sst_file_test.cc</in>
+                  <in>fault_injection_test.cc</in>
+                  <in>file_indexer.cc</in>
+                  <in>file_indexer_test.cc</in>
+                  <in>filename_test.cc</in>
+                  <in>flush_job.cc</in>
+                  <in>flush_job_test.cc</in>
+                  <in>flush_scheduler.cc</in>
+                  <in>forward_iterator.cc</in>
+                  <in>forward_iterator_bench.cc</in>
+                  <in>import_column_family_job.cc</in>
+                  <in>import_column_family_test.cc</in>
+                  <in>internal_stats.cc</in>
+                  <in>listener_test.cc</in>
+                  <in>log_reader.cc</in>
+                  <in>log_test.cc</in>
+                  <in>log_writer.cc</in>
+                  <in>logs_with_prep_tracker.cc</in>
+                  <in>malloc_stats.cc</in>
+                  <in>manual_compaction_test.cc</in>
+                  <in>memtable.cc</in>
+                  <in>memtable_list.cc</in>
+                  <in>memtable_list_test.cc</in>
+                  <in>merge_helper.cc</in>
+                  <in>merge_helper_test.cc</in>
+                  <in>merge_operator.cc</in>
+                  <in>merge_test.cc</in>
+                  <in>obsolete_files_test.cc</in>
+                  <in>options_file_test.cc</in>
+                  <in>output_validator.cc</in>
+                  <in>perf_context_test.cc</in>
+                  <in>periodic_work_scheduler.cc</in>
+                  <in>periodic_work_scheduler_test.cc</in>
+                  <in>plain_table_db_test.cc</in>
+                  <in>prefix_test.cc</in>
+                  <in>range_del_aggregator.cc</in>
+                  <in>range_del_aggregator_bench.cc</in>
+                  <in>range_del_aggregator_test.cc</in>
+                  <in>range_tombstone_fragmenter.cc</in>
+                  <in>range_tombstone_fragmenter_test.cc</in>
+                  <in>repair.cc</in>
+                  <in>repair_test.cc</in>
+                  <in>snapshot_impl.cc</in>
+                  <in>table_cache.cc</in>
+                  <in>table_properties_collector.cc</in>
+                  <in>table_properties_collector_test.cc</in>
+                  <in>transaction_log_impl.cc</in>
+                  <in>trim_history_scheduler.cc</in>
+                  <in>version_builder.cc</in>
+                  <in>version_builder_test.cc</in>
+                  <in>version_edit.cc</in>
+                  <in>version_edit_handler.cc</in>
+                  <in>version_edit_test.cc</in>
+                  <in>version_set.cc</in>
+                  <in>version_set_test.cc</in>
+                  <in>wal_edit.cc</in>
+                  <in>wal_edit_test.cc</in>
+                  <in>wal_manager.cc</in>
+                  <in>wal_manager_test.cc</in>
+                  <in>write_batch.cc</in>
+                  <in>write_batch_base.cc</in>
+                  <in>write_batch_test.cc</in>
+                  <in>write_callback_test.cc</in>
+                  <in>write_controller.cc</in>
+                  <in>write_controller_test.cc</in>
+                  <in>write_thread.cc</in>
+                </df>
+                <df name="db_stress_tool">
+                  <in>batched_ops_stress.cc</in>
+                  <in>cf_consistency_stress.cc</in>
+                  <in>db_stress.cc</in>
+                  <in>db_stress_common.cc</in>
+                  <in>db_stress_driver.cc</in>
+                  <in>db_stress_gflags.cc</in>
+                  <in>db_stress_listener.cc</in>
+                  <in>db_stress_shared_state.cc</in>
+                  <in>db_stress_test_base.cc</in>
+                  <in>db_stress_tool.cc</in>
+                  <in>expected_state.cc</in>
+                  <in>no_batched_ops_stress.cc</in>
+                </df>
+                <df name="env">
+                  <in>composite_env.cc</in>
+                  <in>env.cc</in>
+                  <in>env_basic_test.cc</in>
+                  <in>env_chroot.cc</in>
+                  <in>env_encryption.cc</in>
+                  <in>env_hdfs.cc</in>
+                  <in>env_posix.cc</in>
+                  <in>env_test.cc</in>
+                  <in>file_system.cc</in>
+                  <in>file_system_tracer.cc</in>
+                  <in>fs_posix.cc</in>
+                  <in>fs_remap.cc</in>
+                  <in>io_posix.cc</in>
+                  <in>io_posix_test.cc</in>
+                  <in>mock_env.cc</in>
+                  <in>mock_env_test.cc</in>
+                  <in>unique_id_gen.cc</in>
+                </df>
+                <df name="examples">
+                  <in>c_simple_example.c</in>
+                  <in>column_families_example.cc</in>
+                  <in>compact_files_example.cc</in>
+                  <in>compaction_filter_example.cc</in>
+                  <in>multi_processes_example.cc</in>
+                  <in>optimistic_transaction_example.cc</in>
+                  <in>options_file_example.cc</in>
+                  <in>simple_example.cc</in>
+                  <in>transaction_example.cc</in>
+                </df>
+                <df name="file">
+                  <in>delete_scheduler.cc</in>
+                  <in>delete_scheduler_test.cc</in>
+                  <in>file_prefetch_buffer.cc</in>
+                  <in>file_util.cc</in>
+                  <in>filename.cc</in>
+                  <in>line_file_reader.cc</in>
+                  <in>prefetch_test.cc</in>
+                  <in>random_access_file_reader.cc</in>
+                  <in>random_access_file_reader_test.cc</in>
+                  <in>read_write_util.cc</in>
+                  <in>readahead_raf.cc</in>
+                  <in>sequence_file_reader.cc</in>
+                  <in>sst_file_manager_impl.cc</in>
+                  <in>writable_file_writer.cc</in>
+                </df>
+                <df name="fuzz">
+                  <in>db_fuzzer.cc</in>
+                  <in>db_map_fuzzer.cc</in>
+                  <in>sst_file_writer_fuzzer.cc</in>
+                </df>
+                <df name="java">
+                  <df name="rocksjni">
+                    <in>backupablejni.cc</in>
+                    <in>backupenginejni.cc</in>
+                    <in>cache.cc</in>
+                    <in>cassandra_compactionfilterjni.cc</in>
+                    <in>cassandra_value_operator.cc</in>
+                    <in>checkpoint.cc</in>
+                    <in>clock_cache.cc</in>
+                    <in>columnfamilyhandle.cc</in>
+                    <in>compact_range_options.cc</in>
+                    <in>compaction_filter.cc</in>
+                    <in>compaction_filter_factory.cc</in>
+                    <in>compaction_filter_factory_jnicallback.cc</in>
+                    <in>compaction_job_info.cc</in>
+                    <in>compaction_job_stats.cc</in>
+                    <in>compaction_options.cc</in>
+                    <in>compaction_options_fifo.cc</in>
+                    <in>compaction_options_universal.cc</in>
+                    <in>comparator.cc</in>
+                    <in>comparatorjnicallback.cc</in>
+                    <in>compression_options.cc</in>
+                    <in>concurrent_task_limiter.cc</in>
+                    <in>config_options.cc</in>
+                    <in>env.cc</in>
+                    <in>env_options.cc</in>
+                    <in>event_listener.cc</in>
+                    <in>event_listener_jnicallback.cc</in>
+                    <in>filter.cc</in>
+                    <in>ingest_external_file_options.cc</in>
+                    <in>iterator.cc</in>
+                    <in>jnicallback.cc</in>
+                    <in>loggerjnicallback.cc</in>
+                    <in>lru_cache.cc</in>
+                    <in>memory_util.cc</in>
+                    <in>memtablejni.cc</in>
+                    <in>merge_operator.cc</in>
+                    <in>native_comparator_wrapper_test.cc</in>
+                    <in>optimistic_transaction_db.cc</in>
+                    <in>optimistic_transaction_options.cc</in>
+                    <in>options.cc</in>
+                    <in>options_util.cc</in>
+                    <in>persistent_cache.cc</in>
+                    <in>ratelimiterjni.cc</in>
+                    <in>remove_emptyvalue_compactionfilterjni.cc</in>
+                    <in>restorejni.cc</in>
+                    <in>rocks_callback_object.cc</in>
+                    <in>rocksdb_exception_test.cc</in>
+                    <in>rocksjni.cc</in>
+                    <in>slice.cc</in>
+                    <in>snapshot.cc</in>
+                    <in>sst_file_manager.cc</in>
+                    <in>sst_file_reader_iterator.cc</in>
+                    <in>sst_file_readerjni.cc</in>
+                    <in>sst_file_writerjni.cc</in>
+                    <in>sst_partitioner.cc</in>
+                    <in>statistics.cc</in>
+                    <in>statisticsjni.cc</in>
+                    <in>table.cc</in>
+                    <in>table_filter.cc</in>
+                    <in>table_filter_jnicallback.cc</in>
+                    <in>testable_event_listener.cc</in>
+                    <in>thread_status.cc</in>
+                    <in>trace_writer.cc</in>
+                    <in>trace_writer_jnicallback.cc</in>
+                    <in>transaction.cc</in>
+                    <in>transaction_db.cc</in>
+                    <in>transaction_db_options.cc</in>
+                    <in>transaction_log.cc</in>
+                    <in>transaction_notifier.cc</in>
+                    <in>transaction_notifier_jnicallback.cc</in>
+                    <in>transaction_options.cc</in>
+                    <in>ttl.cc</in>
+                    <in>wal_filter.cc</in>
+                    <in>wal_filter_jnicallback.cc</in>
+                    <in>write_batch.cc</in>
+                    <in>write_batch_test.cc</in>
+                    <in>write_batch_with_index.cc</in>
+                    <in>write_buffer_manager.cc</in>
+                    <in>writebatchhandlerjnicallback.cc</in>
+                  </df>
+                </df>
+                <df name="logging">
+                  <in>auto_roll_logger.cc</in>
+                  <in>auto_roll_logger_test.cc</in>
+                  <in>env_logger_test.cc</in>
+                  <in>event_logger.cc</in>
+                  <in>event_logger_test.cc</in>
+                  <in>log_buffer.cc</in>
+                </df>
+                <df name="memory">
+                  <in>arena.cc</in>
+                  <in>arena_test.cc</in>
+                  <in>concurrent_arena.cc</in>
+                  <in>jemalloc_nodump_allocator.cc</in>
+                  <in>memkind_kmem_allocator.cc</in>
+                  <in>memkind_kmem_allocator_test.cc</in>
+                </df>
+                <df name="memtable">
+                  <in>alloc_tracker.cc</in>
+                  <in>hash_linklist_rep.cc</in>
+                  <in>hash_skiplist_rep.cc</in>
+                  <in>inlineskiplist_test.cc</in>
+                  <in>memtablerep_bench.cc</in>
+                  <in>skiplist_test.cc</in>
+                  <in>skiplistrep.cc</in>
+                  <in>vectorrep.cc</in>
+                  <in>write_buffer_manager.cc</in>
+                  <in>write_buffer_manager_test.cc</in>
+                </df>
+                <df name="microbench">
+                  <in>db_basic_bench.cc</in>
+                  <in>ribbon_bench.cc</in>
+                </df>
+                <df name="monitoring">
+                  <in>histogram.cc</in>
+                  <in>histogram_test.cc</in>
+                  <in>histogram_windowing.cc</in>
+                  <in>in_memory_stats_history.cc</in>
+                  <in>instrumented_mutex.cc</in>
+                  <in>iostats_context.cc</in>
+                  <in>iostats_context_test.cc</in>
+                  <in>perf_context.cc</in>
+                  <in>perf_level.cc</in>
+                  <in>persistent_stats_history.cc</in>
+                  <in>statistics.cc</in>
+                  <in>statistics_test.cc</in>
+                  <in>stats_history_test.cc</in>
+                  <in>thread_status_impl.cc</in>
+                  <in>thread_status_updater.cc</in>
+                  <in>thread_status_updater_debug.cc</in>
+                  <in>thread_status_util.cc</in>
+                  <in>thread_status_util_debug.cc</in>
+                </df>
+                <df name="options">
+                  <in>cf_options.cc</in>
+                  <in>configurable.cc</in>
+                  <in>configurable_test.cc</in>
+                  <in>customizable.cc</in>
+                  <in>customizable_test.cc</in>
+                  <in>db_options.cc</in>
+                  <in>options.cc</in>
+                  <in>options_helper.cc</in>
+                  <in>options_parser.cc</in>
+                  <in>options_settable_test.cc</in>
+                  <in>options_test.cc</in>
+                </df>
+                <df name="port">
+                  <df name="win">
+                    <in>env_default.cc</in>
+                    <in>env_win.cc</in>
+                    <in>io_win.cc</in>
+                    <in>port_win.cc</in>
+                    <in>win_jemalloc.cc</in>
+                    <in>win_logger.cc</in>
+                    <in>win_thread.cc</in>
+                    <in>xpress_win.cc</in>
+                  </df>
+                  <in>port_posix.cc</in>
+                  <in>stack_trace.cc</in>
+                </df>
+                <df name="table">
+                  <df name="adaptive">
+                    <in>adaptive_table_factory.cc</in>
+                  </df>
+                  <df name="block_based">
+                    <in>binary_search_index_reader.cc</in>
+                    <in>block.cc</in>
+                    <in>block_based_filter_block.cc</in>
+                    <in>block_based_filter_block_test.cc</in>
+                    <in>block_based_table_builder.cc</in>
+                    <in>block_based_table_factory.cc</in>
+                    <in>block_based_table_iterator.cc</in>
+                    <in>block_based_table_reader.cc</in>
+                    <in>block_based_table_reader_test.cc</in>
+                    <in>block_builder.cc</in>
+                    <in>block_prefetcher.cc</in>
+                    <in>block_prefix_index.cc</in>
+                    <in>block_test.cc</in>
+                    <in>data_block_footer.cc</in>
+                    <in>data_block_hash_index.cc</in>
+                    <in>data_block_hash_index_test.cc</in>
+                    <in>filter_block_reader_common.cc</in>
+                    <in>filter_policy.cc</in>
+                    <in>flush_block_policy.cc</in>
+                    <in>full_filter_block.cc</in>
+                    <in>full_filter_block_test.cc</in>
+                    <in>hash_index_reader.cc</in>
+                    <in>index_builder.cc</in>
+                    <in>index_reader_common.cc</in>
+                    <in>parsed_full_filter_block.cc</in>
+                    <in>partitioned_filter_block.cc</in>
+                    <in>partitioned_filter_block_test.cc</in>
+                    <in>partitioned_index_iterator.cc</in>
+                    <in>partitioned_index_reader.cc</in>
+                    <in>reader_common.cc</in>
+                    <in>uncompression_dict_reader.cc</in>
+                  </df>
+                  <df name="cuckoo">
+                    <in>cuckoo_table_builder.cc</in>
+                    <in>cuckoo_table_builder_test.cc</in>
+                    <in>cuckoo_table_factory.cc</in>
+                    <in>cuckoo_table_reader.cc</in>
+                    <in>cuckoo_table_reader_test.cc</in>
+                  </df>
+                  <df name="plain">
+                    <in>plain_table_bloom.cc</in>
+                    <in>plain_table_builder.cc</in>
+                    <in>plain_table_factory.cc</in>
+                    <in>plain_table_index.cc</in>
+                    <in>plain_table_key_coding.cc</in>
+                    <in>plain_table_reader.cc</in>
+                  </df>
+                  <in>block_fetcher.cc</in>
+                  <in>block_fetcher_test.cc</in>
+                  <in>cleanable_test.cc</in>
+                  <in>format.cc</in>
+                  <in>get_context.cc</in>
+                  <in>iterator.cc</in>
+                  <in>merger_test.cc</in>
+                  <in>merging_iterator.cc</in>
+                  <in>meta_blocks.cc</in>
+                  <in>mock_table.cc</in>
+                  <in>persistent_cache_helper.cc</in>
+                  <in>sst_file_dumper.cc</in>
+                  <in>sst_file_reader.cc</in>
+                  <in>sst_file_reader_test.cc</in>
+                  <in>sst_file_writer.cc</in>
+                  <in>table_factory.cc</in>
+                  <in>table_properties.cc</in>
+                  <in>table_reader_bench.cc</in>
+                  <in>table_test.cc</in>
+                  <in>two_level_iterator.cc</in>
+                  <in>unique_id.cc</in>
+                </df>
+                <df name="test_util">
+                  <in>mock_time_env.cc</in>
+                  <in>sync_point.cc</in>
+                  <in>sync_point_impl.cc</in>
+                  <in>testharness.cc</in>
+                  <in>testutil.cc</in>
+                  <in>testutil_test.cc</in>
+                  <in>transaction_test_util.cc</in>
+                </df>
+                <df name="third-party">
+                  <df name="folly">
+                    <df name="folly">
+                      <df name="detail">
+                        <in>Futex.cpp</in>
+                      </df>
+                      <df name="synchronization">
+                        <df name="test">
+                          <in>DistributedMutexTest.cpp</in>
+                        </df>
+                        <in>AtomicNotification.cpp</in>
+                        <in>DistributedMutex.cpp</in>
+                        <in>ParkingLot.cpp</in>
+                        <in>WaitOptions.cpp</in>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="gtest-1.8.1">
+                    <df name="fused-src">
+                      <df name="gtest">
+                        <in>gtest-all.cc</in>
+                        <in>gtest_main.cc</in>
+                      </df>
+                    </df>
+                  </df>
+                </df>
+                <df name="tools">
+                  <df name="block_cache_analyzer">
+                    <in>block_cache_trace_analyzer.cc</in>
+                    <in>block_cache_trace_analyzer_test.cc</in>
+                    <in>block_cache_trace_analyzer_tool.cc</in>
+                  </df>
+                  <df name="dump">
+                    <in>db_dump_tool.cc</in>
+                    <in>rocksdb_dump.cc</in>
+                    <in>rocksdb_undump.cc</in>
+                  </df>
+                  <df name="rdb">
+                    <in>db_wrapper.cc</in>
+                    <in>rdb.cc</in>
+                  </df>
+                  <in>blob_dump.cc</in>
+                  <in>db_bench.cc</in>
+                  <in>db_bench_tool.cc</in>
+                  <in>db_bench_tool_test.cc</in>
+                  <in>db_repl_stress.cc</in>
+                  <in>db_sanity_test.cc</in>
+                  <in>io_tracer_parser.cc</in>
+                  <in>io_tracer_parser_test.cc</in>
+                  <in>io_tracer_parser_tool.cc</in>
+                  <in>ldb.cc</in>
+                  <in>ldb_cmd.cc</in>
+                  <in>ldb_cmd_test.cc</in>
+                  <in>ldb_tool.cc</in>
+                  <in>reduce_levels_test.cc</in>
+                  <in>simulated_hybrid_file_system.cc</in>
+                  <in>sst_dump.cc</in>
+                  <in>sst_dump_test.cc</in>
+                  <in>sst_dump_tool.cc</in>
+                  <in>trace_analyzer.cc</in>
+                  <in>trace_analyzer_test.cc</in>
+                  <in>trace_analyzer_tool.cc</in>
+                  <in>write_stress.cc</in>
+                </df>
+                <df name="trace_replay">
+                  <in>block_cache_tracer.cc</in>
+                  <in>block_cache_tracer_test.cc</in>
+                  <in>io_tracer.cc</in>
+                  <in>io_tracer_test.cc</in>
+                  <in>trace_record.cc</in>
+                  <in>trace_record_handler.cc</in>
+                  <in>trace_record_result.cc</in>
+                  <in>trace_replay.cc</in>
+                </df>
+                <df name="util">
+                  <in>autovector_test.cc</in>
+                  <in>bloom_test.cc</in>
+                  <in>coding.cc</in>
+                  <in>coding_test.cc</in>
+                  <in>compaction_job_stats_impl.cc</in>
+                  <in>comparator.cc</in>
+                  <in>compression_context_cache.cc</in>
+                  <in>concurrent_task_limiter_impl.cc</in>
+                  <in>crc32c.cc</in>
+                  <in>crc32c_arm64.cc</in>
+                  <in>crc32c_ppc.c</in>
+                  <in>crc32c_test.cc</in>
+                  <in>defer_test.cc</in>
+                  <in>dynamic_bloom.cc</in>
+                  <in>dynamic_bloom_test.cc</in>
+                  <in>file_checksum_helper.cc</in>
+                  <in>file_reader_writer_test.cc</in>
+                  <in>filelock_test.cc</in>
+                  <in>filter_bench.cc</in>
+                  <in>hash.cc</in>
+                  <in>hash_test.cc</in>
+                  <in>heap_test.cc</in>
+                  <in>log_write_bench.cc</in>
+                  <in>murmurhash.cc</in>
+                  <in>random.cc</in>
+                  <in>random_test.cc</in>
+                  <in>rate_limiter.cc</in>
+                  <in>rate_limiter_test.cc</in>
+                  <in>regex.cc</in>
+                  <in>repeatable_thread_test.cc</in>
+                  <in>ribbon_config.cc</in>
+                  <in>ribbon_test.cc</in>
+                  <in>slice.cc</in>
+                  <in>slice_test.cc</in>
+                  <in>slice_transform_test.cc</in>
+                  <in>status.cc</in>
+                  <in>string_util.cc</in>
+                  <in>thread_list_test.cc</in>
+                  <in>thread_local.cc</in>
+                  <in>thread_local_test.cc</in>
+                  <in>threadpool_imp.cc</in>
+                  <in>timer_queue_test.cc</in>
+                  <in>timer_test.cc</in>
+                  <in>work_queue_test.cc</in>
+                  <in>xxhash.cc</in>
+                </df>
+                <df name="utilities">
+                  <df name="backupable">
+                    <in>backupable_db.cc</in>
+                    <in>backupable_db_test.cc</in>
+                  </df>
+                  <df name="blob_db">
+                    <in>blob_compaction_filter.cc</in>
+                    <in>blob_db.cc</in>
+                    <in>blob_db_impl.cc</in>
+                    <in>blob_db_impl_filesnapshot.cc</in>
+                    <in>blob_db_test.cc</in>
+                    <in>blob_dump_tool.cc</in>
+                    <in>blob_file.cc</in>
+                  </df>
+                  <df name="cassandra">
+                    <in>cassandra_compaction_filter.cc</in>
+                    <in>cassandra_format_test.cc</in>
+                    <in>cassandra_functional_test.cc</in>
+                    <in>cassandra_row_merge_test.cc</in>
+                    <in>cassandra_serialize_test.cc</in>
+                    <in>format.cc</in>
+                    <in>merge_operator.cc</in>
+                    <in>test_utils.cc</in>
+                  </df>
+                  <df name="checkpoint">
+                    <in>checkpoint_impl.cc</in>
+                    <in>checkpoint_test.cc</in>
+                  </df>
+                  <df name="compaction_filters">
+                    <in>remove_emptyvalue_compactionfilter.cc</in>
+                  </df>
+                  <df name="convenience">
+                    <in>info_log_finder.cc</in>
+                  </df>
+                  <df name="leveldb_options">
+                    <in>leveldb_options.cc</in>
+                  </df>
+                  <df name="memory">
+                    <in>memory_test.cc</in>
+                    <in>memory_util.cc</in>
+                  </df>
+                  <df name="merge_operators">
+                    <df name="string_append">
+                      <in>stringappend.cc</in>
+                      <in>stringappend2.cc</in>
+                      <in>stringappend_test.cc</in>
+                    </df>
+                    <in>bytesxor.cc</in>
+                    <in>max.cc</in>
+                    <in>put.cc</in>
+                    <in>sortlist.cc</in>
+                    <in>uint64add.cc</in>
+                  </df>
+                  <df name="option_change_migration">
+                    <in>option_change_migration.cc</in>
+                    <in>option_change_migration_test.cc</in>
+                  </df>
+                  <df name="options">
+                    <in>options_util.cc</in>
+                    <in>options_util_test.cc</in>
+                  </df>
+                  <df name="persistent_cache">
+                    <in>block_cache_tier.cc</in>
+                    <in>block_cache_tier_file.cc</in>
+                    <in>block_cache_tier_metadata.cc</in>
+                    <in>hash_table_bench.cc</in>
+                    <in>hash_table_test.cc</in>
+                    <in>persistent_cache_bench.cc</in>
+                    <in>persistent_cache_test.cc</in>
+                    <in>persistent_cache_tier.cc</in>
+                    <in>volatile_tier_impl.cc</in>
+                  </df>
+                  <df name="simulator_cache">
+                    <in>cache_simulator.cc</in>
+                    <in>cache_simulator_test.cc</in>
+                    <in>sim_cache.cc</in>
+                    <in>sim_cache_test.cc</in>
+                  </df>
+                  <df name="table_properties_collectors">
+                    <in>compact_on_deletion_collector.cc</in>
+                    <in>compact_on_deletion_collector_test.cc</in>
+                  </df>
+                  <df name="trace">
+                    <in>file_trace_reader_writer.cc</in>
+                    <in>replayer_impl.cc</in>
+                  </df>
+                  <df name="transactions">
+                    <df name="lock">
+                      <df name="point">
+                        <in>point_lock_manager.cc</in>
+                        <in>point_lock_manager_test.cc</in>
+                        <in>point_lock_tracker.cc</in>
+                      </df>
+                      <df name="range">
+                        <df name="range_tree">
+                          <df name="lib">
+                            <df name="locktree">
+                              <in>concurrent_tree.cc</in>
+                              <in>keyrange.cc</in>
+                              <in>lock_request.cc</in>
+                              <in>locktree.cc</in>
+                              <in>manager.cc</in>
+                              <in>range_buffer.cc</in>
+                              <in>treenode.cc</in>
+                              <in>txnid_set.cc</in>
+                              <in>wfg.cc</in>
+                            </df>
+                            <df name="util">
+                              <in>dbt.cc</in>
+                              <in>memarena.cc</in>
+                            </df>
+                            <in>standalone_port.cc</in>
+                          </df>
+                          <in>range_tree_lock_manager.cc</in>
+                          <in>range_tree_lock_tracker.cc</in>
+                        </df>
+                        <in>range_locking_test.cc</in>
+                      </df>
+                      <in>lock_manager.cc</in>
+                    </df>
+                    <in>optimistic_transaction.cc</in>
+                    <in>optimistic_transaction_db_impl.cc</in>
+                    <in>optimistic_transaction_test.cc</in>
+                    <in>pessimistic_transaction.cc</in>
+                    <in>pessimistic_transaction_db.cc</in>
+                    <in>snapshot_checker.cc</in>
+                    <in>transaction_base.cc</in>
+                    <in>transaction_db_mutex_impl.cc</in>
+                    <in>transaction_test.cc</in>
+                    <in>transaction_util.cc</in>
+                    <in>write_prepared_transaction_test.cc</in>
+                    <in>write_prepared_txn.cc</in>
+                    <in>write_prepared_txn_db.cc</in>
+                    <in>write_unprepared_transaction_test.cc</in>
+                    <in>write_unprepared_txn.cc</in>
+                    <in>write_unprepared_txn_db.cc</in>
+                  </df>
+                  <df name="ttl">
+                    <in>db_ttl_impl.cc</in>
+                    <in>ttl_test.cc</in>
+                  </df>
+                  <df name="write_batch_with_index">
+                    <in>write_batch_with_index.cc</in>
+                    <in>write_batch_with_index_internal.cc</in>
+                    <in>write_batch_with_index_test.cc</in>
+                  </df>
+                  <in>cache_dump_load.cc</in>
+                  <in>cache_dump_load_impl.cc</in>
+                  <in>compaction_filters.cc</in>
+                  <in>debug.cc</in>
+                  <in>env_librados.cc</in>
+                  <in>env_librados_test.cc</in>
+                  <in>env_mirror.cc</in>
+                  <in>env_mirror_test.cc</in>
+                  <in>env_timed.cc</in>
+                  <in>env_timed_test.cc</in>
+                  <in>fault_injection_env.cc</in>
+                  <in>fault_injection_fs.cc</in>
+                  <in>fault_injection_secondary_cache.cc</in>
+                  <in>merge_operators.cc</in>
+                  <in>object_registry.cc</in>
+                  <in>object_registry_test.cc</in>
+                  <in>util_merge_operators_test.cc</in>
+                  <in>wal_filter.cc</in>
+                </df>
+              </df>
+              <df name="rocksdb-build">
+                <df name="CMakeFiles">
+                  <df name="3.22.2">
+                    <df name="CompilerIdC">
+                      <in>CMakeCCompilerId.c</in>
+                    </df>
+                    <df name="CompilerIdCXX">
+                      <in>CMakeCXXCompilerId.cpp</in>
+                    </df>
+                  </df>
+                </df>
+                <in>build_version.cc</in>
+              </df>
+            </df>
+          </df>
+          <df name="workloads">
+            <in>ApiCorrectness.actor.g.cpp</in>
+            <in>ApiWorkload.actor.g.cpp</in>
+            <in>AsyncFileCorrectness.actor.g.cpp</in>
+            <in>AsyncFileRead.actor.g.cpp</in>
+            <in>AsyncFileWrite.actor.g.cpp</in>
+            <in>AtomicOps.actor.g.cpp</in>
+            <in>AtomicOpsApiCorrectness.actor.g.cpp</in>
+            <in>AtomicRestore.actor.g.cpp</in>
+            <in>AtomicSwitchover.actor.g.cpp</in>
+            <in>BackgroundSelectors.actor.g.cpp</in>
+            <in>BackupAndParallelRestoreCorrectness.actor.g.cpp</in>
+            <in>BackupCorrectness.actor.g.cpp</in>
+            <in>BackupToBlob.actor.g.cpp</in>
+            <in>BackupToDBAbort.actor.g.cpp</in>
+            <in>BackupToDBCorrectness.actor.g.cpp</in>
+            <in>BackupToDBUpgrade.actor.g.cpp</in>
+            <in>BlobGranuleCorrectnessWorkload.actor.g.cpp</in>
+            <in>BlobGranuleVerifier.actor.g.cpp</in>
+            <in>BulkLoad.actor.g.cpp</in>
+            <in>Cache.actor.g.cpp</in>
+            <in>ChangeConfig.actor.g.cpp</in>
+            <in>ChangeFeeds.actor.g.cpp</in>
+            <in>ClearSingleRange.actor.g.cpp</in>
+            <in>ClientTransactionProfileCorrectness.actor.g.cpp</in>
+            <in>ClogSingleConnection.actor.g.cpp</in>
+            <in>CommitBugCheck.actor.g.cpp</in>
+            <in>ConfigIncrement.actor.g.cpp</in>
+            <in>ConfigureDatabase.actor.g.cpp</in>
+            <in>ConflictRange.actor.g.cpp</in>
+            <in>ConsistencyCheck.actor.g.cpp</in>
+            <in>CpuProfiler.actor.g.cpp</in>
+            <in>Cycle.actor.g.cpp</in>
+            <in>DDBalance.actor.g.cpp</in>
+            <in>DDMetrics.actor.g.cpp</in>
+            <in>DDMetricsExclude.actor.g.cpp</in>
+            <in>DataDistributionMetrics.actor.g.cpp</in>
+            <in>DataLossRecovery.actor.g.cpp</in>
+            <in>DifferentClustersSameRV.actor.g.cpp</in>
+            <in>DiskDurability.actor.g.cpp</in>
+            <in>DiskDurabilityTest.actor.g.cpp</in>
+            <in>DiskFailureInjection.actor.g.cpp</in>
+            <in>Downgrade.actor.g.cpp</in>
+            <in>DummyWorkload.actor.g.cpp</in>
+            <in>EncryptionOps.actor.g.cpp</in>
+            <in>ExternalWorkload.actor.g.cpp</in>
+            <in>FastTriggeredWatches.actor.g.cpp</in>
+            <in>FileSystem.actor.g.cpp</in>
+            <in>FuzzApiCorrectness.actor.g.cpp</in>
+            <in>GetMappedRange.actor.g.cpp</in>
+            <in>GetRangeStream.actor.g.cpp</in>
+            <in>HealthMetricsApi.actor.g.cpp</in>
+            <in>HighContentionPrefixAllocatorWorkload.actor.g.cpp</in>
+            <in>Increment.actor.g.cpp</in>
+            <in>IncrementalBackup.actor.g.cpp</in>
+            <in>IndexScan.actor.g.cpp</in>
+            <in>Inventory.actor.g.cpp</in>
+            <in>KVStoreTest.actor.g.cpp</in>
+            <in>KillRegion.actor.g.cpp</in>
+            <in>LocalRatekeeper.actor.g.cpp</in>
+            <in>LockDatabase.actor.g.cpp</in>
+            <in>LockDatabaseFrequently.actor.g.cpp</in>
+            <in>LogMetrics.actor.g.cpp</in>
+            <in>LowLatency.actor.g.cpp</in>
+            <in>MachineAttrition.actor.g.cpp</in>
+            <in>Mako.actor.g.cpp</in>
+            <in>MemoryLifetime.actor.g.cpp</in>
+            <in>MetricLogging.actor.g.cpp</in>
+            <in>MiniCycle.actor.g.cpp</in>
+            <in>MutationLogReaderCorrectness.actor.g.cpp</in>
+            <in>ParallelRestore.actor.g.cpp</in>
+            <in>Performance.actor.g.cpp</in>
+            <in>PhysicalShardMove.actor.g.cpp</in>
+            <in>Ping.actor.g.cpp</in>
+            <in>PopulateTPCC.actor.g.cpp</in>
+            <in>ProtocolVersion.actor.g.cpp</in>
+            <in>PubSubMultiples.actor.g.cpp</in>
+            <in>QueuePush.actor.g.cpp</in>
+            <in>RYWDisable.actor.g.cpp</in>
+            <in>RYWPerformance.actor.g.cpp</in>
+            <in>RandomClogging.actor.g.cpp</in>
+            <in>RandomMoveKeys.actor.g.cpp</in>
+            <in>RandomSelector.actor.g.cpp</in>
+            <in>ReadAfterWrite.actor.g.cpp</in>
+            <in>ReadHotDetection.actor.g.cpp</in>
+            <in>ReadWrite.actor.g.cpp</in>
+            <in>RemoveServersSafely.actor.g.cpp</in>
+            <in>ReportConflictingKeys.actor.g.cpp</in>
+            <in>RestoreBackup.actor.g.cpp</in>
+            <in>RestoreFromBlob.actor.g.cpp</in>
+            <in>Rollback.actor.g.cpp</in>
+            <in>RyowCorrectness.actor.g.cpp</in>
+            <in>SaveAndKill.actor.g.cpp</in>
+            <in>SelectorCorrectness.actor.g.cpp</in>
+            <in>Serializability.actor.g.cpp</in>
+            <in>Sideband.actor.g.cpp</in>
+            <in>SidebandSingle.actor.g.cpp</in>
+            <in>SimpleAtomicAdd.actor.g.cpp</in>
+            <in>SlowTaskWorkload.actor.g.cpp</in>
+            <in>SnapTest.actor.g.cpp</in>
+            <in>SpecialKeySpaceCorrectness.actor.g.cpp</in>
+            <in>StatusWorkload.actor.g.cpp</in>
+            <in>Storefront.actor.g.cpp</in>
+            <in>StreamingRangeRead.actor.g.cpp</in>
+            <in>StreamingRead.actor.g.cpp</in>
+            <in>SubmitBackup.actor.g.cpp</in>
+            <in>SuspendProcesses.actor.g.cpp</in>
+            <in>TPCC.actor.g.cpp</in>
+            <in>TagThrottleApi.actor.g.cpp</in>
+            <in>TargetedKill.actor.g.cpp</in>
+            <in>TaskBucketCorrectness.actor.g.cpp</in>
+            <in>TenantManagement.actor.g.cpp</in>
+            <in>ThreadSafety.actor.g.cpp</in>
+            <in>Throttling.actor.g.cpp</in>
+            <in>Throughput.actor.g.cpp</in>
+            <in>TimeKeeperCorrectness.actor.g.cpp</in>
+            <in>TriggerRecovery.actor.g.cpp</in>
+            <in>UDPWorkload.actor.g.cpp</in>
+            <in>UnitPerf.actor.g.cpp</in>
+            <in>UnitTests.actor.g.cpp</in>
+            <in>Unreadable.actor.g.cpp</in>
+            <in>VersionStamp.actor.g.cpp</in>
+            <in>WatchAndWait.actor.g.cpp</in>
+            <in>Watches.actor.g.cpp</in>
+            <in>WatchesSameKeyCorrectness.actor.g.cpp</in>
+            <in>WorkerErrors.actor.g.cpp</in>
+            <in>WriteBandwidth.actor.g.cpp</in>
+            <in>WriteDuringRead.actor.g.cpp</in>
+            <in>WriteTagThrottling.actor.g.cpp</in>
+          </df>
+          <in>BackupProgress.actor.g.cpp</in>
+          <in>BackupWorker.actor.g.cpp</in>
+          <in>BlobGranuleServerCommon.actor.g.cpp</in>
+          <in>BlobGranuleValidation.actor.g.cpp</in>
+          <in>BlobManager.actor.g.cpp</in>
+          <in>BlobWorker.actor.g.cpp</in>
+          <in>ClusterController.actor.g.cpp</in>
+          <in>ClusterRecovery.actor.g.cpp</in>
+          <in>CommitProxyServer.actor.g.cpp</in>
+          <in>ConfigBroadcaster.actor.g.cpp</in>
+          <in>ConfigDatabaseUnitTests.actor.g.cpp</in>
+          <in>ConfigNode.actor.g.cpp</in>
+          <in>CoordinatedState.actor.g.cpp</in>
+          <in>Coordination.actor.g.cpp</in>
+          <in>CoroFlow.actor.g.cpp</in>
+          <in>CoroFlowCoro.actor.g.cpp</in>
+          <in>DDTeamCollection.actor.g.cpp</in>
+          <in>DataDistribution.actor.g.cpp</in>
+          <in>DataDistributionQueue.actor.g.cpp</in>
+          <in>DataDistributionTracker.actor.g.cpp</in>
+          <in>DiskQueue.actor.g.cpp</in>
+          <in>EncryptKeyProxy.actor.g.cpp</in>
+          <in>FDBExecHelper.actor.g.cpp</in>
+          <in>GrvProxyServer.actor.g.cpp</in>
+          <in>KeyValueStoreCompressTestData.actor.g.cpp</in>
+          <in>KeyValueStoreMemory.actor.g.cpp</in>
+          <in>KeyValueStoreRocksDB.actor.g.cpp</in>
+          <in>KeyValueStoreSQLite.actor.g.cpp</in>
+          <in>LeaderElection.actor.g.cpp</in>
+          <in>LocalConfiguration.actor.g.cpp</in>
+          <in>LogRouter.actor.g.cpp</in>
+          <in>LogSystemDiskQueueAdapter.actor.g.cpp</in>
+          <in>LogSystemPeekCursor.actor.g.cpp</in>
+          <in>MasterProxyServer.actor.g.cpp</in>
+          <in>MetricLogger.actor.g.cpp</in>
+          <in>MoveKeys.actor.g.cpp</in>
+          <in>OldTLogServer_4_6.actor.g.cpp</in>
+          <in>OldTLogServer_6_0.actor.g.cpp</in>
+          <in>OldTLogServer_6_2.actor.g.cpp</in>
+          <in>OnDemandStore.actor.g.cpp</in>
+          <in>PaxosConfigConsumer.actor.g.cpp</in>
+          <in>QuietDatabase.actor.g.cpp</in>
+          <in>Ratekeeper.actor.g.cpp</in>
+          <in>RemoteIKeyValueStore.actor.g.cpp</in>
+          <in>ResolutionBalancer.actor.g.cpp</in>
+          <in>Resolver.actor.g.cpp</in>
+          <in>RestoreApplier.actor.g.cpp</in>
+          <in>RestoreCommon.actor.g.cpp</in>
+          <in>RestoreController.actor.g.cpp</in>
+          <in>RestoreLoader.actor.g.cpp</in>
+          <in>RestoreRoleCommon.actor.g.cpp</in>
+          <in>RestoreUtil.actor.g.cpp</in>
+          <in>RestoreWorker.actor.g.cpp</in>
+          <in>RestoreWorkerInterface.actor.g.cpp</in>
+          <in>RocksDBCheckpointUtils.actor.g.cpp</in>
+          <in>RoleLineage.actor.g.cpp</in>
+          <in>ServerCheckpoint.actor.g.cpp</in>
+          <in>SimEncryptVaultProxy.actor.g.cpp</in>
+          <in>SimpleConfigConsumer.actor.g.cpp</in>
+          <in>SimulatedCluster.actor.g.cpp</in>
+          <in>Status.actor.g.cpp</in>
+          <in>StorageCache.actor.g.cpp</in>
+          <in>TCInfo.actor.g.cpp</in>
+          <in>TLogServer.actor.g.cpp</in>
+          <in>TSSMappingUtil.actor.g.cpp</in>
+          <in>TagPartitionedLogSystem.actor.g.cpp</in>
+          <in>TagThrottler.actor.g.cpp</in>
+          <in>VersionedBTree.actor.g.cpp</in>
+          <in>WaitFailure.actor.g.cpp</in>
+          <in>fdbserver.actor.g.cpp</in>
+          <in>masterserver.actor.g.cpp</in>
+          <in>networktest.actor.g.cpp</in>
+          <in>pubsub.actor.g.cpp</in>
+          <in>storageserver.actor.g.cpp</in>
+          <in>tester.actor.g.cpp</in>
+          <in>worker.actor.g.cpp</in>
+        </df>
+        <df name="flow">
+          <in>ActorCollection.actor.g.cpp</in>
+          <in>CompressedInt.actor.g.cpp</in>
+          <in>Hostname.actor.g.cpp</in>
+          <in>IThreadPoolTest.actor.g.cpp</in>
+          <in>Net2.actor.g.cpp</in>
+          <in>Platform.actor.g.cpp</in>
+          <in>Profiler.actor.g.cpp</in>
+          <in>TLSConfig.actor.g.cpp</in>
+          <in>ThreadHelper.actor.g.cpp</in>
+          <in>Tracing.actor.g.cpp</in>
+          <in>WriteOnlySet.actor.g.cpp</in>
+          <in>genericactors.actor.g.cpp</in>
+        </df>
+        <df name="Jemalloc_project-prefix">
+          <df name="src">
+            <df name="Jemalloc_project">
+              <df name="src">
+                <in>arena.c</in>
+                <in>background_thread.c</in>
+                <in>base.c</in>
+                <in>bin.c</in>
+                <in>bitmap.c</in>
+                <in>ckh.c</in>
+                <in>ctl.c</in>
+                <in>div.c</in>
+                <in>extent.c</in>
+                <in>extent_dss.c</in>
+                <in>extent_mmap.c</in>
+                <in>hash.c</in>
+                <in>hook.c</in>
+                <in>jemalloc.c</in>
+                <in>large.c</in>
+                <in>log.c</in>
+                <in>malloc_io.c</in>
+                <in>mutex.c</in>
+                <in>mutex_pool.c</in>
+                <in>nstime.c</in>
+                <in>pages.c</in>
+                <in>prng.c</in>
+                <in>prof.c</in>
+                <in>rtree.c</in>
+                <in>safety_check.c</in>
+                <in>sc.c</in>
+                <in>stats.c</in>
+                <in>sz.c</in>
+                <in>tcache.c</in>
+                <in>test_hooks.c</in>
+                <in>ticker.c</in>
+                <in>tsd.c</in>
+                <in>witness.c</in>
+              </df>
+            </df>
+          </df>
+        </df>
+        <df name="toml11Project-prefix">
+          <df name="src">
+            <df name="toml11Project-build">
+              <df name="CMakeFiles">
+                <df name="3.22.2">
+                  <df name="CompilerIdC">
+                    <in>CMakeCCompilerId.c</in>
+                  </df>
+                  <df name="CompilerIdCXX">
+                    <in>CMakeCXXCompilerId.cpp</in>
+                  </df>
+                </df>
+              </df>
+            </df>
+          </df>
+        </df>
+      </df>
+      <df name="contrib">
+        <df name="debug_determinism">
+          <in>debug_determinism.cpp</in>
+        </df>
+        <df name="fmt-8.1.1">
+          <df name="src">
+            <in>fmt.cc</in>
+            <in>format.cc</in>
+            <in>os.cc</in>
+          </df>
+        </df>
+        <df name="monitoring">
+          <in>actor_flamegraph.cpp</in>
+        </df>
+      </df>
+      <df name="documentation">
+        <df name="tutorial">
+          <in>tutorial.actor.cpp</in>
+        </df>
+      </df>
+      <df name="fdbbackup">
+        <in>BackupTLSConfig.cpp</in>
+        <in>FileConverter.actor.cpp</in>
+        <in>FileDecoder.actor.cpp</in>
+        <in>backup.actor.cpp</in>
+      </df>
+      <df name="fdbcli">
+        <df name="linenoise">
+          <in>linenoise.c</in>
+        </df>
+        <in>AdvanceVersionCommand.actor.cpp</in>
+        <in>BlobRangeCommand.actor.cpp</in>
+        <in>CacheRangeCommand.actor.cpp</in>
+        <in>ChangeFeedCommand.actor.cpp</in>
+        <in>ConfigureCommand.actor.cpp</in>
+        <in>ConsistencyCheckCommand.actor.cpp</in>
+        <in>CoordinatorsCommand.actor.cpp</in>
+        <in>DataDistributionCommand.actor.cpp</in>
+        <in>ExcludeCommand.actor.cpp</in>
+        <in>ExpensiveDataCheckCommand.actor.cpp</in>
+        <in>FileConfigureCommand.actor.cpp</in>
+        <in>FlowLineNoise.actor.cpp</in>
+        <in>ForceRecoveryWithDataLossCommand.actor.cpp</in>
+        <in>IncludeCommand.actor.cpp</in>
+        <in>KillCommand.actor.cpp</in>
+        <in>LockCommand.actor.cpp</in>
+        <in>MaintenanceCommand.actor.cpp</in>
+        <in>ProfileCommand.actor.cpp</in>
+        <in>SetClassCommand.actor.cpp</in>
+        <in>SnapshotCommand.actor.cpp</in>
+        <in>StatusCommand.actor.cpp</in>
+        <in>SuspendCommand.actor.cpp</in>
+        <in>TenantCommands.actor.cpp</in>
+        <in>ThrottleCommand.actor.cpp</in>
+        <in>TriggerDDTeamInfoLogCommand.actor.cpp</in>
+        <in>TssqCommand.actor.cpp</in>
+        <in>Util.actor.cpp</in>
+        <in>VersionEpochCommand.actor.cpp</in>
+        <in>fdbcli.actor.cpp</in>
+      </df>
+      <df name="fdbclient">
+        <df name="libb64">
+          <in>cdecode.c</in>
+          <in>cencode.c</in>
+        </df>
+        <df name="md5">
+          <in>md5.c</in>
+        </df>
+        <df name="sha1">
+          <in>SHA1.cpp</in>
+        </df>
+        <in>ActorLineageProfiler.cpp</in>
+        <in>AnnotateActor.cpp</in>
+        <in>AsyncFileS3BlobStore.actor.cpp</in>
+        <in>AsyncTaskThread.actor.cpp</in>
+        <in>AutoPublicAddress.cpp</in>
+        <in>BackupAgentBase.actor.cpp</in>
+        <in>BackupContainer.actor.cpp</in>
+        <in>BackupContainerAzureBlobStore.actor.cpp</in>
+        <in>BackupContainerFileSystem.actor.cpp</in>
+        <in>BackupContainerLocalDirectory.actor.cpp</in>
+        <in>BackupContainerS3BlobStore.actor.cpp</in>
+        <in>BlobGranuleFiles.cpp</in>
+        <in>BlobGranuleReader.actor.cpp</in>
+        <in>ClientBooleanParams.cpp</in>
+        <in>ClientKnobCollection.cpp</in>
+        <in>ClientKnobs.cpp</in>
+        <in>ClusterConnectionFile.actor.cpp</in>
+        <in>ClusterConnectionKey.actor.cpp</in>
+        <in>ClusterConnectionMemoryRecord.actor.cpp</in>
+        <in>ConfigKnobs.cpp</in>
+        <in>ConfigTransactionInterface.cpp</in>
+        <in>DatabaseBackupAgent.actor.cpp</in>
+        <in>DatabaseConfiguration.cpp</in>
+        <in>FDBTypes.cpp</in>
+        <in>FileBackupAgent.actor.cpp</in>
+        <in>FluentDSampleIngestor.cpp</in>
+        <in>GlobalConfig.actor.cpp</in>
+        <in>HTTP.actor.cpp</in>
+        <in>IConfigTransaction.cpp</in>
+        <in>IKnobCollection.cpp</in>
+        <in>ISingleThreadTransaction.cpp</in>
+        <in>JsonBuilder.cpp</in>
+        <in>KeyRangeMap.actor.cpp</in>
+        <in>LocalClientAPI.cpp</in>
+        <in>ManagementAPI.actor.cpp</in>
+        <in>MonitorLeader.actor.cpp</in>
+        <in>MultiVersionTransaction.actor.cpp</in>
+        <in>MutationLogReader.actor.cpp</in>
+        <in>NameLineage.cpp</in>
+        <in>NativeAPI.actor.cpp</in>
+        <in>ParallelStream.actor.cpp</in>
+        <in>PaxosConfigTransaction.actor.cpp</in>
+        <in>RYWIterator.cpp</in>
+        <in>ReadYourWrites.actor.cpp</in>
+        <in>RestoreInterface.cpp</in>
+        <in>S3BlobStore.actor.cpp</in>
+        <in>Schemas.cpp</in>
+        <in>ServerKnobCollection.cpp</in>
+        <in>ServerKnobs.cpp</in>
+        <in>SimpleConfigTransaction.actor.cpp</in>
+        <in>SpecialKeySpace.actor.cpp</in>
+        <in>StackLineage.cpp</in>
+        <in>StatusClient.actor.cpp</in>
+        <in>StorageServerInterface.cpp</in>
+        <in>Subspace.cpp</in>
+        <in>SystemData.cpp</in>
+        <in>TagThrottle.actor.cpp</in>
+        <in>TaskBucket.actor.cpp</in>
+        <in>Tenant.cpp</in>
+        <in>TestKnobCollection.cpp</in>
+        <in>ThreadSafeTransaction.cpp</in>
+        <in>TransactionLineage.cpp</in>
+        <in>Tuple.cpp</in>
+        <in>VersionedMap.cpp</in>
+        <in>Versionstamp.cpp</in>
+        <in>zipf.c</in>
+      </df>
+      <df name="FDBLibTLS">
+        <in>FDBLibTLSPlugin.cpp</in>
+        <in>FDBLibTLSPolicy.cpp</in>
+        <in>FDBLibTLSSession.cpp</in>
+        <in>FDBLibTLSVerify.cpp</in>
+        <in>plugin-test.cpp</in>
+        <in>verify-test.cpp</in>
+      </df>
+      <df name="fdbmonitor">
+        <in>fdbmonitor.cpp</in>
+      </df>
+      <df name="fdbrpc">
+        <df name="libcoroutine">
+          <in>Common.c</in>
+          <in>Coro.c</in>
+          <in>context.c</in>
+        </df>
+        <df name="libeio">
+          <in>eio.c</in>
+        </df>
+        <in>ActorFuzz.actor.cpp</in>
+        <in>AsyncFileCached.actor.cpp</in>
+        <in>AsyncFileEncrypted.actor.cpp</in>
+        <in>AsyncFileNonDurable.actor.cpp</in>
+        <in>AsyncFileWriteChecker.cpp</in>
+        <in>FailureMonitor.actor.cpp</in>
+        <in>FlowTests.actor.cpp</in>
+        <in>FlowTransport.actor.cpp</in>
+        <in>HealthMonitor.actor.cpp</in>
+        <in>IAsyncFile.actor.cpp</in>
+        <in>LoadBalance.actor.cpp</in>
+        <in>Locality.cpp</in>
+        <in>Net2FileSystem.cpp</in>
+        <in>PerfMetric.cpp</in>
+        <in>QueueModel.cpp</in>
+        <in>Replication.cpp</in>
+        <in>ReplicationPolicy.cpp</in>
+        <in>ReplicationTypes.cpp</in>
+        <in>ReplicationUtils.cpp</in>
+        <in>SimExternalConnection.actor.cpp</in>
+        <in>Stats.actor.cpp</in>
+        <in>TraceFileIO.cpp</in>
+        <in>dsltest.actor.cpp</in>
+        <in>genericactors.actor.cpp</in>
+        <in>sim2.actor.cpp</in>
+        <in>sim_validation.cpp</in>
+      </df>
+      <df name="fdbserver">
+        <df name="sqlite">
+          <in>btree.c</in>
+          <in>shell.c</in>
+          <in>sqlite3.amalgamation.c</in>
+        </df>
+        <df name="workloads">
+          <in>ApiCorrectness.actor.cpp</in>
+          <in>ApiWorkload.actor.cpp</in>
+          <in>AsyncFile.cpp</in>
+          <in>AsyncFileCorrectness.actor.cpp</in>
+          <in>AsyncFileRead.actor.cpp</in>
+          <in>AsyncFileWrite.actor.cpp</in>
+          <in>AtomicOps.actor.cpp</in>
+          <in>AtomicOpsApiCorrectness.actor.cpp</in>
+          <in>AtomicRestore.actor.cpp</in>
+          <in>AtomicSwitchover.actor.cpp</in>
+          <in>BackgroundSelectors.actor.cpp</in>
+          <in>BackupAndParallelRestoreCorrectness.actor.cpp</in>
+          <in>BackupCorrectness.actor.cpp</in>
+          <in>BackupToBlob.actor.cpp</in>
+          <in>BackupToDBAbort.actor.cpp</in>
+          <in>BackupToDBCorrectness.actor.cpp</in>
+          <in>BackupToDBUpgrade.actor.cpp</in>
+          <in>BlobGranuleCorrectnessWorkload.actor.cpp</in>
+          <in>BlobGranuleVerifier.actor.cpp</in>
+          <in>BulkLoad.actor.cpp</in>
+          <in>Cache.actor.cpp</in>
+          <in>ChangeConfig.actor.cpp</in>
+          <in>ChangeFeeds.actor.cpp</in>
+          <in>ClearSingleRange.actor.cpp</in>
+          <in>ClientTransactionProfileCorrectness.actor.cpp</in>
+          <in>ClogSingleConnection.actor.cpp</in>
+          <in>CommitBugCheck.actor.cpp</in>
+          <in>ConfigIncrement.actor.cpp</in>
+          <in>ConfigureDatabase.actor.cpp</in>
+          <in>ConflictRange.actor.cpp</in>
+          <in>ConsistencyCheck.actor.cpp</in>
+          <in>CpuProfiler.actor.cpp</in>
+          <in>Cycle.actor.cpp</in>
+          <in>DDBalance.actor.cpp</in>
+          <in>DDMetrics.actor.cpp</in>
+          <in>DDMetricsExclude.actor.cpp</in>
+          <in>DataDistributionMetrics.actor.cpp</in>
+          <in>DataLossRecovery.actor.cpp</in>
+          <in>DifferentClustersSameRV.actor.cpp</in>
+          <in>DiskDurability.actor.cpp</in>
+          <in>DiskDurabilityTest.actor.cpp</in>
+          <in>DiskFailureInjection.actor.cpp</in>
+          <in>DummyWorkload.actor.cpp</in>
+          <in>EncryptionOps.actor.cpp</in>
+          <in>ExternalWorkload.actor.cpp</in>
+          <in>FastTriggeredWatches.actor.cpp</in>
+          <in>FileSystem.actor.cpp</in>
+          <in>Fuzz.cpp</in>
+          <in>FuzzApiCorrectness.actor.cpp</in>
+          <in>GetMappedRange.actor.cpp</in>
+          <in>GetRangeStream.actor.cpp</in>
+          <in>HealthMetricsApi.actor.cpp</in>
+          <in>HighContentionPrefixAllocatorWorkload.actor.cpp</in>
+          <in>Increment.actor.cpp</in>
+          <in>IncrementalBackup.actor.cpp</in>
+          <in>IndexScan.actor.cpp</in>
+          <in>Inventory.actor.cpp</in>
+          <in>KVStoreTest.actor.cpp</in>
+          <in>KillRegion.actor.cpp</in>
+          <in>LocalRatekeeper.actor.cpp</in>
+          <in>LockDatabase.actor.cpp</in>
+          <in>LockDatabaseFrequently.actor.cpp</in>
+          <in>LogMetrics.actor.cpp</in>
+          <in>LowLatency.actor.cpp</in>
+          <in>MachineAttrition.actor.cpp</in>
+          <in>Mako.actor.cpp</in>
+          <in>MemoryKeyValueStore.cpp</in>
+          <in>MemoryLifetime.actor.cpp</in>
+          <in>MetricLogging.actor.cpp</in>
+          <in>MiniCycle.actor.cpp</in>
+          <in>MutationLogReaderCorrectness.actor.cpp</in>
+          <in>ParallelRestore.actor.cpp</in>
+          <in>Performance.actor.cpp</in>
+          <in>PhysicalShardMove.actor.cpp</in>
+          <in>Ping.actor.cpp</in>
+          <in>PopulateTPCC.actor.cpp</in>
+          <in>ProtocolVersion.actor.cpp</in>
+          <in>PubSubMultiples.actor.cpp</in>
+          <in>QueuePush.actor.cpp</in>
+          <in>RYWDisable.actor.cpp</in>
+          <in>RYWPerformance.actor.cpp</in>
+          <in>RandomClogging.actor.cpp</in>
+          <in>RandomMoveKeys.actor.cpp</in>
+          <in>RandomSelector.actor.cpp</in>
+          <in>ReadAfterWrite.actor.cpp</in>
+          <in>ReadHotDetection.actor.cpp</in>
+          <in>ReadWrite.actor.cpp</in>
+          <in>RemoveServersSafely.actor.cpp</in>
+          <in>ReportConflictingKeys.actor.cpp</in>
+          <in>RestoreBackup.actor.cpp</in>
+          <in>RestoreFromBlob.actor.cpp</in>
+          <in>Rollback.actor.cpp</in>
+          <in>RyowCorrectness.actor.cpp</in>
+          <in>SaveAndKill.actor.cpp</in>
+          <in>SelectorCorrectness.actor.cpp</in>
+          <in>Serializability.actor.cpp</in>
+          <in>Sideband.actor.cpp</in>
+          <in>SidebandSingle.actor.cpp</in>
+          <in>SimpleAtomicAdd.actor.cpp</in>
+          <in>SlowTaskWorkload.actor.cpp</in>
+          <in>SnapTest.actor.cpp</in>
+          <in>SpecialKeySpaceCorrectness.actor.cpp</in>
+          <in>StatusWorkload.actor.cpp</in>
+          <in>Storefront.actor.cpp</in>
+          <in>StreamingRangeRead.actor.cpp</in>
+          <in>StreamingRead.actor.cpp</in>
+          <in>SubmitBackup.actor.cpp</in>
+          <in>SuspendProcesses.actor.cpp</in>
+          <in>TPCC.actor.cpp</in>
+          <in>TagThrottleApi.actor.cpp</in>
+          <in>TargetedKill.actor.cpp</in>
+          <in>TaskBucketCorrectness.actor.cpp</in>
+          <in>TenantManagement.actor.cpp</in>
+          <in>ThreadSafety.actor.cpp</in>
+          <in>Throttling.actor.cpp</in>
+          <in>Throughput.actor.cpp</in>
+          <in>TimeKeeperCorrectness.actor.cpp</in>
+          <in>TriggerRecovery.actor.cpp</in>
+          <in>UDPWorkload.actor.cpp</in>
+          <in>UnitPerf.actor.cpp</in>
+          <in>UnitTests.actor.cpp</in>
+          <in>Unreadable.actor.cpp</in>
+          <in>VersionStamp.actor.cpp</in>
+          <in>WatchAndWait.actor.cpp</in>
+          <in>Watches.actor.cpp</in>
+          <in>WatchesSameKeyCorrectness.actor.cpp</in>
+          <in>WorkerErrors.actor.cpp</in>
+          <in>WriteBandwidth.actor.cpp</in>
+          <in>WriteDuringRead.actor.cpp</in>
+          <in>WriteTagThrottling.actor.cpp</in>
+        </df>
+        <in>ApplyMetadataMutation.cpp</in>
+        <in>BackupProgress.actor.cpp</in>
+        <in>BackupWorker.actor.cpp</in>
+        <in>BlobGranuleServerCommon.actor.cpp</in>
+        <in>BlobGranuleValidation.actor.cpp</in>
+        <in>BlobManager.actor.cpp</in>
+        <in>BlobWorker.actor.cpp</in>
+        <in>ClusterController.actor.cpp</in>
+        <in>ClusterRecovery.actor.cpp</in>
+        <in>CommitProxyServer.actor.cpp</in>
+        <in>CompactMap.cpp</in>
+        <in>ConfigBroadcaster.actor.cpp</in>
+        <in>ConfigDatabaseUnitTests.actor.cpp</in>
+        <in>ConfigFollowerInterface.cpp</in>
+        <in>ConfigNode.actor.cpp</in>
+        <in>CoordinatedState.actor.cpp</in>
+        <in>Coordination.actor.cpp</in>
+        <in>CoroFlow.actor.cpp</in>
+        <in>CoroFlowCoro.actor.cpp</in>
+        <in>DDTeamCollection.actor.cpp</in>
+        <in>DataDistribution.actor.cpp</in>
+        <in>DataDistributionQueue.actor.cpp</in>
+        <in>DataDistributionTracker.actor.cpp</in>
+        <in>DiskQueue.actor.cpp</in>
+        <in>EncryptKeyProxy.actor.cpp</in>
+        <in>FDBExecHelper.actor.cpp</in>
+        <in>GrvProxyServer.actor.cpp</in>
+        <in>IConfigConsumer.cpp</in>
+        <in>KeyValueStoreCompressTestData.actor.cpp</in>
+        <in>KeyValueStoreMemory.actor.cpp</in>
+        <in>KeyValueStoreRocksDB.actor.cpp</in>
+        <in>KeyValueStoreSQLite.actor.cpp</in>
+        <in>KnobProtectiveGroups.cpp</in>
+        <in>LatencyBandConfig.cpp</in>
+        <in>LeaderElection.actor.cpp</in>
+        <in>LocalConfiguration.actor.cpp</in>
+        <in>LogRouter.actor.cpp</in>
+        <in>LogSystem.cpp</in>
+        <in>LogSystemConfig.cpp</in>
+        <in>LogSystemDiskQueueAdapter.actor.cpp</in>
+        <in>LogSystemPeekCursor.actor.cpp</in>
+        <in>MetricLogger.actor.cpp</in>
+        <in>MoveKeys.actor.cpp</in>
+        <in>MutationTracking.cpp</in>
+        <in>OldTLogServer_4_6.actor.cpp</in>
+        <in>OldTLogServer_6_0.actor.cpp</in>
+        <in>OldTLogServer_6_2.actor.cpp</in>
+        <in>OnDemandStore.actor.cpp</in>
+        <in>PaxosConfigConsumer.actor.cpp</in>
+        <in>QuietDatabase.actor.cpp</in>
+        <in>Ratekeeper.actor.cpp</in>
+        <in>RemoteIKeyValueStore.actor.cpp</in>
+        <in>ResolutionBalancer.actor.cpp</in>
+        <in>Resolver.actor.cpp</in>
+        <in>RestoreApplier.actor.cpp</in>
+        <in>RestoreCommon.actor.cpp</in>
+        <in>RestoreController.actor.cpp</in>
+        <in>RestoreLoader.actor.cpp</in>
+        <in>RestoreRoleCommon.actor.cpp</in>
+        <in>RestoreUtil.actor.cpp</in>
+        <in>RestoreWorker.actor.cpp</in>
+        <in>RestoreWorkerInterface.actor.cpp</in>
+        <in>RkTagThrottleCollection.cpp</in>
+        <in>RocksDBCheckpointUtils.actor.cpp</in>
+        <in>RoleLineage.actor.cpp</in>
+        <in>ServerCheckpoint.actor.cpp</in>
+        <in>SigStack.cpp</in>
+        <in>SimEncryptVaultProxy.actor.cpp</in>
+        <in>SimpleConfigConsumer.actor.cpp</in>
+        <in>SimulatedCluster.actor.cpp</in>
+        <in>SkipList.cpp</in>
+        <in>Status.actor.cpp</in>
+        <in>StorageCache.actor.cpp</in>
+        <in>TCInfo.actor.cpp</in>
+        <in>TLogServer.actor.cpp</in>
+        <in>TSSMappingUtil.actor.cpp</in>
+        <in>TagPartitionedLogSystem.actor.cpp</in>
+        <in>TagThrottler.actor.cpp</in>
+        <in>TransactionTagCounter.cpp</in>
+        <in>VFSAsync.cpp</in>
+        <in>VersionedBTree.actor.cpp</in>
+        <in>WaitFailure.actor.cpp</in>
+        <in>fdbserver.actor.cpp</in>
+        <in>masterserver.actor.cpp</in>
+        <in>networktest.actor.cpp</in>
+        <in>pubsub.actor.cpp</in>
+        <in>storageserver.actor.cpp</in>
+        <in>tester.actor.cpp</in>
+        <in>worker.actor.cpp</in>
+      </df>
+      <df name="fdbservice">
+        <in>FDBService.cpp</in>
+        <in>ServiceBase.cpp</in>
+      </df>
+      <df name="flow">
+        <in>ActorCollection.actor.cpp</in>
+        <in>Arena.cpp</in>
+        <in>BlobCipher.cpp</in>
+        <in>CompressedInt.actor.cpp</in>
+        <in>Deque.cpp</in>
+        <in>DeterministicRandom.cpp</in>
+        <in>Error.cpp</in>
+        <in>FastAlloc.cpp</in>
+        <in>FaultInjection.cpp</in>
+        <in>FileTraceLogWriter.cpp</in>
+        <in>Hash3.c</in>
+        <in>Histogram.cpp</in>
+        <in>Hostname.actor.cpp</in>
+        <in>IThreadPool.cpp</in>
+        <in>IThreadPoolTest.actor.cpp</in>
+        <in>IndexedSet.cpp</in>
+        <in>JsonTraceLogFormatter.cpp</in>
+        <in>Knobs.cpp</in>
+        <in>Net2.actor.cpp</in>
+        <in>Net2Packet.cpp</in>
+        <in>Platform.actor.cpp</in>
+        <in>Profiler.actor.cpp</in>
+        <in>SignalSafeUnwind.cpp</in>
+        <in>StreamCipher.cpp</in>
+        <in>SystemMonitor.cpp</in>
+        <in>TDMetric.cpp</in>
+        <in>TLSConfig.actor.cpp</in>
+        <in>ThreadHelper.actor.cpp</in>
+        <in>ThreadPrimitives.cpp</in>
+        <in>Trace.cpp</in>
+        <in>Tracing.actor.cpp</in>
+        <in>UnitTest.cpp</in>
+        <in>WriteOnlySet.actor.cpp</in>
+        <in>XmlTraceLogFormatter.cpp</in>
+        <in>crc32c-generated-constants.cpp</in>
+        <in>crc32c.cpp</in>
+        <in>flat_buffers.cpp</in>
+        <in>flow.cpp</in>
+        <in>genericactors.actor.cpp</in>
+        <in>network.cpp</in>
+        <in>serialize.cpp</in>
+        <in>stacktrace.amalgamation.cpp</in>
+        <in>test_memcpy.cpp</in>
+        <in>test_memcpy_perf.cpp</in>
+        <in>version.cpp</in>
+        <in>xxhash.c</in>
+      </df>
+      <df name="flowbench">
+        <in>BenchCallback.actor.cpp</in>
+        <in>BenchEncrypt.cpp</in>
+        <in>BenchHash.cpp</in>
+        <in>BenchIONet2.actor.cpp</in>
+        <in>BenchIterate.cpp</in>
+        <in>BenchMem.cpp</in>
+        <in>BenchMetadataCheck.cpp</in>
+        <in>BenchNet2.actor.cpp</in>
+        <in>BenchPopulate.cpp</in>
+        <in>BenchRandom.cpp</in>
+        <in>BenchRef.cpp</in>
+        <in>BenchStream.actor.cpp</in>
+        <in>BenchTimer.cpp</in>
+        <in>BenchVersionVector.cpp</in>
+        <in>GlobalData.cpp</in>
+        <in>flowbench.actor.cpp</in>
+      </df>
+    </df>
+    <logicalFolder name="Modules"
+                   displayName="Modules"
+                   projectFiles="true"
+                   root="/usr/share/cmake/Modules">
+      <itemPath>/usr/share/cmake/Modules/CMakeCCompilerABI.c</itemPath>
+      <itemPath>/usr/share/cmake/Modules/CMakeCXXCompilerABI.cpp</itemPath>
+    </logicalFolder>
+    <logicalFolder name="ExternalFiles"
+                   displayName="Важные файлы"
+                   projectFiles="false"
+                   kind="IMPORTANT_FILES_FOLDER">
+      <itemPath>../../CMakeLists.txt</itemPath>
+      <itemPath>../../bld/Makefile</itemPath>
+      <itemPath>../../nbproject/private/launcher.properties</itemPath>
+    </logicalFolder>
+  </logicalFolder>
+  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
+  <sourceRootList>
+    <Elem>../..</Elem>
+  </sourceRootList>
+  <projectmakefile>../../bld/Makefile</projectmakefile>
+  <confs>
+    <conf name="Default" type="0">
+      <toolsSet>
+        <compilerSet>default</compilerSet>
+        <dependencyChecking>false</dependencyChecking>
+        <rebuildPropChanged>false</rebuildPropChanged>
+      </toolsSet>
+      <flagsDictionary>
+        <element flagsID="0" commonFlags="-fPIC -mavx -fPIC -std=gnu++17"/>
+        <element flagsID="1" commonFlags="-fPIC -std=c++17 -fPIC"/>
+        <element flagsID="2" commonFlags="-fPIC -std=c++17 -m64 -O3"/>
+        <element flagsID="3" commonFlags="-fPIC -std=gnu++17"/>
+        <element flagsID="4" commonFlags="-fPIC -std=gnu++17 -msse4.2 -mpclmul"/>
+        <element flagsID="5" commonFlags="-ggdb -mavx -fPIC -std=gnu11"/>
+        <element flagsID="6" commonFlags="-ggdb -mavx -fPIC -std=gnu90"/>
+        <element flagsID="7" commonFlags="-mavx -fPIC -std=gnu++17"/>
+        <element flagsID="8" commonFlags="-std=c++14"/>
+        <element flagsID="9" commonFlags="-std=gnu11 -O3 -fPIC"/>
+        <element flagsID="10" commonFlags="-xc++ -std=c++11"/>
+        <element flagsID="11" commonFlags="-xc++ -std=c++11 -O2"/>
+      </flagsDictionary>
+      <codeAssistance>
+      </codeAssistance>
+      <makefileType>
+        <makeTool>
+          <buildCommandWorkingDir>../../bld</buildCommandWorkingDir>
+          <buildCommand>ninja -k 0</buildCommand>
+          <cleanCommand>ninja clean</cleanCommand>
+          <executablePath></executablePath>
+        </makeTool>
+        <preBuild>
+          <preBuildCommandWorkingDir>../../bld</preBuildCommandWorkingDir>
+          <preBuildCommand>${CMAKE} -DFDB_RELEASE=OFF -DBUILD_VERSION=0.local -DGENERATE_DEBUG_PACKAGES=OFF -G Ninja ..</preBuildCommand>
+        </preBuild>
+      </makefileType>
+      <item path="../../FDBLibTLS/FDBLibTLSPlugin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../FDBLibTLS/FDBLibTLSPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../FDBLibTLS/FDBLibTLSSession.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../FDBLibTLS/FDBLibTLSVerify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../FDBLibTLS/plugin-test.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../FDBLibTLS/verify-test.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/fdb_c.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="0">
+          <incDir>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+            <Elem>fdb_c_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterApiWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterApiWrapper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterCancelTransactionWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterCorrectnessWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterKeyValueStore.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterScheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterTestSpec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterTransactionExecutor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterUtil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/TesterWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/apitester/fdb_c_api_tester.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/client_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/fdb_c90_test.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+        <cTool flags="6">
+        </cTool>
+      </item>
+      <item path="../../bindings/c/test/mako/mako.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../bindings/c/test/mako/utils.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../bindings/c/test/performance_test.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../bindings/c/test/ryw_benchmark.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../bindings/c/test/txn_size_test.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../bindings/c/test/unit/disconnected_timeout_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>bld/doctest/src/doctest/doctest</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/unit/fdb_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>bld/doctest/src/doctest/doctest</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/unit/setup_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>bld/doctest/src/doctest/doctest</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/unit/trace_partial_file_suffix_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/unit/unit_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>bld/doctest/src/doctest/doctest</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/unit/unit_tests_version_510.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>bld/doctest/src/doctest/doctest</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/workloads/SimpleWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="0">
+        </ccTool>
+      </item>
+      <item path="../../bindings/c/test/workloads/workloads.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="0">
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/DirectoryLayer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/DirectorySubspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/flow</pElem>
+            <pElem>bindings/flow</pElem>
+            <pElem>bindings/flow/tester</pElem>
+            <pElem>bld/bindings/flow/tester</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/HighContentionAllocator.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/Node.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/Subspace.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/flow</pElem>
+            <pElem>bindings/flow</pElem>
+            <pElem>bindings/flow/tester</pElem>
+            <pElem>bld/bindings/flow/tester</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/Tuple.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/flow</pElem>
+            <pElem>bindings/flow</pElem>
+            <pElem>bindings/flow/tester</pElem>
+            <pElem>bld/bindings/flow/tester</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/fdb_flow.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/tester/DirectoryTester.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bindings/flow/tester/Tester.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bindings/java/JavaWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="0">
+          <incDir>
+            <pElem>bld/bindings/java/CMakeFiles/fdb-java.dir/native_headers</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+            <Elem>java_workloads_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bindings/java/fdbJNI.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="0">
+          <incDir>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>bld/bindings/java/CMakeFiles/fdb-java.dir/native_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>fdb_java_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/CMakeFiles/3.22.2/CompilerIdC/CMakeCCompilerId.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/CMakeFiles/3.22.2/CompilerIdCXX/CMakeCXXCompilerId.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/arena.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/background_thread.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/base.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/bin.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/bitmap.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/ckh.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/ctl.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/div.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/extent.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/extent_dss.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/extent_mmap.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/hash.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/hook.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/jemalloc.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/large.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/log.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/malloc_io.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/mutex.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/mutex_pool.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/nstime.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/pages.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/prng.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/prof.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/rtree.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/safety_check.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/sc.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/stats.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/sz.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/tcache.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/test_hooks.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/ticker.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/tsd.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/Jemalloc_project-prefix/src/Jemalloc_project/src/witness.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="9">
+        </cTool>
+      </item>
+      <item path="../../bld/bindings/flow/DirectoryLayer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindings/flow/HighContentionAllocator.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindings/flow/Node.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindings/flow/fdb_flow.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindings/flow/tester/DirectoryTester.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindings/flow/tester/Tester.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/c/ThreadCleanup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/c/fdb_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/mako/mako.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/mako/utils.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/performance_test.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/ryw_benchmark.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/txn_size_test.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/unit/disconnected_timeout_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/unit/fdb_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/unit/trace_partial_file_suffix_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/workloads/SimpleWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/c/test/workloads/workloads.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/DirectoryLayer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/DirectorySubspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/HighContentionAllocator.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/Node.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/Subspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/Tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/fdb_flow.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/tester/DirectoryTester.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/flow/tester/Tester.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/java/JavaWorkload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/bindingtester/tests/java/fdbJNI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/allocation/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/buffers/reference_counted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/chat/chat_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/chat/chat_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/chat/posix_chat_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/echo/async_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/echo/async_udp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/echo/blocking_tcp_echo_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/echo/blocking_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/echo/blocking_udp_echo_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/echo/blocking_udp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/fork/daemon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/fork/process_per_connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/client/async_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/client/sync_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server/connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server/connection_manager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server/request_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server2/connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server2/io_context_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server2/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server2/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server2/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server2/request_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server2/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server2/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server3/connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server3/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server3/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server3/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server3/request_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server3/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server3/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server4/file_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server4/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server4/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server4/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server4/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/http/server4/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/icmp/ping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/invocation/prioritised_handlers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/iostreams/daytime_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/iostreams/daytime_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/iostreams/http_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/local/connect_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/local/iostream_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/local/stream_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/local/stream_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/multicast/receiver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/multicast/sender.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/nonblocking/third_party_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/porthopper/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/porthopper/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/serialization/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/serialization/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/services/daytime_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/services/logger_service.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/socks4/sync_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/spawn/echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/spawn/parallel_grep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/ssl/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/ssl/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/timeouts/async_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/timeouts/blocking_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/timeouts/blocking_token_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/timeouts/blocking_udp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/timeouts/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/timers/time_t_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp03/windows/transmit_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/allocation/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/buffers/reference_counted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/chat/chat_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/chat/chat_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/echo/async_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/echo/async_udp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/echo/blocking_tcp_echo_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/echo/blocking_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/echo/blocking_udp_echo_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/echo/blocking_udp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/executors/actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/executors/bank_account_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/executors/bank_account_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/executors/fork_join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/executors/pipeline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/executors/priority_scheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/fork/daemon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/fork/process_per_connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/futures/daytime_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/handler_tracking/async_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/http/server/connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/http/server/connection_manager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/http/server/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/http/server/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/http/server/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/http/server/request_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/http/server/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/http/server/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/invocation/prioritised_handlers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/local/connect_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/local/iostream_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/local/stream_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/local/stream_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/multicast/receiver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/multicast/sender.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/nonblocking/third_party_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/operations/composed_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/operations/composed_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/operations/composed_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/operations/composed_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/operations/composed_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/operations/composed_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/operations/composed_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/operations/composed_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/socks4/sync_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/spawn/echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/spawn/parallel_grep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/ssl/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/ssl/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/timeouts/async_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/timeouts/blocking_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/timeouts/blocking_token_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/timeouts/blocking_udp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/timeouts/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp11/timers/time_t_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/deferred/deferred_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/deferred/deferred_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/deferred/deferred_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/deferred/deferred_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/deferred/deferred_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/deferred/deferred_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/deferred/deferred_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/executors/actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/executors/async_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/executors/async_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/executors/bank_account_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/executors/bank_account_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/executors/fork_join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/executors/pipeline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/executors/priority_scheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/iostreams/http_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/operations/composed_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/operations/composed_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/operations/composed_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/operations/composed_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/operations/composed_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/operations/composed_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/operations/composed_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/operations/composed_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/parallel_group/parallel_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/parallel_group/wait_for_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/parallel_group/wait_for_one.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/parallel_group/wait_for_one_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp14/parallel_group/wait_for_one_success.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp17/coroutines_ts/chat_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp17/coroutines_ts/echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp17/coroutines_ts/echo_server_with_as_single_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp17/coroutines_ts/echo_server_with_as_tuple_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp17/coroutines_ts/echo_server_with_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp17/coroutines_ts/range_based_for.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp17/coroutines_ts/refactored_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/html/boost_asio/example/cpp20/channels/throttling_proxy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/doc/test/stub.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/example/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/covariance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/droppable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/error_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/extended_p_square.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/extended_p_square_quantile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/external_accumulator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/external_weights.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/kurtosis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/max.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/mean.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/median.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/min.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/moment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/p_square_cumul_dist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/p_square_quantile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/p_square_quantile_extended.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/pot_quantile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/rolling_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/rolling_mean.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/rolling_moment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/rolling_sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/rolling_variance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/skewness.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/sum_kahan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/tail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/tail_mean.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/tail_quantile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/tail_variate_means.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/valarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/variance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_covariance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_extended_p_square.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_kurtosis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_mean.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_median.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_moment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_p_square_cumul_dist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_p_square_quantile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_pot_quantile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_skewness.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_sum_kahan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_tail_mean.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_tail_quantile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_tail_variate_means.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/accumulators/test/weighted_variance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/example/apply_permutation_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/example/clamp_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/example/is_palindrome_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/example/is_partitioned_until_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/example/search_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/minmax/example/minmax_ex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/minmax/example/minmax_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/minmax/fuzzing/minmax_element.fuzz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/minmax/fuzzing/minmax_element_variants.fuzz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/minmax/test/minmax_element_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/minmax/test/minmax_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/example/conv_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/example/find_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/example/predicate_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/example/regex_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/example/replace_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/example/rle_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/example/split_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/example/trim_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/conv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/find_format_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/find_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/join_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/predicate_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/regex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/replace_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/split_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/string/test/trim_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/all_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/any_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/apply_permutation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/clamp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/copy_if_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/copy_n_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/empty_search_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/equal_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/exclusive_scan_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/find_backward_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/find_if_not_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/find_not_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/for_each_n_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/gather_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/gather_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/hex_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/hex_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/hex_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/hex_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/hex_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/inclusive_scan_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/iota_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/is_palindrome_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/is_partitioned_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/is_partitioned_until_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/is_permutation_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/mismatch_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/none_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/one_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/ordered_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/partition_copy_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/partition_point_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/partition_subrange_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/power_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/power_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/reduce_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/search_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/search_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/search_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/search_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/search_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/search_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/search_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/sort_subrange_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/transform_exclusive_scan_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/transform_inclusive_scan_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/algorithm/test/transform_reduce_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/align_down_integral_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/align_down_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/align_overflow_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/align_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/align_up_integral_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/align_up_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/aligned_alloc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/aligned_allocator_adaptor_incomplete_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/aligned_allocator_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/aligned_allocator_incomplete_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/aligned_allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/aligned_delete_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/alignment_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/assume_aligned_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/is_aligned_integral_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/align/test/is_aligned_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_cast_cv_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_from_basic_any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_from_basic_any_rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_test_cv_to_rv_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_test_mplif.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_test_rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_test_temporary_to_ref_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_to_basic_any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/any_to_basic_any_rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_cast_cv_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_from_any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_from_any_rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_from_basic_any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_from_basic_any_rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_alignment_power_of_two_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_cv_to_rv_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_large_object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_mplif.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_multiply_size_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_size_alignment_zero_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_size_less_alignment_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_small_object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_test_temporary_to_ref_failed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_to_any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_to_any_rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_to_basic_any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/any/test/basic_any_to_basic_any_rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array_getfail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array_getfail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/array_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/array/test/test_cmake/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/allocation/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/buffers/reference_counted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/chat/chat_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/chat/chat_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/chat/posix_chat_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/echo/async_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/echo/async_udp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/echo/blocking_tcp_echo_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/echo/blocking_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/echo/blocking_udp_echo_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/echo/blocking_udp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/fork/daemon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/fork/process_per_connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/client/async_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/client/sync_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server/connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server/connection_manager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server/request_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server2/connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server2/io_context_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server2/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server2/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server2/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server2/request_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server2/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server2/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server3/connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server3/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server3/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server3/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server3/request_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server3/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server3/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server4/file_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server4/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server4/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server4/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server4/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/http/server4/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/icmp/ping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/invocation/prioritised_handlers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/iostreams/daytime_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/iostreams/daytime_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/iostreams/http_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/local/connect_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/local/iostream_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/local/stream_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/local/stream_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/multicast/receiver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/multicast/sender.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/nonblocking/third_party_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/porthopper/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/porthopper/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/serialization/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/serialization/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/services/daytime_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/services/logger_service.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/socks4/sync_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/spawn/echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/spawn/parallel_grep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/ssl/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/ssl/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/timeouts/async_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/timeouts/blocking_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/timeouts/blocking_token_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/timeouts/blocking_udp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/timeouts/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/timers/time_t_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/daytime1/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/daytime2/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/daytime3/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/daytime4/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/daytime5/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/daytime6/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/daytime7/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/timer1/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/timer2/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/timer3/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/timer4/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/tutorial/timer5/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp03/windows/transmit_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/allocation/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/buffers/reference_counted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/chat/chat_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/chat/chat_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/echo/async_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/echo/async_udp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/echo/blocking_tcp_echo_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/echo/blocking_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/echo/blocking_udp_echo_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/echo/blocking_udp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/executors/actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/executors/bank_account_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/executors/bank_account_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/executors/fork_join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/executors/pipeline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/executors/priority_scheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/files/async_file_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/files/blocking_file_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/fork/daemon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/fork/process_per_connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/futures/daytime_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/handler_tracking/async_tcp_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/http/server/connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/http/server/connection_manager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/http/server/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/http/server/mime_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/http/server/reply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/http/server/request_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/http/server/request_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/http/server/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/invocation/prioritised_handlers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/iostreams/http_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/local/connect_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/local/iostream_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/local/stream_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/local/stream_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/multicast/receiver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/multicast/sender.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/nonblocking/third_party_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/operations/composed_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/operations/composed_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/operations/composed_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/operations/composed_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/operations/composed_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/operations/composed_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/operations/composed_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/operations/composed_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/socks4/sync_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/spawn/echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/spawn/parallel_grep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/ssl/client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/ssl/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/timeouts/async_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/timeouts/blocking_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/timeouts/blocking_token_tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/timeouts/blocking_udp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/timeouts/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp11/timers/time_t_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/deferred/deferred_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/deferred/deferred_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/deferred/deferred_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/deferred/deferred_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/deferred/deferred_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/deferred/deferred_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/deferred/deferred_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/executors/actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/executors/async_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/executors/async_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/executors/bank_account_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/executors/bank_account_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/executors/fork_join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/executors/pipeline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/executors/priority_scheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/iostreams/http_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/operations/composed_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/operations/composed_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/operations/composed_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/operations/composed_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/operations/composed_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/operations/composed_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/operations/composed_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/operations/composed_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/parallel_group/parallel_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/parallel_group/wait_for_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/parallel_group/wait_for_one.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/parallel_group/wait_for_one_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp14/parallel_group/wait_for_one_success.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp17/coroutines_ts/chat_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp17/coroutines_ts/echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp17/coroutines_ts/echo_server_with_as_single_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp17/coroutines_ts/echo_server_with_as_tuple_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp17/coroutines_ts/echo_server_with_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp17/coroutines_ts/range_based_for.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp17/coroutines_ts/refactored_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/example/cpp20/channels/throttling_proxy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/associated_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/associated_cancellation_slot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/associated_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/associator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/async_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/awaitable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_datagram_socket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_deadline_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_random_access_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_raw_socket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_readable_pipe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_seq_packet_socket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_serial_port.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_signal_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_socket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_socket_acceptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_stream_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_stream_socket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_streambuf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_waitable_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/basic_writable_pipe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/bind_cancellation_slot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/bind_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/buffer_registration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/buffered_read_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/buffered_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/buffered_write_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/buffers_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/cancellation_signal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/cancellation_state.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/cancellation_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/co_spawn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/completion_condition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/compose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/connect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/connect_pipe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/coroutine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/deadline_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/defer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/detached.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/any_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/blocking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/blocking_adaptation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/bulk_execute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/bulk_guarantee.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/connect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/context_as.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/execute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/invocable_archetype.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/mapping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/operation_state.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/outstanding_work.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/prefer_only.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/receiver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/relationship.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/schedule.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/scheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/sender.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/set_done.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/set_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/set_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/start.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution/submit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/execution_context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/executor_work_guard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/awaitable_operators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/basic_channel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/basic_concurrent_channel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/channel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/channel_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/concurrent_channel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/coro/cancel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/coro/co_spawn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/coro/exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/coro/executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/coro/partial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/coro/simple_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/coro/stack_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/coro/use_coro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/deferred.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/experimental/promise.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/file_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/generic/basic_endpoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/generic/datagram_protocol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/generic/raw_protocol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/generic/seq_packet_protocol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/generic/stream_protocol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/high_resolution_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/io_context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/io_context_strand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/address.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/address_v4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/address_v4_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/address_v4_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/address_v6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/address_v6_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/address_v6_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/basic_endpoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/basic_resolver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/basic_resolver_entry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/basic_resolver_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/basic_resolver_query.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/host_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/icmp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/multicast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/network_v4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/network_v6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/resolver_query_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/tcp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/udp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/unicast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ip/v6_only.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/is_read_buffered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/is_write_buffered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/latency/tcp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/latency/tcp_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/latency/udp_client.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/latency/udp_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/local/basic_endpoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/local/connect_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/local/datagram_protocol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/local/stream_protocol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/packaged_task.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/posix/basic_descriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/posix/basic_stream_descriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/posix/descriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/posix/descriptor_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/posix/stream_descriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_applicable_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_applicable_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_applicable_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_applicable_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_preferable_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_preferable_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_preferable_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_preferable_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_preferable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_not_preferable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_prefer_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_query_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_query_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_query_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_query_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_query_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_query_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_query_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_query_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_concept_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_concept_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_concept_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_concept_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_concept_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_concept_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_concept_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_concept_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/can_require_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/prefer_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/prefer_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/prefer_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/prefer_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/prefer_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/prefer_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/query_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/query_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/query_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/require_concept_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/require_concept_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/require_concept_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/require_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/require_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp03/require_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_applicable_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_applicable_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_applicable_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_applicable_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_preferable_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_preferable_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_preferable_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_preferable_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_preferable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_not_preferable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_prefer_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_query_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_query_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_query_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_query_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_query_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_query_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_query_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_query_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_concept_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_concept_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_concept_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_concept_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_concept_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_concept_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_concept_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_concept_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/can_require_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/prefer_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/prefer_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/prefer_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/prefer_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/prefer_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/prefer_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/query_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/query_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/query_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/require_concept_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/require_concept_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/require_concept_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/require_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/require_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp11/require_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_applicable_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_applicable_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_applicable_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_applicable_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_preferable_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_preferable_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_preferable_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_preferable_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_preferable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_not_preferable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_prefer_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_query_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_query_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_query_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_query_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_query_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_query_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_query_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_query_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_concept_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_concept_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_concept_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_concept_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_concept_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_concept_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_concept_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_concept_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_not_applicable_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_not_applicable_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_not_applicable_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_not_applicable_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/can_require_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/prefer_free_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/prefer_free_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/prefer_member_prefer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/prefer_member_require.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/prefer_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/prefer_unsupported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/query_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/query_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/query_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/require_concept_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/require_concept_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/require_concept_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/require_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/require_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/properties/cpp14/require_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/random_access_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/read.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/read_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/read_until.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/readable_pipe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/redirect_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/registered_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/serial_port.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/serial_port_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/signal_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/socket_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ssl/context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ssl/context_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ssl/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ssl/host_name_verification.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ssl/rfc2818_verification.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ssl/stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ssl/stream_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/static_thread_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/steady_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/strand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/stream_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/streambuf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/system_context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/system_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/system_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/this_coro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/thread_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/time_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ts/buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ts/executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ts/internet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ts/io_context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ts/net.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ts/netfwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ts/socket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/ts/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/use_awaitable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/use_future.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/uses_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/wait_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/basic_object_handle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/basic_overlapped_handle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/basic_random_access_handle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/basic_stream_handle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/object_handle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/overlapped_handle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/overlapped_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/random_access_handle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/windows/stream_handle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/writable_pipe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/write.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/asio/test/write_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/assert_is_void_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/assert_msg_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/assert_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/assert_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/check_cmake_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/cmake_install_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/cmake_subdir_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/current_function_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/current_function_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/exp/assert_exp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/exp/assert_msg_exp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/exp/verify_exp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/exp/verify_msg_exp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/source_location_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/source_location_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/source_location_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assert/test/verify_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/compile/decl_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/email_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/list_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/list_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/list_of_workaround.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/multi_index_container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/my_vector_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/ptr_list_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/ptr_list_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/ptr_map_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/static_list_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/std.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/assign/test/tuple_list_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/config/has_sse2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/config/has_sse41.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/config/has_synchronization_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/src/find_address_sse2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/src/find_address_sse41.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/src/lock_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/src/wait_on_address.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/atomic_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/atomic_ref_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/atomicity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/atomicity_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/c_implicit_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/cf_arith_func_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/cf_arith_mem_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/cf_arith_void_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/ipc_atomic_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/ipc_atomic_ref_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/ipc_wait_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/ipc_wait_ref_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/lockfree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/ordering_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/test_cmake/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/wait_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/wait_fuzz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/atomic/test/wait_ref_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/advanced/server-flex/advanced_server_flex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/advanced/server/advanced_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/echo-op/echo_op.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/async-ssl-system-executor/http_client_async_ssl_system_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/async-ssl/http_client_async_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/async/http_client_async.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/coro-ssl/http_client_coro_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/coro/http_client_coro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/crawl/http_crawl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/crawl/urls_large_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/sync-ssl/http_client_sync_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/client/sync/http_client_sync.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/async-ssl/http_server_async_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/async/http_server_async.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/coro-ssl/http_server_coro_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/coro/http_server_coro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/fast/http_server_fast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/flex/http_server_flex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/small/http_server_small.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/stackless/http_server_stackless.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/sync-ssl/http_server_sync_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/http/server/sync/http_server_sync.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/client/async-ssl-system-executor/websocket_client_async_ssl_system_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/client/async-ssl/websocket_client_async_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/client/async/websocket_client_async.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/client/coro/websocket_client_coro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/client/sync/websocket_client_sync.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/async/websocket_server_async.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/chat-multi/http_session.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/chat-multi/listener.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/chat-multi/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/chat-multi/shared_state.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/chat-multi/websocket_session.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/coro/websocket_server_coro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/fast/websocket_server_fast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/stackless/websocket_server_stackless.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/example/websocket/server/sync/websocket_server_sync.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/_experimental/_test_detail_stream_state.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/_experimental/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/_experimental/icy_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/_experimental/stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_base64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_bind_continuation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_clamp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_get_io_context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_is_invocable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_read.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_sha1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_static_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_variant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/_detail_varint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/async_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/basic_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/bind_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/buffer_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/buffered_read_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/buffers_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/buffers_cat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/buffers_prefix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/buffers_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/buffers_suffix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/buffers_to_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/close_socket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/detect_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/file_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/file_posix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/file_stdio.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/file_win32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/flat_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/flat_static_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/flat_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/make_printable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/make_strand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/multi_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/ostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/prepare_buffers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/rate_policy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/read_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/role.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/saved_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/static_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/static_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/stream_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/tcp_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/core/zlib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/basic_dynamic_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/basic_file_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/basic_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/buffer_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/chunk_encode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/dynamic_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/empty_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/field.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/field_compiles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/fields.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/file_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/message.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/read.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/rfc7230.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/serializer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/span_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/status.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/string_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/type_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/vector_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/verb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/http/write.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/ssl/ssl_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/_detail_decorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/_detail_impl_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/_detail_prng.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/accept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/close.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/doc_snippets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/frame.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/handshake.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/option.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/ping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/read1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/read2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/read3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/rfc6455.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/stream_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/stream_explicit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/stream_fwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/teardown.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/utf8_checker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/websocket/write.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/zlib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/zlib/deflate_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/zlib/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/zlib/inflate_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/beast/zlib/zlib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/bench/buffers/bench_buffers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/bench/parser/bench_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/bench/parser/nodejs-parser/http_parser.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/bench/parser/nodejs_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/bench/utf8_checker/bench_utf8_checker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/bench/wsload/wsload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/bench/zlib/deflate_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/bench/zlib/inflate_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/core_1_refresher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/core_3_timeouts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/core_4_layers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/core_snippets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/exemplars.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/http_10_custom_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/http_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/http_snippets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket_1_connecting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket_2_handshaking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket_3_decorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket_4_messages.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket_5_control_frames.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket_6_timeouts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket_7_teardown.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/doc/websocket_8_notes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/example/common/root_certificates.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/example/common/server_certificate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/adler32.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/compress.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/blast/blast.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/infback9/infback9.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/infback9/inftree9.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/inflate86/inffas86.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/iostream/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/iostream/zfstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/iostream2/zstream_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/iostream3/test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/iostream3/zfstream.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/masmx64/inffas8664.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/minizip/ioapi.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/minizip/iowin32.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/minizip/miniunz.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/minizip/minizip.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/minizip/mztools.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/minizip/unzip.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/minizip/zip.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/puff/puff.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/puff/pufftest.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/testzlib/testzlib.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/contrib/untgz/untgz.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/crc32.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/deflate.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/examples/enough.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/examples/fitblk.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/examples/gun.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/examples/gzappend.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/examples/gzjoin.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/examples/gzlog.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/examples/zpipe.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/examples/zran.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/gzclose.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/gzlib.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/gzread.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/gzwrite.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/infback.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/inffast.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/inflate.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/inftrees.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/test/example.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/test/infcover.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/test/minigzip.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/trees.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/uncompr.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/extern/zlib-1.2.11/zutil.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/lib_asio.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/lib_asio_ssl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/lib_beast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/beast/test/lib_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/at_function_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/bimap_and_boost/assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/bimap_and_boost/foreach.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/bimap_and_boost/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/bimap_and_boost/property_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/bimap_and_boost/range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/bimap_and_boost/serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/bimap_and_boost/typeof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/bimap_and_boost/xpressive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/mi_to_b_path/bidirectional_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/mi_to_b_path/hashed_indices.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/mi_to_b_path/mi_bidirectional_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/mi_to_b_path/tagged_bidirectional_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/mighty_bimap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/population_bimap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/projection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/repetitions_counter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/simple_bimap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/standard_map_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/step_by_step.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/tagged_simple_bimap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/tutorial_info_hook.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/tutorial_modify_and_replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/tutorial_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/unconstrained_collection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/example/user_defined_names.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/compile_fail/test_bimap_info_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/compile_fail/test_bimap_info_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/compile_fail/test_bimap_info_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/compile_fail/test_bimap_mutable_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/compile_fail/test_bimap_mutable_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/compile_fail/test_bimap_mutable_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_convenience_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_extra.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_list_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_modify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_multiset_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_mutable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_operator_bracket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_ordered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_project.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_property_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_sequenced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_set_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_unconstrained.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_unordered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_unordered_multiset_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_unordered_set_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_bimap_vector_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_mutant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_mutant_relation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_structured_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bimap/test/test_tagged.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/bind_as_compose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/bind_visitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/apply_rv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/apply_rv_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/apply_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/apply_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/arg_copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/arg_copy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_and_or_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_cdecl_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_cpp20_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_cv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_dm2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_dm3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_dm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_eq2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_eq3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_eq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_fastcall_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_fastcall_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_fn2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_fnobj2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_function2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_function_ap_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_function_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_fwd2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_fwd_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_lookup_problem_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_mf2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_nested_rv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_no_placeholders_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_noexcept_mf2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_noexcept_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_noexcept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_not_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_placeholder_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_rel_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_rv_sp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_rvalue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_stateful_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_stdcall_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_stdcall_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_unary_addr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_unique_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_visit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_void_dm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_void_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/bind_void_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/global_placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_cdecl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_derived_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_dm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_eq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_fastcall_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_noexcept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_rv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_stdcall_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_unary_addr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/mem_fn_void_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/placeholder_const_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/placeholder_std_bind_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/protect_cpp20_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/protect_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/protect_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/ref_fn_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/bind/test/std_placeholders_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/doc/hideous_template.snippet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/add_member_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/add_member_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/add_member_lvalue_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/add_member_rvalue_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/add_member_volatile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/add_noexcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/add_transaction_safe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/add_varargs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/apply_member_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/class_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/function_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/function_types_remove_const_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/has_member_qualifiers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/has_varargs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/has_void_return.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/intro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_const_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_cv_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_invocable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_lvalue_reference_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_noexcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_reference_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_rvalue_reference_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_transaction_safe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/is_volatile_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/overview.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/qualified_class_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/remove_member_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/remove_member_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/remove_member_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/remove_member_volatile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/remove_noexcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/remove_transaction_safe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/remove_varargs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/return_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/example/void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_member_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_member_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_member_lvalue_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_member_rvalue_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_member_volatile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_noexcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_noexcept_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_transaction_safe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_transaction_safe_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_varargs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/add_varargs_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/apply_member_pointer_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/apply_member_pointer_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/apply_member_pointer_pmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/apply_member_pointer_pmf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/args_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/class_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/class_of_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/collapse_flags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/function_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/function_type_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/has_member_qualifiers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/has_member_qualifiers_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/has_varargs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/has_void_return.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_const_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_cv_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_invocable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_invocable_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_lvalue_reference_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_noexcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_rvalue_reference_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_transaction_safe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/is_volatile_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/qualified_class_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/qualified_class_of_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/qualifier_metafunction_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/remove_member_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/remove_member_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/remove_member_volatile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/remove_noexcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/remove_noexcept_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/remove_transaction_safe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/remove_transaction_safe_constraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/remove_varargs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/callable_traits/test/return_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/await_keystroke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/chrono_unit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/clock_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/cycle_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/explore_limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/french.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/i_dont_like_the_default_duration_behavior.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/io_ex1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/io_ex2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/io_ex3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/io_ex4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/io_ex5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/manipulate_clock_object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/min_time_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/miscellaneous.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/rounding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/run_timer_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/run_timer_example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/runtime_resolution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/saturating.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/simulated_thread_interface_demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/test_clock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/test_clock2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/test_duration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/test_minmax.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/test_special_values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/test_thread_clock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/time2_demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/timeval_demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/example/xtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/perf/store_now_in_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/src/chrono.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/src/process_cpu_clocks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/src/thread_clock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/another_obj.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/clock/clock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/arithmetic_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/comparisons_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/cons/convert_float_to_int_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/cons/convert_inexact_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/cons/implicit_constructot_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/cons/non_implicit_convertible_rep_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/cons/treat_as_floating_point_Rep2_true_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/constructor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/default_ratio_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/duration_cast_int_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/duration_cast_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/duration_duration_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/duration_values_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/nonmember/divide_rep2_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/nonmember/modulus_rep2_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/nonmember/times_rep2_lhs_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/nonmember/times_rep2_rhs_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/positive_num_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/ratio_alias_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/ratio_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/rounding_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/typedefs_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/duration/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/intmax_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/io/duration_input.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/io/duration_output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/io/time_point_input.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/io/time_point_output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/one_obj.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/run_timer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/test_10631.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/test_10778.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/test_11006.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/test_11012.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/test_12176.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/test_7868.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/test_9337.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/arithmetic_ext_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/arithmetic_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/comparisons/equal_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/comparisons/less_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/comparisons_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/cons/implicit_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/cons/non_implicit_convertible_duration_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/constructor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/default_duration.pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/default_duration_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/duration.fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/min_max_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/not_duration_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/time_point_cast_int_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/time_point/time_point_cast_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/traits/common_type_duration_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/traits/common_type_time_point_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/traits/duration_values_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/traits/treat_as_floating_point_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/chrono/test/win32_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/example/bounded_buffer_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/example/circular_buffer_bound_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/example/circular_buffer_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/example/circular_buffer_iter_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/example/circular_buffer_sum_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/test/base_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/test/bounded_buffer_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/test/constant_erase_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/test/soft_iterator_invalidation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/circular_buffer/test/space_optimized_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/amd_cpp_kernel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/batched_determinant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/black_scholes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/copy_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/fizz_buzz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/hello_world.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/host_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/inline_ptx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/k_means.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/list_devices.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/longest_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/mandelbrot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/mapped_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/matrix_transpose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/memory_limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/monte_carlo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/nbody.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/opencl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/opencv_convolution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/opencv_flip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/opencv_histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/opencv_optical_flow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/opencv_sobel_filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/opengl_sphere.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/point_centroid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/price_cross.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/print_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/qimage_blur.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/random_walk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/resize_image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/simple_kernel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/simple_moving_average.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/sort_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/threefry_engine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/time_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/transform_sqrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/example/vector_addition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_accumulate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bernoulli_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_binary_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_accumulate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_exclusive_scan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_inner_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_max_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_partial_sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_reduce_by_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_saxpy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_bolt_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_cart_to_polar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_comparison_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_copy_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_copy_to_device.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_discrete_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_erase_remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_exclusive_scan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_find_end.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_host_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_includes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_inner_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_is_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_is_sorted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_max_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_next_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_nth_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_partial_sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_partition_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_prev_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_random_number_engine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_reduce_by_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_reverse_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_rotate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_rotate_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_saxpy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_search_n.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_set_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_set_intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_set_symmetric_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_set_union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_sort_by_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_sort_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stable_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_accumulate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_find_end.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_includes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_inner_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_is_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_max_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_next_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_partial_sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_partition_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_prev_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_reverse_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_rotate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_rotate_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_saxpy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_search_n.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_set_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_set_intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_set_symmetric_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_set_union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_stable_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_stl_unique_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_tbb_accumulate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_tbb_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_tbb_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_uniform_int_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/perf/perf_unique_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/check/has_opencl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/extra/test_interop_eigen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/extra/test_interop_opencv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/extra/test_interop_opengl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/extra/test_interop_qt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/extra/test_interop_vtk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/extra/test_multiple_objects1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/extra/test_multiple_objects2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_accumulate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_adjacent_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_adjacent_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_amd_cpp_kernel_language.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_any_all_none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_async_wait.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_async_wait_guard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_bernoulli_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_binary_search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_buffer_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_buffer_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_clamp_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_closure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_command_queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_complex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_constant_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_context_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_copy_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_copy_type_mismatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_counting_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_device.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_discard_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_discrete_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_dynamic_bitset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_equal_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_event.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_extents.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_extrema.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_find_end.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_flat_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_flat_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_function_input_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_functional_as.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_functional_bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_functional_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_functional_get.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_functional_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_functional_identity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_functional_popcount.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_functional_unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_gather.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_image1d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_image2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_image3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_image_sampler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_includes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_inner_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_inplace_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_inplace_reduce.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_insertion_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_invoke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_iota.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_is_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_is_sorted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_kernel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_linear_congruential_engine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_literal_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_local_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_malloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_mapped_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_merge_sort_gpu.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_mersenne_twister_engine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_mismatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_next_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_no_device_found.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_normal_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_nth_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_opencl_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_partial_sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_partition_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_permutation_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_pinned_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_pipe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_platform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_prev_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_program.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_program_cache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_radix_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_radix_sort_by_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_random_fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_random_shuffle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_reduce.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_reduce_by_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_result_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_rotate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_rotate_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_scan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_scatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_scatter_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_search_n.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_set_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_set_intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_set_symmetric_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_set_union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_sort_by_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_sort_by_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_stable_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_stable_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_stable_sort_by_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_strided_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_svm_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_system.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_tabulate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_threefry_engine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_transform_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_transform_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_transform_reduce.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_type_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_uniform_int_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_uniform_real_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_unique_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_unsupported_extension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_user_defined_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_user_event.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_valarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_wait_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/compute/test/test_zip_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/bad_error_eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/class_concept_check_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/class_concept_fail_expected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/concept_check_fail_expected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/concept_check_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/function_requires_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/old_concept_class_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/old_concept_function_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/old_concept_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/stl_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/stl_concept_covering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/usage_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/where.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/concept_check/test/where_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/arm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/combined.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/mips1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/power.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/riscv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/s390x.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/sparc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/architecture/x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_aggregate_bases_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_aggregate_nsdmi_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_alias_templates_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_aligned_new_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_attributes_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_binary_literals_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_capture_star_this_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_char8_t_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_conditional_explicit_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_constexpr_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_constexpr_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_constexpr_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_decltype_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_decltype_auto_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_deduction_guides_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_delegating_constructors_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_enumerator_attributes_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_exceptions_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_explicit_conversion_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_fold_expressions_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_generic_lambdas_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_guaranteed_copy_elision_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_hex_float_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_if_constexpr_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_impl_destroying_delete_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_impl_three_way_comparison_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_inheriting_constructors_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_inheriting_constructors_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_init_captures_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_initializer_lists_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_inline_variables_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lambdas_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_addressof_constexpr_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_allocator_traits_is_always_equal_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_any_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_apply_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_array_constexpr_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_as_const_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_atomic_is_always_lock_free_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_atomic_ref_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_bind_front_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_bit_cast_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_bool_constant_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_boyer_moore_searcher_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_byte_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_char8_t_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_chrono_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_chrono_udls_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_clamp_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_complex_udls_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_concepts_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_constexpr_misc_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_constexpr_swap_algorithms_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_destroying_delete_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_enable_shared_from_this_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_erase_if_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_exchange_function_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_execution_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_filesystem_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_gcd_lcm_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_generic_associative_lookup_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_generic_unordered_lookup_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_hardware_interference_size_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_has_unique_object_representations_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_hypot_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_incomplete_container_elements_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_integer_sequence_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_integral_constant_callable_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_invoke_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_is_aggregate_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_is_constant_evaluated_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_is_final_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_is_invocable_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_is_null_pointer_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_is_swappable_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_launder_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_list_remove_return_type_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_logical_traits_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_make_from_tuple_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_make_reverse_iterator_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_make_unique_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_map_try_emplace_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_math_special_functions_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_memory_resource_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_node_extract_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_nonmember_container_access_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_not_fn_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_null_iterators_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_optional_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_parallel_algorithm_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_quoted_string_io_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_ranges_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_raw_memory_algorithms_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_result_of_sfinae_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_robust_nonmodifying_seq_ops_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_sample_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_scoped_lock_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_shared_mutex_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_shared_ptr_arrays_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_shared_ptr_weak_type_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_shared_timed_mutex_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_string_udls_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_string_view_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_three_way_comparison_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_to_chars_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_transformation_trait_aliases_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_transparent_operators_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_transparent_operators_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_tuple_element_t_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_tuples_by_type_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_type_trait_variable_templates_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_uncaught_exceptions_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_unordered_map_try_emplace_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_variant_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_lib_void_t_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_namespace_attributes_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_noexcept_function_type_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_nontype_template_args_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_nontype_template_parameter_auto_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_nontype_template_parameter_class_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_nsdmi_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_range_based_for_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_range_based_for_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_raw_strings_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_ref_qualifiers_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_return_type_deduction_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_rtti_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_rvalue_references_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_sized_deallocation_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_static_assert_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_static_assert_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_structured_bindings_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_template_template_args_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_threadsafe_static_init_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_unicode_characters_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_unicode_literals_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_user_defined_literals_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_variable_templates_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_variadic_templates_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/std/cpp_variadic_using_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/checks/test_case.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/abi/abi_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/abi/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/boost_fallthrough_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/boost_override_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/check_memory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/cmd_line_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/config_build_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/config_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/config_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/config_test_c.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/cstdint_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/cstdint_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/cstdint_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_2arg_use_facet_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_2arg_use_facet_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_bethreads_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_bethreads_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_clock_gettime_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_clock_gettime_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_detect_mismatch_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_detect_mismatch_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_dirent_h_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_dirent_h_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_expm1_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_expm1_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_float128_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_float128_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_ftime_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_ftime_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_getsystemtimeasfiletime_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_getsystemtimeasfiletime_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_gettimeofday_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_gettimeofday_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_hash_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_hash_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_int128_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_int128_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_log1p_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_log1p_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_long_long_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_long_long_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_macro_use_facet_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_macro_use_facet_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_ms_int64_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_ms_int64_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_nanosleep_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_nanosleep_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_nl_types_h_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_nl_types_h_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_nrvo_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_nrvo_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_part_alloc_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_part_alloc_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_pthread_delay_np_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_pthread_delay_np_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_pthread_ma_st_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_pthread_ma_st_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_pthread_yield_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_pthread_yield_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_pthreads_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_pthreads_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_rvalue_refs_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_rvalue_refs_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_sched_yield_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_sched_yield_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_sgi_type_traits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_sgi_type_traits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_sigaction_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_sigaction_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_slist_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_slist_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_static_assert_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_static_assert_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_stdint_h_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_stdint_h_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_stlp_use_facet_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_stlp_use_facet_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_unistd_h_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_unistd_h_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_variadic_tmpl_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_variadic_tmpl_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_vc6_mem_templ_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_vc6_mem_templ_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_vc_iterator_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_vc_iterator_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_winthreads_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/has_winthreads_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/header_deprecated_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/helper_macro_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/helper_macros_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/limits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/link/link_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/link/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/math_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_adl_barrier_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_adl_barrier_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_arg_dep_lookup_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_arg_dep_lookup_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_array_type_spec_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_array_type_spec_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_auto_declarations_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_auto_declarations_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_auto_multidecl_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_auto_multidecl_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_auto_ptr_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_auto_ptr_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_bcb_partial_spec_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_bcb_partial_spec_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_char16_t_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_char16_t_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_char32_t_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_char32_t_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_com_value_init_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_com_value_init_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_constexpr_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_constexpr_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ctype_functions_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ctype_functions_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cv_spec_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cv_spec_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cv_void_spec_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cv_void_spec_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cwchar_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cwchar_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cwctype_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cwctype_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx03_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx03_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_addressof_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_addressof_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_alignas_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_alignas_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_allocator_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_allocator_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_atomic_sp_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_atomic_sp_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_defaulted_moves_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_defaulted_moves_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_exception_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_exception_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_final_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_final_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_array_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_array_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_atomic_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_atomic_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_chrono_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_chrono_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_codecvt_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_codecvt_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_condition_variable_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_condition_variable_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_forward_list_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_forward_list_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_future_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_future_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_initializer_list_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_initializer_list_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_mutex_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_random_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_random_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_ratio_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_ratio_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_regex_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_regex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_system_error_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_system_error_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_thread_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_tuple_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_tuple_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_type_traits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_type_traits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_typeindex_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_typeindex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_unordered_map_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_unordered_map_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_unordered_set_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_hdr_unordered_set_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_inline_namespaces_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_inline_namespaces_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_non_pub_def_fun_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_non_pub_def_fun_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_numeric_limits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_numeric_limits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_override_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_override_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_pointer_traits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_pointer_traits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_ref_qualifiers_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_ref_qualifiers_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_sfinae_expr_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_sfinae_expr_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_smart_ptr_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_smart_ptr_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_std_align_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_std_align_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_thread_local_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_thread_local_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_trailing_result_types_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_trailing_result_types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_unrestricted_union_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_unrestricted_union_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_user_lit_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx11_user_lit_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_binary_literals_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_binary_literals_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_constexpr_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_constexpr_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_decltype_auto_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_decltype_auto_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_digit_separator_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_digit_separator_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_generic_lambda_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_generic_lambda_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_hdr_shared_mutex_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_hdr_shared_mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_lambda_capture_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_lambda_capture_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_member_init_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_member_init_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_return_type_ded_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_return_type_ded_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_std_exchange_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_std_exchange_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_var_templ_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx14_var_templ_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_fold_expressions_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_fold_expressions_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_any_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_any_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_char_conv_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_char_conv_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_charconv_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_charconv_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_execution_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_execution_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_filesystem_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_filesystem_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_memory_resource_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_memory_resource_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_optional_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_optional_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_string_view_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_string_view_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_variant_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_hdr_variant_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_if_constexpr_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_if_constexpr_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_inline_variables_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_inline_variables_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_iterator_traits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_iterator_traits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_std_apply_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_std_apply_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_std_invoke_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_std_invoke_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_structured_bindings_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx17_structured_bindings_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_barrier_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_barrier_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_bit_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_bit_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_compare_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_compare_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_concepts_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_concepts_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_coroutine_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_coroutine_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_format_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_format_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_latch_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_latch_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_numbers_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_numbers_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_ranges_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_ranges_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_semaphore_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_semaphore_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_source_location_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_source_location_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_span_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_span_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_stop_token_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_stop_token_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_syncstream_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx20_hdr_syncstream_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx98_binders_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx98_binders_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx98_function_base_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx98_function_base_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx98_random_shuffle_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx98_random_shuffle_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx_hdr_functional_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_cxx_hdr_functional_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_decltype_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_decltype_n3276_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_decltype_n3276_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_decltype_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ded_typename_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ded_typename_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_defaulted_functions_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_defaulted_functions_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_deleted_functions_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_deleted_functions_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_dep_nested_class_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_dep_nested_class_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_dep_val_param_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_dep_val_param_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_excep_std_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_excep_std_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_exceptions_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_exceptions_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_exp_func_tem_arg_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_exp_func_tem_arg_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_explicit_cvt_ops_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_explicit_cvt_ops_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_extern_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_extern_template_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_fenv_h_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_fenv_h_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_fixed_len_variadic_templates_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_fixed_len_variadic_templates_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_func_tmp_order_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_func_tmp_order_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_function_template_default_args_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_function_template_default_args_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_function_type_spec_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_function_type_spec_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_i64_limits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_i64_limits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_inline_memb_init_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_inline_memb_init_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_integral_int64_t_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_integral_int64_t_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_iosfwd_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_iosfwd_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_iostream_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_iostream_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_is_abstract_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_is_abstract_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_iter_construct_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_iter_construct_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_lambdas_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_lambdas_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_limits_const_exp_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_limits_const_exp_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_limits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_limits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ll_limits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ll_limits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_long_long_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_long_long_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_func_spec_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_func_spec_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_tem_keyword_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_tem_keyword_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_tem_pnts_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_tem_pnts_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_templ_frnds_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_templ_frnds_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_templates_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_mem_templates_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_nested_friendship_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_nested_friendship_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_noexcept_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_noexcept_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_nullptr_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_nullptr_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ops_in_namespace_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ops_in_namespace_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_part_spec_def_args_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_part_spec_def_args_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_partial_spec_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_partial_spec_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_priv_aggregate_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_priv_aggregate_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ptr_mem_const_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ptr_mem_const_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_range_based_for_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_range_based_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_raw_literals_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_raw_literals_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_restrict_references_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_restrict_references_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ret_det_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_ret_det_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_rtti_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_rtti_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_rvalue_references_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_rvalue_references_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_scoped_enums_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_scoped_enums_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_sfinae_expr_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_sfinae_expr_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_sfinae_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_sfinae_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_sstream_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_sstream_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_static_assert_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_static_assert_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_allocator_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_allocator_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_distance_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_distance_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_iter_traits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_iter_traits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_iterator_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_iterator_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_locale_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_locale_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_messages_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_messages_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_min_max_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_min_max_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_oi_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_oi_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_typeinfo_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_typeinfo_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_use_facet_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_use_facet_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_wstreambuf_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_wstreambuf_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_wstring_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_std_wstring_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_stdc_namespace_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_stdc_namespace_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_swprintf_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_swprintf_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_tem_local_classes_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_tem_local_classes_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_template_aliases_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_template_aliases_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_template_streams_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_template_streams_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_template_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_template_template_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_two_phase_lookup_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_two_phase_lookup_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_typeid_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_typeid_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_typename_with_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_typename_with_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_unicode_literals_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_unicode_literals_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_unified_init_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_unified_init_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_using_breaks_adl_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_using_breaks_adl_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_using_decl_overld_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_using_decl_overld_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_using_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_using_template_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_variadic_macros_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_variadic_macros_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_variadic_templates_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_variadic_templates_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_void_returns_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_void_returns_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_wchar_t_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/no_wchar_t_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/pragma_message_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/threads/test_thread_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/test/threads/test_thread_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/config/tools/generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_adaptive_node_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_alloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_alloc_expand_bwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_alloc_expand_fwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_alloc_shrink_to_fit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_alloc_stable_vector_burst.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_flat_multiset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_flat_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_set_adaptive_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_set_alloc_v2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_set_avl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_set_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_set_sg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_set_sp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_static_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/bench/bench_vectors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_custom_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_custom_small_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_custom_static_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_custom_tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_custom_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_emplace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_extended_allocators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_move_containers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_pmr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_recursive_containers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/example/doc_type_erasure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/alloc_lib.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/dlmalloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/dlmalloc_2_8_6.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/dlmalloc_ext_2_8_6.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/global_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/monotonic_buffer_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/pool_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/synchronized_pool_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/src/unsynchronized_pool_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/alloc_basic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/alloc_full_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/allocator_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/deque_options_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/deque_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/devector_options_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/devector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_deque_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_devector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_flat_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_flat_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_list_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_slist_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_small_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_stable_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_static_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/explicit_inst_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/flat_map_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/flat_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/flat_set_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/flat_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/flat_tree_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/global_resource_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/insert_vs_emplace_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/list_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/memory_resource_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/monotonic_buffer_resource_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/node_handle_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/null_iterators_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pair_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_deque_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_devector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_flat_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_flat_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_list_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_slist_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_small_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_stable_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/pmr_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/polymorphic_allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/resource_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/scoped_allocator_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/scoped_allocator_usage_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/slist_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/small_vector_options_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/small_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/stable_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/static_vector_options_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/static_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/string_view_compat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/synchronized_pool_resource_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/throw_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/tree_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/unsynchronized_pool_resource_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/uses_allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/vector_options_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container/test/vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/doc/samples/tutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/examples/books.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/examples/point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/examples/portable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/examples/template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/check_float_funcs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/extensions_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_built_in_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_complex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_custom_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_deque_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_float_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_friend_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_function_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_fwd_test_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_fwd_test_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_global_namespace_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_list_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_long_double_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_no_ext_fail_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_no_ext_macro_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_no_ext_macro_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_number_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_optional_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_range_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_reference_values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_std_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_std_smart_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_std_tuple_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_system_error_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_type_index_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_value_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_variant_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/hash_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/implicit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/link_ext_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/link_no_ext_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/link_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/link_test_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/container_hash/test/namespace_fail_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/backtrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/echosse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/endless_loop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/fibonacci.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/jump.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/jump_mov.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/jump_void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/ontop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/ontop_void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/segmented.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/callcc/throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/backtrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/circle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/echosse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/endless_loop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/fibonacci.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/jump.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/jump_mov.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/jump_void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/ontop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/ontop_void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/segmented.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/example/fiber/throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/performance/callcc/performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/performance/fcontext/performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/performance/fiber/performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/src/asm/tail_ppc32_sysv_elf_gas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/src/continuation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/src/dummy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/src/fiber.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/src/posix/stack_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/src/untested.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/src/windows/stack_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/test/test_apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/test/test_callcc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/test/test_fcontext.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/test/test_fiber.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/context/test/test_invoke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/cline90/calendar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/cline90/stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/cline90/vector_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/cline90/vstack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/assertion_level.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/base_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/base_types_no_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/call_if_cxx14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/check_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/code_block.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/condition_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/friend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/friend_invariant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/if_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/ifdef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/ifdef_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/introduction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/introduction_comments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/introduction_public.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/loop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/named_override.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/no_lambdas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/no_lambdas_local_func.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/non_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/old_if_copyable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/old_no_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/optional_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/optional_result_virtual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/overload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/private_protected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/private_protected_virtual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/private_protected_virtual_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/public.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/pure_virtual_public.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/separate_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/static_public.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/throw_on_failure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/features/volatile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/meyer97/stack3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/meyer97/stack4_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/mitchell02/counter_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/mitchell02/courier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/mitchell02/customer_manager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/mitchell02/dictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/mitchell02/name_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/mitchell02/observer_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/mitchell02/simple_queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/mitchell02/stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/n1962/circle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/n1962/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/n1962/factorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/n1962/sqrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/n1962/sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/example/n1962/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/src/contract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/equal_to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/equal_to_cxx14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/false_.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/false_void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/no_equal_call_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/no_equal_condition_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/no_equal_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/true_.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/call_if/true_void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/audit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/audit_disabled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/audit_disabled_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/audit_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/axiom.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/axiom_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/decl_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/decl_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/ifdef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/check/ifdef_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_entry_static_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_entry_static_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_entry_static_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_entry_static_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_exit_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_exit_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_exit_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_exit_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_exit_static_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_exit_static_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_exit_static_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_exit_static_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_post_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_post_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_post_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_post_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_pre_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_pre_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_pre_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/decl_pre_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/ifdef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/ifdef_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/pre_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/smoke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/throwing_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/throwing_old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/throwing_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/constructor/throwing_pre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_entry_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_entry_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_entry_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_entry_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_entry_static_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_entry_static_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_entry_static_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_entry_static_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_exit_static_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_exit_static_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_exit_static_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_exit_static_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_post_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_post_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_post_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/decl_post_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/ifdef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/ifdef_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/pre_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/smoke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/throwing_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/throwing_old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/destructor/throwing_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/audit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/audit_disabled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/audit_disabled_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/audit_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/axiom.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/axiom_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/lib_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/lib_b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/lib_x.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/lib_y.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/no_post_except_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/no_post_except_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/nothing_for_pre_prog.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/other_assertions_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/other_assertions_prog.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/disable/other_assertions_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/decl_post_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/decl_post_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/decl_pre_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/decl_pre_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/ifdef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/ifdef_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/smoke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/throwing_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/throwing_old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/throwing_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/function/throwing_pre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/decl_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/decl_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/decl_cv_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/decl_nothing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/decl_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/decl_static_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/decl_static_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/decl_static_cv_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/ifdef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/ifdef_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/mutable_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/mutable_permissive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_const_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_const_permissive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_cv_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_cv_permissive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_mutable_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_mutable_permissive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_permissive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_volatile_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/static_volatile_permissive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/volatile_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/invariant/volatile_permissive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/auto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/copyable_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/if_copyable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/if_copyable_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/if_copyable_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/no_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/no_macro_if_copyable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/no_make_old_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/old/no_make_old_if_copyable_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_entry_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_entry_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_entry_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_entry_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_entry_static_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_entry_static_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_entry_static_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_entry_static_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_exit_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_exit_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_exit_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_exit_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_exit_static_inv_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_exit_static_inv_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_exit_static_inv_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_exit_static_inv_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_post_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_post_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_post_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_post_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_pre_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_pre_ends.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_pre_mid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/decl_pre_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/friend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/ifdef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/ifdef_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_args0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_args0_no_tva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_args1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_args1_no_tva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_args2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_args2_no_tva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_args_no_tva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/max_bases.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/old_virtual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/overload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/overload_no_tva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/override_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/override_permissive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/protected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/protected_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/smoke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/static_ifdef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/static_ifdef_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/static_throwing_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/static_throwing_old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/static_throwing_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/static_throwing_pre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/throwing_body.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/throwing_body_virtual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/throwing_body_virtual_branch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/throwing_old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/throwing_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/throwing_pre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/virtual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/virtual_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/virtual_access_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/virtual_branch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/public_function/virtual_sparse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/result/mixed_optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/result/mixed_optional_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/result/type_mismatch_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/auto_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/auto_pre_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/auto_pre_old_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/auto_pre_old_post_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/auto_pre_old_post_except_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/except_old_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/except_post_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/except_pre_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/missing_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/nothing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/old_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/old_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/old_post_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/old_pre_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/post_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/post_old_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/post_pre_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/pre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/pre_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/pre_old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/pre_old_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/pre_old_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/pre_old_post_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/pre_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/contract/test/specify/pre_post_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/conversion/test/cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/conversion/test/implicit_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/conversion/test/implicit_cast_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/conversion/test/implicit_cast_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/conversion/test/polymorphic_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/example/algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/example/default_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/example/default_converter_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/example/getting_serious.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/example/getting_started.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/example/lexical_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/example/stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/callable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/encryption.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/fallbacks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/has_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/is_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/lcast_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/performance_spirit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/printf_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/sfinae.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/spirit_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/str_to_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/stream_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/strtol_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/convert/test/user_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/addressof_constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/addressof_fail_rvalue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/addressof_fn_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/addressof_np_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/addressof_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/addressof_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/alloc_construct_cxx11_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/alloc_construct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/alloc_construct_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_allocate_hint_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_allocate_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_const_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_const_void_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_construct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_deallocate_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_destroy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_difference_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_is_always_equal_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_max_size_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_pocca_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_pocma_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_pocs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_rebind_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_size_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_soccc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_value_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/allocator_void_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/as_bytes_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/as_writable_bytes_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_ceil_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_countl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_countr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_endian_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_floor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_popcount_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_rotate_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/bit_width_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/checked_delete_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/checked_delete_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/checked_delete_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/cmath_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/default_allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/demangle_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/demangled_name_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/detail_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/eif_constructors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/eif_dummy_arg_disambiguation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/eif_lazy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/eif_lazy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/eif_member_templates.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/eif_namespace_disambiguation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/eif_no_disambiguation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/eif_partial_specializations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/empty_value_final_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/empty_value_size_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/empty_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/exchange_move_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/exchange_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/explicit_operator_bool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/explicit_operator_bool_compile_fail_conv_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/explicit_operator_bool_compile_fail_conv_pvoid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/explicit_operator_bool_compile_fail_delete.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/explicit_operator_bool_compile_fail_shift.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/explicit_operator_bool_noexcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/first_scalar_constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/first_scalar_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/get_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/has_single_bit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ignore_unused_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/is_same_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lib_typeid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_all_eq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_all_with_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_all_with_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_bool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_eq_nullptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_fail9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_ge_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_gt_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_gt_ge_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_le_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_lt_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_lt_le_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_test6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_with_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/lightweight_test_with_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/no_exceptions_support_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/noinit_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/noncopyable_compile_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/nvp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/pointer_traits_difference_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/pointer_traits_element_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/pointer_traits_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/pointer_traits_pointer_to_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/pointer_traits_rebind_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/quick_exit_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/quick_exit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_conversion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_ct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_cv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_fn_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_implicit_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_implicit_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_implicit_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_implicit_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_rv_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_rv_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_rv_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_rv_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_rv_fail5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/scoped_enum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/scoped_enum_compile_fail_conv_from_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/scoped_enum_compile_fail_conv_to_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sp_typeinfo_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/span_constructible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/span_deduction_guide_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/span_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/span_types_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_compare_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_construct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_contains_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_conversion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_copy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_element_access_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_ends_with_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_eq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_find_first_not_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_find_first_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_find_last_not_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_find_last_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_find_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_iteration_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_lt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_modifiers_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_rfind_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_starts_with_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_stream_insert_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_substr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/sv_types_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_array_of_array_of_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_array_of_array_of_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_array_of_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_array_of_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_array_of_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_const_wrapper_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_lib_header_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_lib_header_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_mixed_headers_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_mixed_headers_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_no_ambiguity_in_boost.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_primitive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_root_header_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_root_header_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_specialized_in_boost.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_specialized_in_boost_and_other.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_specialized_in_global.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_specialized_in_other.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_specialized_in_std.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_std_bitset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_std_dateorder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_std_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_std_typeinfo_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_std_vector_of_boost.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_std_vector_of_global.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/swap/swap_std_vector_of_other.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/test_lib_typeid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/test_lib_typeid2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/to_address_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/type_name_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/typeinfo_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/uncaught_exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/uncaught_exceptions_np.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/underlying_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/use_default_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/core/test/visit_each_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/chaining.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/echo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/fibonacci.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/layout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/parallel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/power.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/same_fringe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/segmented_stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/asymmetric/unwind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/symmetric/dice_game.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/symmetric/merge_arrays.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/symmetric/segmented_stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/symmetric/simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/example/symmetric/unwind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/asymmetric/performance_create_prealloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/asymmetric/performance_create_protected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/asymmetric/performance_create_standard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/asymmetric/performance_switch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/asymmetric/segmented/performance_create_segmented.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/bind_processor_aix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/bind_processor_freebsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/bind_processor_hpux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/bind_processor_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/bind_processor_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/bind_processor_windows.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/symmetric/performance_create_prealloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/symmetric/performance_create_protected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/symmetric/performance_create_standard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/symmetric/performance_switch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/performance/symmetric/segmented/performance_create_segmented.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/src/detail/coroutine_context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/src/exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/src/posix/stack_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/src/windows/stack_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/test/test_asymmetric_coroutine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine/test/test_symmetric_coroutine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/example/fibonacci.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/example/layout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/example/parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/example/same_fringe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/example/segmented.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/bind_processor_aix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/bind_processor_freebsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/bind_processor_hpux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/bind_processor_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/bind_processor_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/bind_processor_windows.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/segmented/performance_create_segmented.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/performance/segmented/performance_switch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/coroutine2/test/test_coroutine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/crc/crc_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/crc/doc/crc_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/crc/test/crc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/crc/test/crc_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/date_serialization_demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/dates_as_strings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/days_alive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/days_between_new_years.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/days_since_year_start.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/days_till_new_year.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/end_of_month_day.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/find_last_day_of_months.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/localization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/month_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/period_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/print_holidays.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/gregorian/print_month.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/local_time/calc_rules.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/local_time/flight.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/local_time/local_date_time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/local_time/seconds_since_epoch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/local_time/simple_time_zone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/posix_time/local_utc_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/posix_time/print_hours.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/posix_time/time_math.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/posix_time/time_periods.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/example/tutorial/io_tutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/src/gregorian/date_generators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/src/gregorian/greg_month.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/src/gregorian/greg_weekday.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/src/gregorian/gregorian_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/src/posix_time/posix_time_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testcurrent_day.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testdate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testdate_duration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testdate_facet_new.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testdate_input_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testdate_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testfacet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testformat_date_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testformatters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testgenerators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testgreg_cal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testgreg_day.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testgreg_durations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testgreg_month.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testgreg_serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testgreg_wstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testgreg_year.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testparse_date.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/gregorian/testperiod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testclocks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testcustom_time_zone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testdst_transition_day_rule.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testlocal_time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testlocal_time_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testlocal_time_input_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testlocal_time_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testlocal_time_period.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testposix_time_zone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testtz_database.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testwcustom_time_zone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/local_time/testwposix_time_zone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/compile_fail/hours_special_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/compile_fail/millisec_special_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/compile_fail/minutes_special_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/compile_fail/seconds_special_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testc_local_adjustor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testclock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testdst_rules.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testduration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testfiletime_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testformatters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testgreg_duration_operators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testiterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testlocal_adjustor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testmicrosec_time_clock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testparse_time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testperiod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/teststreams.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testtime_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testtime_formatters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testtime_input_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testtime_period.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testtime_serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testtime_serialize_versioning.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/posix_time/testtime_wstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/self_contained_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testconstrained_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testfrom_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testgeneric_period.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testgregorian_calendar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testint64_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testint_adapter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testmisc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testtime_resolution_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/date_time/test/testwrapping_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/console.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/enum_to_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/equality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/from_json.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/hash_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/json_rpc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/print_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/printing_enums_ct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/printing_enums_rt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/string_to_enum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/struct_to_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/example/to_json.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/bases_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/class_template_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/compute_base_modifiers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/describe_cxx14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/descriptor_by_name_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/descriptor_by_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/empty_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/enum_from_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/enum_struct_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/enum_to_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/enumerators_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/has_bases_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/has_enumerators_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/has_members_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/members_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/members_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/members_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/members_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/members_test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/members_test6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/members_test7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/members_test8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/nested_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/operator_eq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/operator_lt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/overloaded_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/overloaded_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/pp_call_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/pp_for_each_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/pp_is_empty_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/pp_is_paren_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/pp_name_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/pp_parse_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/pp_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/struct_enum_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/test_d_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/trailing_comma_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/unnamed_namespace_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/describe/test/unnamed_namespace_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/allocator_utilities_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/binary_search_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/blank_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/container_fwd/container_fwd_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/container_fwd/container_no_fwd_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/container_fwd/correctly_disable_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/is_sorted_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/is_xxx_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/numeric_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/reference_content_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/detail/test/test_utf8_codecvt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/getting_started.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/getting_started_library.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/mangled/import_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/mangled/smart_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial1/my_plugin_sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial1/tutorial1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial2/my_plugin_aggregator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial2/tutorial2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial3/tutorial3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial4/load_self.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial4/static_plugin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial5/load_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial6/on_unload_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial6/tutorial6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial7/library1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial7/library2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial7/tutorial7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial8/refcounting_plugin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial8/tutorial8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial8/tutorial8_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/example/tutorial9/tutorial9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/cpp_ctti_type_name_parser_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/cpp_import_class_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/cpp_import_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/cpp_load_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/cpp_mangle_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/cpp_test_library.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/ctti_type_name_parser_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/empty_library.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/empty_library_info_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/library_info_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/link1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/link2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/section_name_too_big.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/shared_library_concurrent_load_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/shared_library_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/shared_library_get_symbol_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/shared_library_load_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/shared_library_search_symbol_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/structures_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/symbol_runtime_info_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/template_method_linux_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dll/test/test_library.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/example/example1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/example/example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/example/example3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/example/timing_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/dyn_bitset_unit_tests1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/dyn_bitset_unit_tests2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/dyn_bitset_unit_tests3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/dyn_bitset_unit_tests4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/dyn_bitset_unit_tests5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/test_ambiguous_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/test_boost_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/test_lowest_bit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/dynamic_bitset/test/test_std_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/example/conversion_use_case.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/example/endian_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/example/udt_conversion_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/example/use_cases.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/arithmetic_buffer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/benchmark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/buffer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/conversion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/data_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/deprecated_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_arithmetic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_in_union_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_ld_st_roundtrip_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_load_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_operations_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_reverse_cx_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_reverse_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_reverse_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_reverse_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_reverse_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_reverse_test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_store_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/endian_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/float_typedef_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/intrinsic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/is_scoped_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/load_convenience_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/loop_time_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/order_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/packed_arithmetic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/packed_buffer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/scoped_enum_emulation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/speed_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/speed_test_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/spirit_conflict_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/endian/test/store_convenience_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/cloning_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/cloning_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/enable_error_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/errinfos.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/error_info_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/error_info_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/example_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/info_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/example/logging.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/src/clone_current_exception_non_intrusive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/1-throw_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/2-throw_exception_no_exceptions_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/3-throw_exception_no_integration_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/4-throw_exception_no_both_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/all_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/cloning_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/copy_exception_no_exceptions_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/copy_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/current_exception_cast_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/current_exception_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/diagnostic_information_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/diagnostic_information_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/enable_error_info_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfo_api_function_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfo_at_line_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfo_errno_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfo_file_handle_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfo_file_name_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfo_file_open_mode_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfo_nested_exception_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfo_type_info_name_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errinfos_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/errno_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/error_info_basic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/error_info_const_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/error_info_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/error_info_lv_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/error_info_lv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/error_info_rv_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/error_info_rv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/exception_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/exception_ptr_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/exception_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/get_error_info_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/has_to_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/helper1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/helper2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/info_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/info_tuple_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/is_output_streamable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/no_exceptions_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/refcount_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/throw_exception_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/throw_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/to_string_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/to_string_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/to_string_stub_hpp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/to_string_stub_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/to_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/unknown_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/visibility_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/exception/test/visibility_test_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/adapt_callbacks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/adapt_method_calls.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/adapt_nonblocking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/asio/autoecho.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/asio/exchange.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/asio/ps/publisher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/asio/ps/server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/asio/ps/subscriber.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/barrier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/future.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/hip/multiple_streams.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/hip/single_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/numa/topology.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/ping_pong.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/priority.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/range_for.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/segmented_stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/wait_stuff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/work_sharing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/examples/work_stealing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/fiber/numa/skynet_stealing_detach.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/fiber/skynet_detach.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/fiber/skynet_join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/fiber/skynet_shared_detach.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/fiber/skynet_shared_join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/fiber/skynet_stealing_async.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/fiber/skynet_stealing_detach.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/fiber/skynet_stealing_join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/thread/skynet_async.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/thread/skynet_pthread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/performance/thread/skynet_std.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/algo/algorithm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/algo/round_robin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/algo/shared_work.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/algo/work_stealing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/barrier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/condition_variable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/fiber.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/future.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/aix/pin_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/aix/topology.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/algo/work_stealing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/freebsd/pin_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/freebsd/topology.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/hpux/pin_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/hpux/topology.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/linux/pin_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/linux/topology.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/pin_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/solaris/pin_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/solaris/topology.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/topology.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/windows/pin_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/numa/windows/topology.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/properties.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/recursive_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/recursive_timed_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/scheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/timed_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/src/waker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_async_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_async_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_barrier_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_barrier_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_buffered_channel_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_buffered_channel_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_condition_mt_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_condition_mt_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_condition_variable_any_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_condition_variable_any_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_condition_variable_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_condition_variable_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_fiber_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_fiber_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_fss_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_fss_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_future_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_future_mt_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_future_mt_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_future_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_mutex_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_mutex_mt_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_mutex_mt_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_mutex_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_packaged_task_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_packaged_task_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_promise_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_promise_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_shared_future_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_shared_future_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_unbuffered_channel_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fiber/test/test_unbuffered_channel_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/bug/bug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_attribute_init_priority.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_bcrypt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_cxx20_atomic_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_stat_st_birthtim.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_stat_st_birthtimensec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_stat_st_birthtimespec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_stat_st_blksize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_stat_st_mtim.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_stat_st_mtimensec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_stat_st_mtimespec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_statx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/has_statx_syscall.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/config/is_windows_ce.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/doc/path_table.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/directory_symlink_parent_resolution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/error_demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/file_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/file_status.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/mbcopy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/mbpath.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/path_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/simple_ls.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/stems.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tchar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut6a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut6b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/example/tut6c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/codecvt_error_category.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/directory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/operations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/path_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/portability.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/unique_path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/utf8_codecvt_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/src/windows_file_codecvt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/config_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/convenience_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/copy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/deprecated_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/design_use_cases.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/equivalent.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/foreach_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/fstream_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/10038.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/10205.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/10485.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/10641.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/11166-remove-race.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/11228--filtered-recursive_directory_iterator-range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/3332/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/4329.-basename.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/5300-temp-dir-path-130.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/6638-global-init-fails-3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/70-71-copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/8930.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/9054_static_const_codecvt_segfault_pre_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/9219.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/99_canonical_with_junction_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/copy_file-compilation-error-2015-05-04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/fchmodat_AT_SYMLINK_NOFOLLOW_6659.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/hello_filesystem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/recurse_dir_iter_5403.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/issues/reparse_tag_file_placeholder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/large_file_support_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/locale_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/long_path_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/macro_default_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/odr1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/odr2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/operations_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/operations_unit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/path_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/path_times.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/path_unit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/relative_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/sample_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/test_cmake/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/filesystem/test/windows_attributes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/example/basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/example/composite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/example/custom_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/example/fibonacci.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/example/html.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/example/key_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/example/perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/example/serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/intermod_holder_dll.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_all_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_assoc_cont_fact_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_assoc_cont_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_basic_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_custom_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_custom_factory_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_init.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_init_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_intermod_holder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_intermod_holder_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_multictor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_multictor_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_no_locking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_no_locking_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_no_tracking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_no_tracking_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_serialization_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_set_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/flyweight/test/test_set_factory_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/array_byref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/array_byref_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/array_byval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/array_byval_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/call_once.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/cstr_byref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/cstr_byref_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/cstr_byval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/cstr_byval_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/dependent_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/noncopyable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/pair_byref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/pair_byref_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/pair_byval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/pair_byval_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/rvalue_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/rvalue_const_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/rvalue_nonconst.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/rvalue_nonconst_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/stl_byref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/stl_byref_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/stl_byval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/stl_byval_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/foreach/test/user_defined.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/benchmark/bench_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/example/sample_advanced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/example/sample_formats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/example/sample_new_features.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/example/sample_userType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/test/format_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/test/format_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/test/format_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/test/format_test_enum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/test/format_test_exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/test/format_test_wstring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/format/tools/format_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/example/bind1st.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/example/int_div.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/example/sum_avg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/contains2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/contains_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_30_repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_arith_cxx98.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_arith_portable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_n_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_ref_cxx98.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_ref_portable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_test_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_test_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/function_typeof_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/lambda_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/mem_fun_cxx98.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/mem_fun_portable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/mixed_cxxstd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/nothrow_swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/result_arg_types_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/return_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/rvalues_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/stateless_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/std_bind_cxx98.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/std_bind_portable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/sum_avg_cxx98.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/sum_avg_portable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/test_bad_function_call.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/test_mixed_cxxstd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/test_return_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function/test/throw_bad_function_call.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/build/preprocess_arity_loops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/build/preprocess_cc_names.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/build/preprocess_encoding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/example/fast_mem_fn_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/example/interface_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/example/interpreter_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/example/macro_type_args_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/example/result_of_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_callable_builtin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_cv_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_cv_mem_func_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_cv_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_function_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_function_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_member_function_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_member_object_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_member_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_nonmember_callable_builtin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/classification/is_variadic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/custom_ccs/member_ccs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/custom_ccs/member_ccs_exact.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/custom_ccs/nonmember_ccs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/custom_ccs/nonmember_ccs_exact.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/custom_ccs/property_tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/class_type_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/components.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/components_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/function_arity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/function_arity_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/parameter_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/parameter_types_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/result_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/decomposition/result_type_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/reconfiguration/cc_preprocessing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/reconfiguration/partial_arity_preprocessing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/reconfiguration/preprocessing_mode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/cv_function_synthesis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/function_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/function_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/function_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/mem_func_ptr_cv1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/mem_func_ptr_cv2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/mem_func_ptr_cv_ptr_to_this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/member_function_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/member_object_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/transformation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/function_types/test/synthesis/variadic_function_synthesis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/factory_allocator_throws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/factory_args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/factory_default_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/factory_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/factory_with_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/factory_with_std_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/value_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/value_factory_args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/factory/test/value_factory_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/forward/test/forward_adapter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/forward/test/lightweight_forward_adapter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/overloaded_function/test/functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/overloaded_function/test/make_call.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/overloaded_function/test/make_decl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/functional/test/function_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/cookbook/do_the_bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/cookbook/fill_em_up.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/extension/test_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/extension/triple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/performance/accumulate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/performance/functional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/performance/inner_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/performance/inner_product2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/performance/sequence_efficiency.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/example/performance/zip_efficiency.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/preprocess/preprocess_fusion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/clear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/count_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/erase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/erase_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/filter_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/flatten.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/iter_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/pop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/pop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/push_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/push_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/remove_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/replace_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/reverse_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/reverse_iter_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/segmented_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/segmented_find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/segmented_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/segmented_for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/ticket-5490.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/zip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/zip2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/algorithm/zip_ignore.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/compile_time/fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/compile_time/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/compile_time/vector_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/compile_time/vector_intrinsic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/compile_time/vector_iteration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/fused.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/fused_function_object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/fused_procedure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/invoke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/invoke_function_object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/invoke_procedure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/make_fused.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/make_fused_function_object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/make_fused_procedure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/make_unfused.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/unfused.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/functional/unfused_typed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_adt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_adt_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_adt_named.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_adt_named_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_adt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_adt_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_adt_named.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_adt_named_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_struct_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_struct_named.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_struct_named_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_tpl_adt_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_tpl_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_assoc_tpl_struct_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_struct_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_struct_named.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_struct_named_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_tpl_adt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_tpl_adt_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_tpl_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adapt_tpl_struct_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/adt_attribute_proxy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/as_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/as_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/as_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/as_map_assoc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/as_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/as_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/back_extended_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/boost_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/boost_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/boost_tuple_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/cons.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/convert_boost_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/convert_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/convert_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/convert_std_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/convert_std_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/convert_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deduce_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_assoc_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_assoc_struct_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_assoc_struct_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_assoc_tpl_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_assoc_tpl_struct_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_assoc_tpl_struct_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_struct_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_struct_inline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_struct_inline_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_struct_inline_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_struct_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_tpl_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_tpl_struct_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_tpl_struct_inline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_tpl_struct_inline_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_tpl_struct_inline_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/define_tpl_struct_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_is_constructible.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_mutate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_nest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_tie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/deque_value_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/filter_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/flatten_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/front_extended_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/github-159.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/github-176.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/iterator_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/joint_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_mutate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_nest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_tie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/list_value_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/make_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/make_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/map_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/map_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/map_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/map_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/map_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/map_mutate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/map_tie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/nil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/nview.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/ref_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/repetitive_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/reverse_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/segmented_iterator_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/single_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/std_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/std_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/std_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/std_tuple_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/test_deduce_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/transform_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_mutate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_nest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_tie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/tuple_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_mutate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_n.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_nest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_tie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/vector_value_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/zip_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/zip_view2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/sequence/zip_view_ignore.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/and.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/index_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/is_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/is_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/pair_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/pair_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/pair_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/pair_nest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/pair_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/pair_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/tag_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/fusion/test/support/unused.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/interprocess.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/iterative_query.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/mapped_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/polygons_shared_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/polygons_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/quick_start.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/range_adaptors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/value_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/value_shared_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/index/src/examples/rtree/variants_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/examples/apple_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/sample/src/fruit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/docutils/tools/support_status/support_status.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/append.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/area.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/area_with_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/assign_2d_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/assign_3d_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/assign_box_corners.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/assign_inverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/assign_point_from_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/assign_point_to_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/assign_points.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/azimuth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/azimuth_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/buffer_with_strategies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/centroid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/clear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/comparable_distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/convex_hull.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/correct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/covered_by.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/crosses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/densify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/densify_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/difference_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/discrete_frechet_distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/discrete_frechet_distance_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/discrete_hausdorff_distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/discrete_hausdorff_distance_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/disjoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/envelope.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/equals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/expand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/for_each_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/for_each_point_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/for_each_segment_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/intersection_ls_ls_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/intersection_poly_poly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/intersection_segment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/intersects_linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/intersects_segment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/is_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/is_valid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/is_valid_failure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/is_valid_message.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/length_with_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/line_interpolate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/line_interpolate_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/make_2d_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/make_3d_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/make_inverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/make_with_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/num_geometries.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/num_points.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/num_segments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/overlaps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/perimeter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/relate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/relation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/return_envelope.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/simplify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/simplify_insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/sym_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/touches_one_geometry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/touches_two_geometries.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/transform_with_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/algorithms/within.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/arithmetic/cross_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/arithmetic/dot_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/closure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/coordinate_dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/coordinate_system.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/coordinate_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/degree_radian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/get_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/get_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/interior_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/point_order.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/point_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/ring_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/rings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/set_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/set_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/core/tag_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_fusion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_polygon_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_polygon_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_polygon_polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_polygon_ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_range/filtered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_range/reversed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_range/sliced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_range/strided.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/boost_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/c_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/adapted/std_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/multi_linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/multi_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/multi_polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/point_xy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/point_xyz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/box_2d_4values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/box_templated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/linestring_templated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/multi_linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/multi_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/multi_point_templated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/multi_polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/register/ring_templated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/geometries/segment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/io/from_wkt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/io/read_wkt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/io/svg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/io/svg_mapper_custom.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/io/to_wkt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/io/wkt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/quick_start.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_distance_asymmetric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_distance_symmetric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_end_flat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_end_round.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_geographic_point_circle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_join_miter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_join_round.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_point_circle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/strategies/buffer_point_square.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/views/box_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/doc/src/examples/views/segment_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/01_point_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/02_linestring_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/03_polygon_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/04_boost_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/05_a_overlay_polygon_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/06_a_transformation_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/06_b_transformation_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/07_a_graph_route_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/07_b_graph_route_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c01_custom_point_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c02_custom_box_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c03_custom_linestring_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c04_a_custom_triangle_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c04_b_custom_triangle_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c05_custom_point_pointer_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c06_custom_polygon_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c07_custom_ring_pointer_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c08_custom_non_std_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c09_custom_fusion_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c10_custom_cs_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/c11_custom_cs_transform_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/ml01_multipolygon_simplify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/ml02_distance_strategy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/ml03_distance_formula.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x01_qt_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x02_gd_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x03_b_soci_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x03_c_soci_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/3d_benchmark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/benchmark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/benchmark2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/benchmark3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/benchmark_experimental.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/benchmark_insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/glut_vis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/random_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/example/serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/algorithms/content.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/algorithms/intersection_content.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/algorithms/is_valid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/algorithms/margin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/algorithms/minmaxdist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/algorithms/path_intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/algorithms/segment_intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/algorithms/union_content.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/minmax_heap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/exceptions/rtree_exceptions_lin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/exceptions/rtree_exceptions_qua.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/exceptions/rtree_exceptions_rst.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_dlin_add_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_dlin_mod_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_dlin_que_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_dqua_add_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_dqua_mod_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_dqua_que_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_drst_add_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_drst_mod_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_drst_que_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_lin_add_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_lin_mod_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_lin_que_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_qua_add_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_qua_mod_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_qua_que_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_rst_add_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_rst_mod_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b2d/rtree_rst_que_b2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_dlin_add_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_dlin_mod_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_dlin_que_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_dqua_add_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_dqua_mod_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_dqua_que_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_drst_add_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_drst_mod_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_drst_que_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_lin_add_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_lin_mod_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_lin_que_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_qua_add_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_qua_mod_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_qua_que_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_rst_add_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_rst_mod_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/b3d/rtree_rst_que_b3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_dlin_add_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_dlin_mod_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_dlin_que_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_dqua_add_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_dqua_mod_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_dqua_que_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_drst_add_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_drst_mod_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_drst_que_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_lin_add_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_lin_mod_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_lin_que_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_qua_add_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_qua_mod_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_qua_que_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_rst_add_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_rst_mod_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p2d/rtree_rst_que_p2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_dlin_add_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_dlin_mod_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_dlin_que_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_dqua_add_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_dqua_mod_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_dqua_que_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_drst_add_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_drst_mod_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_drst_que_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_lin_add_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_lin_mod_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_lin_que_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_qua_add_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_qua_mod_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_qua_que_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_rst_add_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_rst_mod_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/p3d/rtree_rst_que_p3d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_dlin_add_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_dlin_mod_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_dlin_que_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_dqua_add_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_dqua_mod_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_dqua_que_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_drst_add_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_drst_mod_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_drst_que_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_lin_add_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_lin_mod_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_lin_que_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_qua_add_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_qua_mod_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_qua_que_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_rst_add_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_rst_mod_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/generated/s2d/rtree_rst_que_s2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_linear_dyn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_quadratic_dyn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/interprocess/rtree_interprocess_rstar_dyn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_contains_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_epsilon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_insert_remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_intersects_geom.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_move_pack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_non_cartesian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_test_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/rtree/rtree_values_invalid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/varray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/index/test/varray_old.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/append.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/area/area.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/area/area_box_sg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/area/area_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/area/area_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/area/area_sph_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/azimuth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_countries.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_linestring_aimes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_multi_linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_multi_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_multi_polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_piece_border.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_point_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/buffer/buffer_with_strategies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/centroid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/centroid_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/clear_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/comparable_distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/convert_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/convex_hull/convex_hull.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/convex_hull/convex_hull_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/convex_hull/convex_hull_robust.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/convex_hull/convex_hull_sph_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/correct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/correct_closure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/correct_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/covered_by/covered_by.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/covered_by/covered_by_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/covered_by/covered_by_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/covered_by/covered_by_sph_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/crosses/crosses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/crosses/crosses_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/densify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/detail/approximately_equals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/detail/calculate_point_order.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/detail/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/detail/sections/range_by_section.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/detail/tupled_output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/detail/visit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_coverage_a_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_coverage_l_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_coverage_l_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_coverage_p_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_coverage_p_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_coverage_p_p.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_point_box_geometry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_seg_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/disjoint/disjoint_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_ca_ar_ar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_ca_l_ar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_ca_l_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_ca_pl_ar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_ca_pl_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_ca_pl_pl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_geo_linear_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_geo_pl_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_se_geo_ar_ar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_se_geo_l_ar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_se_geo_l_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_se_geo_pl_ar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_se_geo_pl_pl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_se_pl_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/distance/distance_se_pl_pl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/envelope_expand/envelope.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/envelope_expand/envelope_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/envelope_expand/envelope_on_spheroid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/envelope_expand/expand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/envelope_expand/expand_on_spheroid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/equals/equals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/equals/equals_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/equals/equals_on_spheroid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/equals/equals_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/for_each_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/intersects/intersects.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/intersects/intersects_box_geometry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/intersects/intersects_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/intersects/intersects_self.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/intersects/intersects_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/intersects/intersects_sph_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/is_convex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/is_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/is_simple_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/is_valid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/is_valid_failure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/is_valid_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/length/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/length/length_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/length/length_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/length/length_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/line_interpolate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/maximum_gap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/num_geometries.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/num_geometries_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/num_interior_rings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/num_interior_rings_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/num_points.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/num_points_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/num_segments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlaps/overlaps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlaps/overlaps_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlaps/overlaps_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlaps/overlaps_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/assemble.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/copy_segment_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/dissolver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_clusters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turn_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turns.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turns_areal_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turns_areal_areal_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turns_linear_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turns_linear_areal_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turns_linear_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turns_linear_linear_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/get_turns_linear_linear_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/overlay.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/relative_order.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/select_rings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/sort_by_side.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/sort_by_side_basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/split_rings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/traverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/traverse_ccw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/overlay/traverse_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/perimeter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/perimeter/perimeter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/perimeter/perimeter_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/perimeter/perimeter_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/perimeter_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/point_on_surface.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/relate/relate_areal_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/relate/relate_areal_areal_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/relate/relate_linear_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/relate/relate_linear_areal_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/relate/relate_linear_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/relate/relate_linear_linear_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/relate/relate_pointlike_geometry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/remove_spikes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/reverse_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_areal_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_l_a_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_linear_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_multi_areal_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_multi_spike.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_pl_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_pl_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_pl_pl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/difference/difference_tupled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_aa_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_areal_areal_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_linear_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_pl_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_pl_l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_pl_pl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_segment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/intersection/intersection_tupled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/set_ops_ll.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/set_ops_pp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/sym_difference/sym_difference_areal_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/sym_difference/sym_difference_linear_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/sym_difference/sym_difference_tupled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/union/union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/union/union_aa_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/union/union_aa_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/union/union_linear_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/union/union_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/union/union_other_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/union/union_pl_pl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/set_operations/union/union_tupled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/similarity/discrete_frechet_distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/similarity/discrete_hausdorff_distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/simplify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/simplify_countries.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/simplify_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/touches/touches.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/touches/touches_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/touches/touches_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/touches/touches_self.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/touches/touches_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/transform_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/unique_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/within/within.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/within/within_areal_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/within/within_linear_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/within/within_linear_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/within/within_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/within/within_pointlike_geometry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/within/within_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/algorithms/within/within_sph_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/arithmetic/cross_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/arithmetic/dot_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/arithmetic/general.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/arithmetic/infinite_line_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/linestring_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_concept_checker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_geographic_custom_with_wrong_units.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_geographic_with_wrong_units.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_spherical_custom_with_wrong_units.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_spherical_with_wrong_units.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_well_formed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_well_formed_non_cartesian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_well_formed_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_with_incorrect_dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_without_coordinate_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_without_dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_without_getter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/concepts/point_without_setter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/assert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/coordinate_dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/coordinate_system.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/coordinate_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/geometry_id.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/point_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/radian_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/radius.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/reverse_dispatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/topological_dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/core/visit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/envelope_expand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/is.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/measure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/other.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/relops1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/relops2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/setops1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/cs_undefined/setops2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/formulas/direct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/formulas/direct_accuracy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/formulas/direct_meridian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/formulas/intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/formulas/inverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/formulas/inverse_karney.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/formulas/vertex_longitude.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/adapted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/boost_array_as_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/boost_fusion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/boost_polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/boost_polygon_overlay.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/boost_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/boost_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/concepts/check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/custom_linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/infinite_line.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/initialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/multi_linestring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/multi_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/multi_polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/point_xy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/point_xyz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/geometries/segment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/headers/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/io/dsv/dsv_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/io/svg/svg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/io/wkt/wkt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/io/wkt/wkt_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/iterators/closing_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/iterators/concatenate_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/iterators/ever_circling_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/iterators/flatten_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/iterators/point_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/iterators/segment_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/minimal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/policies/compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/policies/rescale_policy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/convex_hull/random_multi_points.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/general_intersection_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/interior_triangles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/intersection_pies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/intersection_stars.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/intersects.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/random_ellipses_stars.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/recursive_polygons.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/star_comb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/areal_areal/ticket_9081.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/buffer/many_ring_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/buffer/multi_point_growth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projection_epsg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projection_interface_d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projection_interface_p4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projection_interface_s.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projection_selftest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projections.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projections_combined.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/projections_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/spar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/srs_transformer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/transformation_epsg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/srs/transformation_interface.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/andoyer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/cross_track.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/crossings_multiply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/distance_cross_track.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/distance_default_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/douglas_peucker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/envelope_segment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/franklin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/haversine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/matrix_transformer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/point_in_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/projected_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/projected_point_ax.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/pythagoras.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/pythagoras_point_box.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/segment_intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/segment_intersection_collinear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/segment_intersection_geo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/segment_intersection_sph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/spherical_side.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/thomas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/transform_cs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/transformer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/vincenty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/strategies/winding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/algorithm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/calculation_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/compress_variant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/for_each_coordinate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/is_implemented.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/math_abs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/math_equals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/math_sqrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/promote_integral.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/select_most_precise.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/transform_variant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/tuples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/util/write_dsv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/views/box_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/views/closeable_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/views/reversible_closeable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/views/reversible_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/geometry/test/views/segment_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/affine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/convolution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/dynamic_image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/interleaved_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/mandelbrot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/packed_pixel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/resize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/doc/html/_downloads/x_gradient.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/adaptive_threshold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/affine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/convolution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/convolve2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/dynamic_image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/harris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/hessian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/interleaved_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/mandelbrot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/packed_pixel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/resize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/sobel_scharr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/threshold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/example/x_gradient.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/algorithm/for_each_pixel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/algorithm/std_fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/algorithm/std_uninitialized_fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/algorithm_channel_arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/algorithm_channel_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/algorithm_channel_invert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/algorithm_channel_multiply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/algorithm_channel_relation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/channel_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/is_channel_integral.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/packed_channel_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/scoped_channel_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/channel/test_fixture.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color/color_spaces_are_compatible.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color/default_color_converter_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color/default_color_converter_impl_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color_base/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color_base/homogeneous_color_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color_base/static_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color_base/static_transform_gray_to_rgb_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/color_base/static_transform_rgb_to_cmyk_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image/image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/box_filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/harris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/hessian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/lanczos_scaling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/median_filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/simple_kernels.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/sobel_scharr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/threshold_binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/threshold_color_spaces_not_compatible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/threshold_otsu.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_processing/threshold_truncate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/axis_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/collection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/derived_view_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/dynamic_step.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/is_planar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/planar_rgba_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/reverse_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/subimage_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/view_is_basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/view_is_mutable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/view_is_step.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/view_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/view_type_from_pixel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/x_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/xy_locator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/image_view/y_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/iterator/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/iterator/dynamic_step.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/iterator/is_planar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/locator/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/locator/dynamic_step.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/bit_aligned_pixel_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/color_convert_cmyk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/is_pixel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/is_planar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/num_channels.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/packed_pixel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/pixel_reference_is_mutable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/pixels_are_compatible.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/pixel/test_fixture.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/point/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/point/multiply_by_non_arithmetic_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/point/point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/promote_integral.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/core/test_fixture.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/dynamic_image/any_image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/dynamic_image/subimage_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/bmp/bmp_make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/bmp/bmp_old_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/bmp/bmp_read_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/bmp/bmp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/bmp/bmp_write_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/jpeg/jpeg_old_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/jpeg/jpeg_read_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/jpeg/jpeg_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/jpeg/jpeg_write_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/png/png_file_format_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/png/png_old_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/png/png_read_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/png/png_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/png/png_write_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/pnm/pnm_old_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/pnm/pnm_read_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/pnm/pnm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/pnm/pnm_write_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/raw/raw_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/simple_all_formats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/targa/targa_old_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/targa/targa_read_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/targa/targa_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/targa/targa_write_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_file_format_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_old_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_subimage_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_float_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_minisblack_test_1-10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_minisblack_test_11-20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_minisblack_test_21-31_32-64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_minisblack_write_test_1-10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_minisblack_write_test_11-20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_minisblack_write_test_21-31_32-64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_palette_test_1-8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_palette_test_8-16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_palette_write_test_1-8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_palette_write_test_8-16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_contig_test_1-10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_contig_test_11-20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_contig_test_21-31_32_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_contig_write_test_1-10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_contig_write_test_11-20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_contig_write_test_21-31_32_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_planar_test_1-10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_planar_test_11-20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_rgb_planar_test_21-31_32_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_tiled_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/io/tiff/tiff_write_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/channel_numeric_operations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/convolve.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/convolve_2d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/convolve_cols.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/convolve_rows.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/extend_boundary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/kernel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/kernel_1d_fixed_even_size_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/kernel_fixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/matrix3x2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/pixel_numeric_operations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/pixel_numeric_operations_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/numeric/resample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/channel_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/channel_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/color_convert_cmyka.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/color_convert_gray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/color_convert_gray_alpha.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/color_convert_hsl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/color_convert_hsv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/color_convert_lab.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/color_convert_luminance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/color_convert_xyz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/get_num_bits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/get_pixel_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/indexed_image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/is_bit_aligned.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/is_homogeneous.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/pixel_bit_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/extension/toolbox/subchroma_image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/header/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/legacy/channel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/legacy/error_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/legacy/image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/legacy/performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/legacy/pixel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/legacy/pixel_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/legacy/recreate_image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/legacy/sample_image.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/gil/test/test_utility_output_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/doc/eg1-iso.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/accum-compile-times.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/actor_clustering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/adj_list_ra_edgelist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/adjacency_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/adjacency_list_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/adjacency_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/astar-cities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/astar_maze.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bellman-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bellman-ford-internet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bfs-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bfs-example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bfs-name-printer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bfs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bfs_neighbor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/biconnected_components.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bipartite_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/boost_web_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/boykov_kolmogorov-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bron_kerbosch_clique_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bron_kerbosch_print_cliques.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/bucket_sorter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/canonical_ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/cc-internet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/city_visitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/closeness_centrality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/clustering_coefficient.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/components_on_edgelist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/connected-components.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/connected_components.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/container_gen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/copy-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/csr-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/cuthill_mckee_ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/cycle-file-dep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/cycle-file-dep2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/cycle_canceling_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/cycle_ratio_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dag_shortest_paths.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dave.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/default-constructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/default-constructor2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/degree_centrality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dfs-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dfs-parenthesis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dfs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dfs_parenthesis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dijkstra-example-listS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dijkstra-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/dijkstra-no-color-map-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/directed_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/eccentricity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edge-connectivity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edge-function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edge-iter-constructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edge_basics.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edge_coloring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edge_connectivity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edge_iterator_constructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edge_property.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/edmonds-karp-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/exterior_properties.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/exterior_property_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/family_tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/fibonacci_heap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/file_dependencies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/filtered-copy-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/filtered_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/filtered_graph_edge_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/filtered_vec_as_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/fr_layout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/gerdemann.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/girth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/graph-assoc-types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/graph-property-iter-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/graph-thingie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/graph_as_tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/graph_property.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/graphviz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/grid_graph_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/grid_graph_properties.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/hawick_circuits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/implicit_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/in_edges.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/inclusive_mean_geodesic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/incremental-components-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/incremental_components.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/influence_prestige.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/interior_pmap_bundled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/interior_property_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/iohb.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/isomorphism.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/iteration_macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/iterator-property-map-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/johnson-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/kevin-bacon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/kevin-bacon2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/king_ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/knights_tour.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/kruskal-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/kruskal-telephone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/kuratowski_subgraph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/labeled_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/last-mod-time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/leda-concept-check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/leda-graph-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/loops_dfs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/make_biconnected_planar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/make_connected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/make_maximal_planar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/matching_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/max_flow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/mcgregor_subgraphs_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/mean_geodesic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/miles_span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/min_max_paths.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/minimum_degree_ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/modify_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/neighbor_bfs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/ordered_out_edges.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/ospf-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/parallel-compile-time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/planar_face_traversal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/prim-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/prim-telephone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/print-adjacent-vertices.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/print-edges.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/print-in-edges.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/print-out-edges.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/property-map-traits-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/property_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/push-relabel-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/put-get-helper-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/quick-tour.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/quick_tour.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/r_c_shortest_paths_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/reachable-loop-head.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/reachable-loop-tail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/read_graphviz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/read_write_dimacs-eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/remove_edge_if_bidir.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/remove_edge_if_dir.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/remove_edge_if_undir.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/reverse_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/roget_components.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/scaled_closeness_centrality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/scc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/simple_planarity_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/sloan_ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/stoer_wagner.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/straight_line_drawing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/strong-components.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/strong_components.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/subgraph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/subgraph_properties.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/successive_shortest_path_nonnegative_weights_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/tiernan_girth_circumference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/tiernan_print_cycles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/topo-sort-file-dep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/topo-sort-file-dep2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/topo-sort-with-leda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/topo-sort-with-sgb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/topo-sort1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/topo-sort2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/topo_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/transitive_closure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/transpose-example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/two_graphs_common_spanning_trees.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/undirected_adjacency_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/undirected_dfs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/undirected_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/vector_as_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/vertex-name-property.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/vertex_basics.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/vf2_sub_graph_iso_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/vf2_sub_graph_iso_multi_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/visitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/weighted_matching_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/example/write_graphviz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/src/graphml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/src/read_graphviz_new.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/adj_list_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/adj_list_edge_list_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/adj_list_invalidation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/adj_list_loops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/adj_matrix_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/adjacency_matrix_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/all_planar_input_files_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/astar_search_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/basic_planarity_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/bellman-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/betweenness_centrality_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/bfs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/bfs_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/biconnected_components_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/bidir_remove_edge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/bidir_vec_remove_edge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/bipartite_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/boykov_kolmogorov_max_flow_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/bron_kerbosch_all_cliques.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/bundled_properties.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/closeness_centrality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/clustering_coefficient.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/core_numbers_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/csr_graph_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/cuthill_mckee_ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/cycle_canceling_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/cycle_ratio_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/dag_longest_paths.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/degree_centrality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/delete_edge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/dfs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/dfs_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/dijkstra_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/dijkstra_heap_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/dijkstra_no_color_map_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/dimacs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/disjoint_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/dominator_tree_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/eccentricity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/edge_list_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/filter_graph_vp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/filtered_graph_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/filtered_graph_properties_dijkstra.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/find_flow_cost_bundled_properties_and_named_params_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/finish_edge_bug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/floyd_warshall_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/generator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/graph_concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/graphml_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/graphviz_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/grid_graph_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/grid_graph_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/gursoy_atun_layout_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/hawick_circuits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/incremental_components_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/index_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/is_straight_line_draw_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/isomorphism.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/johnson-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/king_ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/labeled_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/layout_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/leda_graph_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/lvalue_pmap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/make_bicon_planar_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/make_connected_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/make_maximal_planar_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/mas_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/matching_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/max_flow_algorithms_bundled_properties_and_named_params.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/max_flow_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/mcgregor_subgraphs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/mean_geodesic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/metis_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/metric_tsp_approx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/min_degree_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/named_vertices_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/parallel_edges_loops_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/property_iter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/r_c_shortest_paths_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/random_matching_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/random_spanning_tree_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/rcsp_custom_vertex_id.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/read_propmap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/reverse_graph_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/sequential_vertex_coloring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/stanford_graph_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/stoer_wagner_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/strong_components_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/subgraph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/subgraph_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/subgraph_bundled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/subgraph_props.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/successive_shortest_path_nonnegative_weights_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/test_graphs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/tiernan_all_cycles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/transitive_closure_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/transitive_closure_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/two_graphs_common_spanning_trees_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/undirected_dfs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/vector_graph_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/vf2_sub_graph_iso_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/vf2_sub_graph_iso_test_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph/test/weighted_matching_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/example/breadth_first_search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/example/dijkstra_shortest_paths.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/src/mpi_process_group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/src/tag_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/adjlist_build_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/adjlist_redist_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/adjlist_remove_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/algorithm_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_adjacency_list_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_betweenness_centrality_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_connected_components_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_csr_algorithm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_csr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_dfs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_dimacs_reader.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_graph_coloring_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_mst_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_page_rank_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_property_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_queue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_rmat_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_rmat_cc_ps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_rmat_pagerank.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_shortest_paths_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_st_connected_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/distributed_strong_components_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/hohberg_biconnected_components_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/mesh_generator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/named_vertices_hash_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/named_vertices_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/named_vertices_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/process_group_serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/graph_parallel/test/ssca.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/find_if/compile.fusion.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/find_if/compile.fusion.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/find_if/compile.hana.map.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/find_if/compile.hana.set.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/find_if/compile.hana.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/find_if/compile.meta.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/find_if/compile.mpl.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/find_if/compile.std.integer_sequence.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.cexpr.recursive.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.cexpr.unrolled.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.fusion.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.fusion.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.hana.basic_tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.hana.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.meta.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.mpl.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/compile.mpl11.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/execute.fusion.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/execute.fusion.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/execute.hana.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/execute.std.array.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/fold_left/execute.std.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/including/baseline.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/including/fusion.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/including/hana.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/including/meta.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/including/mpl.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/including/mpl11.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.fusion.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.fusion.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.hana.basic_tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.hana.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.meta.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.mpl.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.mpl11.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.std.array.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/make/compile.std.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/reverse/move.fusion.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/reverse/move.hana.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/reverse/nomove.fusion.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/reverse/nomove.hana.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/sort/compile.hana.tuple.rand.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/sort/compile.hana.tuple.reversed.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/sort/compile.hana.tuple.sorted.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/sort/compile.hana.tuple.sorted_but_first.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/sort/compile.hana.tuple.sorted_but_last.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/compile.fusion.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/compile.fusion.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/compile.hana.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/compile.hana.types.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/compile.meta.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/compile.mpl.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/compile.mpl11.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/execute.fusion.list.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/execute.fusion.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/execute.hana.tuple.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/execute.std.array.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/benchmark/transform/execute.std.vector.erb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/accessors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/adapt_adt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/adapt_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/adjust.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/adjust_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/and.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/append.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/at_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/at_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/basic_tuple/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/chain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/cmake_integration/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/comparing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/concat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/common/common.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/common/common_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/common/has_common.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/convert/embedding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/convert/is_convertible.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/convert/is_embedded.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/convert/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/is_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/tag_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/tag_of_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/when.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/core/when_valid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/count_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/cppcon_2014/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/cppcon_2014/det.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/cppcon_2014/functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/cppcon_2014/matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/cppcon_2014/ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/cycle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/define_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/detail/wrong.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/div.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/drop_front_exactly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/duplicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/eval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/eval_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/fusion/deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/fusion/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/fusion/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/fusion/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/integral_c/integral_constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/list/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/list/conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/list/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/list/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/list/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/vector/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/vector/conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/vector/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/vector/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/mpl/vector/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/boost/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/array/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/array/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/array/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/array/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/integer_sequence/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/integer_sequence/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/integer_sequence/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/integer_sequence/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/integral_constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/ratio/arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/ratio/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/ratio/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ext/std/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/extend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/extract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/first.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/flatten.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/fold_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/fold_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/foldable/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/always.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/arg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/capture.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/compose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/curry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/demux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/fix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/flip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/id.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/iterate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/lockstep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/on.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/overload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/overload_linearly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/partial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/placeholder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/functional/reverse_partial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/fuse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/greater.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/greater_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/in.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/integral_constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/is_disjoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/is_subset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/iterable/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/lazy/comonad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/lazy/functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/lazy/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/lazy/monad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/less.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/less_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/lift.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/erase_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/keys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/symmetric_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/map/values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/max.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/maximum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/maximum_by.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/members.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/min.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/minimum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/minimum_by.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/minus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/dimensional_analysis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/from_json.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/indexed_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/infinite_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/infinite_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/lambda_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/nth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/overload_linearly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/printf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/ref_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/restricted_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/misc/tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/mod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/monadic_compose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/monadic_fold_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/monadic_fold_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/mult.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/negate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/not.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/not_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/one.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/applicative.complex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/applicative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/is_just.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/is_nothing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/just.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/maybe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/monad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/monad_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/nothing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/sfinae.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/sfinae_friendly_metafunctions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/optional/value_or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/overview.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/pair/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/pair/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/pair/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/pair/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/pair/product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/permutations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/power.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/prefix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/prepend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/product/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/product/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/range/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/range/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/range/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/range/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/range/range_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/range/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/remove_at_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/remove_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/remove_range_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/replace_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/replicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/reverse_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/scan_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/scan_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/second.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/applicative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/monad.ints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/monad.types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/monad_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sequence/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/erase_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/symmetric_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/set/union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/slice_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/from_c_str.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/hashable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/literal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/monoid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/string_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/string/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/struct.custom_accessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/struct.mcd.nested.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/struct.mcd.tag_dispatching.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/struct/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/struct/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/struct/keys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/struct/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/struct/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/suffix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/take_back_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/take_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/take_front_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/then.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tuple/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tuple/interop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tuple/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tuple/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tuple/tuple_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tuple/tuple_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/appendix_mpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/constant_side_effects.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/containers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/ext/fusion_to_hana.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/ext/mpl_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/ext/ratio_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/include_ext.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/integral-branching.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/integral.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/introduction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/introspection.adapt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/introspection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/introspection.json.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/introspection.sfinae.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/mpl_cheatsheet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/quickstart.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/quickstart.switchAny.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/rationale.container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/tag_dispatching.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/tutorial/type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/alignof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/basic_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/decltype.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/hashable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/integral.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/is_valid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/metafunction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/metafunction_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/sizeof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/trait.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/type/typeid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/unfold_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/unfold_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/value_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/wandbox.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/zero.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/zip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/zip_shortest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/zip_shortest_with.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/example/zip_with.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/assert/commas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/assert/constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/assert/constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/assert/flexible.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/assert/lambdas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/assert/runtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/permutations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/scans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/take_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/unfolds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/auto/zips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/cnstr.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/basic_tuple/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/builtin_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/constant/arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/constant/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/constant/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/constant/logical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/constant/mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/constant/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/constant/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/integral_constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/sequence/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/sequence/monad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/sequence/monad_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/sequence/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/sequence/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/sequence/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/at_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/fold_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/fold_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/keys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/macro.adapt_adt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/macro.adapt_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/macro.define_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/member_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/members.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/concept/struct/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/core/common.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/core/default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/core/is_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/core/is_embedded.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/core/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/core/tag_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/core/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/core/when.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/deploy/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/algorithm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/canonical_constant/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/create.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/decay.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/ebo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/fast_and.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/first_unsatisfied_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/has_duplicates.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/preprocessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/struct_macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/type_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/type_foldl1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/type_foldr1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/unpack_flatten.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/variadic/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/variadic/drop_into.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/variadic/foldl1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/variadic/foldr1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/variadic/reverse_apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/variadic/split_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/detail/variadic/take.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/euclidean_ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/printable/map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/printable/metafunction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/printable/optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/printable/pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/printable/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/printable/string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/printable/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/printable/type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/type_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/types/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/types/contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/types/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/types/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/types/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/types/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/types/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/empty/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/empty/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/empty/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/joined/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/joined/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/joined/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/joined/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/single/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/single/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/single/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/single/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/sliced/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/sliced/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/sliced/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/sliced/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/laziness.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/less.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/experimental/view/transformed/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/permutations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/scans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/take_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/unfolds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/deque/auto/zips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/permutations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/scans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/take_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/unfolds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/list/auto/zips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/permutations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/scans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/take_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/unfolds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/tuple/auto/zips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/permutations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/scans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/take_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/unfolds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/fusion/vector/auto/zips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/integral_c/arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/integral_c/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/integral_c/constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/integral_c/interop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/integral_c/logical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/integral_c/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/integral_c/tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/list/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/list/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/list/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/list/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/list/tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/list/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/vector/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/vector/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/vector/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/vector/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/vector/tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/mpl/vector/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/intersperse.broken.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/permutations.broken.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/scans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/take_front.broken.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/unfolds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/auto/zips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/monad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/monad_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/boost/tuple/tag_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/array/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/array/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/array/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/array/issue_304.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/array/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/array/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/array/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/bugs/libcxx_19616.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/bugs/libcxx_22806.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integer_sequence/drop_front_exactly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integer_sequence/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integer_sequence/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integer_sequence/front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integer_sequence/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integer_sequence/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integer_sequence/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integral_constant/arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integral_constant/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integral_constant/constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integral_constant/interop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integral_constant/logical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integral_constant/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/integral_constant/tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/pair/first_second.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/pair/issue_90.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/pair/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/pair/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/div.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/less.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/minus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/mod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/mult.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/one.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/ratio/zero.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/permutations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/scans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/take_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/unfolds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/auto/zips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/issue_90.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/laws.functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/tuple/laws.searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ext/std/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/fold_left/ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/fold_right/ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/fold_left_mcd/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/fold_left_mcd/monad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/fold_left_mcd/monad_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/fold_left_mcd/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/fold_left_mcd/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/fold_left_mcd/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/iterable_mcd/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/iterable_mcd/monad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/iterable_mcd/monad_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/iterable_mcd/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/iterable_mcd/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/iterable_mcd/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/unpack_mcd/iterable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/unpack_mcd/monad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/unpack_mcd/monad_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/unpack_mcd/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/unpack_mcd/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/foldable/unpack_mcd/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/capture.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/demux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/fix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/iterate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/lockstep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/overload_linearly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/partial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/placeholder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/functional/reverse_partial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/identity/applicative.full_mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/identity/applicative.monad_mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/identity/functor.adjust_mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/identity/functor.transform_mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/identity/monad.chain_mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/identity/monad.flatten_mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/if_/non_copyable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/constexpr_init.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/github_354.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/hashable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/logical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/operators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/std_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/times.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/integral_constant/udl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/clang_20046.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_112.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_113.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_149.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_165.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_202.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_221.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_234.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_252.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_260.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_266.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_269.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_297.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_31.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_331.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_362.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_365.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_460.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_470.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_75/tu1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_75/tu2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/issues/github_91.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/lazy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/logical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/assign.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/assign.move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/at_key.collisions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/at_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/at_key.ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/at_key.stackoverflow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/cnstr.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/cnstr.default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/cnstr.move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/cnstr.trap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/cnstr.variadic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/erase_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/fold_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/fold_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/is_subset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/keys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/symmetric_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/map/values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/minimal_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/monoid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/numeric/minus_mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/numeric/negate_mcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/chain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/concat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/copy.trap_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/flatten.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/fold_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/fold_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/is_just.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/is_nothing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/less.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/lift.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/maybe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/nested_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/operator_arrow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/operator_deref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/representation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/sfinae.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/optional/value_or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/assign.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/assign.move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/cnstr.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/cnstr.default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/cnstr.memberwise.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/cnstr.move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/comparable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/empty_storage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/foldable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/issue_90.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/orderable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/pair/tag_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/drop_front_exactly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/maximum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/minimum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/range_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/range/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/ring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/cnstr.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/cnstr.default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/cnstr.move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/cnstr.trap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/erase_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/is_subset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/symmetric_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/set/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/c_str.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/cnstr.c_str.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/cnstr.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/cnstr.default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/drop_front_exactly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/less.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/udl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/string/zero.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/any_of.clang_ice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/assign.convert_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/assign.convert_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/assign.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/assign.move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/at.const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/at.non_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/at.rv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/ap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/cartesian_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/drop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/drop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/drop_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/index_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/permutations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/remove_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/remove_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/scans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/span.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/take_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/take_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/take_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/unfolds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/auto/zips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.convert_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.convert_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.nested.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.trap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.variadic_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.variadic_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/cnstr.variadic_forward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/empty_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/hold_refs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/issue_90.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/laws.functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/laws.searchable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/move_only.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/pair_interop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/smart_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.drop_front_exactly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.fold_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.fold_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.prepend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/special.transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/tuple/usability_of_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/adl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/alignof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/decltype.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/inherit_basic_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/integral.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/is_valid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/laws.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/metafunction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/metafunction_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/nested_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/sizeof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/typeid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hana/test/type/unary_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/examples/interface.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/test/binomial_heap_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/test/d_ary_heap_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/test/fibonacci_heap_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/test/mutable_heap_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/test/pairing_heap_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/test/priority_queue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/test/self_contained_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/test/skew_heap_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/heap/tools/throughput_benchmarks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/benchmark/axis_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/benchmark/axis_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/benchmark/histogram_filling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/benchmark/histogram_filling_gsl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/benchmark/histogram_filling_root.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/benchmark/histogram_iteration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/benchmark/histogram_parallel_filling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/getting_started_listing_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/getting_started_listing_02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/getting_started_listing_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/getting_started_listing_04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/getting_started_listing_05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_axis_basic_demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_axis_circular.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_axis_growing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_axis_with_labels.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_axis_with_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_axis_with_uoflow_off.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_2d_axis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_accumulators_advanced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_accumulators_builtin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_accumulators_ouroboros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_accumulators_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_accumulators_with_metadata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_minimal_axis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_modified_axis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_custom_storage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_fill_histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_fill_profile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_fill_weighted_histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_fill_weighted_profile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_histogram_in_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_histogram_operators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_histogram_projection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_histogram_reduction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_histogram_serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_histogram_streaming.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_indexed_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_make_dynamic_histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_make_static_histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_parallel_filling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/examples/guide_stdlib_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/accumulators_count_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/accumulators_count_thread_safe_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/accumulators_mean_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/accumulators_serialization_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/accumulators_sum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/accumulators_thread_safe_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/accumulators_weighted_mean_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/accumulators_weighted_sum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/algorithm_empty_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/algorithm_project_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/algorithm_reduce_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/algorithm_sum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_boolean_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_category_fail0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_category_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_category_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_category_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_integer_fail0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_integer_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_integer_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_integer_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_integer_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_integer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_option_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_regular_fail0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_regular_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_regular_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_variable_fail0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_variable_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_variable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_variant_serialization_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/axis_variant_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/boost_accumulators_support_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/boost_range_support_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/boost_units_support_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/deduction_guides_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_accumulator_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_args_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_argument_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_array_wrapper_serialization_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_axes_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_convert_integer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_detect_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_iterator_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_large_int_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_limits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_make_default_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_misc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_operators_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_relaxed_equal_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_replace_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_safe_comparison_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_static_if_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/detail_tuple_slice_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_custom_axis_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_dynamic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_fail0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_fill_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_growing_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_mixed_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_operators_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_ostream_ascii_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_ostream_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_serialization_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/histogram_threaded_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/indexed_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/issue_290_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/issue_327_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/make_histogram_fail0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/make_histogram_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/odr_main_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/odr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/storage_adaptor_serialization_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/storage_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/storage_adaptor_threaded_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/unlimited_storage_serialization_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/unlimited_storage_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/histogram/test/utility_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/example/in.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/example/pointfree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/example/print.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/example/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/example/static_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/alias.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/always.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/apply_eval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/arg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/capture.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/combine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/compose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/decay.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/decorate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fail/always.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fail/apply_eval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fail/flip_lazy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fail/implicit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fail/rotate_lazy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fail/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fail/unpack_uncallable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/final_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/first_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/flip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/flow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/identity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/implicit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/indirect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/is_invocable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/issue8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/lazy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/lift.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/limit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/match.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/mutable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/pack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/partial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/pipable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/proj.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/protect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/repeat_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/returns.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/reveal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/reverse_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/rotate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/static_def/static_def.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/static_def/static_def2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/tap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/tuple_for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/tuple_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/hof/test/virtual_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/boost_party_/boost_party.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/custom_interval_/custom_interval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/dynamic_interval_/dynamic_interval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/interval_/interval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/interval_container_/interval_container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/itvset_shell_/itvset_shell.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/large_bitset_/large_bitset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/man_power_/man_power.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/month_and_week_grid_/month_and_week_grid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/overlap_counter_/overlap_counter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/party_/party.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/partys_height_average_/partys_height_average.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/partys_tallest_guests_/partys_tallest_guests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/splititvmap_shell_/splititvmap_shell.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/static_interval_/static_interval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/std_copy_/std_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/std_transform_/std_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/example/user_groups_/user_groups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/cmp_clang_ttp_passing2_/cmp_clang_ttp_passing2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/cmp_clang_ttp_passing_/cmp_clang_ttp_passing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/cmp_msvc_value_born_error_/cmp_msvc_value_born_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/ex_boost_party_/ex_boost_party.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fast_stat_interval_map_/fast_stat_interval_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_icl_interval_/fastest_icl_interval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_icl_map_/fastest_icl_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_interval_map_/fastest_interval_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_interval_map_infix_/fastest_interval_map_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_interval_map_infix_mixed_/fastest_interval_map_infix_mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_interval_map_mixed2_/fastest_interval_map_mixed2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_interval_map_mixed_/fastest_interval_map_mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_interval_set_/fastest_interval_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_interval_set_infix_/fastest_interval_set_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_interval_set_mixed_/fastest_interval_set_mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_partial_icl_quantifier_/fastest_partial_icl_quantifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_partial_interval_quantifier_/fastest_partial_interval_quantifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_separate_interval_set_/fastest_separate_interval_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_separate_interval_set_infix_/fastest_separate_interval_set_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_set_icl_set_/fastest_set_icl_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_set_icl_set_/fastest_set_icl_set_shared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_set_interval_set_/fastest_set_interval_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_split_interval_map_/fastest_split_interval_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_split_interval_map_/fastest_split_interval_map_shared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_split_interval_map_infix_/fastest_split_interval_map_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_split_interval_set_/fastest_split_interval_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_split_interval_set_/fastest_split_interval_set_shared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_split_interval_set_infix_/fastest_split_interval_set_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_total_icl_quantifier_/fastest_total_icl_quantifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fastest_total_interval_quantifier_/fastest_total_interval_quantifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fix_icl_after_thread_/fix_icl_after_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fix_include_after_thread_/fix_include_after_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/fix_tickets_/fix_tickets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_casual_/test_casual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_changing_interval_defaults_/test_changing_interval_defaults.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_combinable_/test_combinable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_doc_code_/test_doc_code.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_icl_interval_/test_icl_interval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_icl_map_/test_icl_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_interval_map_/test_interval_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_interval_map_infix_/test_interval_map_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_interval_map_infix_mixed_/test_interval_map_infix_mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_interval_map_mixed2_/test_interval_map_mixed2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_interval_map_mixed_/test_interval_map_mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_interval_set_/test_interval_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_interval_set_infix_/test_interval_set_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_interval_set_mixed_/test_interval_set_mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_misc_/test_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_partial_icl_quantifier_/test_partial_icl_quantifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_partial_interval_quantifier_/test_partial_interval_quantifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_separate_interval_set_/test_separate_interval_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_separate_interval_set_infix_/test_separate_interval_set_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_set_icl_set_/test_set_icl_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_set_icl_set_/test_set_icl_set_shared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_set_interval_set_/test_set_interval_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_split_interval_map_/test_split_interval_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_split_interval_map_/test_split_interval_map_shared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_split_interval_map_infix_/test_split_interval_map_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_split_interval_set_/test_split_interval_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_split_interval_set_/test_split_interval_set_shared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_split_interval_set_infix_/test_split_interval_set_infix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_total_icl_quantifier_/test_total_icl_quantifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_total_interval_quantifier_/test_total_interval_quantifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/icl/test/test_type_traits_/test_type_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/common_factor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/extended_euclidean_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/fail_int_exact.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/fail_int_fast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/fail_int_least.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/fail_uint_65.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/fail_uint_exact.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/fail_uint_fast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/fail_uint_least.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/gcd_constexpr14_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/gcd_noexcept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/has_gmpxx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/integer_fwd_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/integer_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/integer_mask_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/integer_mask_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/integer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/integer_traits_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/integer_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/mod_inverse_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/static_log2_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/static_log2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/static_min_max_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/integer/test/static_min_max_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_anonymous_conditionA.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_anonymous_conditionB.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_anonymous_mutexA.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_anonymous_mutexB.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_anonymous_semaphoreA.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_anonymous_semaphoreB.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_anonymous_upgradable_mutexA.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_anonymous_upgradable_mutexB.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_message_queueA.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/comp_doc_message_queueB.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_adaptive_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_anonymous_shared_memory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_bufferstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_cached_adaptive_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_cached_node_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_complex_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_cont.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_file_mapping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_intrusive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_ipc_message.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_aligned_allocation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_allocation_command.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_construction_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_copy_on_write.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_external_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_grow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_heap_memory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_mapped_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_multiple_allocation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_managed_raw_allocation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_move_containers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_multi_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_named_alloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_named_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_node_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_offset_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_private_adaptive_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_private_node_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_scoped_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_shared_memory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_shared_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_shared_ptr_explicit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_spawn_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_unique_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_unordered_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_vectorstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_where_allocate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_windows_shared_memory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/example/doc_xsi_shared_memory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/adaptive_node_pool_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/adaptive_pool_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/allocexcept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/anonymous_shared_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/boost_use_windows_h.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/bufferstream_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/cached_adaptive_pool_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/cached_node_allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/condition_any_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/condition_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/data_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/deque_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/enable_shared_from_this_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/file_lock_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/file_mapping_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/flat_map_index_allocation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/flat_tree_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/include_but_no_use_windows_h.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/intermodule_singleton_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/intrusive_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/iset_index_allocation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/iunordered_set_index_allocation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/list_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/managed_mapped_file_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/managed_shared_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/managed_windows_shared_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/managed_xsi_shared_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/map_index_allocation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/mapped_file_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/memory_algorithm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/message_queue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/multiprocess_managed_shared_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/mutex_owner_dead_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/mutex_timeout_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/named_condition_any_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/named_condition_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/named_construct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/named_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/named_recursive_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/named_semaphore_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/named_sharable_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/named_upgradable_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/node_allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/node_pool_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/null_index_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/offset_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/private_adaptive_pool_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/private_node_allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/recursive_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/robust_emulation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/robust_recursive_emulation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/segment_manager_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/semaphore_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/sharable_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/shared_memory_mapping_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/shared_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/shared_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/slist_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/stable_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/tree_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/unique_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/unordered_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/upgradable_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/user_buffer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/vectorstream_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/windows_eventlog_stamp_shared_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/windows_shared_dir_func.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/windows_shared_dir_path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/windows_shared_memory_mapping_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/windows_shared_memory_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/interprocess/test/xsi_shared_memory_mapping_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_advanced_value_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_any_hook.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_assoc_optimized_code.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_auto_unlink.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_avl_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_avltree_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_bucket_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_clone_from.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_derivation_value_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_entity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_erasing_and_disposing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_function_hooks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_how_to_use.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_iterator_from_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_list_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_member_value_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_offset_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_positional_insertion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_rbtree_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_recursive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_recursive_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_sg_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_slist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_slist_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_splay_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_splay_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_splaytree_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_stateful_value_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_treap_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_treap_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_unordered_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_value_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/example/doc_window.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/perf/perf_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/perf/tree_perf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/any_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/avl_multiset_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/avl_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/bs_multiset_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/bs_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/container_size_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/custom_bucket_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/default_hook_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/function_hook_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/has_member_function_callable_with.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/has_member_function_callable_with_no_decltype.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/has_member_function_callable_with_no_variadic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/list_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/make_functions_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/multiset_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/null_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/pack_options_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/parent_from_member_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/pointer_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/recursive_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/scary_iterators_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/sg_multiset_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/sg_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/slist_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/splay_multiset_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/splay_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/stateful_value_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/treap_multiset_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/treap_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/unordered_multiset_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/unordered_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/virtual_base_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/intrusive/test/voidptr_key_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/io/test/ios_state_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/io/test/ios_state_unit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/io/test/make_ostream_joiner_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/io/test/ostream_joiner_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/io/test/ostream_put_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/io/test/quoted_fill_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/io/test/quoted_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/build/has_lzma_cputhreads.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/example/boost_back_inserter_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/example/container_device_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/example/container_sink_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/example/container_source_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/example/iterator_range_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/example/std_back_inserter_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/src/bzip2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/src/file_descriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/src/gzip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/src/lzma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/src/mapped_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/src/zlib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/src/zstd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/auto_close_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/bool_trait_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/buffer_size_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/bzip2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/close_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/cmake_install_test/test_fd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/cmake_subdir_test/test_fd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/code_converter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/combine_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/component_access_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/compose_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/copy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/counter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/deprecated_file_descriptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/detail/utf8_codecvt_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/direct_adapter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/dual_seekable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/example_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/execute_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/file_descriptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/file_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/filter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/filtering_stream_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/finite_state_filter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/flush_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/grep_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/gzip_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/invert_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/large_file_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/line_filter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/lzma_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/mapped_file_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/newline_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/null_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/operation_sequence_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/path_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/pipeline_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/read_nonblocking_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/regex_filter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/restrict_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/seekable_file_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/seekable_filter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/sequence_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/slice_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/stdio_filter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/stream_offset_32bit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/stream_offset_64bit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/stream_state_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/symmetric_filter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/tee_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/wide_stream_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/windows_pipe_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/write_failure_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/zlib_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iostreams/test/zstd_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/counting_iterator_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/filter_iterator_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/func_output_iter_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/indirect_iterator_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/node_iterator1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/node_iterator2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/node_iterator3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/permutation_iter_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/reverse_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/reverse_iterator_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/shared_iterator_example1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/shared_iterator_example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/shared_iterator_example3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/example/transform_iterator_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/adl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/advance_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/concept_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/constant_iter_arrow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/constant_iter_arrow_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/counting_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/distance_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/filter_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/function_input_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/generator_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/indirect_iter_member_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/indirect_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/interoperable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/interoperable_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/is_convertible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/is_lvalue_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/is_readable_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/iter_archetype_default_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/iterator_adaptor_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/iterator_adaptor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/iterator_archetype_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/iterator_facade.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/iterator_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/lvalue_concept_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/minimum_category.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/minimum_category_compile_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/next_prior_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/permutation_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/pointee.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/range_distance_compat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/reverse_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/shared_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/transform_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/unit_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/zip_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/zip_iterator_test2_fusion_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/zip_iterator_test2_fusion_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/zip_iterator_test2_fusion_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/zip_iterator_test2_std_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/zip_iterator_test_fusion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/zip_iterator_test_std_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/iterator/test/zip_iterator_test_std_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/bench/bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/check/basic_alignas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/example/path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/example/pretty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/example/proxy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/example/validate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/fuzzing/fuzz_basic_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/fuzzing/fuzz_parse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/fuzzing/fuzz_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/src/src.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/basic_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/cmake_install_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/doc_background.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/doc_forward_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/doc_parsing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/doc_quick_look.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/doc_serializing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/doc_storage_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/doc_uses_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/doc_using_numbers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/double.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/fwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/json.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/kind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/memory_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/monotonic_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/natvis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/null_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/parse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/pilfer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/ryu/d2s_intrinsics_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/ryu/d2s_table_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/ryu/d2s_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/serializer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/snippets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/standalone_with_boost.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/static_resource.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/storage_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/stream_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/string_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/system_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/value_from.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/value_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/value_stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/value_to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/json/test/visit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/algorithm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/bind_tests_advanced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/bind_tests_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/bind_tests_simple_f_refs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/bll_and_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/constructor_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/control_structures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/extending_rt_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/is_instance_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/istreambuf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/member_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/operator_tests_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/phoenix_control_structures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/result_of_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/ret_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/rvalue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda/test/switch_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/compound.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/dereference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/increment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/lambda2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/lookup_problem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/project.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/stream_extract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/stream_insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/subscript.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lambda2/test/version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/benchmark/deep_stack_leaf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/benchmark/deep_stack_other.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/asio_beast_leaf_rpc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/capture_in_exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/capture_in_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/error_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/error_trace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/exception_to_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/lua_callback_eh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/lua_callback_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/print_file/print_file_eh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/print_file/print_file_outcome_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/print_file/print_file_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/example/print_half.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/BOOST_LEAF_ASSIGN_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/BOOST_LEAF_AUTO_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-BOOST_LEAF_ASSIGN.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-BOOST_LEAF_AUTO.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-arg_boost_error_info_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-arg_boost_error_info_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-arg_catch_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-arg_catch_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-arg_match_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-arg_match_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-arg_rvalue_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-diagnostic_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-error_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-exception_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-exception_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-new_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-result_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-result_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-result_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-result_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_compile-fail-verbose_diagnostic_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_capture_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_common_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_context_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_error_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_handle_errors_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_leaf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_on_error_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_pred_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/_hpp_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/accumulate_basic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/accumulate_nested_error_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/accumulate_nested_error_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/accumulate_nested_new_error_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/accumulate_nested_new_error_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/accumulate_nested_success_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/accumulate_nested_success_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/boost_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/capture_exception_async_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/capture_exception_result_async_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/capture_exception_state_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/capture_exception_unload_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/capture_result_async_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/capture_result_state_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/capture_result_unload_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/context_activator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/context_deduction_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/ctx_handle_all_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/ctx_handle_some_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/ctx_remote_handle_all_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/ctx_remote_handle_some_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/defer_basic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/defer_nested_error_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/defer_nested_error_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/defer_nested_new_error_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/defer_nested_new_error_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/defer_nested_success_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/defer_nested_success_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/diagnostic_info_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/e_LastError_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/e_errno_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/error_code_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/error_id_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/exception_to_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/function_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/handle_all_other_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/handle_all_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/handle_basic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/handle_some_other_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/handle_some_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/match_member_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/match_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/match_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/multiple_errors_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/optional_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/preload_basic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/preload_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/preload_nested_error_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/preload_nested_error_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/preload_nested_new_error_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/preload_nested_new_error_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/preload_nested_success_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/preload_nested_success_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/print_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/result_bad_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/result_implicit_conversion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/result_load_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/result_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/result_state_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/try_catch_error_id_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/try_catch_system_error_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/try_catch_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/try_exception_and_result_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/visibility_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/leaf/test/visibility_test_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/example/args_to_numbers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/example/generic_stringize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/example/small_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/example/variant_to_long_double.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/perf/performance_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/abstract_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/arrays_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/containers_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/empty_input_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/filesystem_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/float_types_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/inf_nan_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/integral_types_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/iterator_range_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/lexical_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/loopback_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/no_comp_time_prcision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/no_exceptions_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/no_locale_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/noncopyable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/pointers_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/stream_detection_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/stream_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/to_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/try_lexical_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/typedefed_wchar_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/typedefed_wchar_test_runtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/vc8_bug_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lexical_cast/test/wchars_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/add_cxx11_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/add_global_functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/add_local_functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/add_phoenix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/const_block.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/const_block_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/const_block_error_cxx11_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/expensive_copy_cxx11_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/expensive_copy_local_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/gcc_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/gcc_cxx11_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/gcc_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/gcc_square.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/gcc_store.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/impl_pp_keyword.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/impl_tparam_tricks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/n2529_this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/n2550_find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/noncopyable_cxx11_lambda_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/noncopyable_local_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/phoenix_factorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/phoenix_factorial_local.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/profile_cxx11_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/profile_global_functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/profile_local_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/profile_local_function_inline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/profile_local_functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/profile_phoenix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/example/scope_exit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_default_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_default_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_except_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_except_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_inline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_inline_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_inline_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_params_only.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_params_only_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_params_only_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_template_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_template_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_this_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_this_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_typed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_typed_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_typed_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_with_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_with_default_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/add_with_default_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/all_decl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/all_decl_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/all_decl_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/factorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/factorial_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/factorial_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/goto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/goto_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/goto_error_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/goto_error_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/goto_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/goto_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/macro_commas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/macro_commas_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/macro_commas_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/nesting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/nesting_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/nesting_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/operator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/operator_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/operator_error_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/operator_error_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/operator_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/operator_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/overload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/overload_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/overload_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_assign_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_assign_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_derivative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_derivative_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_derivative_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_inc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_inc_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_inc_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_setget.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_setget_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_setget_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_this_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/return_this_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/same_line.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/same_line_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/same_line_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/ten_void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/ten_void_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/transform_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/transform_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/typeof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/typeof_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/typeof_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/typeof_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/typeof_template_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/local_function/test/typeof_template_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/build/has_iconv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/build/has_icu_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/build/has_xlocale.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/build/option.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/examples/boundary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/examples/calendar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/examples/collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/examples/conversions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/examples/hello.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/examples/wboundary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/examples/wconversions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/examples/whello.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/performance/perf_collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/performance/perf_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/performance/perf_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/encoding/codepage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/boundary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/codecvt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/collator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/date_time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/formatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/icu_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/numeric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/icu/time_zone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/posix/codecvt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/posix/collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/posix/converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/posix/numeric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/posix/posix_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/shared/date_time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/shared/format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/shared/formatting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/shared/generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/shared/ids.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/shared/localization_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/shared/message.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/shared/mo_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/std/codecvt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/std/collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/std/converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/std/numeric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/std/std_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/util/codecvt_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/util/default_locale.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/util/gregorian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/util/info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/util/locale_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/win32/collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/win32/converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/win32/lcid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/win32/numeric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/src/win32/win_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_boundary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_codecvt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_codepage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_codepage_converter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_config.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_date_time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_formatting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_icu_vs_os_timezone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_ios_prop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_message.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_posix_collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_posix_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_posix_formatting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_std_collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_std_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_std_formatting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_utf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_winapi_collate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_winapi_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/locale/test/test_winapi_formatting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/examples/queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/examples/spsc_queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/examples/stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/destructor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/freelist_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/queue_bounded_stress_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/queue_fixedsize_stress_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/queue_interprocess_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/queue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/queue_unbounded_stress_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/spsc_queue_stress_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/spsc_queue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/stack_bounded_stress_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/stack_fixedsize_stress_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/stack_interprocess_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/stack_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/stack_unbounded_stress_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/lockfree/test/tagged_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/config/atomic-int32/atomic_int32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/config/native-syslog/native_syslog.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/config/pthread-mutex-robust/pthread_mutex_robust.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/config/x86-ext/avx2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/config/x86-ext/ssse3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/config/xopen-source-600/xopen_source_600.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/advanced_usage/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/async_log/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/basic_usage/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/bounded_async_log/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/attr_value_extraction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/attr_value_visitation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/core_core_manual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/core_record.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/exception_handling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/expressions_attr_fmt_tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/expressions_channel_severity_filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/expressions_has_attr_stat_accum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/expressions_keyword_fmt_tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/extension_app_launcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/extension_filter_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/extension_filter_parser_custom_rel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/extension_formatter_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/extension_record_tagger.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/extension_stat_collector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/extension_stat_collector_settings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/extension_system_uptime_attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_async.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_async_bounded.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_async_ordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_debugger.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_ipc_logger.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_ipc_receiver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_multifile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_ostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_simple_event_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_sync.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_syslog.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_unlocked.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sinks_xml_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sources_net_connection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sources_net_connection_chan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sources_severity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/sources_severity_channel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_attributes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_file_manual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_filtering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_fmt_custom.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_fmt_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_fmt_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_fmt_stream_manual.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_fmt_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_logging.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_trivial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/tutorial_trivial_flt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/util_dynamic_type_disp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/util_ipc_reliable_mq_writer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/util_manip_to_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/util_setup_settings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/doc/util_static_type_disp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/event_log/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/keywords/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/multiple_files/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/multiple_threads/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/native_syslog/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/rotating_file/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/settings_file/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/settings_file_custom_factories/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/syslog/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/trivial/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/example/wide_char/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/attribute_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/attribute_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/attribute_value_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/code_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/core.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/date_time_format_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/default_attribute_names.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/default_sink.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/dump.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/dump_avx2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/dump_ssse3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/event.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/format_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/global_logger_storage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/named_scope.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/named_scope_format_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/once_block.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/permissions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/posix/ipc_reliable_message_queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/posix/object_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/process_id.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/process_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/record_ostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/default_filter_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/default_formatter_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/filter_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/formatter_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/init_from_settings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/init_from_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/matches_relation_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/parser_utils.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/setup/settings_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/severity_level.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/spirit_encoding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/syslog_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/text_file_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/text_multifile_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/text_ostream_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/thread_id.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/thread_specific.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/threadsafe_queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/timestamp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/trivial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/windows/debug_output_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/windows/event_log_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/windows/ipc_reliable_message_queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/windows/ipc_sync_wrappers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/windows/is_debugger_present.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/windows/light_rw_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/windows/mapped_shared_memory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/src/windows/object_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/compile/current_function_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/compile/self_contained_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/compile/src_logger_assignable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/compile/src_logger_get_attributes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/compile/util_unique_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/compile_fail/attr_functor_void_return.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/performance/dump.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/performance/record_emission.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_attribute_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_attribute_set_ticket11106.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_attribute_value_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_attribute_value_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_attribute_value_set_ticket11190.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_named_scope.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_sets_insertion_lookup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/attr_value_visitation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/core.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/filt_attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/filt_has_attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/filt_matches_boost_regex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/filt_matches_spirit_classic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/filt_matches_spirit_qi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/filt_matches_std_regex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/filt_matches_xpressive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_auto_newline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_c_decor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_char_decor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_csv_decor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_date_time.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_max_size_decor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_message.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_named_scope.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_to_log_manip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/form_xml_decor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/sink_text_ipc_mq_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/src_channel_logger_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/src_record_ostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_dynamic_type_disp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_exception_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_formatting_ostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_ipc_object_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_ipc_reliable_mq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_manip_add_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_manip_auto_newline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_manip_dump.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_manip_optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_manip_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_manip_to_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_manip_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_once_block.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_static_type_disp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_stp_filter_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_stp_formatter_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_stp_settings_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/run/util_string_literal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/test_cmake/log_setup_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/log/test/test_cmake/log_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/compile-fail/implicit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/compile-fail/implicit_int_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/compile-fail/implicit_int_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/compile-fail/implicit_int_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/compile-fail/operator_less_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/compile-fail/operator_less_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/compile/decl_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/tribool_io_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/tribool_rename_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/logic/test/tribool_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_128bit_floatmax_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_fftw3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_float128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_gcc_visibility.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_gmp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_gmpxx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_intel_quad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_long_double_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_mpfr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_mpfr_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_mpreal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/has_ntl_rr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/config/is_ci_sanitizer_run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/doc/graphs/bessel_i0_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/doc/graphs/bessel_i1_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/doc/graphs/dist_graphs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/doc/graphs/plot_1d_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/doc/graphs/sf_graphs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/HSO3SO4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/agm_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/airy_ulps_plot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/airy_zeros_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/arcsine_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/autodiff_black_scholes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/autodiff_black_scholes_brief.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/autodiff_fourth_power.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/autodiff_mixed_partials.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/autodiff_multiprecision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/barycentric_interpolation_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/barycentric_interpolation_example_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/bernoulli_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/bessel_errors_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/bessel_zeros_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/bessel_zeros_example_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/bessel_zeros_interator_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/big_seventh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/binomial_coinflip_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/binomial_confidence_limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/binomial_example_nag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/binomial_quiz_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/binomial_sample_sizes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/brent_minimise_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/c_error_policy_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/cardinal_cubic_b_spline_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/catmull_rom_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/centered_continued_fraction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/chi_square_std_dev_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/cohen_acceleration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/constants_eg1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/continued_fractions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/cstdfloat_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/bootstrap_chebyshev.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/daubechies_coefficients.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/daubechies_scaling_integer_grid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/daubechies_scaling_memory_occupation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/daubechies_scaling_plots.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/daubechies_wavelet_plots.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/find_best_daubechies_interpolator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/regress_daubechies_accuracy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/daubechies_wavelets/wavelet_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/distribution_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/dot_net_example/boost_math/AssemblyInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/dot_net_example/boost_math/Stdafx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/dot_net_example/boost_math/boost_math.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/double_exponential.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/error_handling_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/error_policies_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/error_policy_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/f_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/factorial_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/fft_sines_table.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/find_location_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/find_mean_and_sd_normal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/find_root_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/find_scale_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/float128_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/float_comparison_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/gauss_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/geometric_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/hyperexponential_more_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/hyperexponential_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/inspect_fp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/inverse_chi_squared_bayes_eg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/inverse_chi_squared_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/inverse_chi_squared_find_df_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/inverse_gamma_distribution_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/inverse_gamma_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/inverse_gaussian_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/jacobi_zeta_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lambert_w_basic_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lambert_w_diode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lambert_w_diode_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lambert_w_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lambert_w_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lambert_w_precision_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lambert_w_simple_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/laplace_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/legendre_stieltjes_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lexical_cast_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/lexical_cast_nonfinite_facets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/luroth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/naive_monte_carlo_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nc_chi_sq_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/neg_binom_confidence_limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/neg_binomial_sample_sizes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/negative_binomial_example1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/negative_binomial_example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/neumann_zeros_example_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_facet_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_facet_sstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_legacy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_loopback_ok.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_num_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_num_facet_serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_num_facet_trap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_serialization_archives.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/nonfinite_signaling_NaN.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/normal_misc_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/normal_tables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/numerical_derivative_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/ooura_fourier_integrals_cosine_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/ooura_fourier_integrals_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/ooura_fourier_integrals_multiprecision_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/owens_t_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_eg_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/policy_ref_snip9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/polynomial_arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/reciprocal_fibonacci_constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/root_elliptic_finding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/root_finding_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/root_finding_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/root_finding_fifth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/root_finding_multiprecision_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/root_finding_n_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/root_finding_start_locations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/root_n_finding_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/series.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/skew_normal_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/special_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/students_t_example1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/students_t_example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/students_t_example3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/students_t_single_sample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/students_t_two_samples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/test_cpp_float_close_fraction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/test_nonfinite_loopback.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/to_continued_fraction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/example/trapezoidal_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/erf_error_plot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/erfc_error_plot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/has_c99_cmath.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/has_cxx17_cmath.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/has_gsl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/has_libstdcxx_tr1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/has_rmath.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/plot_jacobi_theta_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/plot_jacobi_theta_x.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/plot_kolmogorov_smirnov_pdf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_agm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_bessel_i.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_bessel_i_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_bessel_j.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_bessel_j_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_bessel_k.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_bessel_k_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_bessel_y.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_bessel_y_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_binomial_coeff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_carlson.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_cbrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_digamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_ellint_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_ellint_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_ellint_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_ellint_d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_erf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_expint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_gamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_hermite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_heuman_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_ibeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_ibeta_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_ibeta_inva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_igamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_igamma_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_igamma_inva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_jacobi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_jacobi_zeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_laguerre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_log1p_expm1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_nc_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_nc_chi_squared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_nc_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_owens_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_polygamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_powm1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_rsqrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_spherical_harmonic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_tgamma_ratio.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_trig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_trigamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/accuracy/test_zeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/bezier_polynomial_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/bilinear_interpolation_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/bivariate_statistics_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/chebyshev_clenshaw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/cohen_acceleration_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/constants_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/cubic_roots_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/is_intel_win.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/jacobi_theta_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/rsqrt_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/table_helper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_agm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_assoc_laguerre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_assoc_legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_beta_inc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_cbrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_cn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_digamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_distributions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_distributions_mode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_dn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_1c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_2c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_3c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_rc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_rd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_rf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ellint_rj.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_erf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_erfc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_expint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_expint_n.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_expm1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_fibonacci.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_gamma_p.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_gamma_p_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_gamma_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_gamma_q_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_gcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ibeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ibeta_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ibetac.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ibetac_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_igamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_in.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_iv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_jn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_js.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_jv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_kn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_kv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_laguerre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_legendre_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_lgamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_log1p.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_mode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_poly_method.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_polygamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_polynomial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_sn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_tgamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_trigamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_yn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_ys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_yv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/test_zeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/reporting/performance/univariate_statistics_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/acosh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/acoshf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/acoshl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/asinh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/asinhf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/asinhl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/assoc_laguerre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/assoc_laguerref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/assoc_laguerrel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/assoc_legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/assoc_legendref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/assoc_legendrel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/atanh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/atanhf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/atanhl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/betaf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/betal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cbrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cbrtf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cbrtl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_1f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_1l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_2f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_2l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_3f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/comp_ellint_3l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/copysign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/copysignf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/copysignl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_i.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_il.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_j.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_jf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_jl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_k.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_kf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_bessel_kl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_neumann.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_neumannf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/cyl_neumannl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_1f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_1l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_2f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_2l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_3f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/ellint_3l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/erf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/erfc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/erfcf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/erfcl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/erff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/erfl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/expint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/expintf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/expintl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/expm1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/expm1f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/expm1l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fmax.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fmaxf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fmaxl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fmin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fminf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fminl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fpclassify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fpclassifyf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/fpclassifyl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/hermite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/hermitef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/hermitel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/hypot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/hypotf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/hypotl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/laguerre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/laguerref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/laguerrel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/legendref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/legendrel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/lgamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/lgammaf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/lgammal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/llround.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/llroundf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/llroundl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/log1p.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/log1pf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/log1pl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/lround.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/lroundf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/lroundl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/nextafter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/nextafterf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/nextafterl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/nexttoward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/nexttowardf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/nexttowardl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/riemann_zeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/riemann_zetaf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/riemann_zetal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/round.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/roundf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/roundl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_bessel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_besself.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_bessell.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_legendref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_legendrel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_neumann.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_neumannf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/sph_neumannl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/tgamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/tgammaf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/tgammal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/trunc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/truncf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/src/tr1/truncl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/adaptive_gauss_kronrod_quadrature_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/agm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/anderson_darling_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/bernoulli_no_atomic_d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/bernoulli_no_atomic_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/bernoulli_no_atomic_mp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/bezier_polynomial_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/bilinear_uniform_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/bivariate_statistics_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/cardinal_b_spline_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/cardinal_cubic_b_spline_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/cardinal_quadratic_b_spline_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/cardinal_quintic_b_spline_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/cardinal_trigonometric_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/catmull_rom_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_abs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_ceil_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_copysign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_div_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_floor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_fmod_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_fpclassify_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_frexp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_ilogb_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_isfinite_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_isinf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_isnan_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_isnormal_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_ldexp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_logb_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_modf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_remainder_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_round_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_scalbln_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_scalbn_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_sqrt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ccmath_trunc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/centered_continued_fraction_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/chebyshev_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/chebyshev_transform_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/cohen_acceleration_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_abs_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_ceil_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_copysign_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_div_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_floor_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_fmod_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_fpclassify_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_frexp_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_ilogb_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_isfinite_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_isinf_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_isnan_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_isnormal_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_ldexp_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_logb_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_modf_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_remainder_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_round_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_scalbln_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_scalbn_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_sqrt_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/ccmath_trunc_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/compl_abs_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/compl_acos_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/compl_acosh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/compl_asin_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/compl_asinh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/compl_atan_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/compl_atanh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/constants_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_cmath_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_complex_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_concept_check_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_concept_check_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_concept_check_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_concept_check_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_iostream_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_limits_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/cstdfloat_types_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/diff_autodiff_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/diff_finite_difference_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/diff_lanczos_smoothing_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/diff_numerical_differentiation_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/diff_numerical_differentiation_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_arcsine_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_bernoulli_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_beta_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_binomial_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_cauchy_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_chi_squared_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_complement_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_empirical_cumulative_dist_func_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_exponential_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_extreme_val_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_find_location_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_find_scale_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_fisher_f_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_gamma_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_geometric_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_hyperexponential_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_hypergeo_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_inv_chi_sq_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_inv_gamma_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_inv_gaussian_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_kolmogorov_smirnov_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_laplace_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_logistic_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_lognormal_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_nc_beta_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_nc_chi_squ_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_nc_f_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_nc_t_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_neg_binom_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_normal_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_pareto_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_poisson_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_skew_norm_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_students_t_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_triangular_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_uniform_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/dist_weibull_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/distribution_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/filters_daubechies_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/gauss_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/gauss_kronrod_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_barycentric_rational_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_barycentric_rational_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_bezier_polynomial_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_bilinear_uniform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_cardinal_trig_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_catmull_rom_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_catmull_rom_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_cubic_hermite_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_cubic_spline_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_cubic_spline_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_makima_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_pchip_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_quintic_hermite_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_septic_hermite_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_vector_barycentric_rational_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/interpolators_whittaker_shannon_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_exp_sinh_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_exp_sinh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_gauss_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_gauss_kronrod_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_naive_monte_carlo_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_naive_monte_carlo_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_ooura_fourier_integrals_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_sinh_sinh_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_sinh_sinh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_tanh_sinh_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_tanh_sinh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_trapezoidal_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_trapezoidal_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/quad_wavelet_transforms_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_acosh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_airy_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_asinh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_atanh_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_bernoulli_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_bessel_deriv_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_bessel_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_beta_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_binomial_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_cbrt_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_chebyshev_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_chebyshev_transform_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_cos_pi_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_daubechies_scaling_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_digamma_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_1_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_2_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_3_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_d_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_rc_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_rd_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_rf_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_rg_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ellint_rj_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_erf_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_expint_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_expm1_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_factorials_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_fibonacci_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_fpclassify_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_gamma_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_gegenbauer_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_hankel_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_hermite_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_heuman_lambda_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_hypot_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_jacobi_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_jacobi_theta_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_jacobi_zeta_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_laguerre_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_lambert_w_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_lanczos_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_legendre_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_legendre_stieltjes_concept_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_legendre_stieltjes_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_log1p_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_math_fwd_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_modf_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_next_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_nonfinite_num_facets_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_owens_t_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_polygamma_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_powm1_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_prime_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_relative_distance_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_round_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_rsqrt_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_sign_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_sin_pi_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_sinc_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_sinhc_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_sph_harm_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_sqrt1pm1_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_trigamma_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_trunc_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_ulp_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/sf_zeta_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_anderson_darling_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_bivariate_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_linear_regression_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_ljung_box_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_runs_test_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_signal_statistics_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_t_test_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_univariate_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/stats_z_test_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/std_real_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/test_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_agm_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_assert_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_atomic_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_big_constant_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_centered_continued_fraction_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_cohen_acceleration_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_complex_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_condition_numbers_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_config_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_convert_from_string_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_cxx03_warn_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_engel_expansion_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_fraction_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_header_deprecated_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_is_detected_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_lexical_cast_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_luroth_expansion_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_minima_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_mp_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_norms_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_polynomial_gcd_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_polynomial_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_precision_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_promotion_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_random_vector_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_rational_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_real_cast_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_remez_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_roots_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_series_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_simple_continued_fraction_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_solve_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_stats_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_test_data_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_test_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_test_value_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_throw_exception_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_toms748_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_traits_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_tuple_inc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_ulps_plot_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tools_workaround_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/compile_test/tr1_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/complex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/condition_number_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/cubic_hermite_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/cubic_roots_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/daubechies_scaling_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/daubechies_wavelet_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/empirical_cumulative_distribution_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/engel_expansion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/erf_limits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/exp_sinh_quadrature_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/log1p_expm1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/powm1_sqrtp1m1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_bessel_i.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_bessel_j.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_bessel_k.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_bessel_y.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_binomial_coeff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_carlson.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_cbrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_digamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_ellint_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_ellint_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_ellint_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_erf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_expint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_factorials.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_gamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_hermite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_ibeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_ibeta_inv_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_ibeta_inv_ab_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_igamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_igamma_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_igamma_inva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_laguerre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_polygamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_std_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_tgamma_ratio.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_trigamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/float128/test_zeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/gauss_kronrod_quadrature_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/gauss_quadrature_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/gegenbauer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/header_deprecated_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/hypot_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/jacobi_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/lanczos_smoothing_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/legendre_stieltjes_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/linear_regression_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ljung_box_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/log1p_expm1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/luroth_expansion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/makima_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/mpfr_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/mpreal_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/multiprc_concept_check_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/naive_monte_carlo_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/noeh_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/norms_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ntl_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/octonion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/ooura_fourier_integral_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/pchip_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/polynomial_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/pow_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/powm1_sqrtp1m1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/quaternion_constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/quaternion_mi1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/quaternion_mi2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/quaternion_mult_incl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/quaternion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/quintic_hermite_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/rsqrt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/septic_hermite_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/signal_statistics_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/simple_continued_fraction_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/sinh_sinh_quadrature_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/special_functions_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/std_real_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/tanh_sinh_mpfr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/tanh_sinh_quadrature_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_0F1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_1F0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_1F1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_1F1_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_1F1_regularized.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_2F0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_airy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_archive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_arcsine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_autodiff_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_autodiff_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_autodiff_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_autodiff_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_autodiff_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_autodiff_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_autodiff_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_autodiff_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_barycentric_rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_basic_nonfinite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bernoulli.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bernoulli_constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_airy_zeros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_i.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_i_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_j.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_j_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_k.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_k_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_y.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_bessel_y_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_beta_dist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_binomial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_binomial_coeff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_carlson.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_cauchy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_cbrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_chi_squared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_classify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_constant_generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_cstdfloat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_digamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_dist_overloads.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ellint_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ellint_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ellint_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ellint_d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_erf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_error_handling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_expint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_exponential_dist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_extreme_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_factorials.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_fibonacci.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_find_location.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_find_scale.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_fisher_f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_gamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_gamma_dist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_gamma_mp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_geometric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_hankel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_hermite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_heuman_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_hyperexponential_dist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_hypergeometric_dist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ibeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ibeta_derivative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ibeta_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ibeta_inv_ab.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_igamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_igamma_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_igamma_inva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/double_test_instances_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/float_test_instances_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/ldouble_test_instances_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/long_double_test_instances_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instances/real_concept_test_instances_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instantiate1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_instantiate2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_inv_hyp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_inverse_chi_squared_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_inverse_gamma_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_inverse_gaussian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_jacobi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_jacobi_theta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_jacobi_zeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_kolmogorov_smirnov.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_laguerre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lambert_w.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lambert_w_derivative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lambert_w_integrals_double.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lambert_w_integrals_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lambert_w_integrals_float128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lambert_w_integrals_long_double.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lambert_w_integrals_quad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_laplace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_ldouble_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_legacy_nonfinite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lexical_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_logistic_dist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_lognormal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_long_double_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_math_fwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_minima.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_nc_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_nc_chi_squared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_nc_f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_nc_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_nc_t_quad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_negative_binomial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_next.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_next_decimal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_no_long_double_policy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_nonfinite_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_nonfinite_trap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_normal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_numerical_differentiation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_owens_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_pFq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_pFq_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_pareto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_poisson.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_policy_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_polygamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_polynomial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_print_info_on_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_double1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_double2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_double3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_double4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_double5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_float1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_float2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_float3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_float4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_ldouble1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_ldouble2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_ldouble3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_ldouble4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_ldouble5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_real_concept1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_real_concept2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_real_concept3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_real_concept4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rational_instances/test_rational_real_concept5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rationals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_rayleigh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_real_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_real_concept_neg_bin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_recurrence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_remez.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_root_finding_concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_root_iterations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_roots.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_round.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_runs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_sign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_signed_zero.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_sinc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_skew_normal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_spherical_harmonic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_standalone_asserts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_students_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_t_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_tgamma_for_issue396_part1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_tgamma_for_issue396_part2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_tgamma_ratio.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_toms748_solve.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_tr1.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_tr1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_trapezoidal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_triangular.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_trig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_trigamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_uniform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_vector_barycentric_rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_weibull.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_z_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/test_zeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/threading_sanity_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/univariate_statistics_backwards_compatible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/univariate_statistics_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/wavelet_transform_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/test/whittaker_shannon_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/bessel_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/bessel_derivative_append_negative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/bessel_derivative_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/bessel_derivative_data_from_bessel_ipps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/beta_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/carlson_ellint_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/cbrt_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/digamma_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ellint_d2_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ellint_d_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ellint_e_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ellint_f_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ellint_k_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ellint_pi2_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ellint_pi3_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/erf_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/expint_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/expint_i_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/factorial_tables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/gamma_P_inva_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/gauss_kronrod_constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/generate_rational_code.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/generate_rational_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/generate_test_values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hermite_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/heuman_lambda_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_0f2_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_1f1_big_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_1f1_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_1f1_log_big_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_1f1_reg_big_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_1f2_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_2f0_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_2f1_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hyp_2f2_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hypergeometric_1F1_error_plot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hypergeometric_1F1_map_neg_b_fwd_recurrence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/hypergeometric_dist_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ibeta_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ibeta_derivative_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ibeta_inv_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/ibeta_invab_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/igamma_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/igamma_temme_large_coef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/inv_hyp_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/jacobi_theta_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/jacobi_zeta_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/laguerre_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/lambert_w_errors_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/lambert_w_high_reference_values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/lambert_w_lookup_table_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/lambert_w_low_reference_values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/lanczos_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/legendre_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/log1p_expm1_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/minimax/f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/minimax/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/nc_t_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/process_perf_results.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/rational_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/sinc_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/spherical_harmonic_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/tgamma_large_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/tgamma_ratio_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/trig_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/math/tools/zeta_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/binary_number/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/calculator/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/calculator_with_parens/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/calculator_with_parens_and_unary_ops/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/compile_to_native_code/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/constexpr_parser/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/grammar_calculator/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/meta_hs/main_handcrafted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/meta_hs/main_in_haskell.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/meta_lambda/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/meta_metaparse/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/minimal_rational/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/parsing_error/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/rational/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/example/regexp/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/BOOST_METAPARSE_STRING.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/accept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/accept_when.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/all_headers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/alphanum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/always.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/always_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/at_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/back_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/build_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/change_error_message.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/concat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/define_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/digit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/digit_to_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/digit_val.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/empty_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/entire_input.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/fail_at_first_char_expected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/fail_tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/first_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldl1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldl_reject_incomplete.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldl_reject_incomplete1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldl_reject_incomplete_start_with_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldl_start_with_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldr1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldr_reject_incomplete.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldr_reject_incomplete1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/foldr_start_with_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/front_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/has_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/if_.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/in_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/in_range_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/int_.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/int_to_digit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/is_char_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/is_digit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/is_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/is_lcase_letter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/is_letter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/is_ucase_letter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/is_whitespace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/iterate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/iterate_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/keyword.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/last_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/letter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/lit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/lit_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/long_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/look_ahead.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/middle_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/next_digit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/nth_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/one_char.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/one_char_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/one_char_except_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/one_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/one_of_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/pop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/pop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/push_back_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/push_front_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/range_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/reject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/repeated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/repeated1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/repeated_one_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/repeated_one_of1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/repeated_reject_incomplete.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/repeated_reject_incomplete1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/return_.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/returns.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/sequence_apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/source_position.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/space.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/spaces.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/string_iterator_tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/string_tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/string_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/token.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/too_long_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/transform_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/transform_error_message.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/unless_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/unpaired.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/update_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/test/version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/tools/benchmark/src/length128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/tools/benchmark/src/max_length.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/metaparse/tools/benchmark/src/number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_clone_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_construct_forward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_file_descriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_how_works.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_move_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_move_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_move_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_move_return.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/example/doc_template_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/adaptive_merge_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/adaptive_sort_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/adl_move_swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/algo_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/back_move_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/bench_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/bench_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/construct_forward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/conversion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/copy_elision_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/copy_move_optimization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/inplace_merge_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/move_algorithm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/move_if_noexcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/move_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/type_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_ctordtor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_default_deleter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_modifiers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_movector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_nullptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_observers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_std_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/move/test/unique_ptr_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/algorithm_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/bind_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/check_cmake_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/cmake_install_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/cmake_subdir_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/construct_from_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/construct_from_tuple_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/function_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/integer_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/integer_sequence_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/integral.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/integral_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/list_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/map_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp11_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_all_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_all_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_all_of_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_and.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_any_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_any_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_any_of_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_append.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_append_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_append_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_apply_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_at_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_bind_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_bind_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_bind_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_clear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_compose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_cond.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_cond_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_copy_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_copy_if_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_count_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_count_if_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_defer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_drop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_erase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_eval_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_eval_if_not.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_eval_if_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_eval_or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_find_if_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_flatten.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_fold_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_from_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_identity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_if_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_inherit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_intersperse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_invoke_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_invoke_q_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_iota.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_is_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_is_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_is_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_iterate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_less.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_list_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_erase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_find_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_find_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_keys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_update.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_map_update_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_max.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_max_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_max_element_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_min.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_min_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_min_element_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_none_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_none_of_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_not_fn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_nth_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_nth_element_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_pairwise_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_pairwise_fold_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_partial_sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_partition_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_pop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_pop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_power_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_product.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_push_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_push_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_quote.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_quote_trait.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_remove_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_remove_if_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_rename.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_replace_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_replace_at_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_replace_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_replace_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_replace_if_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_replace_second.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_replace_third.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_reverse_fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_reverse_fold_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_rotate_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_rotate_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_same.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_second.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_difference_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_intersection_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_push_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_push_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_set_union_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_similar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_sort_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_split.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_starts_with.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_starts_with_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_take.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_third.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_transform_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_transform_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_transform_if_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_transform_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_transform_second.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_transform_sf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_transform_third.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_unique_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_unique_if_q.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_valid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_with_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mp_with_index_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mpl_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mpl_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/mpl_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/set_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/tuple_apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/tuple_apply_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/tuple_for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/tuple_for_each_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/tuple_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/tuple_transform_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/tuple_transform_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/tuple_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/utility_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mp11/test/version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/cartesian_communicator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/generate_collect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/generate_collect_optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/global_min.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/hello_world.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/hello_world_broadcast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/hello_world_groups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/hello_world_nonblocking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/in_place_global_min.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/parallel_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/random_content.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/random_gather.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/random_min.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/random_scatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/reduce_performance_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/example/string_cat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/broadcast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/cartesian_communicator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/communicator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/computation_tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/content_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/environment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/error_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/graph_communicator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/intercommunicator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/mpi_datatype_cache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/mpi_datatype_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/offsets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/packed_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/packed_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/packed_skeleton_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/packed_skeleton_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/point_to_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/collectives.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/datatypes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/documentation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/module.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/py_communicator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/py_environment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/py_exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/py_nonblocking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/py_request.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/py_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/skeleton_and_content.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/python/status.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/request.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/status.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/text_skeleton_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/src/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/all_gather_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/all_reduce_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/all_to_all_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/block_nonblock_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/broadcast_stl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/broadcast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/cartesian_topology_init_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/cartesian_topology_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/debugger.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/gather_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/graph_topology_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/groups_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/is_mpi_op_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/mt_init_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/mt_level_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/non_blocking_any_source.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/nonblocking_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/python/skeleton_content_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/reduce_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/ring_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/scan_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/scatter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/sendrecv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/sendrecv_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/skeleton_content_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/version_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/wait_all_on_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/wait_all_vector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpi/test/wait_any_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/example/fsm/player.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/example/fsm/player1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/example/fsm/player2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/example/inherit_linearly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/example/inherit_multiply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/example/integer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/example/tuple_from_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list10_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list20_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list30_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list40.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list40_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/list/list50_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/map/map10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/map/map20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/map/map30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/map/map40.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/map/map50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set10_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set20_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set30_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set40.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set40_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/set/set50_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/advance_backward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/advance_forward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/and.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/apply_fwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/apply_wrap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/arg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/basic_bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/bind_fwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/bitand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/bitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/bitxor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/divides.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/equal_to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/fold_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/full_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/greater.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/greater_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/inherit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/iter_fold_if_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/iter_fold_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/lambda_no_ctps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/less.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/less_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/list_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/minus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/modulus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/not_equal_to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/quote.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/reverse_fold_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/reverse_iter_fold_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/set_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/shift_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/shift_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/template_arity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/times.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/unpack_args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/src/vector_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector10_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector20_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector30_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector40.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector40_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/preprocessed/vector/vector50_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/advance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/always.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/apply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/apply_wrap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/as_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/assert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/assert_vc8_p1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/assert_vc8_p2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/aux_/increased_arity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/aux_/largest_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/aux_/msvc_is_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/aux_/preprocessor/is_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/aux_/preprocessor/token_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/aux_/template_arity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/bitwise.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/bool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/char.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/contains.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/copy_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/count_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/distance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/empty_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/erase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/erase_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/eval_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/filter_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/fold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/get_tag_def.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/has_xxx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/identity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/index_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/inherit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/insert_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/integral_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/is_placeholder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/is_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/iterator_tags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/joint_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/lambda_args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/list_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/logical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/lower_bound.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/max_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/min_max.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/multiset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/next.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/no_has_xxx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/numeric_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/pair_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/pop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/print.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/push_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/push_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/quote.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/range_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/remove_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/replace_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/same_as.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/set_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/single_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/size_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/sizeof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/stable_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/transform_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/unpack_args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/upper_bound.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/vector_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/mpl/test/zip_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/ActivateStateBeforeTransitionEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/ActiveStateSetBeforeTransition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/AnonymousTutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/AnonymousTutorialEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/AnonymousTutorialWithFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/BoostCon09Full.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/CompilerStressTestEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/CompositeTutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/CompositeTutorialEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/CompositeTutorialWithEumlTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/Constructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/DirectEntryEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/DirectEntryTutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/EumlInternal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/EumlInternalDistributed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/EumlSimple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/ExampleCircularBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/Flags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/FsmAsPtr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/History.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/HistoryEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/MsmComposite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/MsmSimple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/MsmSimpleFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/Orthogonal-deferred.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/Orthogonal-deferred2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/OrthogonalDeferredEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/OrthogonalDeferredEuml2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/ParsingDigits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SCComposite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SCSimple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SM-2Arg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/Serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SerializeCompositeAndHistory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimplePhoenix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTimer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorial2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorialEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorialEuml2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorialInternal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorialInternal2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorialInternalFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorialWithEumlTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorialWithEumlTableKleene.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleTutorialWithEumlTableTypeErasure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleWithFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleWithFunctors2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/SimpleWithFunctors3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/TestErrorOrthogonality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/TestInternal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/Visitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/distributed_table/DistributedTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/distributed_table/Empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/distributed_table/Open.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/iPodEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/iPodSearch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/iPodSearchEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/iPod_distributed/MenuMode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/iPod_distributed/PlayingMode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/HTML/examples/iPod_distributed/iPod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/ActivateStateBeforeTransitionEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/ActiveStateSetBeforeTransition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/AnonymousTutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/AnonymousTutorialEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/AnonymousTutorialWithFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/BoostCon09Full.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/CompilerStressTestEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/CompositeTutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/CompositeTutorialEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/CompositeTutorialWithEumlTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/Constructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/DirectEntryEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/DirectEntryTutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/EumlInternal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/EumlInternalDistributed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/EumlSimple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/ExampleCircularBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/Flags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/FsmAsPtr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/History.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/HistoryEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/MsmComposite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/MsmSimple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/MsmSimpleFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/Orthogonal-deferred.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/Orthogonal-deferred2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/OrthogonalDeferredEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/OrthogonalDeferredEuml2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/ParsingDigits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SCComposite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SCSimple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SM-2Arg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/Serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SerializeCompositeAndHistory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimplePhoenix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTimer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorial2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorialEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorialEuml2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorialInternal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorialInternal2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorialInternalFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorialWithEumlTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorialWithEumlTableKleene.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleTutorialWithEumlTableTypeErasure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleWithFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleWithFunctors2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/SimpleWithFunctors3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/TestErrorOrthogonality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/TestInternal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/Visitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/distributed_table/DistributedTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/distributed_table/Empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/distributed_table/Open.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/iPodEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/iPodSearch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/iPodSearchEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/iPod_distributed/MenuMode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/iPod_distributed/PlayingMode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/doc/PDF/examples/iPod_distributed/iPod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/example/mpl_graph/adjacency_list_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/example/mpl_graph/breadth_first_search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/example/mpl_graph/depth_first_search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/example/mpl_graph/incidence_list_graph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/example/mpl_graph/msm_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/Anonymous.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/AnonymousEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/CompositeEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/CompositeMachine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/Constructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/Entries.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/EventQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/History.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/OrthogonalDeferred.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/OrthogonalDeferred2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/OrthogonalDeferred3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/OrthogonalDeferredEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/Serialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SerializeSimpleEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SerializeWithHistory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SimpleEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SimpleEuml2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SimpleInternal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SimpleInternalEuml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SimpleInternalFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SimpleMachine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/SimpleWithFunctors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/Test2RegionsAnonymous.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/TestConstructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/TestConstructorMovableOnlyTypes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/TestDeferAndMessageQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/TestDeferAndMessageQueue2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/TestDeferAndMessageQueue3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/msm/test/TestDeferIn2Regions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/basic1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/basic2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/foreach_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/foreach_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/op_paren.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/print_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/resize_from_other.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/subview.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/example/subview2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/allocators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/assert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/assign_to_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/concept_checks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/constructors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/dimtest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_cbracket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_cdata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_citerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_cparen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_criterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_csubarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_csubarray2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_csubarray3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_cview.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_cview2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_cview3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_cbracket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_cdata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_citerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_cparen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_criterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_csubarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_csubarray2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_csubarray3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_cview.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_cview2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/fail_ref_cview3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/idxgen1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/index_bases.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/iterators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/range1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/reshape.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/resize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/reverse_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/stl_interaction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/storage_order.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/storage_order_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_array/test/vc_death.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/bimap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/complex_structs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/composite_keys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/fun_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/hashed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/ip_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/non_default_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/random_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/rearrange.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/sequenced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/example/serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/perf/test_perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/check_bmi_key_supported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_all_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_alloc_awareness.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_alloc_awareness_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_basic_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_capacity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_capacity_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_comparison_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_composite_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_composite_key_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_conv_iterators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_conv_iterators_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_copy_assignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_copy_assignment_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_hash_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_hash_ops_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_iterators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_iterators_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_key.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_key_extractors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_key_extractors_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_key_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_list_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_list_ops_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_modifiers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_modifiers_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_mpl_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_mpl_ops_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_node_handling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_node_handling_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_observers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_observers_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_projection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_projection_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_range_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_rank_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_rank_ops_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_rearrange.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_rearrange_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_safe_mode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_safe_mode_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_serialization1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_serialization2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_serialization3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_serialization_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_set_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_set_ops_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_special_set_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_special_set_ops_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_update.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multi_index/test/test_update_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_big_obj.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_constexpr_limits_cmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_eigen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_f2c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_float128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_gmp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_intel_quad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_is_constant_evaluated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_mpc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_mpfi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_mpfr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/has_tommath.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/config/is_ci_sanitizer_run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/doc/numeric_limits_qbk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/big_seventh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/complex128_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/constexpr_float_arithmetic_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/cpp_bin_float_import_export.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/cpp_bin_float_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/cpp_complex_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/cpp_dec_float_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/cpp_int_import_export.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/cpp_int_mul_timing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/cpp_int_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/debug_adaptor_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/eigen_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/exercise_threading_log_agm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/float128_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/floating_point_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/gauss_laguerre_quadrature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/gmp_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/hashing_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/hypergeometric_luke_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/integer_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/logged_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/mixed_integer_arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/mpc_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/mpfi_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/mpfr_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/mpfr_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/numeric_limits_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/random_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/safe_prime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/scoped_precision_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/example/tommath_snips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/cpp_bin_float_conversion_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/delaunay_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/gcd_bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/linpack-benchmark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test09.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/miller_rabin_performance_files/test12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/mixed_equivalent_types_bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test09.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test19.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test21.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test22.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test23.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test24.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test25.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test26.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test27.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test28.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test29.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test31.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test33.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test34.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test35.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test36.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test37.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test38.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test39.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test40.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test41.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test42.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test43.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test44.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test45.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test46.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test47.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test48.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test49.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/performance_test_files/test51.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/rational_bernoulli_allocations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/rational_bernoulli_bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/rational_determinant_bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/rational_zeta18_bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_bessel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_basic_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_09.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_bessel_19.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_09.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_19.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_nct_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_09.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_files/sf_performance_poly_18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_nct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sf_performance_poly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/sqrt_bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/performance/voronoi_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_acos_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_asin_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_atan_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_cos_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_erf_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_erfc_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_exp_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_log_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_sin_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_tan_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/plots/cpp_bin_float_tgamma_errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/bug11922.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/bug12039.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_09.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_21.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_22.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_23.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_24.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_25.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_26.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_27.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_28.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_29.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_31.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_33.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_34.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_35.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_36.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_37.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_38.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_39.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_40.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_41.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_42.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_43.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_44.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_45.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_46.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_47.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_48.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_49.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_51.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_52.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_53.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_54.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_55.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_56.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_57.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_58.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/conv_fail_59.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/cpp_int_complement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/cpp_int_negate_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/cpp_int_negate_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_09.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/compile_fail/operator_fail_18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/number_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/sf_concept_check_basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/sf_concept_check_bessel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/sf_concept_check_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/sf_concept_check_beta_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/sf_concept_check_beta_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/sf_concept_check_elliptic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/sf_concept_check_gamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/concepts/sf_concept_check_poly.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_arithmetic_backend.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_cpp_int_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_cpp_int_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_cpp_int_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_cpp_int_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_cpp_int_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_cpp_int_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/constexpr_test_float128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_167.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_175.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_248.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_265.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_277.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_313.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_370.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/git_issue_98.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/include_test/cpp_bin_float_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/include_test/cpp_dec_float_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/include_test/cpp_int_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/include_test/gmp_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/include_test/mpfr_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/include_test/tommath_include_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/issue_13148.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/issue_13301.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/high_prec/test_gamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/instances/instances.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/log1p_expm1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/powm1_sqrtp1m1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_bessel_i.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_bessel_j.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_bessel_k.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_bessel_y.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_binomial_coeff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_carlson_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_carlson_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_carlson_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_carlson_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_cbrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_digamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ellint_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ellint_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ellint_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_erf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_expint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_gamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_hermite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ibeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ibeta_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ibeta_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ibeta_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ibeta_inv_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_ibeta_inv_ab_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_igamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_igamma_inv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_igamma_inva.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_laguerre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_legendre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_tgamma_ratio.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/math/test_zeta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/no_eh_test_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_acos.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_adapt_serial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_ab_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_ab_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_ab_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_backend_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_complex128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_complex_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_complex_adaptor_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_bin_float_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_bin_float_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_bin_float_2m.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_bin_float_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_bin_float_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_bin_float_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_complex_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_complex_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_dec_float_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_dec_float_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_dec_float_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_dec_float_3m.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_19.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_21.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_22.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_23.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_br.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_int_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_rat_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_cpp_rat_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_dbg_adptr1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_dbg_adptr1m.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_dbg_adptr2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_float_128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_logged_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_logged_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpc_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpc_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpf_50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpf_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpf_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfi_50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfi_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfi_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfr_50.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfr_50_mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfr_50_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfr_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpfr_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpq_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpq_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpz_br.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpz_dbg_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpz_logged_adptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_mpz_rat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_skeleton.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_tommath.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_tommath_br.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_arithmetic_tommath_rat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_asin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_assume_uniform_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_atan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_checked_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_checked_mixed_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_complex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_cpp_bin_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_cpp_dec_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_cpp_rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_float128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_gmp_rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_mpf_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_mpfi_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_mpfr_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_mpz_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_tom_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_convert_from_tom_rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cos.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cos_near_half_pi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cosh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_bin_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_bin_float_conv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_bin_float_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_bin_float_round.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_bin_float_serial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_bin_float_tgamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_dec_float_conv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_dec_float_round.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_dec_float_serial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_dec_float_tgamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_int_conv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_int_deserial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_int_import_export.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_int_karatsuba.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_int_left_shift.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_int_lit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_int_serial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_rat_serial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_cpp_rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_cpp_bin_float_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_cpp_bin_float_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_cpp_bin_float_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_cpp_dec_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_cpp_dec_float_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_cpp_dec_float_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_gmp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_mpc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_mpfr_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_mpfr_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_eigen_interop_mpfr_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_exp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_fixed_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_float128_serial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_float_conversions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_float_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_fpclassify.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_gcd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_generic_conv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_gmp_conversions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_int_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_int_sqrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_miller_rabin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mixed_cpp_bin_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mixed_cpp_dec_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mixed_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mixed_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mixed_move_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mixed_mpf_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mixed_mpfr_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mpc_conversions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mpc_overloads.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mpf_precisions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mpfi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mpfi_precisions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mpfr_conversions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_mpfr_mpc_precisions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_native_integer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_nothrow_cpp_bin_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_nothrow_cpp_dec_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_nothrow_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_nothrow_cpp_rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_nothrow_float128.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_nothrow_gmp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_nothrow_mpfr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_numeric_limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_optional_compat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_pow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_preserve_all_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_preserve_component_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_preserve_related_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_preserve_source_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_preserve_target_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_rat_float_interconv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_rational_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_roots_10k_digits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_round.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_sf_import_c99.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_sin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_sin_near_half_pi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_sinh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_sqrt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_tan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_tanh.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_threaded_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/test_unchecked_cpp_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test21.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test22.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test23.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test31.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test33.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test42.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test43.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test52.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test53.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test62.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test63.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test71.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test72.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/test/ublas_interop/test73.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/multiprecision/tools/sincos.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/config/check_attribute_init_priority.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/config/check_lfs_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/config/check_movable_fstreams.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/src/console_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/src/cstdio.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/src/cstdlib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/src/filebuf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/src/iostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/src/stat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/benchmark_fstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/cmake_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/file_test_helpers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_codecvt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_env.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_filebuf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_fs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_fstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_fstream_special.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_ifstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_iostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_ofstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_stackstring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_stat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_stdio.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_system.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/nowide/test/test_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/bounds_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/compile_fail/built_in_numeric_cast_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/converter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/numeric_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/numeric_cast_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/test_helpers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/test_helpers2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/test_helpers3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/udt_example_0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/conversion/test/udt_support_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/examples/filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/examples/findroot_demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/examples/horner.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/examples/io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/examples/newton-raphson.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/examples/rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/examples/transc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/cmp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/cmp_exn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/cmp_exp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/cmp_lex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/cmp_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/cmp_tribool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/det.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/fmod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/integer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/msvc_x64_flags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/mul.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/overflow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/pi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/pow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/interval/test/test_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/2d_lattice/spreading.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/abm_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/adaptive_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/bind_member_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/bind_member_functions_cpp11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/bulirsch_stoer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/chaotic_system.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/const_step_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/elliptic_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/find_crossing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/fpu.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/generation_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/gmpxx/lorenz_gmpxx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/harmonic_oscillator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/harmonic_oscillator_units.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/heun.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/integrate_times.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/list_lattice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/lorenz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/lorenz_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/molecular_dynamics.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/molecular_dynamics_cells.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/mpi/phase_chain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/mtl/gauss_packet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/mtl/implicit_euler_mtl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/multiprecision/cmp_precision.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/multiprecision/lorenz_mp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/my_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/nt2/phase_oscillator_ensemble.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/openmp/lorenz_ensemble.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/openmp/lorenz_ensemble_nested.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/openmp/lorenz_ensemble_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/openmp/phase_chain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/openmp/phase_chain_omp_state.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/phase_oscillator_ensemble.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/quadmath/black_hole.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/resizing_lattice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/simple1d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/solar_system.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/stepper_details.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/stiff_system.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/stochastic_euler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/stuart_landau.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/two_dimensional_phase_lattice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/ublas/lorenz_ublas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/van_der_pol_stiff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/examples/vexcl/lorenz_ensemble.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/performance/SIMD/roessler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/performance/SIMD/roessler_simd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/performance/c_lorenz.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/performance/odeint_rk4_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/adams_bashforth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/adams_bashforth_moulton.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/adams_moulton.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/adaptive_adams_coefficients.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/adaptive_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/adaptive_time_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/algebra_dispatcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/bulirsch_stoer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/const_step_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/const_step_time_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/controlled_adams_bashforth_moulton.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/default_operations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/euler_stepper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/fusion_algebra.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/generation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/generic_error_stepper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/generic_stepper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/implicit_euler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/integrate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/integrate_implicit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/integrate_overflow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/integrate_stepper_refs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/integrate_times.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/integrators_symplectic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/is_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/is_resizeable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/multi_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/n_step_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/n_step_time_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/abm_time_dependent.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/adams_bashforth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/adams_bashforth_moulton.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/adaptive_adams_bashforth_moulton.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/order_quadrature_formula.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/rosenbrock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/runge_kutta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/symplectic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/numeric/velocity_verlet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/range_algebra.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/regression/regression_147.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/regression/regression_149.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/regression/regression_168.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/regression/regression_189.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/resize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/resizing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/rosenbrock4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/rosenbrock4_mp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/runge_kutta_concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/runge_kutta_controlled_concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/runge_kutta_error_concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/same_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/split.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/std_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/step_size_limitation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/stepper_copying.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/stepper_with_ranges.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/stepper_with_units.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/symplectic_steppers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/times_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/times_time_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/trivial_state.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/unwrap_boost_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/unwrap_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test/velocity_verlet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/eigen/integrate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/eigen/is_resizeable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/eigen/resize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/eigen/runge_kutta4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/eigen/runge_kutta_dopri5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/eigen/same_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/gmp/check_gmp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/gmp/gmp_integrate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/gsl/check_gsl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/mkl/check_mkl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/mpi/norm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/mpi/split_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/mpi/state_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/mtl4/mtl4_resize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/nt2/algebra_dispatcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/nt2/copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/nt2/is_resizeable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/nt2/norm_inf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/nt2/resize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/vexcl/lorenz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/odeint/test_external/vexcl/norm_inf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/inner_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/mm_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/mv_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/opencl/add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/opencl/inner_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/opencl/mm_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/opencl/mv_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/opencl/outer_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/outer_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/reference/add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/reference/inner_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/reference/mm_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/reference/mv_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/benchmarks/reference/outer_prod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/assignment_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/banded_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/banded_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/bounded_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/compressed_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/compressed_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/coordinate_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/coordinate_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/ex_triangular.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/hermitian_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/hermitian_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/identity_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/map_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/mapped_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/mapped_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_binary_scalar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_column.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_column_project.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_matrix_binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_matrix_solve.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_range_project.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_row.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_row_project.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_slice_project.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_unary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_vector_binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_vector_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_vector_slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/matrix_vector_solve.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/symmetric_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/symmetric_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/triangular_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/triangular_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/unbounded_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/unit_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_binary_outer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_binary_redux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_binary_scalar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_range_project.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_slice_project.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_unary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/vector_unary_redux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/zero_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/doc/samples/zero_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/examples/tensor/construction_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/examples/tensor/einstein_notation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/examples/tensor/prod_expressions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/examples/tensor/simple_expressions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/begin_end.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/comp_mat_erase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/concepts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/manual/sp_resize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/manual/test_move_semantics.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/minimal_allocator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/num_columns.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/num_rows.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/opencl/elementwise_operations_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/opencl/elementwise_operations_with_constants_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/opencl/inner_prod_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/opencl/norm2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/opencl/norm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/opencl/outer_prod_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/opencl/prod_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/opencl/transposition_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/placement_new.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/sparse_view_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_einstein_notation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_expression_evaluation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_extents.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_multi_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_multi_index_utility.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_multiplication.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_operators_arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_operators_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_strides.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_tensor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/tensor/test_tensor_matrix_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test21.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test22.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test23.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test31.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test33.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test42.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test43.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test52.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test53.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test62.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test63.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test71.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test72.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test73.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_assignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_banded_storage_layout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_complex_norms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_coordinate_matrix_inplace_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_coordinate_matrix_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_coordinate_vector_inplace_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_fixed_containers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_inplace_solve.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_lu.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_matrix_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_scaled_norm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_ticket7296.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/test_triangular.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/triangular_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/numeric/ublas/test/triangular_layout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_constructible_from_other.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_conversions_from_U.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_convert_from_T.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_deleted_default_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_emplace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_empty_braces.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_equals_none.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_experimental_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail3a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail3b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_const_swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_convert_assign_of_enums.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_convert_from_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_copying_a_moveable_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_explicit_convert_in_value_or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_explicit_convert_in_value_or_call.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_implicit_bool_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_io_without_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_none_io_without_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_fail_optional_rvalue_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_flat_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_inplace_factory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_inplace_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_inplace_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_make_optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_maybe_uninitialized_warning.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_member_T.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_minimum_requirements.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_msvc_bug_workaround.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_noexcept_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_old_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_path_assignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_assign_const_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_assign_mutable_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_assign_portable_minimum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_convert_assign_const_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_convert_assign_const_int_prevented.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_convert_assign_mutable_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_convert_assign_non_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_converting_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_fail_assign_from_Trefref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_fail_assign_from_Urefref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_fail_init_from_Trefref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_fail_init_from_Urefref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_portable_minimum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_ref_to_val.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_sfinae_friendly_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_static_properties.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_tc_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_tie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_test_value_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_xconfig_HACK_TO_LIST_PREDEFINED_MACROS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_xconfig_NO_LEGAL_CONVERT_FROM_REF_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_xconfig_NO_LEGAL_CONVERT_FROM_REF_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_xconfig_NO_PROPER_ASSIGN_FROM_CONST_INT_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_xconfig_NO_PROPER_ASSIGN_FROM_CONST_INT_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_xconfig_NO_PROPER_CONVERT_FROM_CONST_INT_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/optional/test/optional_xconfig_NO_PROPER_CONVERT_FROM_CONST_INT_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/boost-only/asio_integration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/boost-only/asio_integration_1_70.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/boost-only/error_code_registration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/c_api.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/constructors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/cpp_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/error_code_enums1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/error_code_enums2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/error_code_extended.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/error_code_registration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/exception_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/expected_implementation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/experimental_status_code.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/finale.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/foreign_try.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/intro_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/outcome_payload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/policies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/udts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/using_outcome.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/using_result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/doc/src/snippets/void_terminate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/compile-fail/issue0071-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/compile-fail/outcome-int-int-1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/compile-fail/result-int-int-1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/compile-fail/result-int-int-2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/expected-pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/containers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/core-outcome.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/core-result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/coroutine-support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/default-construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/experimental-core-outcome-status.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/experimental-core-result-status.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/experimental-p0709a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/fileopen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/hooks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0007.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0009.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0010.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0012.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0016.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0059.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0061.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0064.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0065.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0071.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0095.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0115.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0116.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0140.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0182.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0203.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0210.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0220.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0244.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0247.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/issue0255.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/noexcept-propagation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/propagate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/serialisation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/success-failure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/udts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/outcome/test/tests/value-or-error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/basics.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/compose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/deduced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/deduced_dependent_predicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/deduced_unmatched_arg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/duplicates.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/earwicker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/efficiency.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/evaluate_category.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/evaluate_category_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/evaluate_category_16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/function_type_tpl_param.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/building-argumentpacks0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/class-template-skeleton0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/deduced-parameters0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/deduced-template-parameters0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/default-expression-evaluation0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/defining-the-keywords0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/defining-the-keywords1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/exercising-the-code-so-far0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/extracting-parameter-types0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/extracting-parameter-types1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/fine-grained-name-control0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/handling-out-parameters0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/headers-and-namespaces0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/lazy-default-computation0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/lazy-default-computation1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/namespaces0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/namespaces1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/namespaces2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/namespaces3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/optional-parameters0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/parameter-enabled-constructors0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/parameter-enabled-function-call-operators0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/parameter-enabled-member-functions0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/parameter-enabled-member-functions1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/predicate-requirements0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/required-parameters0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/static-member-functions0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/template-keywords0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/template-keywords1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/top-level0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/literate/writing-the-function0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/macros_eval_category.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/maybe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/mpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/normalized_argument_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/ntp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/optional_deduced_sfinae.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/parameterized_inheritance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/preprocessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/preprocessor_deduced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/preprocessor_eval_cat_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/preprocessor_eval_cat_no_spec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/preprocessor_eval_category.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/python_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/sfinae.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/singular.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/tutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter/test/unwrap_cv_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/parameter_python/test/python_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/example/get.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/example/motivating_example0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/example/quick_examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/example/sample_printing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/fields_count_on_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/inherited.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/inherited_nonempty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/movable_and_lvalue_references.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/non_aggregate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/ops_on_union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/ops_unions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/ops_unrestricted_unions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/pfr_review_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/private_fields.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/protected_fields.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/rvalue_tie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/compile-fail/virtual_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/loophole_detection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/offset_based_getter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/print_config.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/bitfields_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/constexpr_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/destructuring_tie.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/error_pfr_c1202.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/fields_count_on_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/for_each_field.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/functions_for.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/get_const_field.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/get_non_default_constructible.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/get_rvalue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/issue30.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/issue33.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/motivating_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/motivating_example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/non_copyable_but_movable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/non_dc_non_cop_but_mov.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/non_default_constructible.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/non_movable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/non_std_layout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/optional_chrono.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/optional_like.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/read_write.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/read_write_non_literal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/std_interactions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/template_constructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/template_forwarding_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/template_unconstrained.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/tie_anonymous.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/tie_anonymous_const_field.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/run/tuple_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pfr/test/test_tuple_sizes_on.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/adapted_echo_server.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/all_odds.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/arguments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/bind_goose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/callback.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/container_actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/define_expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/factorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/generator2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/identity_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/invert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/parallel_for.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/references.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/example/values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/preprocess/preprocess_phoenix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/for_each2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/for_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/for_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/iteration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/querying.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/querying2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/querying_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/querying_find2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/transformation1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/transformation2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/transformation3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/algorithm/transformation4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bind/bind_function_object_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bind/bind_function_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bind/bind_member_function_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bind/bind_member_variable_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bind/bug5782.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/algorithm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/bind_tests_advanced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/bind_tests_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/bind_tests_simple_f_refs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/bll_and_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/constructor_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/control_structures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/extending_rt_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/is_instance_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/istreambuf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/member_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/operator_tests_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/phoenix_control_structures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/result_of_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/ret_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/rvalue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/bll_compatibility/switch_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_and_or_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_cdecl_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_cv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_dm1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_dm2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_dm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_eq2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_eq3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_eq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_fastcall_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_fastcall_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_fn2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_fnobj2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_function_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_interoperation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_lookup_problem_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_mf2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_not_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_placeholder_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rel_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rv_sp1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rv_sp2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rv_sp3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rv_sp4_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rv_sp5_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rv_sp6_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rv_sp7_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rv_sp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_rvalue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_stateful_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_stdcall_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_stdcall_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_unary_addr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_void_dm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_void_mf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/boost_bind_compatibility/bind_void_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests10a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests10b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests11a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests11b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests12a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests12b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests1a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests1b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests2a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests2b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests3a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests3b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests4a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests4b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests5a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests5b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests6a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests6b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests7a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests7b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests8a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests8b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests9a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/container/container_tests9b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/core/custom_terminal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/core/intel_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/core/primitives_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/adapt_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/function_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_argument_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_compose_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_fold_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_list2_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_list3_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_list_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_make_pair_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_operator_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_ptr_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_scan_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_templated_struct_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/function/lazy_thunk_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/bind/bind_member_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/bind/bind_member_variable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/argument.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/arity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/bug7730.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/call.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/domain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/environment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/function_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/is_actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/is_nullary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/meta_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/nothing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/terminal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/core/value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/function/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/function/lazy_headers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/fusion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/fusion/at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/fusion_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/object/const_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/object/construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/object/delete.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/object/dynamic_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/object/new.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/object/reinterpret_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/object/static_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator/arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator/bitwise.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator/comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator/if_else.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator/io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator/logical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator/member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/operator/self.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/phoenix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/scope.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/scope/dynamic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/scope/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/scope/let.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/scope/local_variable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/scope/scoped_environment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/scope/this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/spirit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/spirit_no_specialize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement/do_while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement/for.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement/if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement/switch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement/throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement/try_catch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/statement/while.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/stl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/stl/algorithm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/stl/algorithm/iteration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/stl/algorithm/querying.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/stl/algorithm/transformation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/stl/container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/stl/container/container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/support/iterate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/support/preprocessor/round.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/include/version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/object/cast_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/object/new_delete_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/arithmetic_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/bitwise_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/comparison_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/if_else_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/io_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/logical_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/misc_binary_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/self_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/operator/unary_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/actor_assignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug4853.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug5626.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug5824.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug5875.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug5968.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug6040.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug6268.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug7165.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug7166.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/bug7624.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/regression/from_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/bug3289.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/bug8298.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/bug8298f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/bug_000008.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/dynamic_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests19.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests21.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests22.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests23.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/lambda_tests9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/let_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/let_tests_113.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/let_tests_113a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/let_tests_157.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/let_tests_157a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/let_tests_rest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/more_lambda_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/more_let_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/more_let_tests1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/more_let_tests2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/more_let_tests2a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/more_let_tests2b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/scope/this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/statement/bug5715.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/statement/exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/statement/if_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/statement/loops_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/statement/switch_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/phoenix/test/stdlib/cmath.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/example/algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/example/basic_any.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/example/basic_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/example/basic_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/example/exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/example/insertion_emplacement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/example/perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/example/segmented_structure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_algorithm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_algorithm1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_algorithm2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_algorithm3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_algorithm_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_all_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_capacity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_capacity_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_comparison_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_construction_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_emplacement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_emplacement_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_erasure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_erasure_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_insertion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_insertion_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_iterators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_iterators_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_registration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/poly_collection/test/test_registration_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/benchmark/voronoi_benchmark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/benchmark/voronoi_benchmark_points.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/benchmark/voronoi_benchmark_segments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/doc/tutorial/extract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/doc/tutorial/minkowski.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/example/gtl_custom_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/example/gtl_custom_polygon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/example/gtl_custom_polygon_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/example/voronoi_advanced_tutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/example/voronoi_basic_tutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/example/voronoi_visualizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/gtl_boost_unit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/polygon_90_data_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/polygon_interval_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/polygon_point_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/polygon_rectangle_formation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/polygon_rectangle_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/polygon_segment_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/polygon_set_data_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/voronoi_builder_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/voronoi_ctypes_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/voronoi_diagram_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/voronoi_geometry_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/voronoi_predicates_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/voronoi_robust_fpt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/polygon/test/voronoi_structures_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/example/time_pool_alloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/pool_msvc_compiler_bug_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_bug_1252.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_bug_2696.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_bug_3349.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_bug_4960.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_bug_5526.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_msvc_mem_leak_detect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_poisoned_macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_pool_alloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_simple_seg_storage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_threading.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_valgrind_fail_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/test_valgrind_fail_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/pool/test/valgrind_config_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/check_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/info_as_c.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/info_as_cpp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/info_as_objc.m"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/info_as_objcpp.mm"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/macos_endian.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/macos_vs_bsd.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/platform_windows.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/test_cmake/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/tested_at.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/tested_at_outdated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/workaround.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/test/workaround_strict_config.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/tools/check/predef_check_as_c.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/tools/check/predef_check_as_cpp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/tools/check/predef_check_as_objc.m"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/tools/check/predef_check_as_objcpp.mm"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/tools/check/predef_check_cc_as_c.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/tools/check/predef_check_cc_as_cpp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/tools/check/predef_check_cc_as_objc.m"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/predef/tools/check/predef_check_cc_as_objcpp.mm"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/doc/examples/array_arithmetic.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/doc/examples/catch_builtin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/doc/examples/delay.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/doc/examples/duffs_device.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/doc/examples/is_integral.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/doc/examples/linear_fib.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/arithmetic.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/arithmetic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/arithmetic.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/array.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/array.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/checkempty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/checkempty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/comparison.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/comparison.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/comparison.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/config_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/control.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/control.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/control.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/cpp_standard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/debug.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/debug.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/facilities.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/facilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/facilities.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty_variadic_standard_failure.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty_variadic_standard_failure.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty_variadic_standard_failure.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty_variadic_standard_failure2.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty_variadic_standard_failure2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/isempty_variadic_standard_failure2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/iteration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/list.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/list.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/logical.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/logical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/logical.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/punctuation.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/punctuation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/punctuation.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/repetition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/selection.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/selection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/selection.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/seq.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/slot.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/slot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/slot.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/stringize.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/stringize.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/stringize.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/tuple.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/tuple_elem_bug_test.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/vaopt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/vaopt.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/variadic.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/variadic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/preprocessor/test/variadic.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/async_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/env.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/error_handling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/intro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/posix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/start_dir.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/sync_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/terminate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/wait.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/example/windows.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/args_cmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/args_handling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/asio_no_deprecated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async_fut.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async_pipe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async_system_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async_system_future.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async_system_stackful.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async_system_stackful_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async_system_stackful_except.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/async_system_stackless.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/bind_stderr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/bind_stdin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/bind_stdin_stdout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/bind_stdout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/bind_stdout_stderr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/close_stderr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/close_stdin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/close_stdout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/cmd_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/env.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/environment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/exit_argc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/exit_code.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/extensions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/group_wait.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/limit_fd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/multi_ref1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/multi_ref2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/no_ansi_apps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/on_exit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/on_exit2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/on_exit3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/pipe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/pipe_fwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/posix_specific.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/run_exe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/run_exe_path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/search_path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/shell.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/shell_path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/sparring_partner.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/spawn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/spawn_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/start_dir.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/sub_launcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/system_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/system_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/terminate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/throw_on_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/vfork.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/wait.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/wait_for.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/wargs_cmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/process/test/windows_specific.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/config_file_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/custom_syntax.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/env_options.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/first.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/multiple_sources.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/option_groups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/options_description.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/options_heirarchy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/real.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/regex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/example/response_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/cmdline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/config_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/options_description.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/parsers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/positional_options.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/split.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/utf8_codecvt_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/value_semantic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/variables_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/src/winmain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/cmdline_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/exception_txt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/optional_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/options_description_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/parsers_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/positional_options_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/required_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/split_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/test_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/unicode_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/unrecognized_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/variable_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/program_options/test/winmain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/example/compose_property_map_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/example/example1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/example/example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/example/example3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/test/compose_property_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/test/dynamic_properties_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/test/function_property_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/test/property_map_cc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_map/test/transform_value_property_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/examples/custom_data_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/examples/debug_settings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/examples/empty_ptree_trick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/examples/info_grammar_spirit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/examples/speed_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/sandbox.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_info_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_ini_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_json_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_json_parser2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_multi_module1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_multi_module2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_property_tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_rapidxml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/property_tree/test/test_xml_parser_rapidxml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/calc1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/calc2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/calc3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/external_transforms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/futures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/hello.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/lazy_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/map_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/mini_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/rgb.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/tarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/vec3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/example/virtual_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/preprocess/preprocess_proto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/bug2407.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/calculator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/constrained_ops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/cpp-next_bug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/deduce_domain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/deep_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/display_expr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/env_var.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/external_transforms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/flatten.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/make_expr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/matches.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/mem_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/mpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/noinvoke.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/pack_expansion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/protect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/switch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/toy_spirit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/proto/test/toy_spirit2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/const_element_containers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/incomplete_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/indirect_fun.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/issue_23.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/no_exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/pointainer_speed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_circular_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_container_adapter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_inserter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_map_adapter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_unordered_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_unordered_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/ptr_vector_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/simple_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/tree_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/tut1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/tut34.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ptr_container/test/view_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/numpy/dtype.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/numpy/fromdata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/numpy/gaussian.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/numpy/ndarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/numpy/simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/numpy/ufunc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/numpy/wrap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/quickstart/embedding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/quickstart/extending.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/example/tutorial/hello.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/converter/arg_to_python_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/converter/builtin_converters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/converter/from_python.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/converter/registry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/converter/type_id.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/dict.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/errors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/exec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/import.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/long.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/module.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/numpy/dtype.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/numpy/matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/numpy/ndarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/numpy/numpy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/numpy/scalars.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/numpy/ufunc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/enum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/function_doc_signature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/inheritance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/life_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/pickle_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object/stl_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object_operators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/object_protocol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/str.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/src/wrapper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/a_map_indexing_suite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/aligned_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/andreas_beyer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/args.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/as_to_python_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/auto_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/back_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/bases.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/ben_scott1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/bienstman1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/bienstman2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/bienstman3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/bienstman4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/bienstman5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/boost_shared_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/borrowed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/builtin_converters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/callbacks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/calling_conventions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/calling_conventions_mf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/cltree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/const_argument.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/copy_ctor_mutates_rhs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/crossmod_exception_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/crossmod_exception_b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/crossmod_opaque_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/crossmod_opaque_b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/data_members.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/defaults.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/destroy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/dict.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/docstring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/enable_shared_from_this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/enum_ext.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/exception_translator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/exec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/extract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/if_else.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/implicit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/import_.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/indirect_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/injected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/input_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/int_map_indexing_suite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/keywords.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/long.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/m1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/m2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/map_indexing_suite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/minimal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/module_init_exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/module_tail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/multi_arg_constructor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/nested.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/numpy/dtype.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/numpy/indexing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/numpy/ndarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/numpy/shapes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/numpy/templates.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/numpy/ufunc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/object_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/object_manager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/opaque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/operators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/operators_wrapper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/pickle1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/pickle2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/pickle3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/pickle4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/pointee.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/pointer_type_id_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/pointer_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/polymorphism.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/polymorphism2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/polymorphism2_auto_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/properties.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/pytype_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/raw_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/raw_pyobject_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/raw_pyobject_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/register_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/result.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/return_arg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/select_arg_to_python_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/select_from_python_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/select_holder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/shared_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/slice.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/staticmethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/stl_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/str.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/string_literal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/test_overload_resolution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/test_pointer_adoption.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/upcast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/vector_indexing_suite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/virtual_functions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/voidptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/python/test/wrapper_held_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/gen/gen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/access_m_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/access_m_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/access_m_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/access_q_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/access_q_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/access_v_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/access_v_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/access_v_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/cmp_mm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/cmp_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/cmp_vv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/col_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/col_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/conjugate_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/convert_to_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/cross_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/deduce_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/deduce_quat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/deduce_scalar_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/deduce_scalar_mq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/deduce_scalar_mv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/deduce_scalar_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/deduce_vec_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/del_col_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/del_row_col_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/del_row_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/determinant_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/diag_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/diag_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/div_eq_ms_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/div_eq_qs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/div_eq_vs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/div_ms_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/div_qs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/div_vs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/dot_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/dot_vv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/eq_mm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/eq_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/eq_vv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/header-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/identity_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/identity_quat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/interop_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/inverse_m_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/inverse_q_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mag_q_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mag_sqr_q_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mag_sqr_v_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mag_v_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mat_index_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mat_traits_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/math_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_eq_mm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_eq_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_eq_vv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_m_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_mm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_q_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_v_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/minus_vv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_eq_mm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_eq_ms_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_eq_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_eq_qs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_eq_vs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_mm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_ms_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_mv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_qs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_qv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_sm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_sv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_vm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/mul_vs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/neg_col_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/neg_row_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/normalize_q_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/normalize_v_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/plus_eq_mm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/plus_eq_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/plus_eq_vv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/plus_mm_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/plus_qq_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/plus_vv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/projection_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/quat_traits_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/rot_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/rot_quat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/rotx_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/rotx_quat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/roty_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/roty_quat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/rotz_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/rotz_quat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/row_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/row_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/scalar_cast_m_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/scalar_cast_q_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/scalar_cast_v_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/scalar_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/slerp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swap_cols_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swap_rows_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle2_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle2_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle2_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle3_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle3_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle3_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle4_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle4_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle4_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle4_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/swizzle_const_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/to_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/transform_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/translation_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/translation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/transpose_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/vec_index_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/vec_register_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/vec_traits_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/zero_mat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/zero_quat_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/qvm/test/zero_vec_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/example/die.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/example/intersections.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/example/password.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/example/random_demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/example/weighted_die.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/extra/test_haertel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/performance/generate_table.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/performance/nondet_random_speed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/performance/random_speed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/src/random_device.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/faure_validate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/multiprecision_float_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/multiprecision_int_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/niederreiter_base2_validate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/sobol_validate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/statistic_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_bernoulli.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_bernoulli_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_beta.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_beta_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_binomial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_binomial_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_cauchy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_cauchy_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_chi_squared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_chi_squared_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_const_mod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_discrete.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_discrete_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ecuyer1988.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_exponential.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_exponential_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_extreme_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_extreme_value_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_fisher_f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_fisher_f_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_gamma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_gamma_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_generate_canonical.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_geometric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_geometric_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_hellekalek1995.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_hyperexponential.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_hyperexponential_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_independent_bits31.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_independent_bits32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_knuth_b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_kreutzer1986.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci1279.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci19937.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci2281.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci23209.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci3217.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci4423.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci44497.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci607.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lagged_fibonacci9689.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_laplace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_laplace_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_linear_feedback_shift.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lognormal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_lognormal_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_minstd_rand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_minstd_rand0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_mixmax.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_mt11213b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_mt19937.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_mt19937_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_negative_binomial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_negative_binomial_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_non_central_chi_squared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_non_central_chi_squared_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_normal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_normal_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_old_uniform_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_old_uniform_int_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_old_uniform_real.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_old_uniform_real_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_piecewise_constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_piecewise_constant_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_piecewise_linear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_piecewise_linear_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_poisson.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_poisson_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_rand48.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_random_device.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_random_number_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux24.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux24_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux3_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux48.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux48_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux4_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux64_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux64_3_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux64_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_ranlux64_4_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_seed_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_student_t.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_student_t_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_taus88.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_triangle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_triangle_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_uniform_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_uniform_int_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_uniform_on_sphere.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_uniform_on_sphere_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_uniform_real.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_uniform_real_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_uniform_smallint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_uniform_smallint_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_weibull.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_weibull_distribution.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/random/test/test_zero_seed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/doc/example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/doc/reference/adaptors/examples/indirected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/adjacent_filtered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/adjacent_filtered_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/chained.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/copied.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/copied_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/filtered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/filtered_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/formatted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/formatted_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/indexed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/indexed_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/indirected.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/indirected_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/map_keys_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/map_values_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/ref_unwrapped.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/ref_unwrapped_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/replaced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/replaced_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/replaced_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/replaced_if_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/reversed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/reversed_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/sliced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/sliced_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/strided.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/strided2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/strided_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/ticket_6742_transformed_c4789_warning.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/ticket_8676_sliced_transformed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/ticket_9519_strided_reversed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/tokenized.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/tokenized_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/transformed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/transformed_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_abstract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_bidirectional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_brackets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_forward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_mix_values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_random_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_single_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_tparam_conv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/type_erased_transformed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/uniqued.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptor_test/uniqued_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adaptors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adl_conformance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/adl_conformance_no_using.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/copy_n.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/erase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/for_each_ext.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/iota.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/is_sorted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/overwrite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/push_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_ext_test/push_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/adjacent_find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/binary_search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/copy_backward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/copy_n.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/count_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/equal_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/fill.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/find.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/find_end.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/find_first_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/find_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/for_each.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/heap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/includes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/inplace_merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/lexicographical_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/lower_bound.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/max_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/merge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/min_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/mismatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/next_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/nth_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/partial_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/prev_permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/random_shuffle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/remove_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/remove_copy_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/remove_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/replace_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/replace_copy_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/replace_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/reverse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/reverse_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/rotate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/rotate_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/search_n.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/set_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/set_intersection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/set_symmetric_difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/set_union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/stable_partition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/stable_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/swap_ranges.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/unique.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/unique_copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/algorithm_test/upper_bound.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/atl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/begin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/category.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/combine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compat2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compat3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/adjacent_filtered_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/adjacent_filtered_concept2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/adjacent_filtered_concept3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/adjacent_filtered_concept4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/copied_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/copied_concept2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/copied_concept3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/copied_concept4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/reversed_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/reversed_concept2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/reversed_concept3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/reversed_concept4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/sliced_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/sliced_concept2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/sliced_concept3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/sliced_concept4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/uniqued_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/uniqued_concept2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/uniqued_concept3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/adaptor/uniqued_concept4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/compile_fail/iterator_range1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/const_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/const_ranges.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/const_reverse_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/counting_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/difference_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/end.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/extension_mechanism.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/extension_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/has_range_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/irange.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/istream_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/iterator_ext.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/iterator_pair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/iterator_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/iterator_range_drop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/iterator_range_equality_bug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/iterator_range_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/iterator_range_variant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/join.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/mfc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/mutable_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/partial_workaround.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/pointer_as_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/result_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/reverse_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/reverse_result_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/reversible_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/size_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/std_container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/sub_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/ticket_10336.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/ticket_5486.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/ticket_5544_terminate_irange.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/ticket_5547.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/ticket_5556_is_sorted_namespace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/ticket_5811_indirected_optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/ticket_6715_iterator_range_equality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/ticket_6944.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/range/test/value_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/example/display_ex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/example/si_physics.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_abs_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_add_2_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_add_3_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_add_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_add_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_divide_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_divide_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_multiply_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_multiply_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_negate_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_power_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_sign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_subtract_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_arithmetic/ratio_subtract_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_comparison/ratio_equal_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_comparison/ratio_greater_equal_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_comparison/ratio_greater_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_comparison/ratio_less_equal_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_comparison/ratio_less_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_comparison/ratio_not_equal_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_abs_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_arithmetic_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_comparison_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_divides_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_equal_to_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_greater_equal_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_greater_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_less_equal_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_less_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_minus_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_negate_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_not_equal_to_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_plus_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_rational_constant_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_sign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/mpl_times_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_extensions/ratio_ext_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_io/ratio_io_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_io/ratio_io_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_ratio/ratio1_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_ratio/ratio2_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_ratio/ratio3_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_ratio/ratio4_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_ratio/ratio_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/ratio_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/ratio/test/typedefs_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_compile_12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_09.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/expected_fail_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/rational_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/rational/test/rational_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/build/has_icu_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/build/is_legacy_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/grep/grep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/captures_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/credit_card_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/icu_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/mfc_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/partial_regex_grep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/partial_regex_iterate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/partial_regex_match.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_grep_example_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_grep_example_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_grep_example_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_grep_example_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_iterator_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_match_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_merge_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_replace_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_search_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_split_example_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_split_example_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_token_iterator_eg_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/snippets/regex_token_iterator_eg_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/example/timer/regex_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/boost.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/config/pcre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/config/posix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/config/re2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/pcre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/posix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/re2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/std.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/table_helper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/performance/xpressive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/src/posix_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/src/regex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/src/regex_debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/src/static_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/src/wide_posix_api.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/c_compiler_checks/posix_api_check.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/c_compiler_checks/posix_api_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/c_compiler_checks/wide_posix_api_check.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/c_compiler_checks/wide_posix_api_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/captures/captures_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/collate_info/collate_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/concepts/concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/concepts/icu_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/concepts/range_concept_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/concepts/test_bug_11988.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/config_info/regex_config_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/de_fuzz/narrow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/de_fuzz/wide.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/issue153.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/named_subexpressions/named_subexpressions_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/object_cache/object_cache_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/pathology/bad_expression_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/pathology/recursion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/quick_icu.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/basic_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_alt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_anchors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_asserts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_backrefs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_deprecated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_emacs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_escapes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_grep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_icu.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_locale.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_mfc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_non_greedy_repeats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_operators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_overloads.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_perl_ex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_replace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_sets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_simple_repeats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_tricky_cases.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/test_unicode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/regress/wmain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/static_mutex/static_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/test_consolidated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/test_warnings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/test_windows_defs_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/test_windows_defs_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/test_windows_defs_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/test_windows_defs_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/unicode/unicode_casefold_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/test/unicode/unicode_iterator_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/regex/tools/generate/tables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/Motor.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example18.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example19.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example20.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example81.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example82.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example83.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example84.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example91.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example92.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/example93.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/motor1.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/motor2.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/motor3.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/motor_test1.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/motor_test2.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/example/motor_test3.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_add_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_add_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_add_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_add_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_and_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_and_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_and_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_and_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_assignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_auto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_cast_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_add_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_and.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_and_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_cast_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_divide.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_divide_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_equal_to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_equal_to_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_left_shift.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_left_shift_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_less_than.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_less_than_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_modulus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_modulus_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_multiply.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_multiply_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_or_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_right_shift.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_right_shift_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_subtract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_subtract_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_xor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_checked_xor_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_concept_integer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_concept_numeric.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_cpp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_custom_exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_divide_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_divide_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_divide_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_divide_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_equal_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_equal_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_equal_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_equal_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_float.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_interval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_left_shift_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_left_shift_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_left_shift_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_left_shift_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_less_than_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_less_than_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_less_than_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_less_than_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_modulus_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_modulus_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_modulus_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_modulus_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_multiply_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_multiply_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_multiply_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_multiply_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_or_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_or_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_or_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_or_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_range.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_rational.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_right_shift_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_right_shift_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_right_shift_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_right_shift_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_safe_compare.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_stream_overload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_subtract_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_subtract_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_subtract_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_subtract_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_trap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_xor_automatic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_xor_automatic_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_xor_native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_xor_native_constexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/safe_numerics/test/test_z.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/example/scope_guard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/example/scope_guard_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/example/scope_guard_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/example/try_catch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/example/try_catch_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/example/try_catch_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/example/world_cxx11_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native_const_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native_cv_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native_this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native_this_tpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native_tpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native_tu1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native_tu2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/native_tu_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/same_line.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/same_line_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/same_line_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_checkpoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_checkpoint_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_checkpoint_all_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_checkpoint_all_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_checkpoint_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_checkpoint_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_this_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_this_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_tpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_tpl_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_tpl_seq_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_void.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/scope_exit/test/world_void_nova.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_auto_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_fast_archive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_pimpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_pimpl_A.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_polymorphic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_polymorphic_A.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_portable_archive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_shared_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_simple_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_trivial_archive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_xml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_xml_load.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/demo_xml_save.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/fix_six.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/log_archive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/polymorphic_portable_binary_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/polymorphic_portable_binary_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/portable_binary_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/example/portable_binary_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/peformance_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_codecvt_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_iterators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_iterators_base64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_no_rtti.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_polymorphic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_simple_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_utf8_codecvt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/performance_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/xml/int16_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/xml/int256_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/xml/int4_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/xml/int64_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/xml/string16_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/xml/string256_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/xml/string4_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/performance/xml/string64_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/archive_exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_archive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_iserializer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_oserializer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_pointer_iserializer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_pointer_oserializer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_serializer_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_text_iprimitive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_text_oprimitive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_text_wiprimitive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_text_woprimitive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/basic_xml_archive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/binary_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/binary_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/binary_wiarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/binary_woarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/codecvt_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/extended_type_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/extended_type_info_no_rtti.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/extended_type_info_typeid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_binary_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_binary_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_text_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_text_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_text_wiarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_text_woarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_xml_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_xml_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_xml_wiarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/polymorphic_xml_woarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/stl_port.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/text_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/text_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/text_wiarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/text_woarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/utf8_codecvt_facet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/void_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/xml_archive_exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/xml_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/xml_iarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/xml_oarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/xml_wgrammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/xml_wiarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/src/xml_woarchive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/A.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/config_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/dll_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/dll_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/dll_derived2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/dll_polymorphic_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/dll_polymorphic_derived2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/multi_shared1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/multi_shared2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/polymorphic_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/polymorphic_derived1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/polymorphic_derived2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test__helper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_bitset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_boost_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_class_info_load.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_class_info_save.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_codecvt_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_complex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_load_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_load_fail1_nvp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_load_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_load_fail2_nvp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_load_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_load_fail3_nvp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_save_warn1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_save_warn1_nvp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_save_warn2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_save_warn2_nvp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_save_warn3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_save_warn3_nvp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_save_warn4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_const_save_warn4_nvp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_contained_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_cyclic_ptrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_delete_pointer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_deque.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_derived.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_derived_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_derived_class_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_diamond.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_diamond_complex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_dll_exported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_dll_plugin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_dll_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_enable_shared_from_this.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_exported.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_forward_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_forward_list_ptrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_helper_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_inclusion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_inclusion2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_interators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_interrupts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_iterators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_iterators_base64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_list_ptrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_map_boost_unordered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_map_hashed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_map_unordered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_mi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_mult_archive_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_multi_shared_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_multiple_inheritance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_multiple_ptrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_native_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_new_operator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_no_rtti.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_non_default_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_non_default_ctor2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_non_intrusive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_not_serializable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_null_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_nvp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_p_helper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_pimpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_polymorphic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_polymorphic2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_polymorphic2imp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_polymorphic_A.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_primitive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_priority_queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_private_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_private_base2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_private_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_queue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_recursion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_registered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_reset_object_address.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_set_boost_unordered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_set_hashed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_set_unordered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_shared_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_shared_ptr_132.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_shared_ptr_multi_base.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_simple_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_simple_class_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_singleton.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_singleton_inherited.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_singleton_plain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_slist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_slist_ptrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_smart_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_split.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_static_warning.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_strong_typedef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_tracking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_traits_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_traits_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_unique_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_unregistered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_valarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_variant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_void_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/serialization/test/test_z.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/doc/snippet_extractor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/custom_combiners.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/disconnect_and_block.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/doc_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/doc_view_acm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/doc_view_acm_deconstruct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/extended_slot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/hello_world_multi_slot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/hello_world_slot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/ordering_slots.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/passing_slots.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/postconstructor_ex1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/postconstructor_ex2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/predestructor_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/signal_return_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/example/slot_arguments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/connection_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/dead_slot_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/deadlock_regression_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/deconstruct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/deletion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/invocation_benchmark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/ordering_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/regression_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/shared_connection_block_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/signal_n_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/signal_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/signal_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/slot_compile_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/threading_models_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/track_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/signals2/test/trackable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/example/scoped_ptr_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/example/scoped_ptr_example_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/example/shared_ptr_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/example/shared_ptr_example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/example/shared_ptr_example2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/extras/src/sp_collector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/extras/src/sp_debug_hooks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/extras/test/shared_ptr_mt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/extras/test/shared_ptr_timing_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/extras/test/sp_atomic_mt2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/extras/test/sp_atomic_mt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/extras/test/weak_ptr_mt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/extras/test/weak_ptr_timing_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/abi_test_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/abi_test_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_array_construct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_array_esft_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_array_noinit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_array_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_array_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_arrays_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_esft_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_local_shared_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_alloc11_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_array_construct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_array_esft_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_array_noinit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_array_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_array_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_arrays_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_construct11_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_esft_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_shared_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_aggregate_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_args_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_array_construct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_array_noinit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_array_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_array_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_arrays_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_construct_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_noinit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/allocate_unique_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_ap_spa_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_ap_spa_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_ap_spa_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_ap_spa_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_array_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_dereference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_member_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_sp_spa_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_sp_spa_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_sp_spa_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_sp_spa_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_sp_wpa_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_sp_wpa_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_sp_wpa_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_sp_wpa_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_sp_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_sp_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_sp_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_sp_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_spa_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_spa_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_spa_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_spa_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_wp_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_wp_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_wp_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_wp_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_wpa_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_wpa_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_wpa_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_spa_wpa_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_up_spa_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_up_spa_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_up_spa_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_up_spa_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_upa_sp_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_upa_sp_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_upa_sp_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_upa_sp_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wp_wpa_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wp_wpa_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wp_wpa_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wp_wpa_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wpa_wp_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wpa_wp_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wpa_wp_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wpa_wp_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wpa_wpa_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wpa_wpa_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wpa_wpa_ma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/array_fail_wpa_wpa_mc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/atomic_count_mt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/atomic_count_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/atomic_count_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/atomic_sp_constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/atomic_sp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/auto_ptr_lv_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/auto_ptr_rv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/collector_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/cpp11_pointer_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/dll_test_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/dll_test_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/esft_regtest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/esft_second_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/esft_void_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_deleter_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_deleter_array_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_deleter_array_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_deleter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_deleter_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_deleter_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_local_deleter_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_local_deleter_array_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_local_deleter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_local_deleter_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/get_local_deleter_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/intrusive_ptr_move_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/intrusive_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/intrusive_ref_counter_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/ip_convertible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/ip_hash_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/ip_hash_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/local_sp_fn_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/local_sp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_array_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_array_cv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_array_n_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_convertible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_convertible_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_hash_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_hash_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_owner_before_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lsp_owner_equals_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lw_mutex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lw_thread_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/lwm_win32_cs_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_array_esft_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_array_noinit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_array_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_array_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_arrays_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_esft_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_local_shared_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_array_esft_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_array_noinit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_array_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_array_tmp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_array_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_arrays_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_esft_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_fp_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_move_emulation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_msvc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_shared_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_unique_args_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_unique_array_noinit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_unique_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_unique_array_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_unique_noinit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_unique_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_unique_throws_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/make_unique_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/owner_equal_to_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/owner_equal_to_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/owner_hash_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/owner_less_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/owner_less_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_co_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_co_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_co_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_dy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_dy_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_dy_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_st_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_st_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_st_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_cast_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/pointer_to_other_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sa_nullptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/scoped_array_eq_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/scoped_ptr_eq_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_raw_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_raw_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_raw_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_raw_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_raw_test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_raw_test6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_from_this_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_alias_move_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_alias_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_alloc11_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_alloc2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_alloc3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_alloc_construct11_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_alloc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_basic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_compare_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_convertible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_delete_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_fn_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_move_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_mt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_pv_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_reinterpret_pointer_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_rv_pointer_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_rv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/shared_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/smart_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_array_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_array_cv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_array_n_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_atomic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_bml_unique_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_constexpr_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_convertible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_convertible_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_explicit_inst_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_guides_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_guides_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_hash_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_hash_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_hash_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_hash_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_interlocked_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_move_only_deleter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_nothrow_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_nullptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_override_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_owner_before_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_owner_equals_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_owner_hash_value_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_pedantic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_recursive_assign2_rv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_recursive_assign2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_recursive_assign_rv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_recursive_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_report_implementation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_typeinfo_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_unary_addr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_unique_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_unique_ptr_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_unordered_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_windows_h_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/sp_zero_compare_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/spinlock_mt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/spinlock_pool_mt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/spinlock_pool_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/spinlock_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/spinlock_try_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/spinlock_windows_h_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_raw_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_raw_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_raw_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_raw_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_raw_test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_this_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_from_this_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_ptr_alias_move_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_ptr_alias_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_ptr_move_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_ptr_mt_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/weak_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/wp_convertible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/wp_guides_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/wp_hash_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/wp_hash_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/wp_unordered_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/yield_k_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/smart_ptr/test/yield_k_windows_h_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/benchmark/parallel/benchmark_numbers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/benchmark/parallel/benchmark_objects.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/benchmark/parallel/benchmark_strings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/benchmark/parallel/file_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/benchmark/single/benchmark_numbers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/benchmark/single/benchmark_objects.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/benchmark/single/benchmark_strings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/benchmark/single/file_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/alrbreaker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/alreadysorted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/binaryalrbreaker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/boostrandomgen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/caseinsensitive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/charstringsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/double.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/floatfunctorsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/floatsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/generalizedstruct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/int64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/keyplusdatasample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/mostlysorted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/parallelint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/parallelstring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/randomgen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/reverseintsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/reversestringfunctorsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/reversestringsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/rightshiftsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/sample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/shiftfloatsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/stringfunctorsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/stringsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/example/wstringsample.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/float_sort_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/integer_sort_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/sort_detail_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/string_sort_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/test_block_indirect_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/test_flat_stable_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/test_insert_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/test_parallel_stable_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/test_pdqsort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/test_sample_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/sort/test/test_spinsort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/ast_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/boiler_plate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/calc_debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/calc_plain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/comments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/complex_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/distinct/distinct_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/distinct/distinct_parser_dynamic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/error_handling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/error_reporting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/file_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/full_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/functor_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/list_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/matching_tags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/more_calculators/ast_calc2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/more_calculators/calc_with_variables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/more_calculators/phoenix_subrule_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/more_calculators/primitive_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/more_calculators/rpn_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/more_calculators/vmachine_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/no_actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/number_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/parse_tree_calc1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/parser_context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/phoenix_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/position_iterator/position_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/refactoring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/regular_expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/roman_numerals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/stuff_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/stuff_vector2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/subrule_calc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/fundamental/thousand_separated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/intermediate/ipv4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/intermediate/ipv4_opt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/intermediate/lazy_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/intermediate/parameters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/intermediate/regex_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/intermediate/simple_xml/driver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/intermediate/simple_xml/tag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/dynamic_rule.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/epsilon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/multiple_scanners.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/nabialek.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/no_rules/no_rule1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/no_rules/no_rule2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/no_rules/no_rule3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/no_rules_with_typeof/opaque_rule_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_1_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/no_rules_with_typeof/rule_parser_2_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/right_recursion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/example/techniques/typeof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/closures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/example/fundamental/sample9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/binary_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/binders_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/functors_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/iostream_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/mixed_binary_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/more_expressions_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/new_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/primitives_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/statements_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/stl_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/tuples_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/phoenix/test/unary_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/action_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/assign_key_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/clear_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/decrement_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/erase_at_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/increment_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/insert_at_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/insert_key_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/push_back_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/push_front_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/swap_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/actor/unit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/ast_calc_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/bug_000008.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/bug_fixes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/char_strings_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/char_strings_test_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/chset_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/closure_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/confix_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/custom_real_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/directives_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/distinct_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/epsilon_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/escape_char_parser_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/file_iterator_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/fixed_size_queue_fail_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/fixed_size_queue_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/for_p_as_parser_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/for_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/fundamental_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/grammar_def_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/grammar_mt_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/grammar_multi_instance_tst.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/grammar_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/group_match_bug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/if_p_as_parser_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/if_p_int_as_condition_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/if_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/lazy_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/loops_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/match_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/mix_and_match_trees.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/multi_pass_compile_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/multi_pass_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/negated_eps_p_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/numerics_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/operators_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/owi_mt_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/owi_st_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/parametric_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/parser_context_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/parser_traits_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/position_iterator_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/post_skips.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/primitives_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/repeat_ast_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/rule_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/scanner_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/scanner_value_type_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/scoped_lock_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/select_p_with_rule.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/sf_bug_720917.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/shortest_alternative_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/subrule_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/switch_problem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/switch_tests_eps_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/switch_tests_general_def.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/switch_tests_single.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/switch_tests_wo_default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/symbols_add_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/symbols_find_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/symbols_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/threads_disabled_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/traverse_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/tree_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/tree_to_xml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_attribute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_core.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_dynamic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_error_handling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_symbols.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/typeof_support/typeof_utility.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/while_p_as_parser_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/classic/test/while_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/auto_facilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/basic_facilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/calc2_ast_dump.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/calc2_ast_rpn.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/calc2_ast_vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/classify_char.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/complex_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/complex_number_adapt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/complex_number_easier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/customize_counter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/customize_embedded_container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/customize_use_as_container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/escaped_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/generate_code.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/key_value_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/mini_xml_karma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/num_list1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/num_list2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/num_list3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/num_matrix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/printf_style_double_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/quick_start1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/quoted_strings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/reorder_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/karma/simple_columns_directive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/custom_token_attribute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/example1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/example2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/example3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/example4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/example5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/example6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/lexer_debug_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/print_number_tokenids.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/print_numbers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/static_lexer/word_count_generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/static_lexer/word_count_lexer_generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/static_lexer/word_count_lexer_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/static_lexer/word_count_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/strip_comments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/strip_comments_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/word_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/word_count_functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/word_count_functor_flex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/lex/word_count_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/adapt_template_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/boost_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/calc_utree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/calc_utree_ast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/calc_utree_naive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc7/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc7/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc7/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc7/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc7/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc8/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc8/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc8/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc8/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/calc8/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure1/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure1/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure1/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure1/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure1/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure1/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure2/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure2/conjure_static_lexer_generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure2/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure2/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure2/lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure2/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure2/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure2/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure3/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure3/conjure_static_lexer_generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure3/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure3/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure3/lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure3/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure3/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/conjure3/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/mini_c/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/mini_c/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/mini_c/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/mini_c/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/mini_c/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/compiler_tutorial/mini_c/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/complex_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/custom_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/display_attribute_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/employee.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/expect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/german_floating_point.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/iter_pos_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/key_value_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/key_value_sequence_empty_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/key_value_sequence_ordered.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/mini_xml1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/mini_xml2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/mini_xml3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/nabialek.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/num_list1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/num_list2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/num_list3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/num_list4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/parse_date.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/porting_guide_classic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/porting_guide_qi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/reorder_struct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/roman.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/typeof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/qi/unescaped_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/support/multi_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/support/utree/parse_sexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/annotation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/attributes/tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc4b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc4c/calc4c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc4c/grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc7/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc7/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc7/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc7/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc8/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc8/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc8/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc8/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc8/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc9/compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc9/expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc9/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc9/statement.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/calc/calc9/vm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/complex_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/employee.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/error_handling.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/minimal/employee.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/minimal/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/num_list/num_list1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/num_list/num_list2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/num_list/num_list3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/num_list/num_list4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/rexpr/rexpr_full/src/rexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/rexpr/rexpr_full/test/parse_rexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/rexpr/rexpr_min/rexpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/roman.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/example/x3/sum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/karma/calc2_ast_dump_sr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/karma/confix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/karma/mini_xml_karma_sr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/advance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/calc1_sr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/confix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/derived.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/distinct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/flush_multi_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/iter_pos_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/keywords.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/mini_xml2_sr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/options.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/example/qi/seek.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/karma/confix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/karma/subrule.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/qi/advance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/qi/confix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/qi/distinct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/qi/keywords.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/qi/seek.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/qi/subrule.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/test_headers/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/repository/test/test_headers/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/alternative1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/alternative2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/and_predicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/attribute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/auto1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/auto2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/auto3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/binary1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/binary2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/binary3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/bool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/case_handling1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/case_handling2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/case_handling3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/center_alignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/char1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/char2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/char3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/char_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/columns.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/delimiter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/duplicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/encoding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/eol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/eps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/format_manip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/format_manip_attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/format_pointer_container.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/generate_attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/grammar_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/int1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/int2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/int3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/kleene.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/lazy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/left_alignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/lit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/maxwidth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/not_predicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/omit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/pattern1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/pattern2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/pattern3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/pattern4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/real1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/real2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/real3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_adapt_adt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_center_alignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_const_real_policies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_container_variant_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_optional_double.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_real_0.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_real_policy_sign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_real_scientific.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_semantic_action_attribute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/regression_unicode_char.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/repeat1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/repeat2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/right_alignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/rule_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/sequence1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/sequence2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/symbols1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/symbols2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/symbols3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/tricky_alignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/uint_radix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/utree1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/utree2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/utree3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/karma/wstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/auto_switch_lexerstate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/dedent_handling_phoenix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/id_type_enum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/lexer_state_switcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/lexertl1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/lexertl2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/lexertl3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/lexertl4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/lexertl5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/plain_token.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_basic_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_file_iterator1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_file_iterator2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_file_iterator3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_file_iterator4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_less_8563.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_matlib_dynamic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_matlib_generate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_matlib_generate_switch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_matlib_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_matlib_switch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_static_wide_6253.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_syntax_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_wide.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/regression_word_count.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/semantic_actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/set_token_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/set_token_value_phoenix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/state_switcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/string_token_id.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/token_iterpair.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/token_moretypes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/token_omit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/lex/token_onetype.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/actions2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/alternative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/and_predicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/attribute1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/attribute2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/auto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/bool1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/bool2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/char1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/char2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/char_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/encoding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/end.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/eps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/expect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/expectd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/extract_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/grammar_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/hold.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/int1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/int2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/int3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/iterator_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/kleene.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/lazy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/lexeme.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/lit1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/lit2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/match_manip1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/match_manip2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/match_manip3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/match_manip_attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/matches.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/no_case.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/no_skip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/not_predicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/omit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/parse_attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/pass_container1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/pass_container2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/pass_container3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/permutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/range_run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/raw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/real1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/real2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/real3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/real4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/real5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_adapt_adt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_attr_with_action.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_binary_action.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_clear.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_container_attribute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_debug_optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_float_fraction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_fusion_proto_spirit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_lazy_repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_numeric_alternatives.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_one_element_fusion_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_one_element_sequence_attribute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_reorder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_stream_eof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/regression_transform_assignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/rule1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/rule2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/rule3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/rule4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/rule_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/sequential_or.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/skip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/symbols1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/symbols2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/terminal_ex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/to_utf8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/tst.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/uint1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/uint2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/uint3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/uint_radix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/utree1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/utree2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/utree3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/qi/utree4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/char_encoding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/istream_iterator_basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/regression_line_pos_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/regression_multi_pass_error_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/regression_multi_pass_functor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/regression_multi_pass_parse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/regression_multi_pass_position_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/unused_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/utree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/support/utree_debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/test_headers/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/test_headers/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/alternative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/and_predicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/any_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/attr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/attribute_type_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/binary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/bool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/char1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/char_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/confix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/container_support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/difference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/eoi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/eol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/eps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/error_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/expect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/extract_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/fusion_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/grammar_linker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/int1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/iterator_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/kleene.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/lexeme.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/lit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/lit1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/lit2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/matches.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/no_case.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/no_skip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/not_predicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/omit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/optional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/plus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/raw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/real1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/real2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/real3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/real4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/repeat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/rule1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/rule2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/rule3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/rule4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/rule_separate_tu.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/rule_separate_tu_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/seek.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/skip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/symbols1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/symbols2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/symbols3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/to_utf8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/tst.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/uint1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/uint_radix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/unused_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/with.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/test/x3/x3_variant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/boilerplate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/karma/double_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/karma/format_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/karma/int_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/karma/real_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/karma/sequence_performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/qi/attr_vs_actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/qi/int_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/qi/keywords.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/qi/real_parser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/unicode/create_tables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/x3/context.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/spirit/workbench/x3/toy/toy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/build/has_addr2line.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/build/has_backtrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/build/has_windbg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/build/has_windbg_cached.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/example/assert_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/example/debug_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/example/terminate_handler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/example/throwing_st.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/example/trace_addresses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/example/user_config.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/src/addr2line.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/src/backtrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/src/basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/src/noop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/src/windbg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/src/windbg_cached.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/test/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/test/test_impl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/test/test_noop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/test/test_num_conv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/test/test_void_ptr_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/test/thread_safety_checking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stacktrace/test/torture.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/BitMachine/BitMachine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/Camera/Camera.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/Camera/Configuring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/Camera/Main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/Camera/Precompiled.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/Camera/Shooting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/Handcrafted/Handcrafted.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/Keyboard/Keyboard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/Performance/Performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/PingPong/PingPong.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/PingPong/Player.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/StopWatch/StopWatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/example/StopWatch/StopWatch2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/CustomReactionTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/DeferralBug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/DeferralTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/FifoSchedulerTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/HistoryTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InStateReactionTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InconsistentHistoryTest1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InconsistentHistoryTest2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InconsistentHistoryTest3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InconsistentHistoryTest4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InconsistentHistoryTest5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InconsistentHistoryTest6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InconsistentHistoryTest7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InconsistentHistoryTest8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InvalidChartTest1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InvalidChartTest2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InvalidChartTest3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InvalidResultAssignTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InvalidResultCopyTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InvalidResultDefCtorTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InvalidTransitionTest1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/InvalidTransitionTest2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/StateCastTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/StateIterationTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/TerminationTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/TransitionTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/TriggeringEventTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/TuTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/TuTestMain.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/TypeInfoTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/UnconsumedResultTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/statechart/test/UnsuppDeepHistoryTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/example/static_assert_example_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/example/static_assert_example_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/example/static_assert_example_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/cmake_install_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/cmake_subdir_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_assert/test/static_assert_test_fail_9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/static_string/test/static_string.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/back_insert_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/drop_while_view.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/filtered_int_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/interoperability.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/node_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/random_access_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/repeated_chars_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/reverse_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/static_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/example/zip_proxy_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/bidirectional.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/compile_seq_cont_rvalue_constrained_pop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/compile_tests_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/detail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/forward.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/input.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/random_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/reverse_iter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/static_vec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/stl_interfaces/test/static_vec_noncopyable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/src/error_code.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/after_main_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/before_main_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/cmake_install_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/config_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/cygwin_error_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/dynamic_link_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/ec_location_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/ec_location_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/ec_what_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/errc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/errc_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/errc_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/error_category_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/error_category_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/error_code_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/error_code_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/error_code_user_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/error_condition_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/error_condition_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/error_condition_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/failed_constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/failed_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/generic_category_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/generic_category_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/generic_category_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/header_only_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/initialization_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/is_error_code_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/is_error_condition_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/linux_error_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_copy_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_copy_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_default_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_eq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_error_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_error_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_error_construct2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_move_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_move_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_range_for.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_value_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_value_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/result_value_construct2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/single_instance_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/single_instance_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/single_instance_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/snprintf_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_interop_test9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_mismatch_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_single_instance_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_single_instance_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/std_single_instance_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/system_category_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/system_category_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/system_category_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/system_error_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/system_error_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/system_error_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/throw_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/throws_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/warnings_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/win32_hresult_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/system/test/windows_error_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_runtime_list_content.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_bitwise.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_container_default.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_container_lex.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_container_lex_default.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_macro2.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_macro3.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_macro_container_c_array.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_macro_overview.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_macro_workaround.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_message.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_sequence_per_element.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/boost_test_string.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/custom_init.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/custom_main.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/custom_obsolete_init.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example59.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example61.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example62.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example63.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example64.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example65.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example66.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example67.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/dataset_example68.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_00.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_01.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_02.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_03.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_04.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_05.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_06.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_07.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_08.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_09.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_10.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_11.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_12.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_13.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_20.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_21.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_22.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/decorator_23.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example01.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example03.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example06.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example07.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example08.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example09.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example10.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example11.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example12.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example13.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example14.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example15.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example16.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example17.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example18.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example20.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example21.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example22.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example23.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example24.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example25.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example26.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example28.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example29.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example30.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example31.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example32.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example33.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example34.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example35.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example36.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example38.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example40.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example41.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example42.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example43.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example44.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example46.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example47.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example48.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example49.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example50.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example51.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example52.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example53.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example54.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example55.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example56.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example57.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example58.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example80_contexts.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example81_contexts.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example82_contexts.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example83_contexts.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/example84_contexts.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/exception_api.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/exception_check.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/exception_check_predicate.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/exception_nothrow.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/exception_uncaught.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/fixture_02.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/fixture_03.run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/fixture_04.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/logger-customization-point.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/runtime-configuration_1.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/runtime-configuration_2.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/runtime-configuration_3.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/runtime-configuration_4.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/tolerance_01.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/tolerance_02.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/tolerance_03.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/tolerance_04.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/tolerance_05.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/examples/tolerance_06.run-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/const_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/dataset_1/test_file.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/snippet12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/snippet13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/snippet14.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/snippet15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/snippet16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/snippet17.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/doc/snippet/snippet8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/const_string_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/exec_mon_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/external_main_example_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/external_main_example_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/external_main_example_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/filtering_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/named_param_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/prg_exec_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/test_case_template_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_01.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_02.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_03.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_04.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_05.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_06.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_07.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_08.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_09_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_09_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_12.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_13.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_15.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/example/unit_test_example_16.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/compiler_log_formatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/cpp_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/decorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/execution_monitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/framework.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/junit_log_formatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/plain_report_formatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/progress_monitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/results_collector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/results_reporter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/test_framework_init_observer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/test_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/test_tools.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/test_tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/unit_test_log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/unit_test_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/unit_test_monitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/unit_test_parameters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/xml_log_formatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/src/xml_report_formatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/execution_monitor-ts/boost_exception-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/execution_monitor-ts/custom-exception-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/execution_monitor-ts/errors-handling-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/check-streams-on-exit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/decorators-datatestcase-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/log-count-skipped-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/log-formatter-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/master-test-suite-non-copyable-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/message-in-datatestcase-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/result-report-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/run-by-name-or-label-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/test-macro-global-fixture.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/framework-ts/version-uses-module-name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/multithreading-ts/sync-access-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/prg_exec_monitor-ts/result-code-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/prg_exec_monitor-ts/system-exception-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/prg_exec_monitor-ts/uncatched-exception-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/prg_exec_monitor-ts/user-fatal-exception-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/selfcontained.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/smoke-ts/basic-smoke-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/smoke-ts/basic-smoke-test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/smoke-ts/basic-smoke-test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/smoke-ts/basic-smoke-test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/dataset-master-test-suite-accessible-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/dataset-variadic_and_move_semantic-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/array-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/collection-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/implicit-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/initializer_list-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/mono-grid-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/mono-join-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/mono-zip-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/random-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/seed-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/singleton-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/test_case_interface-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/datasets-test/xrange-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/parameterized_test-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test-tree-management-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test-tree-several-suite-decl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_case_template-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_case_template-with-tuples-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_case_template-with-variadic-typelist.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_unit-nested-suite-dependency.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_unit-order-shuffled-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_unit-order-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_unit-report-clashing-names.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_unit-sanitize-names.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/test-organization-ts/test_unit-several-ts-same-name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/shared-library-custom-init-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/shared-library-custom-main-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/shared-library-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/single-header-custom-init-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/single-header-custom-main-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/single-header-multiunit-1-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/single-header-multiunit-2-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/single-header-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/static-library-custom-init-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/usage-variants-ts/static-library-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/utils-ts/algorithm-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/utils-ts/basic_cstring-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/utils-ts/class_properties-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/utils-ts/foreach-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/utils-ts/named_params-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/utils-ts/runtime-param-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/utils-ts/string_cast-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/utils-ts/token_iterator-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/assertion-construction-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/boost_check_equal-str-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/collection-comparison-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/dont_print_log_value-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/fp-comparisons-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/fp-multiprecision-comparison-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/fp-no-comparison-for-incomplete-types-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/fp-relational-operator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/nullptr-support-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/output_test_stream-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test-dataset-over-tuples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test-fixture-detect-setup-teardown-cpp11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test-fixture-detect-setup-teardown.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test-timeout-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test-timeout-suite-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test-timeout-suite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test-timeout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test-with-precondition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/test_tools-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/tools-debuggable-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/tools-under-debugger-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/user-defined-types-logging-customization-points.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/test/writing-test-ts/windows-headers-test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/tools/console_test_runner/src/console_test_runner.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/test/tools/console_test_runner/test/test_runner_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/build/has_atomic_flag_lockfree_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/ba_externallly_locked.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/condition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/default_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/fib_task_region.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/future_fallback_to.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/future_then.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/future_unwrap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/future_when_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/generic_executor_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/lambda_future.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/make_future.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/monitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/not_interleaved.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/not_interleaved2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/once.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/parallel_accumulate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/parallel_quick_sort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/perf_condition_variable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/perf_shared_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/producer_consumer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/producer_consumer2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/producer_consumer_bounded.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/recursive_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/scoped_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/serial_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/serial_executor_cont.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/shared_monitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/shared_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/starvephil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/std_scoped_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/std_thread_guard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/strict_lock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/synchronized_person.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/synchronized_value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/tennis.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/this_executor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/thread_group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/thread_guard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/thread_pool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/tss.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/user_scheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/with_lock_guard.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/example/xtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/future.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/pthread/once.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/pthread/once_atomic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/pthread/thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/tss_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/win32/thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/win32/thread_primitives.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/win32/tss_dll.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/src/win32/tss_pe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/experimental/parallel/v1/exception_list_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/experimental/parallel/v2/task_region_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/functional/invoke/invoke_int_0_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/functional/invoke/invoke_lvalue_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/functional/invoke/invoke_rvalue_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/functional/invoker/invoker_int_0_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/functional/invoker/invoker_lvalue_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/functional/invoker/invoker_rvalue_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/no_implicit_assign_from_lvalue_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/no_implicit_move_from_lvalue_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/self_contained_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/dtor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/lost_notif_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/native_handle_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/wait_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/wait_for_pred_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/wait_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/wait_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable/wait_until_pred_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/dtor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/lost_notif_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/wait_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/wait_for_pred_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/wait_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/condition_variable_any/wait_until_pred_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/cv_status/cv_status_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/conditions/notify_all_at_thread_exit_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/async/async_executor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/async/async_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/async_deferred_then_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/dtor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/get_or_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/get_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/move_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/move_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/share_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/then_deferred_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/then_executor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/then_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/wait_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/wait_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/future/wait_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/make_ready_future_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/alloc_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/default_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/dtor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/func_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/get_future_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/make_ready_at_thread_exit_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/member_swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/move_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/move_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/non_member_swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/operator_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/reset_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/packaged_task/use_allocator_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/alloc_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/dtor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/emplace_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/get_future_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/move_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/move_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_exception_at_thread_exit_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_exception_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_lvalue_at_thread_exit_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_lvalue_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_rvalue_at_thread_exit_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_rvalue_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_value_at_thread_exit_const_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_value_at_thread_exit_void_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_value_const_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/set_value_void_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/promise/use_allocator_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/copy_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/copy_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/dtor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/get_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/move_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/move_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/then_executor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/then_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/wait_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/wait_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/shared_future/wait_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/when_all/iterators_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/when_all/none_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/when_all/one_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/when_all/variadic_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/when_any/iterators_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/when_any/none_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/when_any/one_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/futures/when_any/variadic_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/deque_views/single_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/adopt_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_adopt_lock_compile_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/lock_guard_compile_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_adopt_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/make_lock_guard_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/lock_guard/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/nested_strict_lock/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/nested_strict_lock/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/nested_strict_lock/make_nested_strict_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/nested_strict_lock/owns_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/nested_strict_lock/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/reverse_lock/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/reverse_lock/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/reverse_lock/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/reverse_lock/unique_lock_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/adopt_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/defer_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/duration_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/move_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_unique_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/move_ctor_upgrade_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/time_point_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/cons/try_to_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/locking/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/locking/try_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/locking/unlock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/mod/member_swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/mod/non_member_swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/mod/release_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/obs/mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/obs/op_bool_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/obs/owns_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock_guard/adopt_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock_guard/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock_guard/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/shared_lock_guard/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/make_strict_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/owns_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/strict_lock/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/adopt_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/defer_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/duration_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_adopt_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_defer_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_lock_try_to_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/make_unique_locks_mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_try_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_shared_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_try_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/move_ctor_upgrade_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/time_point_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/cons/try_to_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/locking/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/locking/try_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/locking/unlock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/mod/member_swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/mod/non_member_swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/mod/release_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/obs/mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/obs/op_bool_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/obs/op_int_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/obs/owns_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/unique_lock/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/adopt_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/copy_ctor_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/defer_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/duration_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_try_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_shared_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/move_ctor_unique_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/time_point_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/cons/try_to_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/locking/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/locking/try_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/locking/unlock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/mod/member_swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/mod/non_member_swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/mod/release_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/obs/mutex_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/obs/op_bool_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/obs/owns_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/locks/upgrade_lock/types_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/lock_compile_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/lock_compile_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/native_handle_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/try_lock_compile_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/try_lock_compile_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/mutex/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/null_mutex/assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/null_mutex/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/null_mutex/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/null_mutex/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/null_mutex/try_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/null_mutex/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/null_mutex/try_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/once/call_once/call_once_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/queue_views/single_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_mutex/assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_mutex/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_mutex/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_mutex/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_mutex/native_handle_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_mutex/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_timed_mutex/assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_timed_mutex/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_timed_mutex/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_timed_mutex/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_timed_mutex/native_handle_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/recursive_timed_mutex/try_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/shared_mutex/assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/shared_mutex/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/shared_mutex/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/shared_mutex/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/shared_mutex/try_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/shared_mutex/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/shared_mutex/try_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_bounded_queue/multi_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_bounded_queue/single_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_deque/multi_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_deque/single_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_pq/pq_multi_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_pq/pq_single_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_pq/tq_multi_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_pq/tq_single_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_queue/multi_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/sync_queue/single_thread_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/call_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/copy_T_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/copy_T_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/copy_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/copy_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/default_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/indirect_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/move_T_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/move_T_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/move_assign_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/move_ctor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/swap_T_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/synchronized_value/synchronize_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/timed_mutex/assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/timed_mutex/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/timed_mutex/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/timed_mutex/lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/timed_mutex/native_handle_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/timed_mutex/try_lock_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/timed_mutex/try_lock_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/timed_mutex/try_lock_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_bind.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/sync/mutual_exclusion/with_lock_guard/with_lock_guard_simple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_10340.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_10963.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_10964.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_11053.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_11256.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_11266.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_11499.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_11611.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_11796.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_11818.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_12293.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_12949.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_13480b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_13561.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_2309.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_2501.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_2741.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_3628.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_3837.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_4521.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_4648.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_4882.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_5351.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_5502.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_5542_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_5542_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_5542_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_5891.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_6130.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_6170.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_6174.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_7160.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_7328.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_7571.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_7665.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_7666.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_7720.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_7755.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8455.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8508.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8557.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8586.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8596.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8600.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8674.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8943.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_8960.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_9079_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_9079_b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_9192.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_9303.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_9319.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_9711.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_9856.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_barrier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_barrier_size_fct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_barrier_void_fct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_completion_latch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_condition.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_condition_notify_all.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_condition_notify_one.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_condition_timed_wait_times_out.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_futures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_generic_locks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_hardware_concurrency.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_latch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_lock_concept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_ml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_ml2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_move_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_once.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_physical_concurrency.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_scheduled_tp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_scheduler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_scheduling_adaptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_shared_mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_shared_mutex_part_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_shared_mutex_timed_locks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_shared_mutex_timed_locks_chrono.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_thread_exit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_thread_id.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_thread_launching.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_thread_mf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_thread_move.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_thread_move_return.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_thread_return_local.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_time_jumps.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_tss.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/test_xtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/container/thread_ptr_list_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/container/thread_vector_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/this_thread/get_id/get_id_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/this_thread/sleep_for/sleep_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/this_thread/sleep_until/sleep_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/assign/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/assign/move_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/constr/FArgs_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/constr/F_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/constr/FrvalueArgs_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/constr/Frvalue_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/constr/copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/constr/default_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/constr/lambda_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/constr/move_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/destr/dtor_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/id/hash_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/members/detach_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/members/get_id_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/members/join_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/members/joinable_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/members/native_handle_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/members/swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/members/try_join_for_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/members/try_join_until_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/non_members/swap_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/threads/thread/static/hardware_concurrency_pass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/test/winrt_init.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/bounded_buffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/counter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/factorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/factorial2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/factorial3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/helloworld.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/helloworld2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/helloworld3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/once.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/thread/tutorial/tss.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/cmake_install_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/cmake_subdir_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/lib1_throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/lib2_throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/lib3_throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/make_exception_ptr_nx_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/make_exception_ptr_nx_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/make_exception_ptr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/make_exception_ptr_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_no_both_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_no_exceptions_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_no_integration_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_nx_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_nx_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_nx_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_exception_test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/throw_exception/test/throw_from_library_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/example/auto_cpu_timer_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/example/timex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/src/auto_timers_construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/src/cpu_timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/test/chrono_conflict_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/test/cmake_install_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/test/cmake_subdir_test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/test/cpu_timer_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/test/cpu_timer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/test/original_timer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/timer/test/progress_display_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/example/char_sep_example_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/example/char_sep_example_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/example/char_sep_example_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/test/examples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/test/simple_example_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/test/simple_example_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/test/simple_example_3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/test/simple_example_4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tokenizer/test/simple_example_5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_function_template_works.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_data_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_data_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_data_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_data_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_data_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_data_fail5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_data_fail6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_enum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_fail5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_template_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_template_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_fun_template_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_data2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_data_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_data_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_data_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_data_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_cv_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_cv_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_cv_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_cv_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_cv_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_cv_fail5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_cv_fail6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_cv_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_cv_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_cv_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_cv_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_mem_fun_template_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_cv_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_cv_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_cv_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_cv_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_cv_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_cv_fail5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_cv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_cv_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_cv_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_cv_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_cv_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_member_template_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_data.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_data_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_data_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_data_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_data_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_fun.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_fun_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_fun_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_fun_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_fun_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_fun_template_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_fun_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_mem_fun_template_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_member_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_member_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_member_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_member_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_member_template_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_member_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_static_member_template_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_cp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_cp_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_cp_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_cp_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_cp_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_cp_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_template_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_ct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_ct_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_ct_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_ct_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_ct_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_ct_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_ct_fail5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_type_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_has_union.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_mem_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_mem_type_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_vm_has_template_cp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_vm_has_template_cp_compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_vm_has_template_cp_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_vm_has_template_cp_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_vm_has_template_cp_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tti/test/test_vm_has_template_cp_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tuple/test/another_tuple_test_bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tuple/test/io_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tuple/test/std_tuple_element.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tuple/test/std_tuple_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tuple/test/structured_bindings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/tuple/test/tuple_test_bench.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/associated.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/basic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/compose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/concept_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/construction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/custom.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/multifunction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/overload.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/print_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/printf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/example/references.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/src/dynamic_binding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_any_cast_discard_const1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_any_cast_discard_const2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_any_cast_discard_const3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_any_cast_discard_const4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_any_cast_discard_const5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_any_cast_discard_const6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_any_cast_pointer_to_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_any_cast_pointer_to_val.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_binding_convert_no_mapping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_construct_mismatch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_construct_mismatch_cref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_construct_mismatch_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_construct_mismatch_rref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_cref_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_default_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_increment_discard_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_not_incrementable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_ref_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_ref_discard_const.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_ref_discard_const_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_ref_discard_const_convert_cref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_ref_discard_const_convert_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_ref_discard_const_init.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/fail_rref_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_add_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_any_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_binding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_binding_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_callable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_construct_cref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_construct_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_deduced.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_dereference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_dynamic_any_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_forward_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_free.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_increment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_interface_order.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_is_placeholder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_is_subconcept.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_less.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_negate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_nested.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_param.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_reference.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_relaxed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_same_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_sfinae.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_subscript.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_erasure/test/test_typeid_of.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/constexpr14_namespace_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/constexpr14_sort_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/demangled_names.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/exact_types_match.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/inheritance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/registry.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/runtime_cast.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/table_of_names.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/examples/user_defined_typeinfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/compare_ctti_stl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/ctti_print_name.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/test_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/test_lib_anonymous.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/testing_crossmodule.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/testing_crossmodule_anonymous.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/track_13621.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/type_index_constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/type_index_runtime_cast_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/type_index_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/type_index_test_ctti_alignment.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/type_index_test_ctti_construct_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_index/test/type_index_test_ctti_copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/examples/copy_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/examples/fill_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/examples/iter_swap_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/examples/trivial_destructor_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/add_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/add_cv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/add_lvalue_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/add_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/add_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/add_rvalue_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/add_volatile_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/aligned_storage_a2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/aligned_storage_empy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/aligned_storage_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/alignment_of_a2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/alignment_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_4_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_5_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_6_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_sfinae2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_sfinae_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/common_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/common_type2_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/common_type_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/has_nothrow_assign_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/has_nothrow_cons_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/has_nothrow_copy_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/has_nothrow_destruct_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_assignable_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_base_of_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_constructible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_convertible2_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_convertible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_copy_assignable_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_copy_constructible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_default_constructible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_destructible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_empty_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_list_constructible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_nothrow_move_assignable_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_nothrow_move_constructible_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_polymorphic_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_stateless_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/compile_fail/is_virtual_base_of_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/conditional_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/conjunction_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/copy_cv_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/copy_cv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/copy_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/cxx14_aliases_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/decay_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/detected_or_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/detected_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/disjunction_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/enable_if_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/extent_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/floating_point_promotion_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/function_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes0_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes4_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes5_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes6_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes7_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes8_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_binary_classes9_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_bit_and_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_bit_and_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_bit_or_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_bit_or_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_bit_xor_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_bit_xor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_complement_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_dereference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_divides_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_divides_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_equal_to_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_greater_equal_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_greater_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_left_shift_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_left_shift_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_less_equal_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_less_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_logical_and_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_logical_not_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_logical_or_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_minus_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_minus_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_modulus_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_modulus_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_multiplies_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_multiplies_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_negate_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_not_equal_to_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_nothrow_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_nothrow_constr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_nothrow_copy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_nothrow_destructor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_operator_new_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_plus_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_plus_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_post_decrement_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_post_increment_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_postfix_classes0_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_postfix_classes1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_postfix_classes2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_postfix_classes3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_pre_decrement_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_pre_increment_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_prefix_classes0_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_prefix_classes1_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_prefix_classes2_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_prefix_classes3_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_right_shift_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_right_shift_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_trivial_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_trivial_constr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_trivial_copy_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_trivial_destructor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_trivial_move_assign_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_trivial_move_constructor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_unary_minus_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_unary_plus_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/has_virtual_destructor_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_abstract_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_arithmetic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_assignable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_base_and_derived_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_base_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_bounded_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_class_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_complete_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_complex_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_compound_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_constructible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_convertible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_copy_assignable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_copy_constructible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_default_constr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_destructible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_detected_convertible.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_detected_exact_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_detected_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_empty_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_final_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_float_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_floating_point_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_function_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_fundamental_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_integral_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_list_constructible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_lvalue_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_member_func_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_member_obj_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_member_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_noncopyable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_nothrow_move_assignable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_nothrow_move_constructible_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_nothrow_swappable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_object_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_pod_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_polymorphic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_rvalue_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_same_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_scalar_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_scoped_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_signed_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_stateless_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_trivially_copyable_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_unbounded_array_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_union_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_unscoped_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_unsigned_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_virtual_base_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_void_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/is_volatile_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/make_signed_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/make_unsigned_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/make_void_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/mpl_interop_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/mpl_interop_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/mpl_interop_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/negation_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/promote_basic_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/promote_enum_msvc_bug_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/promote_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/promote_mpl_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/rank_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_all_extents_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_bounds_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_const_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_cv_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_cv_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_extent_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/remove_volatile_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/tricky_abstract_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/tricky_add_pointer_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/tricky_function_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/tricky_incomplete_type_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/tricky_is_enum_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/tricky_partial_spec_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/tricky_rvalue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/type_identity_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/type_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/type_with_alignment_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/test/udt_specialisations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/type_traits/tools/specialisations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/data_member.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/function_binding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/function_ptr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/function_ptr_from_tpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/function_ref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/member_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/modifiers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/msvc_typeof_in_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/nested_typedef.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/noncopyable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/odr1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/odr2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/odr_no_uns1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/odr_no_uns2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/std.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/template_dependent.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/template_enum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/template_int.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/template_multiword.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/template_tpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/template_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/typeof/test/type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/autoprefixes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/complex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/composite_output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/conversion_factor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/heterogeneous_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/information.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/kitchen_sink.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/non_base_dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/performance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/quantity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/quaternion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/radar_beam_height.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/runtime_conversion_factor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/runtime_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/systems.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/temperature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/tutorial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/example/unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/check_conversion_defs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_add_temperature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_adl_detail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_base_dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_heterogeneous_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_implicit_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_add_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_non_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_scalar_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_scalar_sub.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_sub_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_subtract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_unit_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_quantity_unit_subtract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_scalar_quantity_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_scalar_quantity_sub.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_unit_quantity_add.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/fail_unit_quantity_subtract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_absolute.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_base_dimension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_cmath.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_complicated_system.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_custom_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_default_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_dimensionless_ice1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_dimensionless_ice2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_dimensionless_quantity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_implicit_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_information_units.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_lambda.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_limits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_mixed_value_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_negative_denominator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_predicates.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_quantity.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_reduce_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_scaled_conversion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_scaled_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_sqrt_scaled_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_trig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_unit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test/test_unscale.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test_headers/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/test_headers/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/units/tutorial/tutorial_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/doc/src_code/dictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/doc/src_code/intro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/doc/src_code/point1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/doc/src_code/point2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/examples/case_insensitive_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/assign_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/constructor_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/copy_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/erase_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/insert_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/merge_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/move_assign_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/rehash_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/exception/swap_exception_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/allocator_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/assign_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/at_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/bucket_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/compile_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/compile_set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/constructor_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/copy_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/deduction_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/detail_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/emplace_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/equality_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/equivalent_keys_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/erase_equiv_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/erase_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/extract_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/find_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/fwd_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/fwd_set_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/incomplete_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/insert_hint_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/insert_node_type_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/insert_stable_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/insert_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/link_test_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/link_test_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/load_factor_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/merge_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/minimal_allocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/move_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/node_handle_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/noexcept_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/rehash_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/simple_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/swap_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/unordered/test/unordered/unnecessary_copy_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/identity_type/test/abstract.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/identity_type/test/noncopyable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/identity_type/test/paren.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/identity_type/test/template.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/identity_type/test/var.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/identity_type/test/var_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/base_from_member_ref_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/base_from_member_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/binary_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/call_traits_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/compressed_pair_final_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/compressed_pair_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/initialized_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/initialized_test_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/initialized_test_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/iterators_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/operators_constexpr_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/operators_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/result_of_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_ref_from_rvalue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_ref_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_ref_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_ref_test_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_view_constexpr_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_view_from_rvalue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_view_test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_view_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/string_view_test_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/value_init_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/value_init_test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/value_init_test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/value_init_test_fail1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/value_init_test_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/value_init_test_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/utility/test/value_init_workaround_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/compile-fail/basic_random_generator_no_copy_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/compile-fail/basic_random_generator_no_copy_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/compile-fail/random_generator_no_copy_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/compile-fail/random_generator_no_copy_ctor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/compile/decl_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/compile_uuid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/mock_random.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_bench_random.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_detail_random_provider.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_entropy_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_generators.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_include1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_include2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_io.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_md5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_msvc_simd_bug981648_foo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_msvc_simd_bug981648_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_name_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_nil_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_random_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_serialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_sha1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_string_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_tagging.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_uuid.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_uuid_class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_uuid_in_map.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_uuid_no_simd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/uuid/test/test_wserialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/perf/move_perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/auto_visitors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/class_a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/const_ref_apply_visitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/fusion_interop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/hash_recursive_variant_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/hash_variant_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/issue42.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/issue53.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/no_rvalue_to_nonconst_visitation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/overload_selection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/recursive_variant_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/recursive_wrapper_move_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/rvalue_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/test9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_comparison_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_get_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_multivisit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_nonempty_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_over_joint_view_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_polymorphic_get_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_reference_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_rvalue_get_with_ampersand_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_swap_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_visit_internal_linkage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant/test/variant_visit_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/benchmark/benchmark1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/benchmark/benchmark2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/throw_exception.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_alternative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_convert_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_convert_construct_throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_copy_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_copy_assign_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_copy_assign_throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_copy_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_copy_construct_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_copy_construct_throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_default_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_default_construct_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_derived_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_destroy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_emplace_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_emplace_index_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_emplace_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_emplace_type_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_eq_ne.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_eq_ne_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_get_by_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_get_by_index_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_get_by_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_get_by_type_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_holds_alternative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_holds_alternative_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_in_place_index_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_in_place_index_construct_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_in_place_type_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_in_place_type_construct_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_lt_gt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_lt_gt_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_many_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_move_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_move_assign_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_move_assign_throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_move_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_move_construct_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_move_construct_throw.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_ostream_insert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_special.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_subset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_swap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_trivial.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_value_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_value_assign_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_value_construct.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_value_construct_cx.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_valueless.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_visit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_visit_by_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_visit_derived.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/variant2/test/variant_visit_r.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_array_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_array_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_identifier_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_identifier_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_list_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_list_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_number_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_number_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_seq_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_seq_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_tuple_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_tuple_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_type_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_after_type_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_android.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_android.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_empty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_equal.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_to_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_to_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_to_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_array_to_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_ary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_ary.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_array.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_identifier.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_is_empty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_is_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_is_identifier.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_is_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_is_number.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_list.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_number.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_number2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_number2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_vcstring.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_fail_vcstring.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_array_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_empty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_empty_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_empty_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_empty_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_empty_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_empty_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_empty_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_identifier.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_identifier_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_identifier_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_list_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_number.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_number_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_number_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_seq_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_tuple_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_type.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_type_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_assert_is_type_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_cmake/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_assert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_assert.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_assert_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_assert_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail6.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail7.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_empty_fail8.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_equality.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_equality.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_example_switch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_example_switch.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_get_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_get_type.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_identifier.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_identifier_subtyping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_identifier_subtyping.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_filter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_filter.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_identifier.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_index.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_return_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_return_type.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_splitting.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_modifiers_splitting.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_number.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_pp_data_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_pp_data_types.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_sequence.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_sequence_access.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_sequence_access.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_sequence_convert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_sequence_convert.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_type.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_whyhow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_doc_whyhow.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_array.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_identifier.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_list.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_multi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_multi.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_number.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_equal_type.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_identifier_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_identifier_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_identifier_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_identifier_equal.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_array_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_empty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_empty_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_empty_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_empty_tuple_succeed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_empty_tuple_succeed.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_general_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_general_identifier.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_identifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_identifier.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_list_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_number.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_number.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_parens_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_parens_empty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_seq_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple_fail.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple_fail2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple_fail2.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple_fail3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple_fail3.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple_fail4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_tuple_fail4.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_type.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_vmd_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_vmd_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_vmd_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_is_vmd_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_empty.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_empty.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_equal.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_to_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_to_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_to_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_list_to_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_number_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_number_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_number_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_number_equal.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_equal.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_pop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_pop_back.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_pop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_pop_front.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_push_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_push_back.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_push_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_push_front.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_remove.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_size.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_to_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_to_array.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_to_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_to_list.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_to_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_seq_to_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_after_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_after_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_enum.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_enum.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_size.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_to_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_to_array.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_to_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_to_list.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_to_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_to_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_to_tuple.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_sequence_to_tuple.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_equal.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_pop_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_pop_back.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_pop_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_pop_front.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_push_back.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_push_back.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_push_front.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_push_front.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_remove.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_remove.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_size.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_size.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_to_array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_to_array.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_to_list.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_to_list.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_to_seq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_tuple_to_seq.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_type.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_type_elem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_type_elem.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_type_equal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_type_equal.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_variadic_macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/vmd/test/test_variadic_macro.cxx"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/advanced_hooks/advanced_hooks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/check_macro_naming/check_macro_naming.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/cpp_tokens/cpp_tokens.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/cpp_tokens/instantiate_cpp_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/cpp_tokens/instantiate_defined_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/cpp_tokens/instantiate_has_include_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/cpp_tokens/instantiate_slex_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/custom_directives/custom_directives.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/hannibal/hannibal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/lexed_tokens/lexed_tokens.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/list_includes/instantiate_cpp_exprgrammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/list_includes/instantiate_cpp_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/list_includes/instantiate_cpp_literalgrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/list_includes/instantiate_defined_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/list_includes/instantiate_has_include_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/list_includes/instantiate_lexertl_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/list_includes/list_includes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/preprocess_pragma_output/example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/preprocess_pragma_output/preprocess_pragma_output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/quick_start/quick_start.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/real_positions/instantiate_cpp_exprgrammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/real_positions/instantiate_cpp_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/real_positions/instantiate_cpp_literalgrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/real_positions/instantiate_defined_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/real_positions/instantiate_has_include_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/real_positions/instantiate_re2c_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/real_positions/instantiate_re2c_lexer_str.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/real_positions/real_positions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/token_statistics/instantiate_cpp_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/token_statistics/instantiate_defined_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/token_statistics/instantiate_has_include_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/token_statistics/instantiate_xlex_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/token_statistics/token_statistics.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/waveidl/idl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/waveidl/idllexer/idl_re.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/waveidl/instantiate_cpp_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/waveidl/instantiate_defined_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/waveidl/instantiate_has_include_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/waveidl/instantiate_predef_macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/waveidl/instantiate_re2c_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/samples/waveidl/instantiate_re2c_lexer_str.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/cpplexer/re2clex/aq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/cpplexer/re2clex/cpp_re.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/instantiate_cpp_exprgrammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/instantiate_cpp_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/instantiate_cpp_literalgrs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/instantiate_defined_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/instantiate_has_include_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/instantiate_predef_macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/instantiate_re2c_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/instantiate_re2c_lexer_str.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/token_ids.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/src/wave_config_constant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testlexers/test_lexertl_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testlexers/test_re2c_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testlexers/test_slex_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testlexers/test_xlex_lexer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_005.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_006.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_007.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_008.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_009.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_010.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_011.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_012.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_013.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_014.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_015.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_016.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_017.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_018.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_019.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_020.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_021.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_022.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_023.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_024.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_025.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_026.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_027.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_028.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_029.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_030.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_031.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_032.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_033.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_034.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_035.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_036.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_037.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_1_038.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_005.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_006.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_007.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_008.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_009.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_010.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_011.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_012.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_013.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_014.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_015.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_016.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_017.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_018.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_019.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_020.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_021.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_022.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_023.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_024.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_025.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_026.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_027.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_028.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_029.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_2_030.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_3_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_3_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_3_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_3_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_4_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_4_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_4_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_4_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_005.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_006.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_007.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_008.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_009.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_010.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_011.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_012.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_013.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_014.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_015.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_016.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_017.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_018.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_019.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_020.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_021.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_022.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_023.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_024.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_025.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_026.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_027.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_028.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_029.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_030.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_031.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_032.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_033.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_034.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_035.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_036.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_5_037.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_005.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_006.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_007.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_008.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_009.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_010.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_011.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_012.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_013.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_014.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_015.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_016.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_017.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_018.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_019.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_020.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_021.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_022.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_023.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_024.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_025.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_026.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_027.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_028.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_029.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_030.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_031.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_032.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_033.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_034.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_035.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_036.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_037.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_038.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_039.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_040.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_041.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_042.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_043.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_044.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_045.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_046.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_047.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_048.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_049.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_050.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_051.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_052.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_053.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_054.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_055.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_056.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_057.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_058.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_059.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_060.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_061.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_062.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_063.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_064.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_065.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_066.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_067.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_068.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_6_069.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_7_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_7_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_7_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_7_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_7_005.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_7_006.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_005.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_006.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_007.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_008.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_009.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_010.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_8_011.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_001.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_002.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_003.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_004.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_005.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_006.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_007.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_008.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_009.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_010.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_011.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_012.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_013.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_014.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_015.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_016.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_017.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_018.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_019.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_020.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_021.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_022.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_023.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_024.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_025.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_026.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_027.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testfiles/t_9_028.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testwave.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testwave_app.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testwave_app_dll.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/test/testwave/testwave_dll.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/wave/tool/cpp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/compile/decl_header.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/compile/windows_h_post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/compile/windows_h_pre.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/config/has-bcrypt/has_bcrypt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/access_rights_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/apc_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/basic_types_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/bcrypt_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/character_code_conversion_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/condition_variable_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/critical_section_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/crypt_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/dbghelp_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/debugapi_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/directory_management_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/dll_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/environment_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/error_codes_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/error_handling_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/event_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/file_management_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/file_mapping_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/get_current_process_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/get_current_process_id_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/get_current_thread_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/get_current_thread_id_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/get_last_error_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/get_system_directory_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/handle_info_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/handles_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/heap_memory_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/init_once_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/interlocked.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/limits_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/local_memory_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/mutex_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/overlapped_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/page_protection_flags_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/pipes_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/priority_class_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/process_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/security_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/semaphore_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/shell_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/show_window_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/srw_lock_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/stack_backtrace_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/system_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/thread_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/thread_pool_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/time_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/tls_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/wait_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/wait_on_address_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/waitable_timer_abi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/winapi/test/run/winapi_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/example/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/example/numbers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/perf/command_line.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/perf/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/perf/time_boost.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/perf/time_dynamic_xpressive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/perf/time_static_xpressive.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/c_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/c_traits_u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/misc1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/misc2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/multiple_defs1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/multiple_defs2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/regress.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/regress_u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test10.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test10u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test11u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test1u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test2u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test3u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test4u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test5u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test6u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test7u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test8u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test9u.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_assert.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_assert_with_placeholder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_basic_regex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_cycles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_dynamic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_dynamic_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_match_results.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_non_char.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_partial_match.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_regex_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_regex_compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_regex_constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_regex_error.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_regex_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_regex_primitives.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_regex_token_iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_regex_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_skip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_static.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_sub_match.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_symbols.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_typeof.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/test/test_typeof2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/xpressive/tools/perl2xpr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/cmake/constexpr_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/doc/other_snippets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/doc/user_macros_snippets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_example.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/ActNode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/BinaryOPNode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/Edge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/EdgeSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/Node.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/OPNode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/PNode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/Stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/Tape.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/UaryOPNode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/VNode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/autodiff_library/autodiff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/calc1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/calc2a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/calc2b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/calc3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/future_group.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/hello_world.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/hello_world_redux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/lazy_vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/let.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/map_assign.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/minimal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/mixed.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/pipable_algorithms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/self_evaluation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/tarray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/transform_terminals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/vec3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/example/vector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/perf/arithmetic_perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/perf/code_gen_samples.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/perf/lazy_vector_perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/perf/map_assign_code_gen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/perf/map_assign_perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/call_expr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/comma.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_const_term.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_is_expr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_move_only_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_term_plus_expr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_term_plus_term.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_term_plus_x.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_term_plus_x_this_ref_overloads.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_tests_main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_user_macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/compile_x_plus_term.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/default_eval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/depth_stress_test_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/depth_stress_test_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/deref.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/expression_function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_argument.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_callable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_cond.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_else.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_get.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_make_expression.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_make_terminal.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_then.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/fail_transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/if_else.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/lazy_vector_alloc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/left.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/operators_unary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/placeholder_eval.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/print.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/reference_returns.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/right.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/supplied_transforms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/transform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/user_expression_transform_1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/user_expression_transform_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/value.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/libs/yap/test/vector_alloc_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/auto_index/src/auto_index.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/auto_index/src/file_scanning.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/auto_index/src/index_generator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/auto_index/src/tiny_xml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/add_dependent_lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/add_path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/bcp_imp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/copy_path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/file_types.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/fileview.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/licence_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/output_licence_info.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/path_operations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/scan_cvs_path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/bcp/scan_licence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/atomic/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/chrono/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/container/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/filesystem/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/headers/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/blocksort.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/bzip2.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/bzip2recover.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/bzlib.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/compress.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/crctable.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/decompress.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/dlltest.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/huffman.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/mk251.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/randtable.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/spewG.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/bzip2-1.0.8/unzcrash.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/test_bzip2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/test_gzip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/adler32.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/compress.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/blast/blast.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/infback9/infback9.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/infback9/inftree9.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/inflate86/inffas86.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/iostream/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/iostream/zfstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/iostream2/zstream_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/iostream3/test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/iostream3/zfstream.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/masmx64/inffas8664.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/minizip/ioapi.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/minizip/iowin32.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/minizip/miniunz.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/minizip/minizip.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/minizip/mztools.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/minizip/unzip.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/minizip/zip.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/puff/puff.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/puff/pufftest.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/testzlib/testzlib.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/contrib/untgz/untgz.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/crc32.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/deflate.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/examples/enough.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/examples/fitblk.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/examples/gun.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/examples/gzappend.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/examples/gzjoin.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/examples/gzlog.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/examples/zpipe.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/examples/zran.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/gzclose.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/gzlib.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/gzread.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/gzwrite.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/infback.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/inffast.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/inflate.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/inftrees.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/test/example.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/test/infcover.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/test/minigzip.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/trees.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/uncompr.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/iostreams/zlib-1.2.11/zutil.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/log/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/mpi/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/program_options/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/python/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/random/lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/random/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/regex/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/serialization/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/serialization/wquick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/system/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/test/test_mon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/test/test_utf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/thread/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boost_install/test/wave/quick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/boostdep/src/boostdep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/built_tool/core/core.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/built_tool/tblgen/tblgen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/complex-testing/compile-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/complex-testing/fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/complex-testing/post.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/complex-testing/success.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/customization/codegen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/generate/a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/gettext/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/hello/hello.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/libraries/app/app.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/libraries/util/foo/bar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/pch-multi/source/hello_world.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/pch/source/hello_world.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/pkg-config/test1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/pkg-config/test2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/pkg-config/test3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/pkg-config/test4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/pkg-config/test5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/qt/qt3/hello/canvas.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/qt/qt3/hello/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/qt/qt3/moccable-cpp/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/qt/qt3/uic/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/qt/qt4/hello/arrow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/qt/qt4/hello/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/qt/qt4/moccable-cpp/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/qt/qt4/uic/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/sanitizers/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/testing/compile-fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/testing/fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/testing/success.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/time/hello.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/try_compile/foo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/try_compile/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/variant/a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/example/variant/libs/l.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/builtins.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/check_clib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/check_cxx11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/command.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/cwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/debugger.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/execcmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/execnt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/execunix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/execvms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/filent.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/filesys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/fileunix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/filevms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/frames.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/glob.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/hcache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/hdrmacro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/headers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/jam.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/jam_strings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/jamgram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/lists.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/make1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/md5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/mem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/modules.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/modules/order.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/modules/path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/modules/property-set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/modules/regex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/modules/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/modules/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/option.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/parse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/pathnt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/pathsys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/pathunix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/pathvms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/regexp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/rules.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/scan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/startup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/subst.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/sysinfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/timestamp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/variable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/w32_getreg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/src/engine/yyacc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/prebuilt/ext/a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/prebuilt/hello.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test3/a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test3/lib/b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test3/lib2/c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test3/lib2/d.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test3/lib2/helper/e.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test3/lib3/f.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test4/a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test4/a_gcc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/project-test4/lib/b.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/mock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/phonon.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qt3support.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtassistant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtcore.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtcorefail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtdeclarative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtgui.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qthelp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtmultimedia.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtnetwork.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtscript.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtscripttools.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtsql.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtsvg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qttest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtwebkit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtxml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/qtxmlpatterns.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt4/rcc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/initialization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/mock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qt3dcore.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qt3dinput.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qt3dlogic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qt3drender.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtassistant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtbluetooth.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtcharts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtcore.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtcorefail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtdatavisualization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtdeclarative.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtgamepad.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qthelp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtlocation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtmultimedia.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtnetwork.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtnfc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtpositioning.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtpurchasing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtquick.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtscript.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtscripttools.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtscxml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtserialbus.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtserialport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtsql.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtsvg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qttest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwebchannel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwebengine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwebenginewidgets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwebkit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwebkitwidgets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwebsocket.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwebsockets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwebview.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtwidgets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtxml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/qtxmlpatterns.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/qt5/rcc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/rootless/test1/sub_root/a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/rootless/test2/sub_root/a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/rootless/test3/sub/inner/a.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/test2/foo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/toolset-mock/lib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/toolset-mock/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/build/test/toolset-mock/src/mock-program.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/check_build/test/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/add_subdir/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/add_subdir_exc/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/assert/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/atomic/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_fetch/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/arguments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/compile_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/emits_warning.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/link.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/link_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/requires_no_exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/requires_no_rtti.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/requires_variadic_templates.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/return_exit_code.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/run.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/boost_test/run_fail.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/iostreams/test_fd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/locale/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/mp11/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/cmake/test/timer/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/apple_macro_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/ascii_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/assert_macro_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/copyright_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/crlf_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/deprecated_macro_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/end_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/inspect.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/license_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/link_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/minmax_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/path_name_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/tab_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/unnamed_namespace_check.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/inspect/wrong_line_ends_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/bb2html.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/block_element_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/boostbook_chunker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/code_snippet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/collector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/dependency_tracker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/doc_info_actions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/doc_info_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/document_state.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/files.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/glob.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/html_printer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/id_generation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/id_xml.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/include_paths.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/main_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/markups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/native_text.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/phrase_element_grammar.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/post_process.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/quickbook.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/state.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/stream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/syntax_highlight.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/template_stack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/tree.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/utils.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/values.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/src/xml_parse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/callouts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/snippets/pass_thru.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/snippets/unbalanced_snippet1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/snippets/unbalanced_snippet2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/src/text_diff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/stub.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/stub.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/cleanup_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/glob_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/path_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/post_process_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/source_map_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/symbols_find_null.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/symbols_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/utils_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boostProject-prefix/src/boostProject/tools/quickbook/test/unit/values_test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/32.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/arm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/mips1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/power.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/riscv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/s390x.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/sparc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/config/checks/architecture/x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="1">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/libs/context/src/posix/stack_traits.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="2">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/builtins.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/check_clib.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="10">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/check_cxx11.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="10">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/class.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/command.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/cwd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/debugger.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/execcmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/execnt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/execunix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/filent.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/filesys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/fileunix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/frames.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/function.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/glob.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/hash.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/hcache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/hdrmacro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/headers.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/jam.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/jam_strings.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/jamgram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/lists.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/make.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/make1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/md5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/mem.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/modules.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/modules/order.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/modules/path.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/modules/property-set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/modules/regex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/modules/sequence.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/modules/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/native.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/object.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/option.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/parse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/pathnt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/pathsys.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/pathunix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/regexp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/rules.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/scan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/search.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/startup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/subst.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/sysinfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/timestamp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/variable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/w32_getreg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="8">
+        <ccTool flags="11">
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/doctest/parts/doctest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/alternative_macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/assertion_macros.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/asserts_used_outside_of_tests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/concurrency.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/enums.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/logging.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace4.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace5.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace6.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace7.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/namespace9.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/no_failures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/reporters_and_listeners.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/stringification.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/subcases.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/templated_test_cases.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/all_features/test_cases_and_suites.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/combining_the_same_tests_built_differently_in_multiple_shared_objects/default.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/combining_the_same_tests_built_differently_in_multiple_shared_objects/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/combining_the_same_tests_built_differently_in_multiple_shared_objects/return42.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/combining_the_same_tests_built_differently_in_multiple_shared_objects/test_runner.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/exe_with_static_libs/lib_1_src1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/exe_with_static_libs/lib_1_src2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/exe_with_static_libs/lib_2_src.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/exe_with_static_libs/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/executable_dll_and_plugin/dll.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/executable_dll_and_plugin/implementation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/executable_dll_and_plugin/implementation_2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/executable_dll_and_plugin/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/executable_dll_and_plugin/plugin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/installed_doctest_cmake/dll/dll.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/installed_doctest_cmake/dll/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/installed_doctest_cmake/executable/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/mpi/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/examples/mpi/mpi.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/scripts/coverage_maxout.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/scripts/hello_world.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/scripts/how_stuff_works/how_exception_translators_work.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/scripts/how_stuff_works/how_subcases_work.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/scripts/how_stuff_works/testing_crash_scenarios.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/scripts/playground/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/doctest/src/doctest/scripts/playground/test.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/documentation/tutorial/tutorial.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbbackup/FileConverter.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbbackup/FileDecoder.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbbackup/backup.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/AdvanceVersionCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/BlobRangeCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/CacheRangeCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/ChangeFeedCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/ConfigureCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/ConsistencyCheckCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/CoordinatorsCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/DataDistributionCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/ExcludeCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/ExpensiveDataCheckCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/FileConfigureCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/FlowLineNoise.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/ForceRecoveryWithDataLossCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/IncludeCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/KillCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/LockCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/MaintenanceCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/ProfileCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/SetClassCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/SnapshotCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/StatusCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/SuspendCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/TenantCommands.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/ThrottleCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/TriggerDDTeamInfoLogCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/TssqCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/Util.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/VersionEpochCommand.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbcli/fdbcli.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>../..</pElem>
+            <pElem>../../bld</pElem>
+            <pElem>../../contrib/fmt-8.1.1/include</pElem>
+            <pElem>../../bld/jemalloc/include</pElem>
+            <pElem>../../bld/boost_install/include</pElem>
+            <pElem>../../bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/AsyncFileBlobStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/AsyncFileS3BlobStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/AsyncTaskThread.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/BackupAgentBase.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/BackupContainer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/BackupContainerFileSystem.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/BackupContainerLocalDirectory.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/BackupContainerS3BlobStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/BlobGranuleReader.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/BlobStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/ClusterConnectionFile.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/ClusterConnectionKey.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/ClusterConnectionMemoryRecord.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/DatabaseBackupAgent.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/FDBOptions.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/FileBackupAgent.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/GlobalConfig.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/HTTP.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/KeyRangeMap.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/ManagementAPI.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/MetricLogger.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/MonitorLeader.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/MultiVersionTransaction.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/MutationLogReader.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/NativeAPI.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>../..</pElem>
+            <pElem>../../bld</pElem>
+            <pElem>../../contrib/fmt-8.1.1/include</pElem>
+            <pElem>../../bld/jemalloc/include</pElem>
+            <pElem>../../bld/boost_install/include</pElem>
+            <pElem>../../bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/ParallelStream.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/PaxosConfigTransaction.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/ReadYourWrites.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/S3BlobStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/SimpleConfigTransaction.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/SpecialKeySpace.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/StatusClient.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/TagThrottle.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/TaskBucket.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbclient/ThreadSafeTransaction.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/ActorFuzz.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/AsyncFileCached.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/AsyncFileNonDurable.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/FailureMonitor.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/FlowTests.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/FlowTransport.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/HealthMonitor.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/IAsyncFile.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/LoadBalance.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/SimExternalConnection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/Stats.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/dsltest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/genericactors.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbrpc/sim2.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/BackupProgress.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/BackupWorker.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/BlobGranuleServerCommon.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/BlobGranuleValidation.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/BlobManager.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/BlobWorker.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/ClusterController.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/ClusterRecovery.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/CommitProxyServer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/ConfigBroadcaster.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/ConfigDatabaseUnitTests.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/ConfigNode.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/CoordinatedState.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/Coordination.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/CoroFlow.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/CoroFlowCoro.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/DDTeamCollection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/DataDistribution.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/DataDistributionQueue.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/DataDistributionTracker.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/DiskQueue.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/EncryptKeyProxy.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/FDBExecHelper.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>../..</pElem>
+            <pElem>../../bld</pElem>
+            <pElem>../../bindings/c</pElem>
+            <pElem>../../bld/bindings/c</pElem>
+            <pElem>../../bld/fdbserver/workloads</pElem>
+            <pElem>../../fdbserver/workloads</pElem>
+            <pElem>../../bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>../../contrib/fmt-8.1.1/include</pElem>
+            <pElem>../../bld/jemalloc/include</pElem>
+            <pElem>../../bld/boost_install/include</pElem>
+            <pElem>../../bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>../../bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/GrvProxyServer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/KeyValueStoreCompressTestData.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/KeyValueStoreMemory.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/KeyValueStoreRocksDB.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/KeyValueStoreSQLite.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/LeaderElection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/LocalConfiguration.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/LogRouter.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/LogSystemDiskQueueAdapter.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/LogSystemPeekCursor.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/MasterProxyServer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/MetricLogger.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/MoveKeys.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/OldTLogServer_4_6.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/OldTLogServer_6_0.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/OldTLogServer_6_2.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/OnDemandStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/PaxosConfigConsumer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/QuietDatabase.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/Ratekeeper.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RemoteIKeyValueStore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/ResolutionBalancer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/Resolver.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RestoreApplier.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RestoreCommon.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RestoreController.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RestoreLoader.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RestoreRoleCommon.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RestoreUtil.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RestoreWorker.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RestoreWorkerInterface.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RocksDBCheckpointUtils.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/RoleLineage.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/ServerCheckpoint.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/SimEncryptVaultProxy.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/SimpleConfigConsumer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/SimulatedCluster.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>../..</pElem>
+            <pElem>../../bld</pElem>
+            <pElem>../../bindings/c</pElem>
+            <pElem>../../bld/bindings/c</pElem>
+            <pElem>../../bld/fdbserver/workloads</pElem>
+            <pElem>../../fdbserver/workloads</pElem>
+            <pElem>../../bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>../../contrib/fmt-8.1.1/include</pElem>
+            <pElem>../../bld/jemalloc/include</pElem>
+            <pElem>../../bld/boost_install/include</pElem>
+            <pElem>../../bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>../../bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/Status.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/StorageCache.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/TCInfo.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/TLogServer.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/TSSMappingUtil.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/TagPartitionedLogSystem.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/TagThrottler.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/VersionedBTree.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/WaitFailure.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/fdbserver.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>../..</pElem>
+            <pElem>../../bld</pElem>
+            <pElem>../../bindings/c</pElem>
+            <pElem>../../bld/bindings/c</pElem>
+            <pElem>../../bld/fdbserver/workloads</pElem>
+            <pElem>../../fdbserver/workloads</pElem>
+            <pElem>../../bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>../../contrib/fmt-8.1.1/include</pElem>
+            <pElem>../../bld/jemalloc/include</pElem>
+            <pElem>../../bld/boost_install/include</pElem>
+            <pElem>../../bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>../../bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/masterserver.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/networktest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/pubsub.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb-build/CMakeFiles/3.22.2/CompilerIdC/CMakeCCompilerId.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb-build/CMakeFiles/3.22.2/CompilerIdCXX/CMakeCXXCompilerId.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb-build/build_version.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/cache_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/cache_bench_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/cache_entry_roles.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/cache_reservation_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/cache_reservation_manager_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/cache_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/clock_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/lru_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/lru_cache_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/cache/sharded_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/arena_wrapped_db_iter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_counting_iterator_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_fetcher.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_addition.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_addition_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_builder_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_cache_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_garbage.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_garbage_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_meta.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_file_reader_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_garbage_meter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_garbage_meter_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_log_format.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_log_sequential_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/blob_log_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/db_blob_basic_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/db_blob_compaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/db_blob_corruption_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/db_blob_index_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/blob/prefetch_buffer_collection.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/c.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/c_test.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/column_family.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/column_family_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compact_files_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/clipping_iterator_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_iterator_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_job.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_job_stats_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_job_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker_fifo.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker_level.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_picker_universal.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/compaction_service_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/compaction/sst_partitioner.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/comparator_db_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/convenience.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/corruption_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/cuckoo_table_db_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_basic_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_block_cache_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_bloom_filter_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_compaction_filter_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_compaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_dynamic_level_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_encryption_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_filesnapshot.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_flush_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/compacted_db_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_compaction_flush.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_debug.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_experimental.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_files.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_open.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_readonly.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_secondary.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl/db_impl_write.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_info_dumper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_inplace_update_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_io_failure_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_iter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_iter_stress_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_iter_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_iterator_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_kv_checksum_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_log_iter_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_logical_block_size_cache_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_memtable_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_merge_operand_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_merge_operator_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_options_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_properties_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_range_del_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_secondary_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_sst_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_statistics_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_table_properties_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_tailing_iter_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_test2.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_test_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_universal_compaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_wal_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_with_timestamp_basic_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_with_timestamp_compaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_write_buffer_manager_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_write_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/dbformat.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/dbformat_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/deletefile_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/error_handler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/error_handler_fs_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/event_helpers.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/experimental.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/external_sst_file_basic_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/external_sst_file_ingestion_job.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/external_sst_file_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/fault_injection_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/file_indexer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/file_indexer_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/filename_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/flush_job.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/flush_job_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/flush_scheduler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/forward_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/forward_iterator_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/import_column_family_job.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/import_column_family_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/internal_stats.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/listener_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/log_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/log_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/log_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/logs_with_prep_tracker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/malloc_stats.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/manual_compaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/memtable.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/memtable_list.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/memtable_list_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/merge_helper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/merge_helper_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/merge_operator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/merge_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/obsolete_files_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/options_file_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/output_validator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/perf_context_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/periodic_work_scheduler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/periodic_work_scheduler_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/plain_table_db_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/prefix_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/range_del_aggregator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/range_del_aggregator_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/range_del_aggregator_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/range_tombstone_fragmenter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/range_tombstone_fragmenter_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/repair.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/repair_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/snapshot_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/table_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/table_properties_collector.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/table_properties_collector_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/transaction_log_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/trim_history_scheduler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_builder_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_edit.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_edit_handler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_edit_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_set.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/version_set_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/wal_edit.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/wal_edit_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/wal_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/wal_manager_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_batch.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_batch_base.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_batch_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_callback_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_controller.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_controller_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db/write_thread.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/batched_ops_stress.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/cf_consistency_stress.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/db_stress.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/db_stress_common.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/db_stress_driver.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/db_stress_gflags.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/db_stress_listener.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/db_stress_shared_state.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/db_stress_test_base.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/db_stress_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/expected_state.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/db_stress_tool/no_batched_ops_stress.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/composite_env.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_basic_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_chroot.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_encryption.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_hdfs.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_posix.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/env_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/file_system.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/file_system_tracer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/fs_posix.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/fs_remap.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/io_posix.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/io_posix_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/mock_env.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/mock_env_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/env/unique_id_gen.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/c_simple_example.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/column_families_example.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/compact_files_example.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/compaction_filter_example.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/multi_processes_example.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/optimistic_transaction_example.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/options_file_example.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/simple_example.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/examples/transaction_example.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/delete_scheduler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/delete_scheduler_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/file_prefetch_buffer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/file_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/filename.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/line_file_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/prefetch_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/random_access_file_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/random_access_file_reader_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/read_write_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/readahead_raf.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/sequence_file_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/sst_file_manager_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/file/writable_file_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/fuzz/db_fuzzer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/fuzz/db_map_fuzzer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/fuzz/sst_file_writer_fuzzer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/backupablejni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/backupenginejni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/cassandra_compactionfilterjni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/cassandra_value_operator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/checkpoint.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/clock_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/columnfamilyhandle.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compact_range_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compaction_filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compaction_filter_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compaction_filter_factory_jnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compaction_job_info.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compaction_job_stats.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compaction_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compaction_options_fifo.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compaction_options_universal.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/comparator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/comparatorjnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/compression_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/concurrent_task_limiter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/config_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/env.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/env_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/event_listener.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/event_listener_jnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/ingest_external_file_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/jnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/loggerjnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/lru_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/memory_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/memtablejni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/merge_operator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/native_comparator_wrapper_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/optimistic_transaction_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/optimistic_transaction_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/options_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/persistent_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/ratelimiterjni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/remove_emptyvalue_compactionfilterjni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/restorejni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/rocks_callback_object.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/rocksdb_exception_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/rocksjni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/slice.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/snapshot.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/sst_file_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/sst_file_reader_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/sst_file_readerjni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/sst_file_writerjni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/sst_partitioner.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/statistics.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/statisticsjni.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/table.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/table_filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/table_filter_jnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/testable_event_listener.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/thread_status.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/trace_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/trace_writer_jnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/transaction.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/transaction_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/transaction_db_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/transaction_log.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/transaction_notifier.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/transaction_notifier_jnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/transaction_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/ttl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/wal_filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/wal_filter_jnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/write_batch.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/write_batch_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/write_batch_with_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/write_buffer_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/java/rocksjni/writebatchhandlerjnicallback.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/auto_roll_logger.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/auto_roll_logger_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/env_logger_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/event_logger.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/event_logger_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/logging/log_buffer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/arena.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/arena_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/concurrent_arena.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/jemalloc_nodump_allocator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/memkind_kmem_allocator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memory/memkind_kmem_allocator_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/alloc_tracker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/hash_linklist_rep.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/hash_skiplist_rep.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/inlineskiplist_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/memtablerep_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/skiplist_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/skiplistrep.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/vectorrep.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/write_buffer_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/memtable/write_buffer_manager_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/microbench/db_basic_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/microbench/ribbon_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/histogram.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/histogram_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/histogram_windowing.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/in_memory_stats_history.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/instrumented_mutex.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/iostats_context.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/iostats_context_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/perf_context.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/perf_level.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/persistent_stats_history.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/statistics.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/statistics_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/stats_history_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_updater.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_updater_debug.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/monitoring/thread_status_util_debug.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/cf_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/configurable.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/configurable_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/customizable.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/customizable_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/db_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/options_helper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/options_parser.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/options_settable_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/options/options_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/port_posix.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/stack_trace.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/win/env_default.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/win/env_win.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/win/io_win.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/win/port_win.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/win/win_jemalloc.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/win/win_logger.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/win/win_thread.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/port/win/xpress_win.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/adaptive/adaptive_table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/binary_search_index_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_filter_block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_filter_block_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_based_table_reader_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_prefetcher.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_prefix_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/block_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/data_block_footer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/data_block_hash_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/data_block_hash_index_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/filter_block_reader_common.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/filter_policy.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/flush_block_policy.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/full_filter_block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/full_filter_block_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/hash_index_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/index_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/index_reader_common.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/parsed_full_filter_block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/partitioned_filter_block.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/partitioned_filter_block_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/partitioned_index_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/partitioned_index_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/reader_common.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_based/uncompression_dict_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_fetcher.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/block_fetcher_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cleanable_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cuckoo/cuckoo_table_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cuckoo/cuckoo_table_builder_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cuckoo/cuckoo_table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cuckoo/cuckoo_table_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/cuckoo/cuckoo_table_reader_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/format.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/get_context.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/merger_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/merging_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/meta_blocks.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/mock_table.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/persistent_cache_helper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_bloom.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_builder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_key_coding.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain/plain_table_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/sst_file_dumper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/sst_file_reader.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/sst_file_reader_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/sst_file_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/table_factory.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/table_properties.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/table_reader_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/table_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/two_level_iterator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/table/unique_id.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/mock_time_env.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/sync_point.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/sync_point_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/testharness.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/testutil.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/testutil_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/test_util/transaction_test_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/detail/Futex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/AtomicNotification.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/DistributedMutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/ParkingLot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/WaitOptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/gtest-1.8.1/fused-src/gtest/gtest_main.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/blob_dump.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/block_cache_analyzer/block_cache_trace_analyzer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/block_cache_analyzer/block_cache_trace_analyzer_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/db_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/db_bench_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/db_bench_tool_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/db_repl_stress.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/db_sanity_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/dump/db_dump_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/dump/rocksdb_dump.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/dump/rocksdb_undump.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/io_tracer_parser.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/io_tracer_parser_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/io_tracer_parser_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/ldb.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/ldb_cmd.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/ldb_cmd_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/ldb_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/rdb/db_wrapper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/rdb/rdb.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/reduce_levels_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/simulated_hybrid_file_system.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/sst_dump.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/sst_dump_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/sst_dump_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/trace_analyzer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/trace_analyzer_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/trace_analyzer_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/tools/write_stress.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/block_cache_tracer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/block_cache_tracer_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/io_tracer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/io_tracer_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/trace_record.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/trace_record_handler.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/trace_record_result.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/trace_replay/trace_replay.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/autovector_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/bloom_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/coding.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/coding_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/compaction_job_stats_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/comparator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/compression_context_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/concurrent_task_limiter_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/crc32c.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="4">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/crc32c_arm64.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/crc32c_ppc.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/crc32c_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/defer_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/dynamic_bloom.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/dynamic_bloom_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/file_checksum_helper.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/file_reader_writer_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/filelock_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/filter_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/hash.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/hash_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/heap_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/log_write_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/murmurhash.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/random.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/random_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/rate_limiter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/rate_limiter_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/regex.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/repeatable_thread_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/ribbon_config.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/ribbon_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/slice.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/slice_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/slice_transform_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/status.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/string_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/thread_list_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/thread_local.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/thread_local_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/threadpool_imp.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/timer_queue_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/timer_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/work_queue_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/util/xxhash.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/backupable/backupable_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/backupable/backupable_db_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_compaction_filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_db_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_db_impl_filesnapshot.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_db_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_dump_tool.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/blob_db/blob_file.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cache_dump_load.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cache_dump_load_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/cassandra_compaction_filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/cassandra_format_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/cassandra_functional_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/cassandra_row_merge_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/cassandra_serialize_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/format.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/merge_operator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/cassandra/test_utils.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/checkpoint/checkpoint_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/checkpoint/checkpoint_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/compaction_filters.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/convenience/info_log_finder.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/debug.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/env_librados.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/env_librados_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/env_mirror.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/env_mirror_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/env_timed.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/env_timed_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/fault_injection_env.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/fault_injection_fs.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/fault_injection_secondary_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/leveldb_options/leveldb_options.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/memory/memory_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/memory/memory_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/bytesxor.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/max.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/put.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/sortlist.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/string_append/stringappend.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/string_append/stringappend2.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/string_append/stringappend_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/merge_operators/uint64add.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/object_registry.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/object_registry_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/option_change_migration/option_change_migration.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/option_change_migration/option_change_migration_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/options/options_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/options/options_util_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/block_cache_tier.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/block_cache_tier_file.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/hash_table_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/hash_table_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/persistent_cache_bench.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/persistent_cache_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/persistent_cache_tier.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/persistent_cache/volatile_tier_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/simulator_cache/cache_simulator.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/simulator_cache/cache_simulator_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/simulator_cache/sim_cache.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/simulator_cache/sim_cache_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/table_properties_collectors/compact_on_deletion_collector.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/trace/file_trace_reader_writer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/trace/replayer_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/lock_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/point/point_lock_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/point/point_lock_manager_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/point/point_lock_tracker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_locking_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/concurrent_tree.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/keyrange.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/lock_request.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/range_buffer.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/treenode.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/txnid_set.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/locktree/wfg.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/standalone_port.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/util/dbt.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/lib/util/memarena.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/optimistic_transaction.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/optimistic_transaction_db_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/optimistic_transaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/pessimistic_transaction.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/pessimistic_transaction_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/snapshot_checker.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/transaction_base.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/transaction_db_mutex_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/transaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/transaction_util.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_prepared_transaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_prepared_txn.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_prepared_txn_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_unprepared_transaction_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_unprepared_txn.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/write_unprepared_txn_db.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/ttl/db_ttl_impl.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/ttl/ttl_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/util_merge_operators_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/wal_filter.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="3">
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_test.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/storageserver.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/tester.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/worker.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ApiCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ApiWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/AsyncFileCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/AsyncFileRead.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/AsyncFileWrite.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/AtomicOps.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/AtomicOpsApiCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/AtomicRestore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/AtomicSwitchover.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BackgroundSelectors.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BackupCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BackupToBlob.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BackupToDBAbort.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BackupToDBCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BackupToDBUpgrade.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BlobGranuleCorrectnessWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BlobGranuleVerifier.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/BulkLoad.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Cache.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ChangeConfig.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ChangeFeeds.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ClearSingleRange.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ClientTransactionProfileCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ClogSingleConnection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/CommitBugCheck.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ConfigIncrement.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ConfigureDatabase.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ConflictRange.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ConsistencyCheck.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/CpuProfiler.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Cycle.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DDBalance.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DDMetrics.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DDMetricsExclude.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DataDistributionMetrics.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DataLossRecovery.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DifferentClustersSameRV.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DiskDurability.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DiskDurabilityTest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DiskFailureInjection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Downgrade.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/DummyWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/EncryptionOps.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ExternalWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/FastTriggeredWatches.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/FileSystem.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/FuzzApiCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/GetMappedRange.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/GetRangeStream.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/HealthMetricsApi.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/HighContentionPrefixAllocatorWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Increment.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/IncrementalBackup.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/IndexScan.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Inventory.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/KVStoreTest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/KillRegion.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/LocalRatekeeper.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/LockDatabase.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/LockDatabaseFrequently.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/LogMetrics.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/LowLatency.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/MachineAttrition.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Mako.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/MemoryLifetime.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/MetricLogging.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/MiniCycle.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/MutationLogReaderCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ParallelRestore.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Performance.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/PhysicalShardMove.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Ping.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/PopulateTPCC.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ProtocolVersion.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/PubSubMultiples.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/QueuePush.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RYWDisable.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RYWPerformance.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RandomClogging.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RandomMoveKeys.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RandomSelector.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ReadAfterWrite.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ReadHotDetection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ReadWrite.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RemoveServersSafely.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ReportConflictingKeys.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RestoreBackup.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RestoreFromBlob.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Rollback.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/RyowCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SaveAndKill.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SelectorCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Serializability.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Sideband.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SidebandSingle.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SimpleAtomicAdd.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SlowTaskWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SnapTest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/StatusWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Storefront.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/StreamingRangeRead.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/StreamingRead.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SubmitBackup.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/SuspendProcesses.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/TPCC.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/TagThrottleApi.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/TargetedKill.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/TaskBucketCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/TenantManagement.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/ThreadSafety.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Throttling.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Throughput.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/TimeKeeperCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/TriggerRecovery.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/UDPWorkload.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/UnitPerf.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/UnitTests.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Unreadable.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/VersionStamp.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/WatchAndWait.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/Watches.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/WatchesSameKeyCorrectness.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/WorkerErrors.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/WriteBandwidth.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/WriteDuringRead.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/fdbserver/workloads/WriteTagThrottling.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/ActorCollection.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/CompressedInt.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/Hostname.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/IThreadPoolTest.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/Net2.actor.g.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/Platform.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/Profiler.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/TLSConfig.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/ThreadHelper.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/Tracing.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/WriteOnlySet.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/flow/genericactors.actor.g.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../bld/toml11Project-prefix/src/toml11Project-build/CMakeFiles/3.22.2/CompilerIdC/CMakeCCompilerId.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="../../bld/toml11Project-prefix/src/toml11Project-build/CMakeFiles/3.22.2/CompilerIdCXX/CMakeCXXCompilerId.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../contrib/debug_determinism/debug_determinism.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../contrib/fmt-8.1.1/src/fmt.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../contrib/fmt-8.1.1/src/format.cc"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../contrib/fmt-8.1.1/src/os.cc" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../contrib/monitoring/actor_flamegraph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../documentation/tutorial/tutorial.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbbackup/BackupTLSConfig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbbackup/FileConverter.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbbackup/FileDecoder.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbbackup/backup.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/AdvanceVersionCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/BlobRangeCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/CacheRangeCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/ChangeFeedCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/ConfigureCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/ConsistencyCheckCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/CoordinatorsCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/DataDistributionCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/ExcludeCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/ExpensiveDataCheckCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/FileConfigureCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/FlowLineNoise.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/ForceRecoveryWithDataLossCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/IncludeCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/KillCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/LockCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/MaintenanceCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/ProfileCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/SetClassCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/SnapshotCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/StatusCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/SuspendCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/TenantCommands.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/ThrottleCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/TriggerDDTeamInfoLogCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/TssqCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/Util.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/VersionEpochCommand.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/fdbcli.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbcli/linenoise/linenoise.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbclient/ActorLineageProfiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/AnnotateActor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/AsyncFileS3BlobStore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/AsyncTaskThread.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/AutoPublicAddress.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/BackupAgentBase.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/BackupContainer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/BackupContainerAzureBlobStore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/BackupContainerFileSystem.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/BackupContainerLocalDirectory.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/BackupContainerS3BlobStore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/BlobGranuleFiles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/BlobGranuleReader.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ClientBooleanParams.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ClientKnobCollection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ClientKnobs.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ClusterConnectionFile.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ClusterConnectionKey.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ClusterConnectionMemoryRecord.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ConfigKnobs.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ConfigTransactionInterface.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/DatabaseBackupAgent.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/DatabaseConfiguration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/FDBTypes.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/FileBackupAgent.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/FluentDSampleIngestor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/GlobalConfig.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/HTTP.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/IConfigTransaction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/IKnobCollection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ISingleThreadTransaction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/JsonBuilder.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/KeyRangeMap.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/LocalClientAPI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ManagementAPI.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/MonitorLeader.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/MultiVersionTransaction.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/MutationLogReader.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/NameLineage.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/NativeAPI.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ParallelStream.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/PaxosConfigTransaction.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/RYWIterator.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ReadYourWrites.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/RestoreInterface.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/S3BlobStore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/Schemas.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ServerKnobCollection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ServerKnobs.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/SimpleConfigTransaction.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/SpecialKeySpace.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/StackLineage.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/StatusClient.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/StorageServerInterface.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/Subspace.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/SystemData.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/TagThrottle.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/TaskBucket.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/Tenant.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/TestKnobCollection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/ThreadSafeTransaction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>../..</pElem>
+            <pElem>../../bld</pElem>
+            <pElem>../../contrib/fmt-8.1.1/include</pElem>
+            <pElem>../../bld/jemalloc/include</pElem>
+            <pElem>../../bld/boost_install/include</pElem>
+            <pElem>../../bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/TransactionLineage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/Tuple.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/VersionedMap.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/Versionstamp.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/libb64/cdecode.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbclient/libb64/cencode.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbclient/md5/md5.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbclient/sha1/SHA1.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../fdbclient/zipf.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbmonitor/fdbmonitor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/ActorFuzz.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/AsyncFileCached.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/AsyncFileEncrypted.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/AsyncFileNonDurable.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/AsyncFileWriteChecker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/FailureMonitor.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/FlowTests.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/FlowTransport.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/HealthMonitor.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/IAsyncFile.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/LoadBalance.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/Locality.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/Net2FileSystem.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/PerfMetric.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/QueueModel.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/Replication.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/ReplicationPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/ReplicationTypes.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/ReplicationUtils.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/SimExternalConnection.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/Stats.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/TraceFileIO.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/dsltest.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/genericactors.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/libcoroutine/Common.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbrpc/libcoroutine/Coro.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbrpc/libcoroutine/context.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbrpc/libeio/eio.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../fdbrpc/sim2.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbrpc/sim_validation.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ApplyMetadataMutation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/BackupProgress.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/BackupWorker.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/BlobGranuleServerCommon.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/BlobGranuleValidation.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/BlobManager.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/BlobWorker.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ClusterController.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ClusterRecovery.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/CommitProxyServer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/CompactMap.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ConfigBroadcaster.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ConfigDatabaseUnitTests.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ConfigFollowerInterface.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ConfigNode.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/CoordinatedState.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/Coordination.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/CoroFlow.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/CoroFlowCoro.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/DDTeamCollection.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/DataDistribution.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/DataDistributionQueue.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/DataDistributionTracker.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/DiskQueue.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/EncryptKeyProxy.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/FDBExecHelper.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/GrvProxyServer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/IConfigConsumer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/KeyValueStoreCompressTestData.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/KeyValueStoreMemory.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/KeyValueStoreRocksDB.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/KeyValueStoreSQLite.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/KnobProtectiveGroups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/LatencyBandConfig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/LeaderElection.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/LocalConfiguration.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/LogRouter.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/LogSystem.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/LogSystemConfig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/LogSystemDiskQueueAdapter.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/LogSystemPeekCursor.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/MetricLogger.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/MoveKeys.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/MutationTracking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/OldTLogServer_4_6.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/OldTLogServer_6_0.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/OldTLogServer_6_2.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/OnDemandStore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/PaxosConfigConsumer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/QuietDatabase.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/Ratekeeper.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RemoteIKeyValueStore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ResolutionBalancer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/Resolver.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RestoreApplier.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RestoreCommon.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RestoreController.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RestoreLoader.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RestoreRoleCommon.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RestoreUtil.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RestoreWorker.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RestoreWorkerInterface.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RkTagThrottleCollection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RocksDBCheckpointUtils.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/RoleLineage.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/ServerCheckpoint.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/SigStack.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/SimEncryptVaultProxy.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/SimpleConfigConsumer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/SimulatedCluster.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/SkipList.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/Status.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/StorageCache.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/TCInfo.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/TLogServer.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/TSSMappingUtil.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/TagPartitionedLogSystem.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/TagThrottler.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/TransactionTagCounter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/VFSAsync.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/VersionedBTree.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/WaitFailure.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/fdbserver.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/masterserver.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/networktest.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/pubsub.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/sqlite/btree.c" ex="false" tool="0" flavor2="2">
+      </item>
+      <item path="../../fdbserver/sqlite/shell.c" ex="false" tool="0" flavor2="2">
+      </item>
+      <item path="../../fdbserver/sqlite/sqlite3.amalgamation.c"
+            ex="false"
+            tool="0"
+            flavor2="10">
+        <cTool flags="5">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../fdbserver/storageserver.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/tester.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/worker.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ApiCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ApiWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/AsyncFile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/AsyncFileCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/AsyncFileRead.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/AsyncFileWrite.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/AtomicOps.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/AtomicOpsApiCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/AtomicRestore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/AtomicSwitchover.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BackgroundSelectors.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BackupCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BackupToBlob.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BackupToDBAbort.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BackupToDBCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BackupToDBUpgrade.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BlobGranuleCorrectnessWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BlobGranuleVerifier.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/BulkLoad.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Cache.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ChangeConfig.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ChangeFeeds.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ClearSingleRange.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ClientTransactionProfileCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ClogSingleConnection.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/CommitBugCheck.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ConfigIncrement.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ConfigureDatabase.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ConflictRange.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ConsistencyCheck.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/CpuProfiler.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Cycle.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DDBalance.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DDMetrics.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DDMetricsExclude.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DataDistributionMetrics.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DataLossRecovery.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DifferentClustersSameRV.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DiskDurability.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DiskDurabilityTest.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DiskFailureInjection.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/DummyWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/EncryptionOps.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ExternalWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/FastTriggeredWatches.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/FileSystem.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Fuzz.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/FuzzApiCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/GetMappedRange.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/GetRangeStream.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/HealthMetricsApi.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/HighContentionPrefixAllocatorWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Increment.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/IncrementalBackup.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/IndexScan.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Inventory.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/KVStoreTest.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/KillRegion.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/LocalRatekeeper.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/LockDatabase.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/LockDatabaseFrequently.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/LogMetrics.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/LowLatency.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/MachineAttrition.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Mako.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/MemoryKeyValueStore.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bld/fdbserver/workloads</pElem>
+            <pElem>fdbserver/workloads</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>SSD_ROCKSDB_EXPERIMENTAL</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/MemoryLifetime.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/MetricLogging.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/MiniCycle.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/MutationLogReaderCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ParallelRestore.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Performance.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/PhysicalShardMove.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Ping.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/PopulateTPCC.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ProtocolVersion.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/PubSubMultiples.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/QueuePush.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RYWDisable.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RYWPerformance.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RandomClogging.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RandomMoveKeys.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RandomSelector.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ReadAfterWrite.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ReadHotDetection.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ReadWrite.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RemoveServersSafely.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ReportConflictingKeys.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RestoreBackup.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RestoreFromBlob.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Rollback.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/RyowCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SaveAndKill.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SelectorCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Serializability.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Sideband.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SidebandSingle.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SimpleAtomicAdd.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SlowTaskWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SnapTest.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/StatusWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Storefront.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/StreamingRangeRead.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/StreamingRead.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SubmitBackup.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/SuspendProcesses.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/TPCC.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/TagThrottleApi.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/TargetedKill.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/TaskBucketCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/TenantManagement.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/ThreadSafety.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Throttling.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Throughput.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/TimeKeeperCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/TriggerRecovery.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/UDPWorkload.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/UnitPerf.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/UnitTests.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Unreadable.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/VersionStamp.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/WatchAndWait.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/Watches.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/WatchesSameKeyCorrectness.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/WorkerErrors.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/WriteBandwidth.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/WriteDuringRead.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbserver/workloads/WriteTagThrottling.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbservice/FDBService.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../fdbservice/ServiceBase.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/ActorCollection.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/Arena.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/BlobCipher.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/CompressedInt.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/Deque.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/DeterministicRandom.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/Error.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/FastAlloc.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/FaultInjection.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/FileTraceLogWriter.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/Hash3.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../flow/Histogram.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/Hostname.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/IThreadPool.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/IThreadPoolTest.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/IndexedSet.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/JsonTraceLogFormatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/Knobs.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/Net2.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/Net2Packet.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/Platform.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/Profiler.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/SignalSafeUnwind.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/StreamCipher.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/SystemMonitor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/TDMetric.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/TLSConfig.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/ThreadHelper.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/ThreadPrimitives.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/Trace.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/Tracing.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/UnitTest.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/WriteOnlySet.actor.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/XmlTraceLogFormatter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/crc32c-generated-constants.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/crc32c.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/flat_buffers.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/flow.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/genericactors.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flow/network.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/serialize.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/stacktrace.amalgamation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/test_memcpy.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/test_memcpy_perf.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/version.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="7">
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../flow/xxhash.c" ex="false" tool="0" flavor2="10">
+        <cTool flags="5">
+        </cTool>
+      </item>
+      <item path="../../flowbench/BenchCallback.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchEncrypt.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchHash.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchIONet2.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchIterate.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchMem.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchMetadataCheck.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchNet2.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchPopulate.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchRandom.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchRef.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchStream.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchTimer.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/BenchVersionVector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/GlobalData.cpp" ex="false" tool="1" flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="../../flowbench/flowbench.actor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <item path="/usr/share/cmake/Modules/CMakeCCompilerABI.c"
+            ex="false"
+            tool="0"
+            flavor2="2">
+      </item>
+      <item path="/usr/share/cmake/Modules/CMakeCXXCompilerABI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="11">
+        <ccTool flags="8">
+        </ccTool>
+      </item>
+      <folder path="0/bindings">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/bindings/c">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bindings/c/test/apitester">
+        <ccTool>
+          <incDir>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/toml11/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+        </ccTool>
+      </folder>
+      <folder path="0/bindings/c/test/mako">
+        <cTool>
+          <incDir>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/bindings/c/test/workloads">
+        <ccTool>
+          <incDir>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>c_workloads_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bindings/java">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>/usr/lib/jvm/java/include</pElem>
+            <pElem>/usr/lib/jvm/java/include/linux</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/Jemalloc_project-prefix">
+        <cTool>
+          <incDir>
+            <pElem>bld/Jemalloc_project-prefix/src/Jemalloc_project/include</pElem>
+            <pElem>bld/Jemalloc_project-prefix/src/Jemalloc_project</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>JEMALLOC_NO_PRIVATE_NAMESPACE</Elem>
+            <Elem>PIC</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/bld/bindings">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/bindings/flow</pElem>
+            <pElem>bindings/flow</pElem>
+            <pElem>bindings/flow/tester</pElem>
+            <pElem>bld/bindings/flow/tester</pElem>
+            <pElem>bld/bindings/c</pElem>
+            <pElem>bindings/c</pElem>
+            <pElem>bld/bindings/c/foundationdb</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/boost_targetProject-prefix/src/boost_targetProject/libs">
+        <ccTool>
+          <incDir>
+            <pElem>bld/boost_targetProject-prefix/src/boost_targetProject</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_ALL_NO_LIB=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/boost_targetProject-prefix/src/boost_targetProject/libs/context">
+        <ccTool>
+          <preprocessorList>
+            <Elem>BOOST_CONTEXT_SOURCE</Elem>
+            <Elem>BOOST_DISABLE_ASSERTS</Elem>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine/modules">
+        <ccTool>
+          <incDir>
+            <pElem>bld/boost_targetProject-prefix/src/boost_targetProject/tools/build/src/engine</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NDEBUG</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/documentation">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbbackup">
+        <ccTool>
+          <incDir>
+            <pElem>../..</pElem>
+            <pElem>../../bld</pElem>
+            <pElem>../../contrib/fmt-8.1.1/include</pElem>
+            <pElem>../../bld/jemalloc/include</pElem>
+            <pElem>../../bld/boost_install/include</pElem>
+            <pElem>../../bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbcli">
+        <ccTool>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbrpc">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>fdbrpc/libeio</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb/db/db_impl">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb/table/adaptive">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb/table/plain">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly/folly/detail">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/compaction_filters">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/leveldb_options">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/trace">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/fdbserver/rocksdb-prefix/src/rocksdb/utilities/transactions/lock/range/range_tree">
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/include</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb/third-party/folly</pElem>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HAVE_PCLMUL</Elem>
+            <Elem>HAVE_SSE42</Elem>
+            <Elem>LZ4</Elem>
+            <Elem>OS_LINUX</Elem>
+            <Elem>ROCKSDB_FALLOCATE_PRESENT</Elem>
+            <Elem>ROCKSDB_LIB_IO_POSIX</Elem>
+            <Elem>ROCKSDB_MALLOC_USABLE_SIZE</Elem>
+            <Elem>ROCKSDB_NO_DYNAMIC_EXTENSION</Elem>
+            <Elem>ROCKSDB_PLATFORM_POSIX</Elem>
+            <Elem>ROCKSDB_PTHREAD_ADAPTIVE_MUTEX</Elem>
+            <Elem>ROCKSDB_RANGESYNC_PRESENT</Elem>
+            <Elem>ROCKSDB_SCHED_GETCPU_PRESENT</Elem>
+            <Elem>ROCKSDB_SUPPORT_THREAD_LOCAL</Elem>
+            <Elem>ROCKSDB_USE_RTTI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/bld/flow">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/contrib/debug_determinism">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/contrib/monitoring">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/fdbcli">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/fdbclient">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/fdbclient/sha1">
+        <ccTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+            <pElem>bld/msgpackProject-prefix/src/msgpackProject/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>ENABLE_SAMPLING</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/fdbmonitor">
+        <ccTool>
+          <incDir>
+            <pElem>../..</pElem>
+            <pElem>../../bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="0/fdbrpc">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>USE_UCONTEXT</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/flow">
+        <cTool>
+          <incDir>
+            <pElem>.</pElem>
+            <pElem>bld</pElem>
+            <pElem>contrib/fmt-8.1.1/include</pElem>
+            <pElem>bld/jemalloc/include</pElem>
+            <pElem>bld/boost_install/include</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>BOOST_BIND_GLOBAL_PLACEHOLDERS</Elem>
+            <Elem>BOOST_ERROR_CODE_HEADER_ONLY</Elem>
+            <Elem>BOOST_SYSTEM_NO_DEPRECATED</Elem>
+            <Elem>CMAKE_BUILD</Elem>
+            <Elem>NO_INTELLISENSE</Elem>
+            <Elem>TLS_DISABLED</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="Modules">
+        <cTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build/CMakeFiles/CMakeTmp</pElem>
+          </incDir>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>bld/fdbserver/rocksdb-prefix/src/rocksdb-build/CMakeFiles/CMakeTmp</pElem>
+          </incDir>
+        </ccTool>
+      </folder>
+    </conf>
+  </confs>
+</configurationDescriptor>
diff --git a/ide-projects/Netbeans12/nbproject/project.xml b/ide-projects/Netbeans12/nbproject/project.xml
new file mode 100644
index 00000000000..a3761e45b72
--- /dev/null
+++ b/ide-projects/Netbeans12/nbproject/project.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.cnd.makeproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/make-project/1">
+            <name>FoundationDb</name>
+            <c-extensions>c,m</c-extensions>
+            <cpp-extensions>cc,cpp,cxx,mm</cpp-extensions>
+            <header-extensions>h,hpp,ipp</header-extensions>
+            <sourceEncoding>UTF-8</sourceEncoding>
+            <make-dep-projects/>
+            <sourceRootList>
+                <sourceRootElem>../..</sourceRootElem>
+            </sourceRootList>
+            <confList>
+                <confElem>
+                    <name>Default</name>
+                    <type>0</type>
+                </confElem>
+            </confList>
+            <formatting>
+                <project-formatting-style>false</project-formatting-style>
+            </formatting>
+        </data>
+    </configuration>
+</project>

From 1df82c5cb18bc21f42e64f0626cec372737ea2f6 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Thu, 28 Jul 2022 10:46:28 -0700
Subject: [PATCH 561/740] Validate subrange reads in simulation (#7597) (#7720)

* Add extra validation to special key space reads in simulation

* Fix bugs turned up by validating subrange reads

* Change to validateSpecialSubrangeRead

It is in general not safe to expect that a read from the special key
space returns the same results if performed again, since the
transaction may be being modified concurrently.

* Add comment

* Add comment

Co-authored-by: Andrew Noyes <andrew.noyes@snowflake.com>
---
 fdbclient/SpecialKeySpace.actor.cpp           | 89 ++++++++++++++++++-
 fdbclient/SpecialKeySpace.actor.h             | 10 +++
 .../workloads/ReportConflictingKeys.actor.cpp |  9 +-
 3 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index a5b559a91e0..c0212ea4988 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -676,13 +676,14 @@ Future<RangeResult> ConflictingKeysImpl::getRange(ReadYourWritesTransaction* ryw
 	if (ryw->getTransactionState()->conflictingKeys) {
 		auto krMapPtr = ryw->getTransactionState()->conflictingKeys.get();
 		auto beginIter = krMapPtr->rangeContaining(kr.begin);
-		if (beginIter->begin() != kr.begin)
-			++beginIter;
 		auto endIter = krMapPtr->rangeContaining(kr.end);
+
+		if (!kr.contains(beginIter->begin()) && beginIter != endIter)
+			++beginIter;
 		for (auto it = beginIter; it != endIter; ++it) {
 			result.push_back_deep(result.arena(), KeyValueRef(it->begin(), it->value()));
 		}
-		if (endIter->begin() != kr.end)
+		if (kr.contains(endIter->begin()))
 			result.push_back_deep(result.arena(), KeyValueRef(endIter->begin(), endIter->value()));
 	}
 	return result;
@@ -2817,3 +2818,85 @@ Future<Optional<std::string>> TenantMapRangeImpl::commit(ReadYourWritesTransacti
 
 	return tag(waitForAll(tenantManagementFutures), Optional<std::string>());
 }
+
+ACTOR Future<Void> validateSpecialSubrangeRead(ReadYourWritesTransaction* ryw,
+                                               KeySelector begin,
+                                               KeySelector end,
+                                               GetRangeLimits limits,
+                                               Reverse reverse,
+                                               RangeResult result) {
+	if (!result.size()) {
+		RangeResult testResult = wait(ryw->getRange(begin, end, limits, Snapshot::True, reverse));
+		ASSERT(testResult == result);
+		return Void();
+	}
+
+	if (reverse) {
+		ASSERT(std::is_sorted(result.begin(), result.end(), KeyValueRef::OrderByKeyBack{}));
+	} else {
+		ASSERT(std::is_sorted(result.begin(), result.end(), KeyValueRef::OrderByKey{}));
+	}
+
+	// Generate a keyrange where we can determine the expected result based solely on the previous readrange, and whose
+	// boundaries may or may not be keys in result.
+	std::vector<Key> candidateKeys;
+	if (reverse) {
+		for (int i = result.size() - 1; i >= 0; --i) {
+			candidateKeys.emplace_back(result[i].key);
+			if (i - 1 >= 0) {
+				candidateKeys.emplace_back(keyBetween(KeyRangeRef(result[i].key, result[i - 1].key)));
+			}
+		}
+	} else {
+		for (int i = 0; i < result.size(); ++i) {
+			candidateKeys.emplace_back(result[i].key);
+			if (i + 1 < result.size()) {
+				candidateKeys.emplace_back(keyBetween(KeyRangeRef(result[i].key, result[i + 1].key)));
+			}
+		}
+	}
+	std::sort(candidateKeys.begin(), candidateKeys.end());
+	int originalSize = candidateKeys.size();
+	// Add more candidate keys so that we might read a range between two adjacent result keys.
+	for (int i = 0; i < originalSize - 1; ++i) {
+		candidateKeys.emplace_back(keyBetween(KeyRangeRef(candidateKeys[i], candidateKeys[i + 1])));
+	}
+	std::vector<Key> keys;
+	keys = { deterministicRandom()->randomChoice(candidateKeys), deterministicRandom()->randomChoice(candidateKeys) };
+	std::sort(keys.begin(), keys.end());
+	state KeySelector testBegin = firstGreaterOrEqual(keys[0]);
+	state KeySelector testEnd = firstGreaterOrEqual(keys[1]);
+
+	// Generate expected result. Linear time is ok here since we're in simulation, and there's a benefit to keeping this
+	// simple (as we're using it as an test oracle)
+	state RangeResult expectedResult;
+	// The reverse parameter should be the same as for the original read, so if
+	// reverse is true then the results are _already_ in reverse order.
+	for (const auto& kr : result) {
+		if (kr.key >= keys[0] && kr.key < keys[1]) {
+			expectedResult.push_back(expectedResult.arena(), kr);
+		}
+	}
+
+	// Test
+	RangeResult testResult = wait(ryw->getRange(testBegin, testEnd, limits, Snapshot::True, reverse));
+	if (testResult != expectedResult) {
+		fmt::print("Reverse: {}\n", reverse);
+		fmt::print("Original range: [{}, {})\n", begin.toString(), end.toString());
+		fmt::print("Original result:\n");
+		for (const auto& kr : result) {
+			fmt::print("	{} -> {}\n", kr.key.printable(), kr.value.printable());
+		}
+		fmt::print("Test range: [{}, {})\n", testBegin.getKey().printable(), testEnd.getKey().printable());
+		fmt::print("Expected:\n");
+		for (const auto& kr : expectedResult) {
+			fmt::print("	{} -> {}\n", kr.key.printable(), kr.value.printable());
+		}
+		fmt::print("Got:\n");
+		for (const auto& kr : testResult) {
+			fmt::print("	{} -> {}\n", kr.key.printable(), kr.value.printable());
+		}
+		ASSERT(testResult == expectedResult);
+	}
+	return Void();
+}
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index 836567ecf4a..d2b8563d9e7 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -550,5 +550,15 @@ class TenantMapRangeImpl : public SpecialKeyRangeRWImpl {
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
 
+// If the underlying set of key-value pairs of a key space is not changing, then we expect repeating a read to give the
+// same result. Additionally, we can generate the expected result of any read if that read is reading a subrange. This
+// actor performs a read of an arbitrary subrange of [begin, end) and validates the results.
+ACTOR Future<Void> validateSpecialSubrangeRead(ReadYourWritesTransaction* ryw,
+                                               KeySelector begin,
+                                               KeySelector end,
+                                               GetRangeLimits limits,
+                                               Reverse reverse,
+                                               RangeResult result);
+
 #include "flow/unactorcompiler.h"
 #endif
diff --git a/fdbserver/workloads/ReportConflictingKeys.actor.cpp b/fdbserver/workloads/ReportConflictingKeys.actor.cpp
index 33ac14584af..854612333bb 100644
--- a/fdbserver/workloads/ReportConflictingKeys.actor.cpp
+++ b/fdbserver/workloads/ReportConflictingKeys.actor.cpp
@@ -192,9 +192,16 @@ struct ReportConflictingKeysWorkload : TestWorkload {
 					                LiteralStringRef("\xff\xff").withPrefix(conflictingKeysRange.begin));
 					// The getRange here using the special key prefix "\xff\xff/transaction/conflicting_keys/" happens
 					// locally Thus, the error handling is not needed here
-					Future<RangeResult> conflictingKeyRangesFuture = tr2->getRange(ckr, CLIENT_KNOBS->TOO_MANY);
+					state Future<RangeResult> conflictingKeyRangesFuture = tr2->getRange(ckr, CLIENT_KNOBS->TOO_MANY);
 					ASSERT(conflictingKeyRangesFuture.isReady());
 
+					wait(validateSpecialSubrangeRead(tr2.getPtr(),
+					                                 firstGreaterOrEqual(ckr.begin),
+					                                 firstGreaterOrEqual(ckr.end),
+					                                 GetRangeLimits(),
+					                                 Reverse::False,
+					                                 conflictingKeyRangesFuture.get()));
+
 					tr2 = makeReference<ReadYourWritesTransaction>(cx);
 
 					const RangeResult conflictingKeyRanges = conflictingKeyRangesFuture.get();

From a62282a1b6d3b445eac401120f590ded66585534 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Thu, 28 Jul 2022 21:09:43 -0400
Subject: [PATCH 562/740] Fix bug where too many logs were generated.

---
 fdbclient/NativeAPI.actor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 7ef8f9a313b..6718c92dcfa 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -267,14 +267,16 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 				}
 			}
 		}
+		// do not log if commitVersion == readVersion as it is common.
 		if (!updatedVersionMap && commitVersion != readVersion) {
-			// This can have a performance impact if vv is enabled, so provide some diags
 			TraceEvent(SevDebug, "CommitVersionNotFoundForSS")
 			    .detail("InSSIDMap", iter != ssidTagMapping.end() ? 1 : 0)
 			    .detail("Tag", tag)
 			    .detail("CommitVersion", commitVersion)
 			    .detail("ReadVersion", readVersion)
-			    .detail("VersionVector", ssVersionVectorCache.toString());
+			    .detail("VersionVector", ssVersionVectorCache.toString())
+			    .setMaxEventLength(11000)
+			    .setMaxFieldLength(10000);
 			++transactionCommitVersionNotFoundForSS;
 		}
 	}

From 8bfbc2712df0dba7f27e4ed6dff85496210c3aa2 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Fri, 29 Jul 2022 16:35:33 -0700
Subject: [PATCH 563/740] Add g_traceBatch for prefetch query (#7730) (#7732)

---
 fdbserver/storageserver.actor.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 7f87fd0b4d4..2882afdb0be 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3435,6 +3435,9 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 	state double getValuesStart = g_network->timer();
 	getRange.begin = firstGreaterOrEqual(KeyRef(*a, prefix));
 	getRange.end = firstGreaterOrEqual(strinc(prefix, *a));
+	if (pOriginalReq->debugID.present())
+		g_traceBatch.addEvent(
+		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.quickGetKeyValues.Before");
 	try {
 		// TODO: Use a lower level API may be better? Or tweak priorities?
 		GetKeyValuesRequest req;
@@ -3465,6 +3468,10 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 			getRange.result = RangeResultRef(reply.data, reply.more);
 			const double duration = g_network->timer() - getValuesStart;
 			data->counters.mappedRangeLocalSample.addMeasurement(duration);
+			if (pOriginalReq->debugID.present())
+				g_traceBatch.addEvent("TransactionDebug",
+				                      pOriginalReq->debugID.get().first(),
+				                      "storageserver.quickGetKeyValues.AfterLocalFetch");
 			return getRange;
 		}
 		// Otherwise fallback.
@@ -3486,6 +3493,10 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 		getRange.result = rangeResult;
 		const double duration = g_network->timer() - getValuesStart;
 		data->counters.mappedRangeRemoteSample.addMeasurement(duration);
+		if (pOriginalReq->debugID.present())
+			g_traceBatch.addEvent("TransactionDebug",
+			                      pOriginalReq->debugID.get().first(),
+			                      "storageserver.quickGetKeyValues.AfterRemoteFetch");
 		return getRange;
 	} else {
 		throw quick_get_key_values_miss();
@@ -3772,7 +3783,9 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	result.arena.dependsOn(input.arena);
 
 	result.data.reserve(result.arena, input.data.size());
-
+	if (pOriginalReq->debugID.present())
+		g_traceBatch.addEvent(
+		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.Start");
 	state Tuple mappedKeyFormatTuple;
 	state Tuple mappedKeyTuple;
 
@@ -3791,6 +3804,9 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	state std::vector<MappedKeyValueRef> kvms(k);
 	state std::vector<Future<Void>> subqueries;
 	state int offset = 0;
+	if (pOriginalReq->debugID.present())
+		g_traceBatch.addEvent(
+		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.BeforeLoop");
 	for (; offset < sz; offset += SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE) {
 		// Divide into batches of MAX_PARALLEL_QUICK_GET_VALUE subqueries
 		for (int i = 0; i + offset < sz && i < SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE; i++) {
@@ -3810,11 +3826,17 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 			    mapSubquery(data, input.version, pOriginalReq, &result.arena, isRangeQuery, it, kvm, mappedKey));
 		}
 		wait(waitForAll(subqueries));
+		if (pOriginalReq->debugID.present())
+			g_traceBatch.addEvent(
+			    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.AfterBatch");
 		subqueries.clear();
 		for (int i = 0; i + offset < sz && i < SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE; i++) {
 			result.data.push_back(result.arena, kvms[i]);
 		}
 	}
+	if (pOriginalReq->debugID.present())
+		g_traceBatch.addEvent(
+		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.AfterAll");
 	return result;
 }
 

From 1ce8b6edadb6ec800006a55ea12cb54959885e34 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Mon, 1 Aug 2022 15:20:21 -0700
Subject: [PATCH 564/740] Prefer IPv6 in hostname resolving. (#7750)

---
 flow/Hostname.actor.cpp |  4 ++--
 flow/network.cpp        | 20 +++++++++++++++++++-
 flow/network.h          | 16 ++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/flow/Hostname.actor.cpp b/flow/Hostname.actor.cpp
index 110061e5c98..84a3cc78971 100644
--- a/flow/Hostname.actor.cpp
+++ b/flow/Hostname.actor.cpp
@@ -43,7 +43,7 @@ ACTOR Future<Optional<NetworkAddress>> resolveImpl(Hostname* self) {
 	try {
 		std::vector<NetworkAddress> addresses =
 		    wait(INetworkConnections::net()->resolveTCPEndpointWithDNSCache(self->host, self->service));
-		NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		NetworkAddress address = INetworkConnections::pickOneAddress(addresses);
 		address.flags = 0; // Reset the parsed address to public
 		address.fromHostname = NetworkAddressFromHostname::True;
 		if (self->isTLS) {
@@ -84,7 +84,7 @@ Optional<NetworkAddress> Hostname::resolveBlocking() {
 	try {
 		std::vector<NetworkAddress> addresses =
 		    INetworkConnections::net()->resolveTCPEndpointBlockingWithDNSCache(host, service);
-		NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		NetworkAddress address = INetworkConnections::pickOneAddress(addresses);
 		address.flags = 0; // Reset the parsed address to public
 		address.fromHostname = NetworkAddressFromHostname::True;
 		if (isTLS) {
diff --git a/flow/network.cpp b/flow/network.cpp
index 0e592b7a6af..ed9b3c80943 100644
--- a/flow/network.cpp
+++ b/flow/network.cpp
@@ -279,7 +279,7 @@ Future<Reference<IConnection>> INetworkConnections::connect(const std::string& h
 	// Use map to create an actor that returns an endpoint or throws
 	Future<NetworkAddress> pickEndpoint =
 	    map(resolveTCPEndpoint(host, service), [=](std::vector<NetworkAddress> const& addresses) -> NetworkAddress {
-		    NetworkAddress addr = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		    NetworkAddress addr = INetworkConnections::pickOneAddress(addresses);
 		    addr.fromHostname = true;
 		    if (isTLS) {
 			    addr.flags = NetworkAddress::FLAG_TLS;
@@ -347,4 +347,22 @@ TEST_CASE("/flow/network/ipaddress") {
 	return Void();
 }
 
+TEST_CASE("/flow/network/ipV6Preferred") {
+	std::vector<NetworkAddress> addresses;
+	for (int i = 0; i < 50; ++i) {
+		std::string s = format("%d.%d.%d.%d:%d", i, i, i, i, i);
+		addresses.push_back(NetworkAddress::parse(s));
+	}
+	std::string ipv6 = "[2001:db8:85a3::8a2e:370:7334]:4800";
+	addresses.push_back(NetworkAddress::parse(ipv6));
+	for (int i = 50; i < 100; ++i) {
+		std::string s = format("%d.%d.%d.%d:%d", i, i, i, i, i);
+		addresses.push_back(NetworkAddress::parse(s));
+	}
+	// Confirm IPv6 is always preferred.
+	ASSERT(INetworkConnections::pickOneAddress(addresses).toString() == ipv6);
+
+	return Void();
+}
+
 NetworkInfo::NetworkInfo() : handshakeLock(new FlowLock(FLOW_KNOBS->TLS_HANDSHAKE_LIMIT)) {}
diff --git a/flow/network.h b/flow/network.h
index 2fdd7ab32d5..f6900a648b2 100644
--- a/flow/network.h
+++ b/flow/network.h
@@ -734,6 +734,22 @@ class INetworkConnections {
 		return static_cast<INetworkConnections*>((void*)g_network->global(INetwork::enNetworkConnections));
 	}
 
+	// If a DNS name can be resolved to both and IPv4 and IPv6 addresses, we want IPv6 addresses when running the
+	// clusters on IPv6.
+	// This function takes a vector of addresses and return a random one, preferring IPv6 over IPv4.
+	static NetworkAddress pickOneAddress(const std::vector<NetworkAddress>& addresses) {
+		std::vector<NetworkAddress> ipV6Addresses;
+		for (const NetworkAddress& addr : addresses) {
+			if (addr.isV6()) {
+				ipV6Addresses.push_back(addr);
+			}
+		}
+		if (ipV6Addresses.size() > 0) {
+			return ipV6Addresses[deterministicRandom()->randomInt(0, ipV6Addresses.size())];
+		}
+		return addresses[deterministicRandom()->randomInt(0, addresses.size())];
+	}
+
 	void removeCachedDNS(const std::string& host, const std::string& service) { dnsCache.remove(host, service); }
 
 	DNSCache dnsCache;

From 9c1050203a0dc63b594ba580285f089c49e0fb15 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:59:08 -0700
Subject: [PATCH 565/740] Retain debug id in prefetch server-server call
 (#7755)

Co-authored-by: Renxuan Wang <renxuan@apple.com>
---
 fdbserver/storageserver.actor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 2882afdb0be..9d742989ffe 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3483,6 +3483,9 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 	if (SERVER_KNOBS->QUICK_GET_KEY_VALUES_FALLBACK) {
 		state Transaction tr(data->cx, pOriginalReq->tenantInfo.name);
 		tr.setVersion(version);
+		if (pOriginalReq->debugID.present()) {
+			tr.debugTransaction(pOriginalReq->debugID.get());
+		}
 		// TODO: is DefaultPromiseEndpoint the best priority for this?
 		tr.trState->taskID = TaskPriority::DefaultPromiseEndpoint;
 		Future<RangeResult> rangeResultFuture =

From 4f903724bfcc506a21693f630e8b8b47c1e2f142 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Thu, 4 Aug 2022 12:45:45 -0700
Subject: [PATCH 566/740] Add test coverage for
 SpecialKeyRangeAsyncImpl::getRange(release-7.1) (#7778)

* Validate subrange reads in simulation (#7597)

* Add extra validation to special key space reads in simulation

* Fix bugs turned up by validating subrange reads

* Change to validateSpecialSubrangeRead

It is in general not safe to expect that a read from the special key
space returns the same results if performed again, since the
transaction may be being modified concurrently.

* Add comment

* Add comment

* Add test coverage for SpecialKeyRangeAsyncImpl::getRange  (#7671)

* Add getRange test coverage for SpecialKeyRangeAsyncImpl

* Fix the bug in SpecialKeyRangeAsyncImpl found by the test

* Refactor ConflictingKeysImpl::getRange to use containedRanges to simplify the code

* Fix file format

* Initialize SpecialKeyRangeAsyncImpl cache with correct end key

* Add release notes

* Revert "Refactor ConflictingKeysImpl::getRange to use containedRanges to simplify the code"

This reverts commit fdd298f469bf73b107e5ca29072c49774820d3d6.

Co-authored-by: Andrew Noyes <andrew.noyes@snowflake.com>
---
 fdbclient/SpecialKeySpace.actor.cpp           | 41 +++++++++++++------
 fdbclient/SpecialKeySpace.actor.h             | 23 +++++++----
 .../SpecialKeySpaceCorrectness.actor.cpp      | 30 +++++++++-----
 3 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index c0212ea4988..e084b329a6d 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -147,7 +147,7 @@ RangeResult rywGetRange(ReadYourWritesTransaction* ryw, const KeyRangeRef& kr, c
 ACTOR Future<Void> moveKeySelectorOverRangeActor(const SpecialKeyRangeReadImpl* skrImpl,
                                                  ReadYourWritesTransaction* ryw,
                                                  KeySelector* ks,
-                                                 Optional<RangeResult>* cache) {
+                                                 KeyRangeMap<Optional<RangeResult>>* cache) {
 	// should be removed before calling
 	ASSERT(!ks->orEqual);
 
@@ -233,7 +233,7 @@ ACTOR Future<Void> normalizeKeySelectorActor(SpecialKeySpace* sks,
                                              KeyRangeRef boundary,
                                              int* actualOffset,
                                              RangeResult* result,
-                                             Optional<RangeResult>* cache) {
+                                             KeyRangeMap<Optional<RangeResult>>* cache) {
 	// If offset < 1, where we need to move left, iter points to the range containing at least one smaller key
 	// (It's a wasting of time to walk through the range whose begin key is same as ks->key)
 	// (rangeContainingKeyBefore itself handles the case where ks->key == Key())
@@ -336,8 +336,9 @@ ACTOR Future<RangeResult> SpecialKeySpace::getRangeAggregationActor(SpecialKeySp
 	state int actualBeginOffset;
 	state int actualEndOffset;
 	state KeyRangeRef moduleBoundary;
-	// used to cache result from potential first read
-	state Optional<RangeResult> cache;
+	// used to cache results from potential first async read
+	// the current implementation will read the whole range result to save in the cache
+	state KeyRangeMap<Optional<RangeResult>> cache(Optional<RangeResult>(), specialKeys.end);
 
 	if (ryw->specialKeySpaceRelaxed()) {
 		moduleBoundary = sks->range;
@@ -384,7 +385,7 @@ ACTOR Future<RangeResult> SpecialKeySpace::getRangeAggregationActor(SpecialKeySp
 			KeyRangeRef kr = iter->range();
 			KeyRef keyStart = kr.contains(begin.getKey()) ? begin.getKey() : kr.begin;
 			KeyRef keyEnd = kr.contains(end.getKey()) ? end.getKey() : kr.end;
-			if (iter->value()->isAsync() && cache.present()) {
+			if (iter->value()->isAsync() && cache.rangeContaining(keyStart).value().present()) {
 				const SpecialKeyRangeAsyncImpl* ptr = dynamic_cast<const SpecialKeyRangeAsyncImpl*>(iter->value());
 				RangeResult pairs_ = wait(ptr->getRange(ryw, KeyRangeRef(keyStart, keyEnd), limits, &cache));
 				pairs = pairs_;
@@ -415,7 +416,7 @@ ACTOR Future<RangeResult> SpecialKeySpace::getRangeAggregationActor(SpecialKeySp
 			KeyRangeRef kr = iter->range();
 			KeyRef keyStart = kr.contains(begin.getKey()) ? begin.getKey() : kr.begin;
 			KeyRef keyEnd = kr.contains(end.getKey()) ? end.getKey() : kr.end;
-			if (iter->value()->isAsync() && cache.present()) {
+			if (iter->value()->isAsync() && cache.rangeContaining(keyStart).value().present()) {
 				const SpecialKeyRangeAsyncImpl* ptr = dynamic_cast<const SpecialKeyRangeAsyncImpl*>(iter->value());
 				RangeResult pairs_ = wait(ptr->getRange(ryw, KeyRangeRef(keyStart, keyEnd), limits, &cache));
 				pairs = pairs_;
@@ -626,12 +627,8 @@ Future<Void> SpecialKeySpace::commit(ReadYourWritesTransaction* ryw) {
 	return commitActor(this, ryw);
 }
 
-SKSCTestImpl::SKSCTestImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
-
-Future<RangeResult> SKSCTestImpl::getRange(ReadYourWritesTransaction* ryw,
-                                           KeyRangeRef kr,
-                                           GetRangeLimits limitsHint) const {
-	ASSERT(range.contains(kr));
+// For SKSCTestRWImpl and SKSCTestAsyncReadImpl
+Future<RangeResult> SKSCTestGetRangeBase(ReadYourWritesTransaction* ryw, KeyRangeRef kr, GetRangeLimits limitsHint) {
 	auto resultFuture = ryw->getRange(kr, CLIENT_KNOBS->TOO_MANY);
 	// all keys are written to RYW, since GRV is set, the read should happen locally
 	ASSERT(resultFuture.isReady());
@@ -641,11 +638,29 @@ Future<RangeResult> SKSCTestImpl::getRange(ReadYourWritesTransaction* ryw,
 	return rywGetRange(ryw, kr, kvs);
 }
 
-Future<Optional<std::string>> SKSCTestImpl::commit(ReadYourWritesTransaction* ryw) {
+SKSCTestRWImpl::SKSCTestRWImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
+
+Future<RangeResult> SKSCTestRWImpl::getRange(ReadYourWritesTransaction* ryw,
+                                             KeyRangeRef kr,
+                                             GetRangeLimits limitsHint) const {
+	ASSERT(range.contains(kr));
+	return SKSCTestGetRangeBase(ryw, kr, limitsHint);
+}
+
+Future<Optional<std::string>> SKSCTestRWImpl::commit(ReadYourWritesTransaction* ryw) {
 	ASSERT(false);
 	return Optional<std::string>();
 }
 
+SKSCTestAsyncReadImpl::SKSCTestAsyncReadImpl(KeyRangeRef kr) : SpecialKeyRangeAsyncImpl(kr) {}
+
+Future<RangeResult> SKSCTestAsyncReadImpl::getRange(ReadYourWritesTransaction* ryw,
+                                                    KeyRangeRef kr,
+                                                    GetRangeLimits limitsHint) const {
+	ASSERT(range.contains(kr));
+	return SKSCTestGetRangeBase(ryw, kr, limitsHint);
+}
+
 ReadConflictRangeImpl::ReadConflictRangeImpl(KeyRangeRef kr) : SpecialKeyRangeReadImpl(kr) {}
 
 ACTOR static Future<RangeResult> getReadConflictRangeImpl(ReadYourWritesTransaction* ryw, KeyRange kr) {
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index d2b8563d9e7..9d233689272 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -126,7 +126,7 @@ class SpecialKeyRangeAsyncImpl : public SpecialKeyRangeReadImpl {
 	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
 	                             KeyRangeRef kr,
 	                             GetRangeLimits limitsHint,
-	                             Optional<RangeResult>* cache) const {
+	                             KeyRangeMap<Optional<RangeResult>>* cache) const {
 		return getRangeAsyncActor(this, ryw, kr, limitsHint, cache);
 	}
 
@@ -136,17 +136,18 @@ class SpecialKeyRangeAsyncImpl : public SpecialKeyRangeReadImpl {
 	                                                    ReadYourWritesTransaction* ryw,
 	                                                    KeyRangeRef kr,
 	                                                    GetRangeLimits limits,
-	                                                    Optional<RangeResult>* cache) {
+	                                                    KeyRangeMap<Optional<RangeResult>>* cache) {
 		ASSERT(skrAyncImpl->getKeyRange().contains(kr));
 		ASSERT(cache != nullptr);
-		if (!cache->present()) {
+		ASSERT(cache->rangeContaining(kr.begin) == cache->rangeContainingKeyBefore(kr.end));
+		if (!(*cache)[kr.begin].present()) {
 			// For simplicity, every time we need to cache, we read the whole range
 			// Although sometimes the range can be narrowed,
 			// there is not a general way to do it in complicated scenarios
 			RangeResult result_ = wait(skrAyncImpl->getRange(ryw, skrAyncImpl->getKeyRange(), limits));
-			*cache = result_;
+			cache->insert(skrAyncImpl->getKeyRange(), result_);
 		}
-		const auto& allResults = cache->get();
+		const auto& allResults = (*cache)[kr.begin].get();
 		int start = 0, end = allResults.size();
 		while (start < allResults.size() && allResults[start].key < kr.begin)
 			++start;
@@ -271,15 +272,23 @@ class SpecialKeySpace {
 };
 
 // Used for SpecialKeySpaceCorrectnessWorkload
-class SKSCTestImpl : public SpecialKeyRangeRWImpl {
+class SKSCTestRWImpl : public SpecialKeyRangeRWImpl {
 public:
-	explicit SKSCTestImpl(KeyRangeRef kr);
+	explicit SKSCTestRWImpl(KeyRangeRef kr);
 	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
 	                             KeyRangeRef kr,
 	                             GetRangeLimits limitsHint) const override;
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
 
+class SKSCTestAsyncReadImpl : public SpecialKeyRangeAsyncImpl {
+public:
+	explicit SKSCTestAsyncReadImpl(KeyRangeRef kr);
+	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
+	                             KeyRangeRef kr,
+	                             GetRangeLimits limitsHint) const override;
+};
+
 // Use special key prefix "\xff\xff/transaction/conflicting_keys/<some_key>",
 // to retrieve keys which caused latest not_committed(conflicting with another transaction) error.
 // The returned key value pairs are interpreted as :
diff --git a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
index b1b326b56ac..5437ca418ac 100644
--- a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
+++ b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
@@ -39,8 +39,10 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 	double testDuration, absoluteRandomProb, transactionsPerSecond;
 	PerfIntCounter wrongResults, keysCount;
 	Reference<ReadYourWritesTransaction> ryw; // used to store all populated data
-	std::vector<std::shared_ptr<SKSCTestImpl>> impls;
+	std::vector<std::shared_ptr<SKSCTestRWImpl>> rwImpls;
+	std::vector<std::shared_ptr<SKSCTestAsyncReadImpl>> asyncReadImpls;
 	Standalone<VectorRef<KeyRangeRef>> keys;
+	Standalone<VectorRef<KeyRangeRef>> rwKeys;
 
 	SpecialKeySpaceCorrectnessWorkload(WorkloadContext const& wcx)
 	  : TestWorkload(wcx), wrongResults("Wrong Results"), keysCount("Number of generated keys") {
@@ -81,12 +83,20 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 			Key startKey(baseKey + "/");
 			Key endKey(baseKey + "/\xff");
 			self->keys.push_back_deep(self->keys.arena(), KeyRangeRef(startKey, endKey));
-			self->impls.push_back(std::make_shared<SKSCTestImpl>(KeyRangeRef(startKey, endKey)));
-			// Although there are already ranges registered, the testing range will replace them
-			cx->specialKeySpace->registerKeyRange(SpecialKeySpace::MODULE::TESTONLY,
-			                                      SpecialKeySpace::IMPLTYPE::READWRITE,
-			                                      self->keys.back(),
-			                                      self->impls.back().get());
+			if (deterministicRandom()->random01() < 0.2) {
+				self->asyncReadImpls.push_back(std::make_shared<SKSCTestAsyncReadImpl>(KeyRangeRef(startKey, endKey)));
+				cx->specialKeySpace->registerKeyRange(SpecialKeySpace::MODULE::TESTONLY,
+				                                      SpecialKeySpace::IMPLTYPE::READONLY,
+				                                      self->keys.back(),
+				                                      self->asyncReadImpls.back().get());
+			} else {
+				self->rwImpls.push_back(std::make_shared<SKSCTestRWImpl>(KeyRangeRef(startKey, endKey)));
+				// Although there are already ranges registered, the testing range will replace them
+				cx->specialKeySpace->registerKeyRange(SpecialKeySpace::MODULE::TESTONLY,
+				                                      SpecialKeySpace::IMPLTYPE::READWRITE,
+				                                      self->keys.back(),
+				                                      self->rwImpls.back().get());
+			}
 			// generate keys in each key range
 			int keysInRange = deterministicRandom()->randomInt(self->minKeysPerRange, self->maxKeysPerRange + 1);
 			self->keysCount += keysInRange;
@@ -154,7 +164,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 			}
 
 			// check ryw result consistency
-			KeyRange rkr = self->randomKeyRange();
+			KeyRange rkr = self->randomRWKeyRange();
 			KeyRef rkey1 = rkr.begin;
 			KeyRef rkey2 = rkr.end;
 			// randomly set/clear two keys or clear a key range
@@ -238,8 +248,8 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 		return true;
 	}
 
-	KeyRange randomKeyRange() {
-		Key prefix = keys[deterministicRandom()->randomInt(0, rangeCount)].begin;
+	KeyRange randomRWKeyRange() {
+		Key prefix = rwImpls[deterministicRandom()->randomInt(0, rwImpls.size())]->getKeyRange().begin;
 		Key rkey1 = Key(deterministicRandom()->randomAlphaNumeric(deterministicRandom()->randomInt(0, keyBytes)))
 		                .withPrefix(prefix);
 		Key rkey2 = Key(deterministicRandom()->randomAlphaNumeric(deterministicRandom()->randomInt(0, keyBytes)))

From 84849c3764650dc6b883438cb12e148b39db93a5 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Mon, 8 Aug 2022 17:48:38 +0300
Subject: [PATCH 567/740] Rollback and rework commit #16ccea to reduce TLS
 section size

---
 flow/CMakeLists.txt | 4 ----
 flow/FastAlloc.cpp  | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index 6f02c3f9815..5cd37810b5f 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -181,10 +181,6 @@ else()
   target_link_libraries(flow PUBLIC boost_target)
   target_link_libraries(flow_sampling PUBLIC boost_target)
 endif()
-if(USE_JEMALLOC)
-  target_link_libraries(flow PUBLIC jemalloc)
-  target_link_libraries(flow_sampling PUBLIC jemalloc)
-endif()
 if(USE_VALGRIND)
   target_link_libraries(flow PUBLIC Valgrind)
   target_link_libraries(flow_sampling PUBLIC Valgrind)
diff --git a/flow/FastAlloc.cpp b/flow/FastAlloc.cpp
index 262d1b017c7..a59bf56d94e 100644
--- a/flow/FastAlloc.cpp
+++ b/flow/FastAlloc.cpp
@@ -591,7 +591,6 @@ template class FastAllocator<8192>;
 template class FastAllocator<16384>;
 
 #ifdef USE_JEMALLOC
-#include <jemalloc/jemalloc.h>
 TEST_CASE("/jemalloc/4k_aligned_usable_size") {
 	void* ptr;
 	try {
@@ -615,4 +614,4 @@ TEST_CASE("/jemalloc/4k_aligned_usable_size") {
 	}
 	return Void();
 }
-#endif
\ No newline at end of file
+#endif

From e202a391bce8f14869e2c63c802f97c3d347a662 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 8 Aug 2022 14:30:16 -0700
Subject: [PATCH 568/740] Add knobs for min/max Ratekeeper limit

The default has no effects.
---
 fdbclient/ServerKnobs.cpp      | 4 +++-
 fdbclient/ServerKnobs.h        | 2 ++
 fdbserver/Ratekeeper.actor.cpp | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 6024cb2c57f..d7b2af6f193 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -591,9 +591,11 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( SLOW_SMOOTHING_AMOUNT,                                10.0 ); if( slowRatekeeper ) SLOW_SMOOTHING_AMOUNT = 50.0;
 	init( METRIC_UPDATE_RATE,                                     .1 ); if( slowRatekeeper ) METRIC_UPDATE_RATE = 0.5;
 	init( DETAILED_METRIC_UPDATE_RATE,                           5.0 );
-	init (RATEKEEPER_DEFAULT_LIMIT,                              1e6 ); if( randomize && BUGGIFY ) RATEKEEPER_DEFAULT_LIMIT = 0;
+	init( RATEKEEPER_DEFAULT_LIMIT,                              1e6 ); if( randomize && BUGGIFY ) RATEKEEPER_DEFAULT_LIMIT = 0;
 	init( RATEKEEPER_LIMIT_REASON_SAMPLE_RATE,                   0.1 );
 	init( RATEKEEPER_PRINT_LIMIT_REASON,                       false ); if( randomize && BUGGIFY ) RATEKEEPER_PRINT_LIMIT_REASON = true;
+	init( RATEKEEPER_MIN_RATE,                                   0.0 );
+	init( RATEKEEPER_MAX_RATE,                                   1e9 );
 
 	bool smallStorageTarget = randomize && BUGGIFY;
 	init( TARGET_BYTES_PER_STORAGE_SERVER,                    1000e6 ); if( smallStorageTarget ) TARGET_BYTES_PER_STORAGE_SERVER = 3000e3;
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 28aedbc11ea..a3319ae7f90 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -529,6 +529,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	double RATEKEEPER_DEFAULT_LIMIT;
 	double RATEKEEPER_LIMIT_REASON_SAMPLE_RATE;
 	bool RATEKEEPER_PRINT_LIMIT_REASON;
+	double RATEKEEPER_MIN_RATE;
+	double RATEKEEPER_MAX_RATE;
 
 	int64_t TARGET_BYTES_PER_STORAGE_SERVER;
 	int64_t SPRING_BYTES_STORAGE_SERVER;
diff --git a/fdbserver/Ratekeeper.actor.cpp b/fdbserver/Ratekeeper.actor.cpp
index 9b7c3103948..25475c52882 100644
--- a/fdbserver/Ratekeeper.actor.cpp
+++ b/fdbserver/Ratekeeper.actor.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "fdbserver/DataDistribution.actor.h"
+#include "fdbserver/Knobs.h"
 #include "fdbserver/Ratekeeper.h"
 #include "fdbserver/TagThrottler.h"
 #include "fdbserver/WaitFailure.h"
@@ -901,6 +902,11 @@ void Ratekeeper::updateRate(RatekeeperLimits* limits) {
 	limits->tpsLimitMetric = std::min(limits->tpsLimit, 1e6);
 	limits->reasonMetric = limitReason;
 
+	if (limits->priority == TransactionPriority::DEFAULT) {
+		limits->tpsLimit = std::max(limits->tpsLimit, SERVER_KNOBS->RATEKEEPER_MIN_RATE);
+		limits->tpsLimit = std::min(limits->tpsLimit, SERVER_KNOBS->RATEKEEPER_MAX_RATE);
+	}
+
 	if (deterministicRandom()->random01() < 0.1) {
 		const std::string& name = limits->rkUpdateEventCacheHolder.getPtr()->trackingKey;
 		TraceEvent(name.c_str(), id)

From 27735db79e068d0c02f1470f8bac51f845a8b1f0 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Tue, 9 Aug 2022 07:35:32 +0300
Subject: [PATCH 569/740] Reducing TLS section size

---
 cmake/Jemalloc.cmake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/cmake/Jemalloc.cmake b/cmake/Jemalloc.cmake
index aedb834808d..ab99062fcb5 100644
--- a/cmake/Jemalloc.cmake
+++ b/cmake/Jemalloc.cmake
@@ -5,24 +5,20 @@ if(NOT USE_JEMALLOC)
 endif()
 
 add_library(im_jemalloc_pic STATIC IMPORTED)
-add_library(im_jemalloc STATIC IMPORTED)
 include(ExternalProject)
 set(JEMALLOC_DIR "${CMAKE_BINARY_DIR}/jemalloc")
 ExternalProject_add(Jemalloc_project
   URL "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"
   URL_HASH SHA256=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
   BUILD_BYPRODUCTS "${JEMALLOC_DIR}/include/jemalloc/jemalloc.h"
-  "${JEMALLOC_DIR}/lib/libjemalloc.a"
   "${JEMALLOC_DIR}/lib/libjemalloc_pic.a"
   PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/cmake/jemalloc.patch
-  CONFIGURE_COMMAND ./configure --prefix=${JEMALLOC_DIR} --enable-static --disable-cxx --enable-prof
+  CONFIGURE_COMMAND ./configure --prefix=${JEMALLOC_DIR} --enable-static --disable-cxx --enable-prof --disable-initial-exec-tls
   BUILD_IN_SOURCE ON
   BUILD_COMMAND make
   INSTALL_DIR "${JEMALLOC_DIR}"
   INSTALL_COMMAND make install)
-add_dependencies(im_jemalloc Jemalloc_project)
 add_dependencies(im_jemalloc_pic Jemalloc_project)
 set_target_properties(im_jemalloc_pic PROPERTIES IMPORTED_LOCATION "${JEMALLOC_DIR}/lib/libjemalloc_pic.a")
-set_target_properties(im_jemalloc PROPERTIES IMPORTED_LOCATION "${JEMALLOC_DIR}/lib/libjemalloc.a")
 target_include_directories(jemalloc INTERFACE "${JEMALLOC_DIR}/include")
-target_link_libraries(jemalloc INTERFACE im_jemalloc_pic im_jemalloc)
\ No newline at end of file
+target_link_libraries(jemalloc INTERFACE im_jemalloc_pic)

From c9b32037966668d14c8f870c516db94b03d03bd2 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 9 Aug 2022 11:28:05 -0700
Subject: [PATCH 570/740] Added 7.1.18, 7.1.19 release notes

---
 .../source/release-notes/release-notes-710.rst  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 7847ea457f7..4854230c1d0 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,19 @@
 Release Notes
 #############
 
+7.1.19
+======
+* Same as 7.1.18 release with AVX enabled.
+
+7.1.18
+======
+* Released with AVX disabled.
+* Added knobs for the minimum and the maximum of the Ratekeeper's default priority. `(PR #7820) <https://github.com/apple/foundationdb/pull/7820>`_
+* Fixed bugs in ``getRange`` of the special key space. `(PR #7778) <https://github.com/apple/foundationdb/pull/7778>`_, `(PR #7720) <https://github.com/apple/foundationdb/pull/7720>`_
+* Added debug ID for secondary queries in index prefetching. `(PR #7755) <https://github.com/apple/foundationdb/pull/7755>`_
+* Changed hostname resolving to prefer IPv6 addresses. `(PR #7750) <https://github.com/apple/foundationdb/pull/7750>`_
+* Added more transaction debug events for prefetch queries. `(PR #7732) <https://github.com/apple/foundationdb/pull/7732>`_
+
 7.1.17
 ======
 * Same as 7.1.16 release with AVX enabled.
@@ -17,7 +30,7 @@ Release Notes
 * Fixed ScopeEventFieldTypeMismatch error for TLogMetrics. `(PR #7640) <https://github.com/apple/foundationdb/pull/7640>`_
 * Added getMappedRange latency metrics. `(PR #7632) <https://github.com/apple/foundationdb/pull/7632>`_
 * Fixed a version vector performance bug due to not updating client side tag cache. `(PR #7616) <https://github.com/apple/foundationdb/pull/7616>`_
-* Fixed DiskReadSeconds and DiskWriteSeconds calculaion in ProcessMetrics. `(PR #7609) <https://github.com/apple/foundationdb/pull/7609>`_
+* Fixed DiskReadSeconds and DiskWriteSeconds calculation in ProcessMetrics. `(PR #7609) <https://github.com/apple/foundationdb/pull/7609>`_
 * Added Rocksdb compression and data size stats. `(PR #7596) <https://github.com/apple/foundationdb/pull/7596>`_
 
 7.1.15
@@ -76,7 +89,7 @@ Release Notes
 * Added support of the reboot command in go bindings. `(PR #7270) <https://github.com/apple/foundationdb/pull/7270>`_
 * Fixed several issues in profiling special keys using GlobalConfig. `(PR #7120) <https://github.com/apple/foundationdb/pull/7120>`_
 * Fixed a stuck transaction system bug due to inconsistent recovery transaction version. `(PR #7261) <https://github.com/apple/foundationdb/pull/7261>`_
-* Fixed a unknown_error crash due to not resolving hostnames. `(PR #7254) <https://github.com/apple/foundationdb/pull/7254>`_
+* Fixed an unknown_error crash due to not resolving hostnames. `(PR #7254) <https://github.com/apple/foundationdb/pull/7254>`_
 * Fixed a heap-use-after-free bug. `(PR #7250) <https://github.com/apple/foundationdb/pull/7250>`_
 * Fixed a performance issue that remote TLogs are sending too many pops to log routers. `(PR #7235) <https://github.com/apple/foundationdb/pull/7235>`_
 * Fixed an issue that SharedTLogs are not displaced and leaking disk space. `(PR #7246) <https://github.com/apple/foundationdb/pull/7246>`_

From 7e95cd74674c2267858efe2d8e6744bbeb802907 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 9 Aug 2022 19:55:33 +0000
Subject: [PATCH 571/740] update version after 7.1.17 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91e4f314ae1..5e260c5ec3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.17
+  VERSION 7.1.18
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 4e8b4db5500a6d98609a8c5653b5b2b628d52ee8 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 9 Aug 2022 19:58:02 +0000
Subject: [PATCH 572/740] disable AVX for 7.1.18 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 473861420dfa020f623cfb1300936a45130abeb9 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 9 Aug 2022 20:03:32 +0000
Subject: [PATCH 573/740] enable AVX and update version for 7.1.19 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e260c5ec3a..98f19d8f226 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.18
+  VERSION 7.1.19
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 74843b9429265a2c812711b9bdb22840c0c07ab0 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Wed, 10 Aug 2022 00:28:24 +0300
Subject: [PATCH 574/740] Bumped to the new revision due to boto3 requirements
 in fdb-joshua repo

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2f18154afb8..61af132b5c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -196,8 +196,8 @@ jobs:
     env:
       JOSHUA_DB_VER: "6.3.15"
       N_OF_TESTS: 600 # to fit in 360 minutes job run limit
-      JOSHUA_AGENT_URL: "docker.io/osamarin68"
-      JOSHUA_AGENT_TAG: "8.6.3"
+      JOSHUA_AGENT_URL: "docker.io/1inker"
+      JOSHUA_AGENT_TAG: "rhel8-20220809"
 
     steps:
       - name: Install dependencies

From afa628f80aba0d1b5df2d0447b22b7b5f1f6e6d2 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Wed, 10 Aug 2022 00:48:16 +0300
Subject: [PATCH 575/740] Try to fix deploy test in Ubuntu

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61af132b5c2..0197fd39081 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -139,7 +139,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       RHEL_IMAGE_NAME: "registry.access.redhat.com/ubi8/ubi:latest"
-      UBUNTU_IMAGE_NAME: "ubuntu:21.10"
+      UBUNTU_IMAGE_NAME: "ubuntu:18.04"
 
     steps:
       - name: Download RPMs and DEBs packages

From 73e4a11e986e2ee432f1da240c5cceceabf7d01f Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Wed, 10 Aug 2022 15:26:23 +0300
Subject: [PATCH 576/740] Try to fix 'run tests' step in github

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0197fd39081..0a01254245a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -221,7 +221,7 @@ jobs:
           sudo sed -i s/127.0.0.1/$MY_IP/ /etc/foundationdb/fdb.cluster
           sudo crudini --set /etc/foundationdb/foundationdb.conf fdbserver memory 4GiB
           sudo systemctl start foundationdb
-          pip3 install 'foundationdb==${{ env.JOSHUA_DB_VER }}'
+          pip3 install 'foundationdb==${{ env.JOSHUA_DB_VER }}' boto3
 
       - name: Download the correctness package
         uses: actions/download-artifact@v2

From b4e91059a11670d3cd4f8ae4bede7ebb3d624bb6 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 10 Aug 2022 15:58:21 +0000
Subject: [PATCH 577/740] update version after 7.1.19 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98f19d8f226..740fdded801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.19
+  VERSION 7.1.20
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From fd24a072d686c8d58be8b42ab81af7e1473afd20 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 9 Aug 2022 20:31:45 -0700
Subject: [PATCH 578/740] Add fault injection to GRV proxy to return error
 response

This turns out to fail a lot of tests that we need to fix.
---
 fdbserver/GrvProxyServer.actor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp
index 61b100779ec..fc3d9b5d233 100644
--- a/fdbserver/GrvProxyServer.actor.cpp
+++ b/fdbserver/GrvProxyServer.actor.cpp
@@ -29,6 +29,7 @@
 #include "fdbserver/WaitFailure.h"
 #include "fdbserver/WorkerInterface.actor.h"
 #include "fdbrpc/sim_validation.h"
+#include "flow/IRandom.h"
 #include "flow/flow.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
@@ -425,7 +426,9 @@ ACTOR Future<Void> queueGetReadVersionRequests(Reference<AsyncVar<ServerDBInfo>
 			// WARNING: this code is run at a high priority, so it needs to do as little work as possible
 			bool canBeQueued = true;
 			if (stats->txnRequestIn.getValue() - stats->txnRequestOut.getValue() >
-			    SERVER_KNOBS->START_TRANSACTION_MAX_QUEUE_SIZE) {
+			        SERVER_KNOBS->START_TRANSACTION_MAX_QUEUE_SIZE ||
+			    (g_network->isSimulated() && !g_simulator.speedUpSimulation &&
+			     deterministicRandom()->random01() < 0.01)) {
 				// When the limit is hit, try to drop requests from the lower priority queues.
 				if (req.priority == TransactionPriority::BATCH) {
 					canBeQueued = false;

From 0fd57b801093c665568ae4ff26ef8f2d10c8286f Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 9 Aug 2022 22:45:44 -0700
Subject: [PATCH 579/740] Client needs to handle proxy_memory_limit_exceeded
 error

---
 fdbclient/NativeAPI.actor.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 794e56d151f..75e7531a20d 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -6632,9 +6632,12 @@ ACTOR Future<GetReadVersionReply> getConsistentReadVersion(SpanID parentSpan,
 				}
 			}
 		} catch (Error& e) {
-			if (e.code() != error_code_broken_promise && e.code() != error_code_batch_transaction_throttled)
+			if (e.code() != error_code_broken_promise && e.code() != error_code_batch_transaction_throttled &&
+			    e.code() != error_code_proxy_memory_limit_exceeded)
 				TraceEvent(SevError, "GetConsistentReadVersionError").error(e);
-			if (e.code() == error_code_batch_transaction_throttled && !cx->apiVersionAtLeast(630)) {
+			if ((e.code() == error_code_batch_transaction_throttled ||
+			     e.code() == error_code_proxy_memory_limit_exceeded) &&
+			    !cx->apiVersionAtLeast(630)) {
 				wait(delayJittered(5.0));
 			} else {
 				throw;

From 3d8257c9e068ad0157b69cc7cb00e5a0e4ca503c Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 10 Aug 2022 11:21:37 -0700
Subject: [PATCH 580/740] Add retry in waitForCommittedVersion for GRV error
 response

---
 fdbclient/NativeAPI.actor.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 75e7531a20d..cd86940ada9 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3460,8 +3460,8 @@ ACTOR Future<Key> getKey(Reference<TransactionState> trState,
 
 ACTOR Future<Version> waitForCommittedVersion(Database cx, Version version, SpanID spanContext) {
 	state Span span("NAPI:waitForCommittedVersion"_loc, { spanContext });
-	try {
-		loop {
+	loop {
+		try {
 			choose {
 				when(wait(cx->onProxiesChanged())) {}
 				when(GetReadVersionReply v = wait(basicLoadBalance(
@@ -3487,10 +3487,16 @@ ACTOR Future<Version> waitForCommittedVersion(Database cx, Version version, Span
 					wait(delay(CLIENT_KNOBS->FUTURE_VERSION_RETRY_DELAY, cx->taskID));
 				}
 			}
+		} catch (Error& e) {
+			if (e.code() == error_code_batch_transaction_throttled ||
+			    e.code() == error_code_proxy_memory_limit_exceeded) {
+				// GRV Proxy returns an error
+				wait(delayJittered(5.0));
+			} else {
+				TraceEvent(SevError, "WaitForCommittedVersionError").error(e);
+				throw;
+			}
 		}
-	} catch (Error& e) {
-		TraceEvent(SevError, "WaitForCommittedVersionError").error(e);
-		throw;
 	}
 }
 

From c5c8e73f6e435863cc15b96e70959c5b4aa4e3d4 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 10 Aug 2022 14:13:03 -0700
Subject: [PATCH 581/740] Fix backup worker to handle GRV errors

---
 fdbserver/BackupWorker.actor.cpp | 38 ++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/fdbserver/BackupWorker.actor.cpp b/fdbserver/BackupWorker.actor.cpp
index 0ac5b56a7d6..4163bca42ca 100644
--- a/fdbserver/BackupWorker.actor.cpp
+++ b/fdbserver/BackupWorker.actor.cpp
@@ -428,20 +428,30 @@ struct BackupData {
 	ACTOR static Future<Version> _getMinKnownCommittedVersion(BackupData* self) {
 		state Span span("BA:GetMinCommittedVersion"_loc);
 		loop {
-			GetReadVersionRequest request(span.context,
-			                              0,
-			                              TransactionPriority::DEFAULT,
-			                              invalidVersion,
-			                              GetReadVersionRequest::FLAG_USE_MIN_KNOWN_COMMITTED_VERSION);
-			choose {
-				when(wait(self->cx->onProxiesChanged())) {}
-				when(GetReadVersionReply reply =
-				         wait(basicLoadBalance(self->cx->getGrvProxies(UseProvisionalProxies::False),
-				                               &GrvProxyInterface::getConsistentReadVersion,
-				                               request,
-				                               self->cx->taskID))) {
-					self->cx->ssVersionVectorCache.applyDelta(reply.ssVersionVectorDelta);
-					return reply.version;
+			try {
+				GetReadVersionRequest request(span.context,
+				                              0,
+				                              TransactionPriority::DEFAULT,
+				                              invalidVersion,
+				                              GetReadVersionRequest::FLAG_USE_MIN_KNOWN_COMMITTED_VERSION);
+				choose {
+					when(wait(self->cx->onProxiesChanged())) {}
+					when(GetReadVersionReply reply =
+					         wait(basicLoadBalance(self->cx->getGrvProxies(UseProvisionalProxies::False),
+					                               &GrvProxyInterface::getConsistentReadVersion,
+					                               request,
+					                               self->cx->taskID))) {
+						self->cx->ssVersionVectorCache.applyDelta(reply.ssVersionVectorDelta);
+						return reply.version;
+					}
+				}
+			} catch (Error& e) {
+				if (e.code() == error_code_batch_transaction_throttled ||
+				    e.code() == error_code_proxy_memory_limit_exceeded) {
+					// GRV Proxy returns an error
+					wait(delayJittered(5.0));
+				} else {
+					throw;
 				}
 			}
 		}

From b99ecfd9733ebc126f5b1ff7975a69c030583383 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 10 Aug 2022 14:44:17 -0700
Subject: [PATCH 582/740] Fix FuzzApiCorrectness workload

---
 fdbserver/workloads/FuzzApiCorrectness.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/workloads/FuzzApiCorrectness.actor.cpp b/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
index bec0240257a..e04ea8a48cb 100644
--- a/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
+++ b/fdbserver/workloads/FuzzApiCorrectness.actor.cpp
@@ -61,7 +61,7 @@ struct ExceptionContract {
 		    e.code() == error_code_future_version || e.code() == error_code_transaction_cancelled ||
 		    e.code() == error_code_key_too_large || e.code() == error_code_value_too_large ||
 		    e.code() == error_code_process_behind || e.code() == error_code_batch_transaction_throttled ||
-		    e.code() == error_code_tag_throttled) {
+		    e.code() == error_code_tag_throttled || e.code() == error_code_proxy_memory_limit_exceeded) {
 			return;
 		}
 

From def709c0f4fefbee743735d2687f6f1f5ecb5382 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 10 Aug 2022 14:59:48 -0700
Subject: [PATCH 583/740] Fix SpecialKeySpaceCorrectness workload

---
 .../SpecialKeySpaceCorrectness.actor.cpp      | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
index 5437ca418ac..495dd050dfe 100644
--- a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
+++ b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
@@ -874,41 +874,58 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 		}
 		TraceEvent(SevDebug, "DatabaseLocked").log();
 		// if database locked, fdb read should get database_locked error
-		try {
-			tx->reset();
-			tx->setOption(FDBTransactionOptions::RAW_ACCESS);
-			RangeResult res = wait(tx->getRange(normalKeys, 1));
-		} catch (Error& e) {
-			if (e.code() == error_code_actor_cancelled)
-				throw;
-			ASSERT(e.code() == error_code_database_locked);
+		tx->reset();
+		loop {
+			try {
+				tx->setOption(FDBTransactionOptions::RAW_ACCESS);
+				RangeResult res = wait(tx->getRange(normalKeys, 1));
+			} catch (Error& e) {
+				if (e.code() == error_code_actor_cancelled)
+					throw;
+				if (e.code() == error_code_proxy_memory_limit_exceeded ||
+				    e.code() == error_code_batch_transaction_throttled) {
+					wait(tx->onError(e));
+				} else {
+					ASSERT(e.code() == error_code_database_locked);
+					break;
+				}
+			}
 		}
 		// make sure we unlock the database
 		// unlock is idempotent, thus we can commit many times until successful
+		tx->reset();
 		loop {
 			try {
-				tx->reset();
 				tx->setOption(FDBTransactionOptions::RAW_ACCESS);
 				tx->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
 				// unlock the database
 				tx->clear(SpecialKeySpace::getManagementApiCommandPrefix("lock"));
 				wait(tx->commit());
 				TraceEvent(SevDebug, "DatabaseUnlocked").log();
-				tx->reset();
+				break;
+			} catch (Error& e) {
+				TraceEvent(SevDebug, "DatabaseUnlockFailure").error(e);
+				ASSERT(e.code() != error_code_database_locked);
+				wait(tx->onError(e));
+			}
+		}
+
+		tx->reset();
+		loop {
+			try {
 				// read should be successful
 				tx->setOption(FDBTransactionOptions::RAW_ACCESS);
 				RangeResult res = wait(tx->getRange(normalKeys, 1));
-				tx->reset();
 				break;
 			} catch (Error& e) {
-				TraceEvent(SevDebug, "DatabaseUnlockFailure").error(e);
-				ASSERT(e.code() != error_code_database_locked);
 				wait(tx->onError(e));
 			}
 		}
+
 		// test consistencycheck which only used by ConsistencyCheck Workload
 		// Note: we have exclusive ownership of fdbShouldConsistencyCheckBeSuspended,
 		// no existing workloads can modify the key
+		tx->reset();
 		{
 			try {
 				tx->setOption(FDBTransactionOptions::READ_SYSTEM_KEYS);

From 93eb64fa9fb558907c3c3c8f47de67df454af922 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 10 Aug 2022 16:21:04 -0700
Subject: [PATCH 584/740] Fix LocalRatekeeper workload

---
 fdbserver/workloads/LocalRatekeeper.actor.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fdbserver/workloads/LocalRatekeeper.actor.cpp b/fdbserver/workloads/LocalRatekeeper.actor.cpp
index 97f8af04bc2..67d84d309f5 100644
--- a/fdbserver/workloads/LocalRatekeeper.actor.cpp
+++ b/fdbserver/workloads/LocalRatekeeper.actor.cpp
@@ -18,6 +18,7 @@
  * limitations under the License.
  */
 
+#include "fdbclient/FDBTypes.h"
 #include "fdbserver/workloads/workloads.actor.h"
 #include <fdbserver/Knobs.h>
 #include <flow/actorcompiler.h>
@@ -82,7 +83,16 @@ struct LocalRatekeeperWorkload : TestWorkload {
 				    .detail("Actual", metrics.localRateLimit);
 			}
 			tr.reset();
-			Version readVersion = wait(tr.getReadVersion());
+			state Version readVersion = invalidVersion;
+			loop {
+				try {
+					Version v = wait(tr.getReadVersion());
+					readVersion = v;
+					break;
+				} catch (Error& e) {
+					wait(tr.onError(e));
+				}
+			}
 			requests.clear();
 			// we send 100 requests to this storage node and count how many of those get rejected
 			for (int i = 0; i < 100; ++i) {

From 3fe1f978f33feba894bfd022a8c44c48cffeb596 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 11 Aug 2022 11:23:44 -0700
Subject: [PATCH 585/740] Add a client knob GRV_ERROR_RETRY_DELAY

---
 fdbclient/ClientKnobs.cpp        | 1 +
 fdbclient/ClientKnobs.h          | 1 +
 fdbclient/NativeAPI.actor.cpp    | 2 +-
 fdbserver/BackupWorker.actor.cpp | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ClientKnobs.cpp b/fdbclient/ClientKnobs.cpp
index 7427078d5b5..d9d7331f146 100644
--- a/fdbclient/ClientKnobs.cpp
+++ b/fdbclient/ClientKnobs.cpp
@@ -63,6 +63,7 @@ void ClientKnobs::initialize(Randomize randomize) {
 
 	init( WRONG_SHARD_SERVER_DELAY,                .01 ); if( randomize && BUGGIFY ) WRONG_SHARD_SERVER_DELAY = deterministicRandom()->random01(); // FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY; // SOMEDAY: This delay can limit performance of retrieving data when the cache is mostly wrong (e.g. dumping the database after a test)
 	init( FUTURE_VERSION_RETRY_DELAY,              .01 ); if( randomize && BUGGIFY ) FUTURE_VERSION_RETRY_DELAY = deterministicRandom()->random01();// FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY;
+	init( GRV_ERROR_RETRY_DELAY,                   5.0 ); if( randomize && BUGGIFY ) FUTURE_VERSION_RETRY_DELAY = 0.01 + 5 * deterministicRandom()->random01();
 	init( UNKNOWN_TENANT_RETRY_DELAY,              0.0 ); if( randomize && BUGGIFY ) UNKNOWN_TENANT_RETRY_DELAY = deterministicRandom()->random01();
 	init( REPLY_BYTE_LIMIT,                      80000 );
 	init( DEFAULT_BACKOFF,                         .01 ); if( randomize && BUGGIFY ) DEFAULT_BACKOFF = deterministicRandom()->random01();
diff --git a/fdbclient/ClientKnobs.h b/fdbclient/ClientKnobs.h
index ca3dd1494ee..5978c43b1fe 100644
--- a/fdbclient/ClientKnobs.h
+++ b/fdbclient/ClientKnobs.h
@@ -61,6 +61,7 @@ class ClientKnobs : public KnobsImpl<ClientKnobs> {
 	double WRONG_SHARD_SERVER_DELAY; // SOMEDAY: This delay can limit performance of retrieving data when the cache is
 	                                 // mostly wrong (e.g. dumping the database after a test)
 	double FUTURE_VERSION_RETRY_DELAY;
+	double GRV_ERROR_RETRY_DELAY;
 	double UNKNOWN_TENANT_RETRY_DELAY;
 	int REPLY_BYTE_LIMIT;
 	double DEFAULT_BACKOFF;
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index cd86940ada9..91f1f62c2d3 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3491,7 +3491,7 @@ ACTOR Future<Version> waitForCommittedVersion(Database cx, Version version, Span
 			if (e.code() == error_code_batch_transaction_throttled ||
 			    e.code() == error_code_proxy_memory_limit_exceeded) {
 				// GRV Proxy returns an error
-				wait(delayJittered(5.0));
+				wait(delayJittered(CLIENT_KNOBS->GRV_ERROR_RETRY_DELAY));
 			} else {
 				TraceEvent(SevError, "WaitForCommittedVersionError").error(e);
 				throw;
diff --git a/fdbserver/BackupWorker.actor.cpp b/fdbserver/BackupWorker.actor.cpp
index 4163bca42ca..789935bd2cd 100644
--- a/fdbserver/BackupWorker.actor.cpp
+++ b/fdbserver/BackupWorker.actor.cpp
@@ -449,7 +449,7 @@ struct BackupData {
 				if (e.code() == error_code_batch_transaction_throttled ||
 				    e.code() == error_code_proxy_memory_limit_exceeded) {
 					// GRV Proxy returns an error
-					wait(delayJittered(5.0));
+					wait(delayJittered(CLIENT_KNOBS->GRV_ERROR_RETRY_DELAY));
 				} else {
 					throw;
 				}

From 581819e438bece9d0d230f7f19872ce8fdf185b8 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 11 Aug 2022 14:06:16 -0700
Subject: [PATCH 586/740] Fix attribute_not_found error in bulkSetup()

---
 fdbserver/workloads/BulkSetup.actor.h | 43 ++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/fdbserver/workloads/BulkSetup.actor.h b/fdbserver/workloads/BulkSetup.actor.h
index 4d1acdbb449..8e8c8b48753 100644
--- a/fdbserver/workloads/BulkSetup.actor.h
+++ b/fdbserver/workloads/BulkSetup.actor.h
@@ -158,6 +158,37 @@ ACTOR Future<std::vector<std::pair<uint64_t, double>>> trackInsertionCount(Datab
                                                                            std::vector<uint64_t> countsOfInterest,
                                                                            double checkInterval);
 
+ACTOR template <class T>
+Future<Void> waitForLowInFlight(Database cx, T* workload) {
+	state Future<Void> timeout = delay(300.0);
+	loop {
+		try {
+			if (timeout.isReady()) {
+				throw timed_out();
+			}
+
+			int64_t inFlight = wait(getDataInFlight(cx, workload->dbInfo));
+			TraceEvent("DynamicWarming").detail("InFlight", inFlight);
+			if (inFlight > 1e6) { // Wait for just 1 MB to be in flight
+				wait(delay(1.0));
+			} else {
+				wait(delay(1.0));
+				TraceEvent("DynamicWarmingDone").log();
+				break;
+			}
+		} catch (Error& e) {
+			if (e.code() == error_code_attribute_not_found) {
+				// DD may not be initialized yet and attribute "DataInFlight" can be missing
+				wait(delay(1.0));
+			} else {
+				TraceEvent(SevWarn, "WaitForLowInFlightError").error(e);
+				throw;
+			}
+		}
+	}
+	return Void();
+}
+
 ACTOR template <class T>
 Future<Void> bulkSetup(Database cx,
                        T* workload,
@@ -279,17 +310,7 @@ Future<Void> bulkSetup(Database cx,
 	if (postSetupWarming != 0) {
 		try {
 			wait(delay(5.0)); // Wait for the data distribution in a small test to start
-			loop {
-				int64_t inFlight = wait(getDataInFlight(cx, workload->dbInfo));
-				TraceEvent("DynamicWarming").detail("InFlight", inFlight);
-				if (inFlight > 1e6) { // Wait for just 1 MB to be in flight
-					wait(delay(1.0));
-				} else {
-					wait(delay(1.0));
-					TraceEvent("DynamicWarmingDone").log();
-					break;
-				}
-			}
+			wait(waitForLowInFlight(cx, workload)); // Wait for the data distribution in a small test to start
 		} catch (Error& e) {
 			if (e.code() == error_code_actor_cancelled)
 				throw;

From 6a65f700bed3e8a4f1d5ba72626fbb7ae327a061 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 15 Aug 2022 14:29:33 -0700
Subject: [PATCH 587/740] Increase waitForLowInFlight timeout

Seeing a CheckRelocation test failed with 300s timeout.
---
 fdbclient/ClientKnobs.cpp             | 2 +-
 fdbserver/workloads/BulkSetup.actor.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ClientKnobs.cpp b/fdbclient/ClientKnobs.cpp
index d9d7331f146..8e1c1a277cd 100644
--- a/fdbclient/ClientKnobs.cpp
+++ b/fdbclient/ClientKnobs.cpp
@@ -63,7 +63,7 @@ void ClientKnobs::initialize(Randomize randomize) {
 
 	init( WRONG_SHARD_SERVER_DELAY,                .01 ); if( randomize && BUGGIFY ) WRONG_SHARD_SERVER_DELAY = deterministicRandom()->random01(); // FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY; // SOMEDAY: This delay can limit performance of retrieving data when the cache is mostly wrong (e.g. dumping the database after a test)
 	init( FUTURE_VERSION_RETRY_DELAY,              .01 ); if( randomize && BUGGIFY ) FUTURE_VERSION_RETRY_DELAY = deterministicRandom()->random01();// FLOW_KNOBS->PREVENT_FAST_SPIN_DELAY;
-	init( GRV_ERROR_RETRY_DELAY,                   5.0 ); if( randomize && BUGGIFY ) FUTURE_VERSION_RETRY_DELAY = 0.01 + 5 * deterministicRandom()->random01();
+	init( GRV_ERROR_RETRY_DELAY,                   5.0 ); if( randomize && BUGGIFY ) GRV_ERROR_RETRY_DELAY = 0.01 + 5 * deterministicRandom()->random01();
 	init( UNKNOWN_TENANT_RETRY_DELAY,              0.0 ); if( randomize && BUGGIFY ) UNKNOWN_TENANT_RETRY_DELAY = deterministicRandom()->random01();
 	init( REPLY_BYTE_LIMIT,                      80000 );
 	init( DEFAULT_BACKOFF,                         .01 ); if( randomize && BUGGIFY ) DEFAULT_BACKOFF = deterministicRandom()->random01();
diff --git a/fdbserver/workloads/BulkSetup.actor.h b/fdbserver/workloads/BulkSetup.actor.h
index 8e8c8b48753..07f30052af1 100644
--- a/fdbserver/workloads/BulkSetup.actor.h
+++ b/fdbserver/workloads/BulkSetup.actor.h
@@ -160,7 +160,7 @@ ACTOR Future<std::vector<std::pair<uint64_t, double>>> trackInsertionCount(Datab
 
 ACTOR template <class T>
 Future<Void> waitForLowInFlight(Database cx, T* workload) {
-	state Future<Void> timeout = delay(300.0);
+	state Future<Void> timeout = delay(600.0);
 	loop {
 		try {
 			if (timeout.isReady()) {

From 152ad0f46ce65beaacbbec302c2dc5f0e768933d Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Tue, 16 Aug 2022 10:36:40 +0300
Subject: [PATCH 588/740] Try to fix tests

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0a01254245a..ae264373ff7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -197,7 +197,7 @@ jobs:
       JOSHUA_DB_VER: "6.3.15"
       N_OF_TESTS: 600 # to fit in 360 minutes job run limit
       JOSHUA_AGENT_URL: "docker.io/1inker"
-      JOSHUA_AGENT_TAG: "rhel8-20220809"
+      JOSHUA_AGENT_TAG: "rhel8-20220816"
 
     steps:
       - name: Install dependencies
@@ -205,7 +205,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y sudo wget crudini git python3 python3-pip
-          sudo pip3 install wheel setuptools python-dateutil lxml
+          sudo pip3 install wheel setuptools python-dateutil lxml boto3
 
       - name: Install FoundationDb
         shell: bash
@@ -221,7 +221,7 @@ jobs:
           sudo sed -i s/127.0.0.1/$MY_IP/ /etc/foundationdb/fdb.cluster
           sudo crudini --set /etc/foundationdb/foundationdb.conf fdbserver memory 4GiB
           sudo systemctl start foundationdb
-          pip3 install 'foundationdb==${{ env.JOSHUA_DB_VER }}' boto3
+          pip3 install 'foundationdb==${{ env.JOSHUA_DB_VER }}'
 
       - name: Download the correctness package
         uses: actions/download-artifact@v2

From a4372500f0a7f2462432f2aa669bbff56104c373 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Tue, 16 Aug 2022 16:47:38 +0300
Subject: [PATCH 589/740] Build with clang for linux has been implemented

---
 .../c/test/unit/third_party/CMakeLists.txt    |  2 +-
 cmake/CompileBoost.cmake                      |  6 +++---
 cmake/ConfigureCompiler.cmake                 |  2 ++
 cmake/FDBComponents.cmake                     | 19 ++++++++++---------
 cmake/Jemalloc.cmake                          |  2 +-
 flowbench/benchmark.cmake                     |  3 ++-
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/bindings/c/test/unit/third_party/CMakeLists.txt b/bindings/c/test/unit/third_party/CMakeLists.txt
index 5f26630744f..ecfa872b210 100644
--- a/bindings/c/test/unit/third_party/CMakeLists.txt
+++ b/bindings/c/test/unit/third_party/CMakeLists.txt
@@ -6,7 +6,7 @@ ExternalProject_Add(
     doctest
     PREFIX ${CMAKE_BINARY_DIR}/doctest
     GIT_REPOSITORY https://github.com/onqtam/doctest.git
-    GIT_TAG 7b9885133108ae301ddd16e2651320f54cafeba7 # v2.4.8
+    GIT_TAG b7c21ec5ceeadb4951b00396fc1e4642dd347e5f # v2.4.9
     TIMEOUT 10
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
diff --git a/cmake/CompileBoost.cmake b/cmake/CompileBoost.cmake
index 52788e68ce5..f50d82e7bfd 100644
--- a/cmake/CompileBoost.cmake
+++ b/cmake/CompileBoost.cmake
@@ -9,7 +9,7 @@ function(compile_boost)
 
   # Configure bootstrap command
   set(BOOTSTRAP_COMMAND "./bootstrap.sh")
-  set(BOOTSTRAP_LIBRARIES "context")
+  set(BOOTSTRAP_LIBRARIES "context,filesystem,iostreams")
 
   set(BOOST_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
   if(CLANG)
@@ -29,7 +29,7 @@ function(compile_boost)
   set(B2_COMMAND "./b2")
   set(BOOST_COMPILER_FLAGS -fvisibility=hidden -fPIC -std=c++17 -w)
   set(BOOST_LINK_FLAGS "")
-  if(APPLE OR CLANG OR USE_LIBCXX)
+  if(APPLE OR USE_LIBCXX)
     list(APPEND BOOST_COMPILER_FLAGS -stdlib=libc++ -nostdlib++)
     list(APPEND BOOST_LINK_FLAGS -static-libgcc -lc++ -lc++abi)
   endif()
@@ -52,7 +52,7 @@ function(compile_boost)
     URL "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2"
     URL_HASH SHA256=8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
     CONFIGURE_COMMAND ${BOOTSTRAP_COMMAND} ${BOOTSTRAP_ARGS} --with-libraries=${BOOTSTRAP_LIBRARIES} --with-toolset=${BOOST_TOOLSET}
-    BUILD_COMMAND ${B2_COMMAND} link=static ${COMPILE_BOOST_BUILD_ARGS} --prefix=${BOOST_INSTALL_DIR} ${USER_CONFIG_FLAG} install
+    BUILD_COMMAND ${B2_COMMAND} toolset=${BOOST_TOOLSET} link=static ${COMPILE_BOOST_BUILD_ARGS} --prefix=${BOOST_INSTALL_DIR} ${USER_CONFIG_FLAG} install
     BUILD_IN_SOURCE ON
     INSTALL_COMMAND ""
     UPDATE_COMMAND ""
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index a7e0a8697df..8b71400ab2a 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -285,6 +285,8 @@ else()
         endif()
         add_link_options(-stdlib=libc++ -Wl,-build-id=sha1)
       endif()
+    else()
+      add_link_options(-latomic)
     endif()
     if (OPEN_FOR_IDE)
       add_compile_options(
diff --git a/cmake/FDBComponents.cmake b/cmake/FDBComponents.cmake
index 60fbe44a0d7..865e2f79dc9 100644
--- a/cmake/FDBComponents.cmake
+++ b/cmake/FDBComponents.cmake
@@ -164,13 +164,12 @@ endif()
 set(SSD_ROCKSDB_EXPERIMENTAL ON CACHE BOOL "Build with experimental RocksDB support")
 set(PORTABLE_ROCKSDB ON CACHE BOOL "Compile RocksDB in portable mode") # Set this to OFF to compile RocksDB with `-march=native`
 set(WITH_LIBURING OFF CACHE BOOL "Build with liburing enabled") # Set this to ON to include liburing
-# RocksDB is currently enabled by default for GCC but does not build with the latest
-# Clang.
-if (SSD_ROCKSDB_EXPERIMENTAL AND GCC)
+# RocksDB is currently enabled by default for all compilers. Clang 14 could build it too.
+#if (SSD_ROCKSDB_EXPERIMENTAL AND GCC)
   set(WITH_ROCKSDB_EXPERIMENTAL ON)
-else()
-  set(WITH_ROCKSDB_EXPERIMENTAL OFF)
-endif()
+#else()
+#  set(WITH_ROCKSDB_EXPERIMENTAL OFF)
+#endif()
 
 ################################################################################
 # TOML11
@@ -188,9 +187,11 @@ else()
   ExternalProject_add(toml11Project
     URL "https://github.com/ToruNiina/toml11/archive/v3.4.0.tar.gz"
     URL_HASH SHA256=bc6d733efd9216af8c119d8ac64a805578c79cc82b813e4d1d880ca128bd154d
-    CMAKE_CACHE_ARGS
-      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/toml11
-      -Dtoml11_BUILD_TEST:BOOL=OFF
+    CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+               -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+               -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+               -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/toml11
+               -Dtoml11_BUILD_TEST=OFF
     BUILD_ALWAYS ON)
   add_library(toml11_target INTERFACE)
   add_dependencies(toml11_target toml11Project)
diff --git a/cmake/Jemalloc.cmake b/cmake/Jemalloc.cmake
index ab99062fcb5..e1a91c39794 100644
--- a/cmake/Jemalloc.cmake
+++ b/cmake/Jemalloc.cmake
@@ -13,7 +13,7 @@ ExternalProject_add(Jemalloc_project
   BUILD_BYPRODUCTS "${JEMALLOC_DIR}/include/jemalloc/jemalloc.h"
   "${JEMALLOC_DIR}/lib/libjemalloc_pic.a"
   PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/cmake/jemalloc.patch
-  CONFIGURE_COMMAND ./configure --prefix=${JEMALLOC_DIR} --enable-static --disable-cxx --enable-prof --disable-initial-exec-tls
+  CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --prefix=${JEMALLOC_DIR} --enable-static --disable-cxx --enable-prof --disable-initial-exec-tls
   BUILD_IN_SOURCE ON
   BUILD_COMMAND make
   INSTALL_DIR "${JEMALLOC_DIR}"
diff --git a/flowbench/benchmark.cmake b/flowbench/benchmark.cmake
index 4334a3113f3..44054bcd115 100644
--- a/flowbench/benchmark.cmake
+++ b/flowbench/benchmark.cmake
@@ -9,7 +9,7 @@ ExternalProject_Add(googlebenchmark
   GIT_CONFIG        advice.detachedHead=false
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-build"
-  CMAKE_ARGS        "-DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_LTO=true"
+  CMAKE_ARGS        "-DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_LTO=true -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""
@@ -24,6 +24,7 @@ ExternalProject_Add(googletest DEPENDS googlebenchmark
   GIT_CONFIG        advice.detachedHead=false
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-src/googletest"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-build/googletest"
+  CMAKE_ARGS        "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""

From 763993f16389e1158af711600e6004b4dace0323 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 11 Jul 2022 09:01:59 +0000
Subject: [PATCH 590/740] update version after 7.1.15 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f2899fc4b4..cef4f8656ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.15
+  VERSION 7.1.16
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 4aaf444e61d2b7c1845ac5e38df8477eb60b95f8 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 11 Jul 2022 10:28:34 -0700
Subject: [PATCH 591/740] Add 7.1.14 and 7.1.15 release notes

---
 .../source/release-notes/release-notes-710.rst       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 54729502907..091bc410543 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,18 @@
 Release Notes
 #############
 
+7.1.15
+======
+* Same as 7.1.14 release with AVX enabled.
+
+7.1.14
+======
+* Released with AVX disabled.
+* Fixed a high commit latency bug when there are data movement. `(PR #7548) <https://github.com/apple/foundationdb/pull/7548>`_
+* Fixed the primary locality on the sequencer by obtaining it from cluster controller. `(PR #7535) <https://github.com/apple/foundationdb/pull/7535>`_
+* Added StorageEngine type to StorageMetrics trace events. `(PR #7546) <https://github.com/apple/foundationdb/pull/7546>`_
+* Improved hasIncompleteVersionstamp performance in Java binding to use iteration rather than stream processing. `(PR #7559) <https://github.com/apple/foundationdb/pull/7559>`_
+
 7.1.13
 ======
 * Same as 7.1.12 release with AVX enabled.

From f18ac32acf7f4ead2c2d9bccfff7d8ff5526ddf1 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Thu, 7 Jul 2022 14:44:11 -0700
Subject: [PATCH 592/740] Adding rocksdb compression and data size stats.

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 48 +++++++++++++++++++-----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 41886f38dc9..f6c3fe7198f 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -741,7 +741,8 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
                                        std::shared_ptr<PerfContextMetrics> perfContextMetrics,
                                        rocksdb::DB* db,
                                        std::shared_ptr<ReadIteratorPool> readIterPool,
-                                       Counters* counters) {
+                                       Counters* counters,
+                                       CF cf) {
 	state std::vector<std::tuple<const char*, uint32_t, uint64_t>> tickerStats = {
 		{ "StallMicros", rocksdb::STALL_MICROS, 0 },
 		{ "BytesRead", rocksdb::BYTES_READ, 0 },
@@ -779,7 +780,7 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
 		{ "CountIterSkippedKeys", rocksdb::NUMBER_ITER_SKIP, 0 },
 
 	};
-	state std::vector<std::pair<const char*, std::string>> propertyStats = {
+	state std::vector<std::pair<const char*, std::string>> intPropertyStats = {
 		{ "NumImmutableMemtables", rocksdb::DB::Properties::kNumImmutableMemTable },
 		{ "NumImmutableMemtablesFlushed", rocksdb::DB::Properties::kNumImmutableMemTableFlushed },
 		{ "IsMemtableFlushPending", rocksdb::DB::Properties::kMemTableFlushPending },
@@ -807,6 +808,14 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
 		{ "LiveSstFilesSize", rocksdb::DB::Properties::kLiveSstFilesSize },
 	};
 
+	state std::vector<std::pair<const char*, std::string>> strPropertyStats = {
+		{ "LevelStats", rocksdb::DB::Properties::kLevelStats },
+	};
+
+	state std::vector<std::pair<const char*, std::string>> levelStrPropertyStats = {
+		{ "CompressionRatioAtLevel", rocksdb::DB::Properties::kCompressionRatioAtLevelPrefix },
+	};
+
 	state std::unordered_map<std::string, uint64_t> readIteratorPoolStats = {
 		{ "NumReadIteratorsCreated", 0 },
 		{ "NumTimesReadIteratorsReused", 0 },
@@ -816,21 +825,40 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
 		wait(delay(SERVER_KNOBS->ROCKSDB_METRICS_DELAY));
 		TraceEvent e("RocksDBMetrics", id);
 		uint64_t stat;
-		for (auto& t : tickerStats) {
-			auto& [name, ticker, cum] = t;
+		for (auto& [name, ticker, cum] : tickerStats) {
 			stat = statistics->getTickerCount(ticker);
 			e.detail(name, stat - cum);
 			cum = stat;
 		}
 
-		for (auto& p : propertyStats) {
-			auto& [name, property] = p;
+		for (const auto& [name, property] : intPropertyStats) {
 			stat = 0;
 			// GetAggregatedIntProperty gets the aggregated int property from all column families.
 			ASSERT(db->GetAggregatedIntProperty(property, &stat));
 			e.detail(name, stat);
 		}
 
+		std::string propValue;
+		for (const auto& [name, property] : strPropertyStats) {
+			propValue = "";
+			ASSERT(db->GetProperty(cf, property, &propValue));
+			e.detail(name, propValue);
+		}
+
+		rocksdb::ColumnFamilyMetaData cf_meta_data;
+		db->GetColumnFamilyMetaData(cf, &cf_meta_data);
+		int numLevels = static_cast<int>(cf_meta_data.levels.size());
+		std::string levelProp;
+		for (const auto& [name, property] : levelStrPropertyStats) {
+			levelProp = "";
+			for (int level = 0; level < numLevels; level++) {
+				propValue = "";
+				ASSERT(db->GetProperty(cf, property + std::to_string(level), &propValue));
+				levelProp += std::to_string(level) + ":" + propValue + (level == numLevels - 1 ? "" : ",");
+			}
+			e.detail(name, levelProp);
+		}
+
 		stat = readIterPool->numReadIteratorsCreated();
 		e.detail("NumReadIteratorsCreated", stat - readIteratorPoolStats["NumReadIteratorsCreated"]);
 		readIteratorPoolStats["NumReadIteratorsCreated"] = stat;
@@ -984,13 +1012,13 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				// The current thread and main thread are same when the code runs in simulation.
 				// blockUntilReady() is getting the thread into deadlock state, so directly calling
 				// the metricsLogger.
-				a.metrics =
-				    rocksDBMetricLogger(id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
-				    flowLockLogger(id, a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
+				a.metrics = rocksDBMetricLogger(
+				                id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters, cf) &&
+				            flowLockLogger(id, a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
 			} else {
 				onMainThread([&] {
 					a.metrics = rocksDBMetricLogger(
-					                id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters) &&
+					                id, options.statistics, perfContextMetrics, db, readIterPool, &a.counters, cf) &&
 					            flowLockLogger(id, a.readLock, a.fetchLock) && refreshReadIteratorPool(readIterPool);
 					return Future<bool>(true);
 				}).blockUntilReady();

From 2838fb89a86fdf213822c6217b7f217050e104cf Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Mon, 18 Jul 2022 13:47:08 -0700
Subject: [PATCH 593/740] Fix processDiskReadSeconds and
 processDiskWriteSeconds. (#7609)

---
 flow/Platform.actor.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/flow/Platform.actor.cpp b/flow/Platform.actor.cpp
index c07ff01bca6..486025e5877 100644
--- a/flow/Platform.actor.cpp
+++ b/flow/Platform.actor.cpp
@@ -1734,15 +1734,10 @@ SystemStatistics getSystemStatistics(std::string const& dataFolder,
 			    0,
 			    returnStats.elapsed -
 			        std::min<double>(returnStats.elapsed, (nowIOMilliSecs - (*statState)->lastIOMilliSecs) / 1000.0));
-			returnStats.processDiskReadSeconds = std::max<double>(
-			    0,
-			    returnStats.elapsed - std::min<double>(returnStats.elapsed,
-			                                           (nowReadMilliSecs - (*statState)->lastReadMilliSecs) / 1000.0));
+			returnStats.processDiskReadSeconds =
+			    std::min<double>(returnStats.elapsed, (nowReadMilliSecs - (*statState)->lastReadMilliSecs) / 1000.0);
 			returnStats.processDiskWriteSeconds =
-			    std::max<double>(0,
-			                     returnStats.elapsed -
-			                         std::min<double>(returnStats.elapsed,
-			                                          (nowWriteMilliSecs - (*statState)->lastWriteMilliSecs) / 1000.0));
+			    std::min<double>(returnStats.elapsed, (nowWriteMilliSecs - (*statState)->lastWriteMilliSecs) / 1000.0);
 			returnStats.processDiskRead = (nowReads - (*statState)->lastReads);
 			returnStats.processDiskWrite = (nowWrites - (*statState)->lastWrites);
 			returnStats.processDiskWriteSectors = (nowWriteSectors - (*statState)->lastWriteSectors);

From ae1249cecb28c5693d12088118f601bbb3dc063d Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Tue, 19 Jul 2022 12:54:39 -0400
Subject: [PATCH 594/740] cherry pick 7613 - update tag client cache on
 getKeyLocation (#7616)

---
 fdbclient/NativeAPI.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index e11249f8c67..844dabae3d8 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -2834,6 +2834,7 @@ ACTOR Future<KeyRangeLocationInfo> getKeyLocation_internal(Database cx,
 					auto locationInfo =
 					    cx->setCachedLocation(tenant, rep.tenantEntry, rep.results[0].first, rep.results[0].second);
 					updateTssMappings(cx, rep);
+					updateTagMappings(cx, rep);
 
 					return KeyRangeLocationInfo(
 					    rep.tenantEntry,

From 4b86ce5caaa6276e11ae7a6c54e71a1c79d0bab0 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 19 Jul 2022 22:27:29 -0700
Subject: [PATCH 595/740] Fix ScopeEventFieldTypeMismatch error for TLogMetrics

Backport changes made to TLogServer in #4616 back to old TLog implementations.
Old implementations were using SpecialCounter, which is string. The new type
is int64_t. Without the change, we can have many events like:

<Event Severity="30" Time="1658165532.958152" DateTime="2022-07-18T17:32:12Z" Type="ScopeEventFieldTypeMismatch" ID="0000000000000000" EventType="TraceEvent.TLogMetrics" FieldName="QueueDiskBytesUsed" OldType="Int64" NewType="String" ThreadID="2451559325190099131" Machine="10.242.248.26:4703" LogGroup="xxxx" Roles="TL" />
---
 fdbserver/OldTLogServer_4_6.actor.cpp | 36 +++++++++++++--------------
 fdbserver/OldTLogServer_6_0.actor.cpp | 36 +++++++++++++--------------
 fdbserver/OldTLogServer_6_2.actor.cpp | 36 +++++++++++++--------------
 3 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/fdbserver/OldTLogServer_4_6.actor.cpp b/fdbserver/OldTLogServer_4_6.actor.cpp
index 7fa6573a533..b523212f49c 100644
--- a/fdbserver/OldTLogServer_4_6.actor.cpp
+++ b/fdbserver/OldTLogServer_4_6.actor.cpp
@@ -458,24 +458,6 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 		specialCounter(cc, "Version", [this]() { return this->version.get(); });
 		specialCounter(cc, "SharedBytesInput", [tLogData]() { return tLogData->bytesInput; });
 		specialCounter(cc, "SharedBytesDurable", [tLogData]() { return tLogData->bytesDurable; });
-		specialCounter(
-		    cc, "KvstoreBytesUsed", [tLogData]() { return tLogData->persistentData->getStorageBytes().used; });
-		specialCounter(
-		    cc, "KvstoreBytesFree", [tLogData]() { return tLogData->persistentData->getStorageBytes().free; });
-		specialCounter(cc, "KvstoreBytesAvailable", [tLogData]() {
-			return tLogData->persistentData->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "KvstoreBytesTotal", [tLogData]() { return tLogData->persistentData->getStorageBytes().total; });
-		specialCounter(
-		    cc, "QueueDiskBytesUsed", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().used; });
-		specialCounter(
-		    cc, "QueueDiskBytesFree", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().free; });
-		specialCounter(cc, "QueueDiskBytesAvailable", [tLogData]() {
-			return tLogData->rawPersistentQueue->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "QueueDiskBytesTotal", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().total; });
 		specialCounter(cc, "ActivePeekStreams", [tLogData]() { return tLogData->activePeekStreams; });
 	}
 
@@ -1424,7 +1406,23 @@ ACTOR Future<Void> tLogCore(TLogData* self, Reference<LogData> logData) {
 	                                     logData->logId,
 	                                     SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                                     &logData->cc,
-	                                     logData->logId.toString() + "/TLogMetrics"));
+	                                     logData->logId.toString() + "/TLogMetrics",
+	                                     [self = self](TraceEvent& te) {
+		                                     StorageBytes sbTlog = self->persistentData->getStorageBytes();
+		                                     te.detail("KvstoreBytesUsed", sbTlog.used);
+		                                     te.detail("KvstoreBytesFree", sbTlog.free);
+		                                     te.detail("KvstoreBytesAvailable", sbTlog.available);
+		                                     te.detail("KvstoreBytesTotal", sbTlog.total);
+		                                     te.detail("KvstoreBytesTemp", sbTlog.temp);
+
+		                                     StorageBytes sbQueue = self->rawPersistentQueue->getStorageBytes();
+		                                     te.detail("QueueDiskBytesUsed", sbQueue.used);
+		                                     te.detail("QueueDiskBytesFree", sbQueue.free);
+		                                     te.detail("QueueDiskBytesAvailable", sbQueue.available);
+		                                     te.detail("QueueDiskBytesTotal", sbQueue.total);
+		                                     te.detail("QueueDiskBytesTemp", sbQueue.temp);
+	                                     }));
+
 	logData->addActor.send(serveTLogInterface(self, logData->tli, logData, warningCollectorInput));
 
 	try {
diff --git a/fdbserver/OldTLogServer_6_0.actor.cpp b/fdbserver/OldTLogServer_6_0.actor.cpp
index 2d016d4a6a5..61ed31fc057 100644
--- a/fdbserver/OldTLogServer_6_0.actor.cpp
+++ b/fdbserver/OldTLogServer_6_0.actor.cpp
@@ -554,24 +554,6 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 		specialCounter(cc, "SharedBytesDurable", [tLogData]() { return tLogData->bytesDurable; });
 		specialCounter(cc, "SharedOverheadBytesInput", [tLogData]() { return tLogData->overheadBytesInput; });
 		specialCounter(cc, "SharedOverheadBytesDurable", [tLogData]() { return tLogData->overheadBytesDurable; });
-		specialCounter(
-		    cc, "KvstoreBytesUsed", [tLogData]() { return tLogData->persistentData->getStorageBytes().used; });
-		specialCounter(
-		    cc, "KvstoreBytesFree", [tLogData]() { return tLogData->persistentData->getStorageBytes().free; });
-		specialCounter(cc, "KvstoreBytesAvailable", [tLogData]() {
-			return tLogData->persistentData->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "KvstoreBytesTotal", [tLogData]() { return tLogData->persistentData->getStorageBytes().total; });
-		specialCounter(
-		    cc, "QueueDiskBytesUsed", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().used; });
-		specialCounter(
-		    cc, "QueueDiskBytesFree", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().free; });
-		specialCounter(cc, "QueueDiskBytesAvailable", [tLogData]() {
-			return tLogData->rawPersistentQueue->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "QueueDiskBytesTotal", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().total; });
 		specialCounter(cc, "ActivePeekStreams", [tLogData]() { return tLogData->activePeekStreams; });
 	}
 
@@ -2241,7 +2223,23 @@ ACTOR Future<Void> tLogCore(TLogData* self,
 	                                     logData->logId,
 	                                     SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                                     &logData->cc,
-	                                     logData->logId.toString() + "/TLogMetrics"));
+	                                     logData->logId.toString() + "/TLogMetrics",
+	                                     [self = self](TraceEvent& te) {
+		                                     StorageBytes sbTlog = self->persistentData->getStorageBytes();
+		                                     te.detail("KvstoreBytesUsed", sbTlog.used);
+		                                     te.detail("KvstoreBytesFree", sbTlog.free);
+		                                     te.detail("KvstoreBytesAvailable", sbTlog.available);
+		                                     te.detail("KvstoreBytesTotal", sbTlog.total);
+		                                     te.detail("KvstoreBytesTemp", sbTlog.temp);
+
+		                                     StorageBytes sbQueue = self->rawPersistentQueue->getStorageBytes();
+		                                     te.detail("QueueDiskBytesUsed", sbQueue.used);
+		                                     te.detail("QueueDiskBytesFree", sbQueue.free);
+		                                     te.detail("QueueDiskBytesAvailable", sbQueue.available);
+		                                     te.detail("QueueDiskBytesTotal", sbQueue.total);
+		                                     te.detail("QueueDiskBytesTemp", sbQueue.temp);
+	                                     }));
+
 	logData->addActor.send(serveTLogInterface(self, tli, logData, warningCollectorInput));
 	logData->addActor.send(cleanupPeekTrackers(logData.getPtr()));
 	logData->addActor.send(logPeekTrackers(logData.getPtr()));
diff --git a/fdbserver/OldTLogServer_6_2.actor.cpp b/fdbserver/OldTLogServer_6_2.actor.cpp
index ffb449aff58..55498be35b5 100644
--- a/fdbserver/OldTLogServer_6_2.actor.cpp
+++ b/fdbserver/OldTLogServer_6_2.actor.cpp
@@ -641,24 +641,6 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 		specialCounter(cc, "SharedBytesDurable", [tLogData]() { return tLogData->bytesDurable; });
 		specialCounter(cc, "SharedOverheadBytesInput", [tLogData]() { return tLogData->overheadBytesInput; });
 		specialCounter(cc, "SharedOverheadBytesDurable", [tLogData]() { return tLogData->overheadBytesDurable; });
-		specialCounter(
-		    cc, "KvstoreBytesUsed", [tLogData]() { return tLogData->persistentData->getStorageBytes().used; });
-		specialCounter(
-		    cc, "KvstoreBytesFree", [tLogData]() { return tLogData->persistentData->getStorageBytes().free; });
-		specialCounter(cc, "KvstoreBytesAvailable", [tLogData]() {
-			return tLogData->persistentData->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "KvstoreBytesTotal", [tLogData]() { return tLogData->persistentData->getStorageBytes().total; });
-		specialCounter(
-		    cc, "QueueDiskBytesUsed", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().used; });
-		specialCounter(
-		    cc, "QueueDiskBytesFree", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().free; });
-		specialCounter(cc, "QueueDiskBytesAvailable", [tLogData]() {
-			return tLogData->rawPersistentQueue->getStorageBytes().available;
-		});
-		specialCounter(
-		    cc, "QueueDiskBytesTotal", [tLogData]() { return tLogData->rawPersistentQueue->getStorageBytes().total; });
 		specialCounter(cc, "PeekMemoryReserved", [tLogData]() { return tLogData->peekMemoryLimiter.activePermits(); });
 		specialCounter(cc, "PeekMemoryRequestsStalled", [tLogData]() { return tLogData->peekMemoryLimiter.waiters(); });
 		specialCounter(cc, "ActivePeekStreams", [tLogData]() { return tLogData->activePeekStreams; });
@@ -2701,7 +2683,23 @@ ACTOR Future<Void> tLogCore(TLogData* self,
 	                                     logData->logId,
 	                                     SERVER_KNOBS->STORAGE_LOGGING_DELAY,
 	                                     &logData->cc,
-	                                     logData->logId.toString() + "/TLogMetrics"));
+	                                     logData->logId.toString() + "/TLogMetrics",
+	                                     [self = self](TraceEvent& te) {
+		                                     StorageBytes sbTlog = self->persistentData->getStorageBytes();
+		                                     te.detail("KvstoreBytesUsed", sbTlog.used);
+		                                     te.detail("KvstoreBytesFree", sbTlog.free);
+		                                     te.detail("KvstoreBytesAvailable", sbTlog.available);
+		                                     te.detail("KvstoreBytesTotal", sbTlog.total);
+		                                     te.detail("KvstoreBytesTemp", sbTlog.temp);
+
+		                                     StorageBytes sbQueue = self->rawPersistentQueue->getStorageBytes();
+		                                     te.detail("QueueDiskBytesUsed", sbQueue.used);
+		                                     te.detail("QueueDiskBytesFree", sbQueue.free);
+		                                     te.detail("QueueDiskBytesAvailable", sbQueue.available);
+		                                     te.detail("QueueDiskBytesTotal", sbQueue.total);
+		                                     te.detail("QueueDiskBytesTemp", sbQueue.temp);
+	                                     }));
+
 	logData->addActor.send(serveTLogInterface(self, tli, logData, warningCollectorInput));
 	logData->addActor.send(cleanupPeekTrackers(logData.getPtr()));
 	logData->addActor.send(logPeekTrackers(logData.getPtr()));

From a4f7a82253009b82fd03f3a8f8446010ac540c39 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 19 Jul 2022 16:30:44 -0700
Subject: [PATCH 596/740] Add getMappedRange latency metrics

---
 fdbserver/storageserver.actor.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 991410f6ad7..3cd60ef61db 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -940,6 +940,9 @@ struct StorageServer {
 
 		LatencySample readLatencySample;
 		LatencyBands readLatencyBands;
+		LatencySample mappedRangeSample; // Samples getMappedRange latency
+		LatencySample mappedRangeRemoteSample; // Samples getMappedRange remote subquery latency
+		LatencySample mappedRangeLocalSample; // Samples getMappedRange local subquery latency
 
 		Counters(StorageServer* self)
 		  : cc("StorageServer", self->thisServerID.toString()), allQueries("QueryQueue", cc),
@@ -971,7 +974,19 @@ struct StorageServer {
 		                      self->thisServerID,
 		                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
-		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY) {
+		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY),
+		    mappedRangeSample("GetMappedRangeMetrics",
+		                      self->thisServerID,
+		                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    mappedRangeRemoteSample("GetMappedRangeRemoteMetrics",
+		                            self->thisServerID,
+		                            SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                            SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    mappedRangeLocalSample("GetMappedRangeLocalMetrics",
+		                           self->thisServerID,
+		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE) {
 			specialCounter(cc, "LastTLogVersion", [self]() { return self->lastTLogVersion; });
 			specialCounter(cc, "Version", [self]() { return self->version.get(); });
 			specialCounter(cc, "StorageVersion", [self]() { return self->storageVersion(); });
@@ -2808,6 +2823,7 @@ ACTOR Future<GetValueReqAndResultRef> quickGetValue(StorageServer* data,
                                                     // To provide span context, tags, debug ID to underlying lookups.
                                                     GetMappedKeyValuesRequest* pOriginalReq) {
 	state GetValueReqAndResultRef getValue;
+	state double getValueStart = g_network->timer();
 	getValue.key = key;
 
 	if (data->shards[key]->isReadable()) {
@@ -2828,6 +2844,8 @@ ACTOR Future<GetValueReqAndResultRef> quickGetValue(StorageServer* data,
 			if (!reply.error.present()) {
 				++data->counters.quickGetValueHit;
 				copyOptionalValue(a, getValue, reply.value);
+				const double duration = g_network->timer() - getValueStart;
+				data->counters.mappedRangeLocalSample.addMeasurement(duration);
 				return getValue;
 			}
 			// Otherwise fallback.
@@ -2847,6 +2865,8 @@ ACTOR Future<GetValueReqAndResultRef> quickGetValue(StorageServer* data,
 		// TODO: async in case it needs to read from other servers.
 		Optional<Value> valueOption = wait(valueFuture);
 		copyOptionalValue(a, getValue, valueOption);
+		const double duration = g_network->timer() - getValueStart;
+		data->counters.mappedRangeRemoteSample.addMeasurement(duration);
 		return getValue;
 	} else {
 		throw quick_get_value_miss();
@@ -3412,6 +3432,7 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
     // To provide span context, tags, debug ID to underlying lookups.
     GetMappedKeyValuesRequest* pOriginalReq) {
 	state GetRangeReqAndResultRef getRange;
+	state double getValuesStart = g_network->timer();
 	getRange.begin = firstGreaterOrEqual(KeyRef(*a, prefix));
 	getRange.end = firstGreaterOrEqual(strinc(prefix, *a));
 	try {
@@ -3442,6 +3463,8 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 			// Convert GetKeyValuesReply to RangeResult.
 			a->dependsOn(reply.arena);
 			getRange.result = RangeResultRef(reply.data, reply.more);
+			const double duration = g_network->timer() - getValuesStart;
+			data->counters.mappedRangeLocalSample.addMeasurement(duration);
 			return getRange;
 		}
 		// Otherwise fallback.
@@ -3461,6 +3484,8 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 		RangeResult rangeResult = wait(rangeResultFuture);
 		a->dependsOn(rangeResult.arena());
 		getRange.result = rangeResult;
+		const double duration = g_network->timer() - getValuesStart;
+		data->counters.mappedRangeRemoteSample.addMeasurement(duration);
 		return getRange;
 	} else {
 		throw quick_get_key_values_miss();
@@ -3995,6 +4020,7 @@ ACTOR Future<Void> getMappedKeyValuesQ(StorageServer* data, GetMappedKeyValuesRe
 
 	double duration = g_network->timer() - req.requestTime();
 	data->counters.readLatencySample.addMeasurement(duration);
+	data->counters.mappedRangeSample.addMeasurement(duration);
 	if (data->latencyBandConfig.present()) {
 		int maxReadBytes =
 		    data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());

From 760c447c9b624368c7334637e7404d30acf8a02d Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Wed, 20 Jul 2022 11:54:32 -0700
Subject: [PATCH 597/740] Increase AllTags field length in TLogReady

---
 fdbserver/OldTLogServer_6_0.actor.cpp | 6 ++++--
 fdbserver/OldTLogServer_6_2.actor.cpp | 6 ++++--
 fdbserver/TLogServer.actor.cpp        | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fdbserver/OldTLogServer_6_0.actor.cpp b/fdbserver/OldTLogServer_6_0.actor.cpp
index 61ed31fc057..1502dbaa2b0 100644
--- a/fdbserver/OldTLogServer_6_0.actor.cpp
+++ b/fdbserver/OldTLogServer_6_0.actor.cpp
@@ -2768,8 +2768,10 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	req.reply.send(recruited);
 
 	TraceEvent("TLogReady", logData->logId)
-	    .detail("AllTags", describe(req.allTags))
-	    .detail("Locality", logData->locality);
+	    .detail("Locality", logData->locality)
+	    .setMaxEventLength(11000)
+	    .setMaxFieldLength(10000)
+	    .detail("AllTags", describe(req.allTags));
 
 	updater = Void();
 	wait(tLogCore(self, logData, recruited, pulledRecoveryVersions));
diff --git a/fdbserver/OldTLogServer_6_2.actor.cpp b/fdbserver/OldTLogServer_6_2.actor.cpp
index 55498be35b5..ce9b4e5c407 100644
--- a/fdbserver/OldTLogServer_6_2.actor.cpp
+++ b/fdbserver/OldTLogServer_6_2.actor.cpp
@@ -3259,8 +3259,10 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	req.reply.send(recruited);
 
 	TraceEvent("TLogReady", logData->logId)
-	    .detail("AllTags", describe(req.allTags))
-	    .detail("Locality", logData->locality);
+	    .detail("Locality", logData->locality)
+	    .setMaxEventLength(11000)
+	    .setMaxFieldLength(10000)
+	    .detail("AllTags", describe(req.allTags));
 
 	updater = Void();
 	wait(tLogCore(self, logData, recruited, pulledRecoveryVersions));
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 755bacf9aeb..546c72be222 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -3532,8 +3532,10 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	req.reply.send(recruited);
 
 	TraceEvent("TLogReady", logData->logId)
-	    .detail("AllTags", describe(req.allTags))
-	    .detail("Locality", logData->locality);
+	    .detail("Locality", logData->locality)
+	    .setMaxEventLength(11000)
+	    .setMaxFieldLength(10000)
+	    .detail("AllTags", describe(req.allTags));
 
 	updater = Void();
 	wait(tLogCore(self, logData, recruited, pulledRecoveryVersions));

From 2cb8860cad0899bf0680f2df3c7a05ab57329c35 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Wed, 20 Jul 2022 15:05:10 -0700
Subject: [PATCH 598/740] Log tlog initialization

---
 fdbserver/TagPartitionedLogSystem.actor.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp
index 30b6ddf4cbf..755ff7a1147 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.cpp
+++ b/fdbserver/TagPartitionedLogSystem.actor.cpp
@@ -2614,6 +2614,8 @@ ACTOR Future<Void> TagPartitionedLogSystem::newRemoteEpoch(TagPartitionedLogSyst
 		req.tLogLocalities = localities;
 		req.tLogPolicy = logSet->tLogPolicy;
 		req.locality = remoteLocality;
+		TraceEvent("RemoteTLogRouterReplies", self->dbgid)
+		    .detail("WorkerID", remoteWorkers.logRouters[i % remoteWorkers.logRouters.size()].id());
 		logRouterInitializationReplies.push_back(transformErrors(
 		    throwErrorOr(
 		        remoteWorkers.logRouters[i % remoteWorkers.logRouters.size()].logRouter.getReplyUnlessFailedFor(
@@ -2693,11 +2695,13 @@ ACTOR Future<Void> TagPartitionedLogSystem::newRemoteEpoch(TagPartitionedLogSyst
 	}
 
 	remoteTLogInitializationReplies.reserve(remoteWorkers.remoteTLogs.size());
-	for (int i = 0; i < remoteWorkers.remoteTLogs.size(); i++)
+	for (int i = 0; i < remoteWorkers.remoteTLogs.size(); i++) {
+		TraceEvent("RemoteTLogReplies", self->dbgid).detail("WorkerID", remoteWorkers.remoteTLogs[i].id());
 		remoteTLogInitializationReplies.push_back(transformErrors(
 		    throwErrorOr(remoteWorkers.remoteTLogs[i].tLog.getReplyUnlessFailedFor(
 		        remoteTLogReqs[i], SERVER_KNOBS->TLOG_TIMEOUT, SERVER_KNOBS->MASTER_FAILURE_SLOPE_DURING_RECOVERY)),
 		    cluster_recovery_failed()));
+	}
 
 	TraceEvent("RemoteLogRecruitment_InitializingRemoteLogs")
 	    .detail("StartVersion", logSet->startVersion)
@@ -2966,11 +2970,13 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 	}
 
 	initializationReplies.reserve(recr.tLogs.size());
-	for (int i = 0; i < recr.tLogs.size(); i++)
+	for (int i = 0; i < recr.tLogs.size(); i++) {
+		TraceEvent("PrimaryTLogReplies", logSystem->getDebugID()).detail("WorkerID", recr.tLogs[i].id());
 		initializationReplies.push_back(transformErrors(
 		    throwErrorOr(recr.tLogs[i].tLog.getReplyUnlessFailedFor(
 		        reqs[i], SERVER_KNOBS->TLOG_TIMEOUT, SERVER_KNOBS->MASTER_FAILURE_SLOPE_DURING_RECOVERY)),
 		    cluster_recovery_failed()));
+	}
 
 	state std::vector<Future<Void>> recoveryComplete;
 
@@ -3034,11 +3040,14 @@ ACTOR Future<Reference<ILogSystem>> TagPartitionedLogSystem::newEpoch(
 		}
 
 		satelliteInitializationReplies.reserve(recr.satelliteTLogs.size());
-		for (int i = 0; i < recr.satelliteTLogs.size(); i++)
+		for (int i = 0; i < recr.satelliteTLogs.size(); i++) {
+			TraceEvent("PrimarySatelliteTLogReplies", logSystem->getDebugID())
+			    .detail("WorkerID", recr.satelliteTLogs[i].id());
 			satelliteInitializationReplies.push_back(transformErrors(
 			    throwErrorOr(recr.satelliteTLogs[i].tLog.getReplyUnlessFailedFor(
 			        sreqs[i], SERVER_KNOBS->TLOG_TIMEOUT, SERVER_KNOBS->MASTER_FAILURE_SLOPE_DURING_RECOVERY)),
 			    cluster_recovery_failed()));
+		}
 
 		wait(waitForAll(satelliteInitializationReplies) || oldRouterRecruitment);
 

From 20aae7b8def68abf0cb0a276ad6d1e3c806d45e6 Mon Sep 17 00:00:00 2001
From: Xiaoge Su <magichp@gmail.com>
Date: Thu, 21 Jul 2022 19:38:59 -0700
Subject: [PATCH 599/740] Add TraceEvent to the construction/destruction of
 DatabaseContext

This is to figure out why huge databaseLogger related TraceEvents
generated after 7.1 released.
---
 fdbclient/NativeAPI.actor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 844dabae3d8..3a2cab5db65 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1454,6 +1454,9 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
     smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
     specialKeySpace(std::make_unique<SpecialKeySpace>(specialKeys.begin, specialKeys.end, /* test */ false)),
     connectToDatabaseEventCacheHolder(format("ConnectToDatabase/%s", dbId.toString().c_str())) {
+
+	TraceEvent("DatabaseContextCreated").backtrace();
+
 	dbId = deterministicRandom()->randomUniqueID();
 	connected = (clientInfo->get().commitProxies.size() && clientInfo->get().grvProxies.size())
 	                ? Void()
@@ -1762,6 +1765,8 @@ DatabaseContext::~DatabaseContext() {
 		it->second->notifyContextDestroyed();
 	ASSERT_ABORT(server_interf.empty());
 	locationCache.insert(allKeys, Reference<LocationInfo>());
+
+	TraceEvent("DatabaseContextDestructed").backtrace();
 }
 
 Optional<KeyRangeLocationInfo> DatabaseContext::getCachedLocation(const Optional<TenantName>& tenantName,

From 24c6b3d4884f98130df2b7f8434ef40abf4074fb Mon Sep 17 00:00:00 2001
From: Xiaoge Su <magichp@gmail.com>
Date: Thu, 21 Jul 2022 23:11:33 -0700
Subject: [PATCH 600/740] fixup! Update code per comments

---
 fdbclient/NativeAPI.actor.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 3a2cab5db65..794e56d151f 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -1455,9 +1455,10 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
     specialKeySpace(std::make_unique<SpecialKeySpace>(specialKeys.begin, specialKeys.end, /* test */ false)),
     connectToDatabaseEventCacheHolder(format("ConnectToDatabase/%s", dbId.toString().c_str())) {
 
-	TraceEvent("DatabaseContextCreated").backtrace();
-
 	dbId = deterministicRandom()->randomUniqueID();
+
+	TraceEvent("DatabaseContextCreated", dbId).backtrace();
+
 	connected = (clientInfo->get().commitProxies.size() && clientInfo->get().grvProxies.size())
 	                ? Void()
 	                : clientInfo->onChange();
@@ -1766,7 +1767,7 @@ DatabaseContext::~DatabaseContext() {
 	ASSERT_ABORT(server_interf.empty());
 	locationCache.insert(allKeys, Reference<LocationInfo>());
 
-	TraceEvent("DatabaseContextDestructed").backtrace();
+	TraceEvent("DatabaseContextDestructed", dbId).backtrace();
 }
 
 Optional<KeyRangeLocationInfo> DatabaseContext::getCachedLocation(const Optional<TenantName>& tenantName,

From 6507a182e936d6e9ef289f2dab8c486681baa427 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Thu, 21 Jul 2022 15:00:00 -0700
Subject: [PATCH 601/740] Add CommitDebug event after Commit Proxy reporting
 committed version to master

---
 fdbserver/CommitProxyServer.actor.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 86ed60d3223..1918a575a06 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -1465,7 +1465,7 @@ ACTOR Future<Void> reply(CommitBatchContext* self) {
 	state ProxyCommitData* const pProxyCommitData = self->pProxyCommitData;
 	state Span span("MP:reply"_loc, self->span.context);
 
-	const Optional<UID>& debugID = self->debugID;
+	state const Optional<UID>& debugID = self->debugID;
 
 	if (self->prevVersion && self->commitVersion - self->prevVersion < SERVER_KNOBS->MAX_VERSIONS_IN_FLIGHT / 2) {
 		//TraceEvent("CPAdvanceMinVersion", self->pProxyCommitData->dbgid).detail("PrvVersion", self->prevVersion).detail("CommitVersion", self->commitVersion).detail("Master", self->pProxyCommitData->master.id().toString()).detail("TxSize", self->trs.size());
@@ -1506,6 +1506,12 @@ ACTOR Future<Void> reply(CommitBatchContext* self) {
 		                                     writtenTags),
 		    TaskPriority::ProxyMasterVersionReply));
 	}
+
+	if (debugID.present()) {
+		g_traceBatch.addEvent(
+		    "CommitDebug", debugID.get().first(), "CommitProxyServer.commitBatch.AfterReportRawCommittedVersion");
+	}
+
 	if (self->commitVersion > pProxyCommitData->committedVersion.get()) {
 		pProxyCommitData->locked = self->lockedAfter;
 		pProxyCommitData->metadataVersion = self->metadataVersionAfter;

From d64b4d4d99547b299450acebc14157fe693f8781 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Sun, 24 Jul 2022 16:51:18 -0700
Subject: [PATCH 602/740] Error in FetchKey GRV shouldn't fail storageserver

---
 fdbserver/storageserver.actor.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 3cd60ef61db..7cfb72262cc 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -5728,11 +5728,18 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 			// At iteration 1, dest SS selects GRV as fetchVersion and (suppose) can read the data from src SS.
 			// Then dest SS waits its version catch up with this GRV version and write the data to disk.
 			// Note that dest SS waits outside the fetchKeysParallelismLock.
+			fetchVersion = std::max(shard->fetchVersion, data->version.get());
 			if (lastError.code() == error_code_transaction_too_old) {
-				Version grvVersion = wait(tr.getRawReadVersion());
-				fetchVersion = std::max(grvVersion, data->version.get());
-			} else {
-				fetchVersion = std::max(shard->fetchVersion, data->version.get());
+				try {
+					Version grvVersion = wait(tr.getRawReadVersion());
+					fetchVersion = std::max(grvVersion, fetchVersion);
+				} catch (Error& e) {
+					// Note that error in getting GRV doesn't affect any storage server state. Therefore, we catch all
+					// errors here without failing the storage server. When error happens, fetchVersion fall back to
+					// the above computed fetchVersion.
+					TraceEvent(SevWarn, "FetchKeyGRVError", data->thisServerID).error(e);
+					lastError = e;
+				}
 			}
 			ASSERT(fetchVersion >= shard->fetchVersion); // at this point, shard->fetchVersion is the last fetchVersion
 			shard->fetchVersion = fetchVersion;

From bb35396741abdfe8790e8076b87a6a4a63d12f15 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Sun, 24 Jul 2022 17:20:49 -0700
Subject: [PATCH 603/740] Add testing mechanism

---
 fdbserver/storageserver.actor.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 7cfb72262cc..7f87fd0b4d4 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -5729,11 +5729,23 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 			// Then dest SS waits its version catch up with this GRV version and write the data to disk.
 			// Note that dest SS waits outside the fetchKeysParallelismLock.
 			fetchVersion = std::max(shard->fetchVersion, data->version.get());
+			if (g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01)) {
+				// Test using GRV version for fetchKey.
+				lastError = transaction_too_old();
+			}
 			if (lastError.code() == error_code_transaction_too_old) {
 				try {
 					Version grvVersion = wait(tr.getRawReadVersion());
+					if (g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01)) {
+						// Test failed GRV request.
+						throw proxy_memory_limit_exceeded();
+					}
 					fetchVersion = std::max(grvVersion, fetchVersion);
 				} catch (Error& e) {
+					if (e.code() == error_code_actor_cancelled) {
+						throw e;
+					}
+
 					// Note that error in getting GRV doesn't affect any storage server state. Therefore, we catch all
 					// errors here without failing the storage server. When error happens, fetchVersion fall back to
 					// the above computed fetchVersion.

From 2d1021b20393ea3e1d7d8de2bbdfbe62997f6f09 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Sun, 24 Jul 2022 13:38:06 -0700
Subject: [PATCH 604/740] Add timeout to places during Status generation

Otherwise, the status generation becomes a blocking call, which is undesirable,
because many operational tools require a timely response, even if it is in-
complete.
---
 fdbserver/Status.actor.cpp | 43 +++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 123ea1e48a8..d4b52bb47eb 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -832,7 +832,8 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 		}
 	}
 
-	std::vector<NetworkAddress> addressVec = wait(coordinators.ccr->getConnectionString().tryResolveHostnames());
+	std::vector<NetworkAddress> addressVec =
+	    wait(timeoutError(coordinators.ccr->getConnectionString().tryResolveHostnames(), 5.0));
 	for (const auto& coordinator : addressVec) {
 		roles.addCoordinatorRole(coordinator);
 	}
@@ -1928,7 +1929,7 @@ ACTOR static Future<std::vector<std::pair<StorageServerInterface, EventMap>>> ge
 	                            std::vector<std::string>{
 	                                "StorageMetrics", "ReadLatencyMetrics", "ReadLatencyBands", "BusiestReadTag" })) &&
 	     store(busiestWriteTags, getServerBusiestWriteTags(servers, address_workers, rkWorker)) &&
-	     store(metadata, getServerMetadata(servers, cx, true)));
+	     store(metadata, timeoutError(getServerMetadata(servers, cx, true), 5.0)));
 
 	ASSERT(busiestWriteTags.size() == results.size() && metadata.size() == results.size());
 	for (int i = 0; i < results.size(); ++i) {
@@ -2757,18 +2758,29 @@ ACTOR Future<JsonBuilderObject> storageWigglerStatsFetcher(DatabaseConfiguration
 	state Reference<ReadYourWritesTransaction> tr(new ReadYourWritesTransaction(cx));
 	state Optional<Value> primaryV;
 	state Optional<Value> remoteV;
-	loop {
-		try {
-			if (use_system_priority) {
-				tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+	state Future<Void> readTimeout = delay(5); // avoid looping forever
+	try {
+		loop {
+			try {
+				if (readTimeout.isReady()) {
+					throw timed_out();
+				}
+
+				if (use_system_priority) {
+					tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+				}
+				int64_t timeout_ms = 5000;
+				tr->setOption(FDBTransactionOptions::TIMEOUT, StringRef((uint8_t*)&timeout_ms, sizeof(int64_t)));
+				wait(store(primaryV, StorageWiggleMetrics::runGetTransaction(tr, true)) &&
+				     store(remoteV, StorageWiggleMetrics::runGetTransaction(tr, false)));
+				wait(tr->commit());
+				break;
+			} catch (Error& e) {
+				wait(tr->onError(e));
 			}
-			wait(store(primaryV, StorageWiggleMetrics::runGetTransaction(tr, true)) &&
-			     store(remoteV, StorageWiggleMetrics::runGetTransaction(tr, false)));
-			wait(tr->commit());
-			break;
-		} catch (Error& e) {
-			wait(tr->onError(e));
 		}
+	} catch (Error& e) {
+		TraceEvent(SevWarn, "StorageWigglerStatsError").error(e);
 	}
 
 	JsonBuilderObject res;
@@ -3009,9 +3021,10 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			if (configuration.get().perpetualStorageWiggleSpeed > 0) {
 				state Future<std::vector<std::pair<UID, StorageWiggleValue>>> primaryWiggleValues;
 				state Future<std::vector<std::pair<UID, StorageWiggleValue>>> remoteWiggleValues;
+				double timeout = g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01) ? 0.0 : 2.0;
 
-				primaryWiggleValues = readStorageWiggleValues(cx, true, true);
-				remoteWiggleValues = readStorageWiggleValues(cx, false, true);
+				primaryWiggleValues = timeoutError(readStorageWiggleValues(cx, true, true), timeout);
+				remoteWiggleValues = timeoutError(readStorageWiggleValues(cx, false, true), timeout);
 				wait(store(storageWiggler, storageWigglerStatsFetcher(configuration.get(), cx, true)) &&
 				     success(primaryWiggleValues) && success(remoteWiggleValues));
 
@@ -3025,7 +3038,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			wait(success(primaryDCFO));
 
 			std::vector<NetworkAddress> coordinatorAddresses =
-			    wait(coordinators.ccr->getConnectionString().tryResolveHostnames());
+			    wait(timeoutError(coordinators.ccr->getConnectionString().tryResolveHostnames(), 5.0));
 
 			int logFaultTolerance = 100;
 			if (db->get().recoveryState >= RecoveryState::ACCEPTING_COMMITS) {

From 71b51f73c569a5948ab2cf2f088e470e614939e2 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Sun, 24 Jul 2022 14:30:42 -0700
Subject: [PATCH 605/740] Fix test failure when getting wiggle value timed out

---
 .../source/mr-status-json-schemas.rst.inc     |  3 +-
 fdbclient/Schemas.cpp                         |  3 +-
 fdbserver/Status.actor.cpp                    | 29 +++++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
index 6047bbc37f6..ac9ed77da39 100644
--- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc
+++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc
@@ -523,7 +523,8 @@
                   "duplicate_mutation_streams",
                   "duplicate_mutation_fetch_timeout",
                   "primary_dc_missing",
-                  "fetch_primary_dc_timeout"
+                  "fetch_primary_dc_timeout",
+                  "fetch_storage_wiggler_stats_timeout"
                ]
             },
             "issues":[
diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp
index 519a10c4597..9b8ff098dc7 100644
--- a/fdbclient/Schemas.cpp
+++ b/fdbclient/Schemas.cpp
@@ -554,7 +554,8 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
                   "duplicate_mutation_streams",
                   "duplicate_mutation_fetch_timeout",
                   "primary_dc_missing",
-                  "fetch_primary_dc_timeout"
+                  "fetch_primary_dc_timeout",
+                  "fetch_storage_wiggler_stats_timeout"
                ]
             },
             "issues":[
diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index d4b52bb47eb..de8cdade44c 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -3023,15 +3023,26 @@ ACTOR Future<StatusReply> clusterGetStatus(
 				state Future<std::vector<std::pair<UID, StorageWiggleValue>>> remoteWiggleValues;
 				double timeout = g_network->isSimulated() && BUGGIFY_WITH_PROB(0.01) ? 0.0 : 2.0;
 
-				primaryWiggleValues = timeoutError(readStorageWiggleValues(cx, true, true), timeout);
-				remoteWiggleValues = timeoutError(readStorageWiggleValues(cx, false, true), timeout);
-				wait(store(storageWiggler, storageWigglerStatsFetcher(configuration.get(), cx, true)) &&
-				     success(primaryWiggleValues) && success(remoteWiggleValues));
-
-				for (auto& p : primaryWiggleValues.get())
-					wiggleServers.insert(p.first);
-				for (auto& p : remoteWiggleValues.get())
-					wiggleServers.insert(p.first);
+				try {
+					primaryWiggleValues = timeoutError(readStorageWiggleValues(cx, true, true), timeout);
+					remoteWiggleValues = timeoutError(readStorageWiggleValues(cx, false, true), timeout);
+					wait(store(storageWiggler, storageWigglerStatsFetcher(configuration.get(), cx, true)) &&
+					     success(primaryWiggleValues) && success(remoteWiggleValues));
+
+					for (auto& p : primaryWiggleValues.get())
+						wiggleServers.insert(p.first);
+					for (auto& p : remoteWiggleValues.get())
+						wiggleServers.insert(p.first);
+				} catch (Error& e) {
+					if (!primaryWiggleValues.canGet())
+						messages.push_back(
+						    JsonString::makeMessage("fetch_storage_wiggler_stats_timeout",
+						                            "Fetching wiggling servers in the primary region timed out."));
+					if (!remoteWiggleValues.canGet())
+						messages.push_back(
+						    JsonString::makeMessage("fetch_storage_wiggler_stats_timeout",
+						                            "Fetching wiggling servers in the remote region timed out."));
+				}
 			}
 
 			state std::vector<JsonBuilderObject> workerStatuses = wait(getAll(futures2));

From 7d2b49858ba0812a5e44925277223385cd808db4 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Sun, 24 Jul 2022 14:51:49 -0700
Subject: [PATCH 606/740] Reduce a DNS lookup in Status generation

---
 fdbserver/Status.actor.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index de8cdade44c..8a4f29a5314 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -735,6 +735,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
     std::vector<std::pair<GrvProxyInterface, EventMap>> grvProxies,
     std::vector<BlobWorkerInterface> blobWorkers,
     ServerCoordinators coordinators,
+    std::vector<NetworkAddress> coordinatorAddresses,
     Database cx,
     Optional<DatabaseConfiguration> configuration,
     Optional<Key> healthyZone,
@@ -832,9 +833,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 		}
 	}
 
-	std::vector<NetworkAddress> addressVec =
-	    wait(timeoutError(coordinators.ccr->getConnectionString().tryResolveHostnames(), 5.0));
-	for (const auto& coordinator : addressVec) {
+	for (const auto& coordinator : coordinatorAddresses) {
 		roles.addCoordinatorRole(coordinator);
 	}
 
@@ -2964,6 +2963,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 
 		statusObj["machines"] = machineStatusFetcher(mMetrics, workers, configuration, &status_incomplete_reasons);
 
+		state std::vector<NetworkAddress> coordinatorAddresses;
 		if (configuration.present()) {
 			// Do the latency probe by itself to avoid interference from other status activities
 			state bool isAvailable = true;
@@ -3048,8 +3048,9 @@ ACTOR Future<StatusReply> clusterGetStatus(
 			state std::vector<JsonBuilderObject> workerStatuses = wait(getAll(futures2));
 			wait(success(primaryDCFO));
 
-			std::vector<NetworkAddress> coordinatorAddresses =
+			std::vector<NetworkAddress> addresses =
 			    wait(timeoutError(coordinators.ccr->getConnectionString().tryResolveHostnames(), 5.0));
+			coordinatorAddresses = std::move(addresses);
 
 			int logFaultTolerance = 100;
 			if (db->get().recoveryState >= RecoveryState::ACCEPTING_COMMITS) {
@@ -3190,6 +3191,7 @@ ACTOR Future<StatusReply> clusterGetStatus(
 		                              grvProxies,
 		                              blobWorkers,
 		                              coordinators,
+		                              coordinatorAddresses,
 		                              cx,
 		                              configuration,
 		                              loadResult.present() ? loadResult.get().healthyZone : Optional<Key>(),

From baf0382dc03d46a9d4582f3c1222ae1fd43be9ef Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Sun, 24 Jul 2022 21:51:10 -0700
Subject: [PATCH 607/740] TLog track unpopped recovery tag

---
 fdbserver/TLogServer.actor.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 546c72be222..d2fc0a9def9 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -518,7 +518,8 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 
 	Deque<std::pair<Version, Standalone<VectorRef<uint8_t>>>> messageBlocks;
 	std::vector<std::vector<Reference<TagData>>> tag_data; // tag.locality | tag.id
-	int unpoppedRecoveredTags;
+	int unpoppedRecoveredTagCount;
+	std::set<Tag> unpoppedRecoveredTags;
 	std::map<Tag, Promise<Void>> waitingTags;
 
 	Reference<TagData> getTagData(Tag tag) {
@@ -642,7 +643,7 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	                 std::string context)
 	  : stopped(false), initialized(false), queueCommittingVersion(0), knownCommittedVersion(0),
 	    durableKnownCommittedVersion(0), minKnownCommittedVersion(0), queuePoppedVersion(0), minPoppedTagVersion(0),
-	    minPoppedTag(invalidTag), unpoppedRecoveredTags(0), cc("TLog", interf.id().toString()),
+	    minPoppedTag(invalidTag), unpoppedRecoveredTagCount(0), cc("TLog", interf.id().toString()),
 	    bytesInput("BytesInput", cc), bytesDurable("BytesDurable", cc), blockingPeeks("BlockingPeeks", cc),
 	    blockingPeekTimeouts("BlockingPeekTimeouts", cc), emptyPeeks("EmptyPeeks", cc),
 	    nonEmptyPeeks("NonEmptyPeeks", cc), logId(interf.id()), protocolVersion(protocolVersion),
@@ -1196,14 +1197,20 @@ ACTOR Future<Void> tLogPopCore(TLogData* self, Tag inputTag, Version to, Referen
 
 		if (tagData->unpoppedRecovered && upTo > logData->recoveredAt) {
 			tagData->unpoppedRecovered = false;
-			logData->unpoppedRecoveredTags--;
+			logData->unpoppedRecoveredTagCount--;
+			logData->unpoppedRecoveredTags.erase(tag);
 			TraceEvent("TLogPoppedTag", logData->logId)
-			    .detail("Tags", logData->unpoppedRecoveredTags)
+			    .detail("Tags", logData->unpoppedRecoveredTagCount)
 			    .detail("Tag", tag.toString())
 			    .detail("DurableKCVer", logData->durableKnownCommittedVersion)
-			    .detail("RecoveredAt", logData->recoveredAt);
-			if (logData->unpoppedRecoveredTags == 0 && logData->durableKnownCommittedVersion >= logData->recoveredAt &&
-			    logData->recoveryComplete.canBeSet()) {
+			    .detail("RecoveredAt", logData->recoveredAt)
+			    .detail("UnpoppedTags", describe(logData->unpoppedRecoveredTags));
+			if (logData->unpoppedRecoveredTagCount == 0 &&
+			    logData->durableKnownCommittedVersion >= logData->recoveredAt && logData->recoveryComplete.canBeSet()) {
+				TraceEvent("TLogRecoveryComplete", logData->logId)
+				    .detail("Tags", logData->unpoppedRecoveredTagCount)
+				    .detail("DurableKCVer", logData->durableKnownCommittedVersion)
+				    .detail("RecoveredAt", logData->recoveredAt);
 				logData->recoveryComplete.send(Void());
 			}
 		}
@@ -2148,10 +2155,10 @@ ACTOR Future<Void> doQueueCommit(TLogData* self,
 	ASSERT(ver > logData->queueCommittedVersion.get());
 
 	logData->durableKnownCommittedVersion = knownCommittedVersion;
-	if (logData->unpoppedRecoveredTags == 0 && knownCommittedVersion >= logData->recoveredAt &&
+	if (logData->unpoppedRecoveredTagCount == 0 && knownCommittedVersion >= logData->recoveredAt &&
 	    logData->recoveryComplete.canBeSet()) {
 		TraceEvent("TLogRecoveryComplete", logData->logId)
-		    .detail("Tags", logData->unpoppedRecoveredTags)
+		    .detail("Tags", logData->unpoppedRecoveredTagCount)
 		    .detail("DurableKCVer", logData->durableKnownCommittedVersion)
 		    .detail("RecoveredAt", logData->recoveredAt);
 		logData->recoveryComplete.send(Void());
@@ -3438,7 +3445,8 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 			logData->queueCommittedVersion.set(logData->unrecoveredBefore - 1);
 			logData->version.set(logData->unrecoveredBefore - 1);
 
-			logData->unpoppedRecoveredTags = req.allTags.size();
+			logData->unpoppedRecoveredTagCount = req.allTags.size();
+			logData->unpoppedRecoveredTags = std::set<Tag>(req.allTags.begin(), req.allTags.end());
 			wait(initPersistentState(self, logData) || logData->removed);
 
 			TraceEvent("TLogRecover", self->dbgid)

From 581c81101e164e51c426bcb1ccdff3a4e4964132 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 26 Jul 2022 11:00:11 -0700
Subject: [PATCH 608/740] Fix a crash bug during CC shutdown process

actor_cancel should be thrown, otherwise the rest code can access invalid
memory.
---
 fdbserver/Status.actor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 8a4f29a5314..8b0d938ecb9 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -2708,6 +2708,9 @@ ACTOR Future<JsonBuilderObject> lockedStatusFetcher(Reference<AsyncVar<ServerDBI
 			try {
 				wait(tr.onError(e));
 			} catch (Error& e) {
+				if (e.code() == error_code_actor_cancelled)
+					throw;
+
 				incomplete_reasons->insert(format("Unable to determine if database is locked (%s).", e.what()));
 				break;
 			}

From f2ba466cefcd9ffd1a2fe7a42a6c46261932b519 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 26 Jul 2022 21:52:29 +0000
Subject: [PATCH 609/740] disable AVX for 7.1.16 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 8b71400ab2a..d898377f26a 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 0fcb5e5a0c6b4b8d4bf5af409b13c4091ba1a73f Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 26 Jul 2022 22:05:31 +0000
Subject: [PATCH 610/740] enable AVX and update version for 7.1.17 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cef4f8656ee..f8cbf996742 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.16
+  VERSION 7.1.17
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index d898377f26a..8b71400ab2a 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 2f088d5222337a56797e6bbff45487d768329cdf Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 27 Jul 2022 09:51:34 -0700
Subject: [PATCH 611/740] Add 7.1.16, 7.1.17 release notes

---
 .../source/release-notes/release-notes-710.rst   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 091bc410543..7847ea457f7 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,22 @@
 Release Notes
 #############
 
+7.1.17
+======
+* Same as 7.1.16 release with AVX enabled.
+
+7.1.16
+======
+* Released with AVX disabled.
+* Fixed a crash bug when cluster controller shuts down. `(PR #7706) <https://github.com/apple/foundationdb/pull/7706>`_
+* Fixed a storage server failure when getReadVersion returns an error. `(PR #7688) <https://github.com/apple/foundationdb/pull/7688>`_
+* Fixed unbounded status json generation. `(PR #7680) <https://github.com/apple/foundationdb/pull/7680>`_
+* Fixed ScopeEventFieldTypeMismatch error for TLogMetrics. `(PR #7640) <https://github.com/apple/foundationdb/pull/7640>`_
+* Added getMappedRange latency metrics. `(PR #7632) <https://github.com/apple/foundationdb/pull/7632>`_
+* Fixed a version vector performance bug due to not updating client side tag cache. `(PR #7616) <https://github.com/apple/foundationdb/pull/7616>`_
+* Fixed DiskReadSeconds and DiskWriteSeconds calculaion in ProcessMetrics. `(PR #7609) <https://github.com/apple/foundationdb/pull/7609>`_
+* Added Rocksdb compression and data size stats. `(PR #7596) <https://github.com/apple/foundationdb/pull/7596>`_
+
 7.1.15
 ======
 * Same as 7.1.14 release with AVX enabled.

From 8a2a5000a17f91e95d486fd65c69c40a81dbd758 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Thu, 28 Jul 2022 10:46:28 -0700
Subject: [PATCH 612/740] Validate subrange reads in simulation (#7597) (#7720)

* Add extra validation to special key space reads in simulation

* Fix bugs turned up by validating subrange reads

* Change to validateSpecialSubrangeRead

It is in general not safe to expect that a read from the special key
space returns the same results if performed again, since the
transaction may be being modified concurrently.

* Add comment

* Add comment

Co-authored-by: Andrew Noyes <andrew.noyes@snowflake.com>
---
 fdbclient/SpecialKeySpace.actor.cpp           | 89 ++++++++++++++++++-
 fdbclient/SpecialKeySpace.actor.h             | 10 +++
 .../workloads/ReportConflictingKeys.actor.cpp |  9 +-
 3 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index a5b559a91e0..c0212ea4988 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -676,13 +676,14 @@ Future<RangeResult> ConflictingKeysImpl::getRange(ReadYourWritesTransaction* ryw
 	if (ryw->getTransactionState()->conflictingKeys) {
 		auto krMapPtr = ryw->getTransactionState()->conflictingKeys.get();
 		auto beginIter = krMapPtr->rangeContaining(kr.begin);
-		if (beginIter->begin() != kr.begin)
-			++beginIter;
 		auto endIter = krMapPtr->rangeContaining(kr.end);
+
+		if (!kr.contains(beginIter->begin()) && beginIter != endIter)
+			++beginIter;
 		for (auto it = beginIter; it != endIter; ++it) {
 			result.push_back_deep(result.arena(), KeyValueRef(it->begin(), it->value()));
 		}
-		if (endIter->begin() != kr.end)
+		if (kr.contains(endIter->begin()))
 			result.push_back_deep(result.arena(), KeyValueRef(endIter->begin(), endIter->value()));
 	}
 	return result;
@@ -2817,3 +2818,85 @@ Future<Optional<std::string>> TenantMapRangeImpl::commit(ReadYourWritesTransacti
 
 	return tag(waitForAll(tenantManagementFutures), Optional<std::string>());
 }
+
+ACTOR Future<Void> validateSpecialSubrangeRead(ReadYourWritesTransaction* ryw,
+                                               KeySelector begin,
+                                               KeySelector end,
+                                               GetRangeLimits limits,
+                                               Reverse reverse,
+                                               RangeResult result) {
+	if (!result.size()) {
+		RangeResult testResult = wait(ryw->getRange(begin, end, limits, Snapshot::True, reverse));
+		ASSERT(testResult == result);
+		return Void();
+	}
+
+	if (reverse) {
+		ASSERT(std::is_sorted(result.begin(), result.end(), KeyValueRef::OrderByKeyBack{}));
+	} else {
+		ASSERT(std::is_sorted(result.begin(), result.end(), KeyValueRef::OrderByKey{}));
+	}
+
+	// Generate a keyrange where we can determine the expected result based solely on the previous readrange, and whose
+	// boundaries may or may not be keys in result.
+	std::vector<Key> candidateKeys;
+	if (reverse) {
+		for (int i = result.size() - 1; i >= 0; --i) {
+			candidateKeys.emplace_back(result[i].key);
+			if (i - 1 >= 0) {
+				candidateKeys.emplace_back(keyBetween(KeyRangeRef(result[i].key, result[i - 1].key)));
+			}
+		}
+	} else {
+		for (int i = 0; i < result.size(); ++i) {
+			candidateKeys.emplace_back(result[i].key);
+			if (i + 1 < result.size()) {
+				candidateKeys.emplace_back(keyBetween(KeyRangeRef(result[i].key, result[i + 1].key)));
+			}
+		}
+	}
+	std::sort(candidateKeys.begin(), candidateKeys.end());
+	int originalSize = candidateKeys.size();
+	// Add more candidate keys so that we might read a range between two adjacent result keys.
+	for (int i = 0; i < originalSize - 1; ++i) {
+		candidateKeys.emplace_back(keyBetween(KeyRangeRef(candidateKeys[i], candidateKeys[i + 1])));
+	}
+	std::vector<Key> keys;
+	keys = { deterministicRandom()->randomChoice(candidateKeys), deterministicRandom()->randomChoice(candidateKeys) };
+	std::sort(keys.begin(), keys.end());
+	state KeySelector testBegin = firstGreaterOrEqual(keys[0]);
+	state KeySelector testEnd = firstGreaterOrEqual(keys[1]);
+
+	// Generate expected result. Linear time is ok here since we're in simulation, and there's a benefit to keeping this
+	// simple (as we're using it as an test oracle)
+	state RangeResult expectedResult;
+	// The reverse parameter should be the same as for the original read, so if
+	// reverse is true then the results are _already_ in reverse order.
+	for (const auto& kr : result) {
+		if (kr.key >= keys[0] && kr.key < keys[1]) {
+			expectedResult.push_back(expectedResult.arena(), kr);
+		}
+	}
+
+	// Test
+	RangeResult testResult = wait(ryw->getRange(testBegin, testEnd, limits, Snapshot::True, reverse));
+	if (testResult != expectedResult) {
+		fmt::print("Reverse: {}\n", reverse);
+		fmt::print("Original range: [{}, {})\n", begin.toString(), end.toString());
+		fmt::print("Original result:\n");
+		for (const auto& kr : result) {
+			fmt::print("	{} -> {}\n", kr.key.printable(), kr.value.printable());
+		}
+		fmt::print("Test range: [{}, {})\n", testBegin.getKey().printable(), testEnd.getKey().printable());
+		fmt::print("Expected:\n");
+		for (const auto& kr : expectedResult) {
+			fmt::print("	{} -> {}\n", kr.key.printable(), kr.value.printable());
+		}
+		fmt::print("Got:\n");
+		for (const auto& kr : testResult) {
+			fmt::print("	{} -> {}\n", kr.key.printable(), kr.value.printable());
+		}
+		ASSERT(testResult == expectedResult);
+	}
+	return Void();
+}
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index 836567ecf4a..d2b8563d9e7 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -550,5 +550,15 @@ class TenantMapRangeImpl : public SpecialKeyRangeRWImpl {
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
 
+// If the underlying set of key-value pairs of a key space is not changing, then we expect repeating a read to give the
+// same result. Additionally, we can generate the expected result of any read if that read is reading a subrange. This
+// actor performs a read of an arbitrary subrange of [begin, end) and validates the results.
+ACTOR Future<Void> validateSpecialSubrangeRead(ReadYourWritesTransaction* ryw,
+                                               KeySelector begin,
+                                               KeySelector end,
+                                               GetRangeLimits limits,
+                                               Reverse reverse,
+                                               RangeResult result);
+
 #include "flow/unactorcompiler.h"
 #endif
diff --git a/fdbserver/workloads/ReportConflictingKeys.actor.cpp b/fdbserver/workloads/ReportConflictingKeys.actor.cpp
index 33ac14584af..854612333bb 100644
--- a/fdbserver/workloads/ReportConflictingKeys.actor.cpp
+++ b/fdbserver/workloads/ReportConflictingKeys.actor.cpp
@@ -192,9 +192,16 @@ struct ReportConflictingKeysWorkload : TestWorkload {
 					                LiteralStringRef("\xff\xff").withPrefix(conflictingKeysRange.begin));
 					// The getRange here using the special key prefix "\xff\xff/transaction/conflicting_keys/" happens
 					// locally Thus, the error handling is not needed here
-					Future<RangeResult> conflictingKeyRangesFuture = tr2->getRange(ckr, CLIENT_KNOBS->TOO_MANY);
+					state Future<RangeResult> conflictingKeyRangesFuture = tr2->getRange(ckr, CLIENT_KNOBS->TOO_MANY);
 					ASSERT(conflictingKeyRangesFuture.isReady());
 
+					wait(validateSpecialSubrangeRead(tr2.getPtr(),
+					                                 firstGreaterOrEqual(ckr.begin),
+					                                 firstGreaterOrEqual(ckr.end),
+					                                 GetRangeLimits(),
+					                                 Reverse::False,
+					                                 conflictingKeyRangesFuture.get()));
+
 					tr2 = makeReference<ReadYourWritesTransaction>(cx);
 
 					const RangeResult conflictingKeyRanges = conflictingKeyRangesFuture.get();

From 4cda9ede0a21a46e799a7c487a20e3bd826a2c43 Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Fri, 29 Jul 2022 16:35:33 -0700
Subject: [PATCH 613/740] Add g_traceBatch for prefetch query (#7730) (#7732)

---
 fdbserver/storageserver.actor.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 7f87fd0b4d4..2882afdb0be 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3435,6 +3435,9 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 	state double getValuesStart = g_network->timer();
 	getRange.begin = firstGreaterOrEqual(KeyRef(*a, prefix));
 	getRange.end = firstGreaterOrEqual(strinc(prefix, *a));
+	if (pOriginalReq->debugID.present())
+		g_traceBatch.addEvent(
+		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.quickGetKeyValues.Before");
 	try {
 		// TODO: Use a lower level API may be better? Or tweak priorities?
 		GetKeyValuesRequest req;
@@ -3465,6 +3468,10 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 			getRange.result = RangeResultRef(reply.data, reply.more);
 			const double duration = g_network->timer() - getValuesStart;
 			data->counters.mappedRangeLocalSample.addMeasurement(duration);
+			if (pOriginalReq->debugID.present())
+				g_traceBatch.addEvent("TransactionDebug",
+				                      pOriginalReq->debugID.get().first(),
+				                      "storageserver.quickGetKeyValues.AfterLocalFetch");
 			return getRange;
 		}
 		// Otherwise fallback.
@@ -3486,6 +3493,10 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 		getRange.result = rangeResult;
 		const double duration = g_network->timer() - getValuesStart;
 		data->counters.mappedRangeRemoteSample.addMeasurement(duration);
+		if (pOriginalReq->debugID.present())
+			g_traceBatch.addEvent("TransactionDebug",
+			                      pOriginalReq->debugID.get().first(),
+			                      "storageserver.quickGetKeyValues.AfterRemoteFetch");
 		return getRange;
 	} else {
 		throw quick_get_key_values_miss();
@@ -3772,7 +3783,9 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	result.arena.dependsOn(input.arena);
 
 	result.data.reserve(result.arena, input.data.size());
-
+	if (pOriginalReq->debugID.present())
+		g_traceBatch.addEvent(
+		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.Start");
 	state Tuple mappedKeyFormatTuple;
 	state Tuple mappedKeyTuple;
 
@@ -3791,6 +3804,9 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 	state std::vector<MappedKeyValueRef> kvms(k);
 	state std::vector<Future<Void>> subqueries;
 	state int offset = 0;
+	if (pOriginalReq->debugID.present())
+		g_traceBatch.addEvent(
+		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.BeforeLoop");
 	for (; offset < sz; offset += SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE) {
 		// Divide into batches of MAX_PARALLEL_QUICK_GET_VALUE subqueries
 		for (int i = 0; i + offset < sz && i < SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE; i++) {
@@ -3810,11 +3826,17 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 			    mapSubquery(data, input.version, pOriginalReq, &result.arena, isRangeQuery, it, kvm, mappedKey));
 		}
 		wait(waitForAll(subqueries));
+		if (pOriginalReq->debugID.present())
+			g_traceBatch.addEvent(
+			    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.AfterBatch");
 		subqueries.clear();
 		for (int i = 0; i + offset < sz && i < SERVER_KNOBS->MAX_PARALLEL_QUICK_GET_VALUE; i++) {
 			result.data.push_back(result.arena, kvms[i]);
 		}
 	}
+	if (pOriginalReq->debugID.present())
+		g_traceBatch.addEvent(
+		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.AfterAll");
 	return result;
 }
 

From 8d9bf2a43612777f59a33f21a35281ee96f0800e Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Mon, 1 Aug 2022 15:20:21 -0700
Subject: [PATCH 614/740] Prefer IPv6 in hostname resolving. (#7750)

---
 flow/Hostname.actor.cpp |  4 ++--
 flow/network.cpp        | 20 +++++++++++++++++++-
 flow/network.h          | 16 ++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/flow/Hostname.actor.cpp b/flow/Hostname.actor.cpp
index 110061e5c98..84a3cc78971 100644
--- a/flow/Hostname.actor.cpp
+++ b/flow/Hostname.actor.cpp
@@ -43,7 +43,7 @@ ACTOR Future<Optional<NetworkAddress>> resolveImpl(Hostname* self) {
 	try {
 		std::vector<NetworkAddress> addresses =
 		    wait(INetworkConnections::net()->resolveTCPEndpointWithDNSCache(self->host, self->service));
-		NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		NetworkAddress address = INetworkConnections::pickOneAddress(addresses);
 		address.flags = 0; // Reset the parsed address to public
 		address.fromHostname = NetworkAddressFromHostname::True;
 		if (self->isTLS) {
@@ -84,7 +84,7 @@ Optional<NetworkAddress> Hostname::resolveBlocking() {
 	try {
 		std::vector<NetworkAddress> addresses =
 		    INetworkConnections::net()->resolveTCPEndpointBlockingWithDNSCache(host, service);
-		NetworkAddress address = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		NetworkAddress address = INetworkConnections::pickOneAddress(addresses);
 		address.flags = 0; // Reset the parsed address to public
 		address.fromHostname = NetworkAddressFromHostname::True;
 		if (isTLS) {
diff --git a/flow/network.cpp b/flow/network.cpp
index 0e592b7a6af..ed9b3c80943 100644
--- a/flow/network.cpp
+++ b/flow/network.cpp
@@ -279,7 +279,7 @@ Future<Reference<IConnection>> INetworkConnections::connect(const std::string& h
 	// Use map to create an actor that returns an endpoint or throws
 	Future<NetworkAddress> pickEndpoint =
 	    map(resolveTCPEndpoint(host, service), [=](std::vector<NetworkAddress> const& addresses) -> NetworkAddress {
-		    NetworkAddress addr = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		    NetworkAddress addr = INetworkConnections::pickOneAddress(addresses);
 		    addr.fromHostname = true;
 		    if (isTLS) {
 			    addr.flags = NetworkAddress::FLAG_TLS;
@@ -347,4 +347,22 @@ TEST_CASE("/flow/network/ipaddress") {
 	return Void();
 }
 
+TEST_CASE("/flow/network/ipV6Preferred") {
+	std::vector<NetworkAddress> addresses;
+	for (int i = 0; i < 50; ++i) {
+		std::string s = format("%d.%d.%d.%d:%d", i, i, i, i, i);
+		addresses.push_back(NetworkAddress::parse(s));
+	}
+	std::string ipv6 = "[2001:db8:85a3::8a2e:370:7334]:4800";
+	addresses.push_back(NetworkAddress::parse(ipv6));
+	for (int i = 50; i < 100; ++i) {
+		std::string s = format("%d.%d.%d.%d:%d", i, i, i, i, i);
+		addresses.push_back(NetworkAddress::parse(s));
+	}
+	// Confirm IPv6 is always preferred.
+	ASSERT(INetworkConnections::pickOneAddress(addresses).toString() == ipv6);
+
+	return Void();
+}
+
 NetworkInfo::NetworkInfo() : handshakeLock(new FlowLock(FLOW_KNOBS->TLS_HANDSHAKE_LIMIT)) {}
diff --git a/flow/network.h b/flow/network.h
index 2fdd7ab32d5..f6900a648b2 100644
--- a/flow/network.h
+++ b/flow/network.h
@@ -734,6 +734,22 @@ class INetworkConnections {
 		return static_cast<INetworkConnections*>((void*)g_network->global(INetwork::enNetworkConnections));
 	}
 
+	// If a DNS name can be resolved to both and IPv4 and IPv6 addresses, we want IPv6 addresses when running the
+	// clusters on IPv6.
+	// This function takes a vector of addresses and return a random one, preferring IPv6 over IPv4.
+	static NetworkAddress pickOneAddress(const std::vector<NetworkAddress>& addresses) {
+		std::vector<NetworkAddress> ipV6Addresses;
+		for (const NetworkAddress& addr : addresses) {
+			if (addr.isV6()) {
+				ipV6Addresses.push_back(addr);
+			}
+		}
+		if (ipV6Addresses.size() > 0) {
+			return ipV6Addresses[deterministicRandom()->randomInt(0, ipV6Addresses.size())];
+		}
+		return addresses[deterministicRandom()->randomInt(0, addresses.size())];
+	}
+
 	void removeCachedDNS(const std::string& host, const std::string& service) { dnsCache.remove(host, service); }
 
 	DNSCache dnsCache;

From 06e652b596128a3ca6621ad9a0e25d5c7a16eb0e Mon Sep 17 00:00:00 2001
From: Hao Fu <77984096+hfu94@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:59:08 -0700
Subject: [PATCH 615/740] Retain debug id in prefetch server-server call
 (#7755)

Co-authored-by: Renxuan Wang <renxuan@apple.com>
---
 fdbserver/storageserver.actor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 2882afdb0be..9d742989ffe 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3483,6 +3483,9 @@ ACTOR Future<GetRangeReqAndResultRef> quickGetKeyValues(
 	if (SERVER_KNOBS->QUICK_GET_KEY_VALUES_FALLBACK) {
 		state Transaction tr(data->cx, pOriginalReq->tenantInfo.name);
 		tr.setVersion(version);
+		if (pOriginalReq->debugID.present()) {
+			tr.debugTransaction(pOriginalReq->debugID.get());
+		}
 		// TODO: is DefaultPromiseEndpoint the best priority for this?
 		tr.trState->taskID = TaskPriority::DefaultPromiseEndpoint;
 		Future<RangeResult> rangeResultFuture =

From 90abb42246797c9a21c8afe7b346b7b550961fd8 Mon Sep 17 00:00:00 2001
From: Chaoguang Lin <chaoguang.lin@snowflake.com>
Date: Thu, 4 Aug 2022 12:45:45 -0700
Subject: [PATCH 616/740] Add test coverage for
 SpecialKeyRangeAsyncImpl::getRange(release-7.1) (#7778)

* Validate subrange reads in simulation (#7597)

* Add extra validation to special key space reads in simulation

* Fix bugs turned up by validating subrange reads

* Change to validateSpecialSubrangeRead

It is in general not safe to expect that a read from the special key
space returns the same results if performed again, since the
transaction may be being modified concurrently.

* Add comment

* Add comment

* Add test coverage for SpecialKeyRangeAsyncImpl::getRange  (#7671)

* Add getRange test coverage for SpecialKeyRangeAsyncImpl

* Fix the bug in SpecialKeyRangeAsyncImpl found by the test

* Refactor ConflictingKeysImpl::getRange to use containedRanges to simplify the code

* Fix file format

* Initialize SpecialKeyRangeAsyncImpl cache with correct end key

* Add release notes

* Revert "Refactor ConflictingKeysImpl::getRange to use containedRanges to simplify the code"

This reverts commit fdd298f469bf73b107e5ca29072c49774820d3d6.

Co-authored-by: Andrew Noyes <andrew.noyes@snowflake.com>
---
 fdbclient/SpecialKeySpace.actor.cpp           | 41 +++++++++++++------
 fdbclient/SpecialKeySpace.actor.h             | 23 +++++++----
 .../SpecialKeySpaceCorrectness.actor.cpp      | 30 +++++++++-----
 3 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index c0212ea4988..e084b329a6d 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -147,7 +147,7 @@ RangeResult rywGetRange(ReadYourWritesTransaction* ryw, const KeyRangeRef& kr, c
 ACTOR Future<Void> moveKeySelectorOverRangeActor(const SpecialKeyRangeReadImpl* skrImpl,
                                                  ReadYourWritesTransaction* ryw,
                                                  KeySelector* ks,
-                                                 Optional<RangeResult>* cache) {
+                                                 KeyRangeMap<Optional<RangeResult>>* cache) {
 	// should be removed before calling
 	ASSERT(!ks->orEqual);
 
@@ -233,7 +233,7 @@ ACTOR Future<Void> normalizeKeySelectorActor(SpecialKeySpace* sks,
                                              KeyRangeRef boundary,
                                              int* actualOffset,
                                              RangeResult* result,
-                                             Optional<RangeResult>* cache) {
+                                             KeyRangeMap<Optional<RangeResult>>* cache) {
 	// If offset < 1, where we need to move left, iter points to the range containing at least one smaller key
 	// (It's a wasting of time to walk through the range whose begin key is same as ks->key)
 	// (rangeContainingKeyBefore itself handles the case where ks->key == Key())
@@ -336,8 +336,9 @@ ACTOR Future<RangeResult> SpecialKeySpace::getRangeAggregationActor(SpecialKeySp
 	state int actualBeginOffset;
 	state int actualEndOffset;
 	state KeyRangeRef moduleBoundary;
-	// used to cache result from potential first read
-	state Optional<RangeResult> cache;
+	// used to cache results from potential first async read
+	// the current implementation will read the whole range result to save in the cache
+	state KeyRangeMap<Optional<RangeResult>> cache(Optional<RangeResult>(), specialKeys.end);
 
 	if (ryw->specialKeySpaceRelaxed()) {
 		moduleBoundary = sks->range;
@@ -384,7 +385,7 @@ ACTOR Future<RangeResult> SpecialKeySpace::getRangeAggregationActor(SpecialKeySp
 			KeyRangeRef kr = iter->range();
 			KeyRef keyStart = kr.contains(begin.getKey()) ? begin.getKey() : kr.begin;
 			KeyRef keyEnd = kr.contains(end.getKey()) ? end.getKey() : kr.end;
-			if (iter->value()->isAsync() && cache.present()) {
+			if (iter->value()->isAsync() && cache.rangeContaining(keyStart).value().present()) {
 				const SpecialKeyRangeAsyncImpl* ptr = dynamic_cast<const SpecialKeyRangeAsyncImpl*>(iter->value());
 				RangeResult pairs_ = wait(ptr->getRange(ryw, KeyRangeRef(keyStart, keyEnd), limits, &cache));
 				pairs = pairs_;
@@ -415,7 +416,7 @@ ACTOR Future<RangeResult> SpecialKeySpace::getRangeAggregationActor(SpecialKeySp
 			KeyRangeRef kr = iter->range();
 			KeyRef keyStart = kr.contains(begin.getKey()) ? begin.getKey() : kr.begin;
 			KeyRef keyEnd = kr.contains(end.getKey()) ? end.getKey() : kr.end;
-			if (iter->value()->isAsync() && cache.present()) {
+			if (iter->value()->isAsync() && cache.rangeContaining(keyStart).value().present()) {
 				const SpecialKeyRangeAsyncImpl* ptr = dynamic_cast<const SpecialKeyRangeAsyncImpl*>(iter->value());
 				RangeResult pairs_ = wait(ptr->getRange(ryw, KeyRangeRef(keyStart, keyEnd), limits, &cache));
 				pairs = pairs_;
@@ -626,12 +627,8 @@ Future<Void> SpecialKeySpace::commit(ReadYourWritesTransaction* ryw) {
 	return commitActor(this, ryw);
 }
 
-SKSCTestImpl::SKSCTestImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
-
-Future<RangeResult> SKSCTestImpl::getRange(ReadYourWritesTransaction* ryw,
-                                           KeyRangeRef kr,
-                                           GetRangeLimits limitsHint) const {
-	ASSERT(range.contains(kr));
+// For SKSCTestRWImpl and SKSCTestAsyncReadImpl
+Future<RangeResult> SKSCTestGetRangeBase(ReadYourWritesTransaction* ryw, KeyRangeRef kr, GetRangeLimits limitsHint) {
 	auto resultFuture = ryw->getRange(kr, CLIENT_KNOBS->TOO_MANY);
 	// all keys are written to RYW, since GRV is set, the read should happen locally
 	ASSERT(resultFuture.isReady());
@@ -641,11 +638,29 @@ Future<RangeResult> SKSCTestImpl::getRange(ReadYourWritesTransaction* ryw,
 	return rywGetRange(ryw, kr, kvs);
 }
 
-Future<Optional<std::string>> SKSCTestImpl::commit(ReadYourWritesTransaction* ryw) {
+SKSCTestRWImpl::SKSCTestRWImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
+
+Future<RangeResult> SKSCTestRWImpl::getRange(ReadYourWritesTransaction* ryw,
+                                             KeyRangeRef kr,
+                                             GetRangeLimits limitsHint) const {
+	ASSERT(range.contains(kr));
+	return SKSCTestGetRangeBase(ryw, kr, limitsHint);
+}
+
+Future<Optional<std::string>> SKSCTestRWImpl::commit(ReadYourWritesTransaction* ryw) {
 	ASSERT(false);
 	return Optional<std::string>();
 }
 
+SKSCTestAsyncReadImpl::SKSCTestAsyncReadImpl(KeyRangeRef kr) : SpecialKeyRangeAsyncImpl(kr) {}
+
+Future<RangeResult> SKSCTestAsyncReadImpl::getRange(ReadYourWritesTransaction* ryw,
+                                                    KeyRangeRef kr,
+                                                    GetRangeLimits limitsHint) const {
+	ASSERT(range.contains(kr));
+	return SKSCTestGetRangeBase(ryw, kr, limitsHint);
+}
+
 ReadConflictRangeImpl::ReadConflictRangeImpl(KeyRangeRef kr) : SpecialKeyRangeReadImpl(kr) {}
 
 ACTOR static Future<RangeResult> getReadConflictRangeImpl(ReadYourWritesTransaction* ryw, KeyRange kr) {
diff --git a/fdbclient/SpecialKeySpace.actor.h b/fdbclient/SpecialKeySpace.actor.h
index d2b8563d9e7..9d233689272 100644
--- a/fdbclient/SpecialKeySpace.actor.h
+++ b/fdbclient/SpecialKeySpace.actor.h
@@ -126,7 +126,7 @@ class SpecialKeyRangeAsyncImpl : public SpecialKeyRangeReadImpl {
 	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
 	                             KeyRangeRef kr,
 	                             GetRangeLimits limitsHint,
-	                             Optional<RangeResult>* cache) const {
+	                             KeyRangeMap<Optional<RangeResult>>* cache) const {
 		return getRangeAsyncActor(this, ryw, kr, limitsHint, cache);
 	}
 
@@ -136,17 +136,18 @@ class SpecialKeyRangeAsyncImpl : public SpecialKeyRangeReadImpl {
 	                                                    ReadYourWritesTransaction* ryw,
 	                                                    KeyRangeRef kr,
 	                                                    GetRangeLimits limits,
-	                                                    Optional<RangeResult>* cache) {
+	                                                    KeyRangeMap<Optional<RangeResult>>* cache) {
 		ASSERT(skrAyncImpl->getKeyRange().contains(kr));
 		ASSERT(cache != nullptr);
-		if (!cache->present()) {
+		ASSERT(cache->rangeContaining(kr.begin) == cache->rangeContainingKeyBefore(kr.end));
+		if (!(*cache)[kr.begin].present()) {
 			// For simplicity, every time we need to cache, we read the whole range
 			// Although sometimes the range can be narrowed,
 			// there is not a general way to do it in complicated scenarios
 			RangeResult result_ = wait(skrAyncImpl->getRange(ryw, skrAyncImpl->getKeyRange(), limits));
-			*cache = result_;
+			cache->insert(skrAyncImpl->getKeyRange(), result_);
 		}
-		const auto& allResults = cache->get();
+		const auto& allResults = (*cache)[kr.begin].get();
 		int start = 0, end = allResults.size();
 		while (start < allResults.size() && allResults[start].key < kr.begin)
 			++start;
@@ -271,15 +272,23 @@ class SpecialKeySpace {
 };
 
 // Used for SpecialKeySpaceCorrectnessWorkload
-class SKSCTestImpl : public SpecialKeyRangeRWImpl {
+class SKSCTestRWImpl : public SpecialKeyRangeRWImpl {
 public:
-	explicit SKSCTestImpl(KeyRangeRef kr);
+	explicit SKSCTestRWImpl(KeyRangeRef kr);
 	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
 	                             KeyRangeRef kr,
 	                             GetRangeLimits limitsHint) const override;
 	Future<Optional<std::string>> commit(ReadYourWritesTransaction* ryw) override;
 };
 
+class SKSCTestAsyncReadImpl : public SpecialKeyRangeAsyncImpl {
+public:
+	explicit SKSCTestAsyncReadImpl(KeyRangeRef kr);
+	Future<RangeResult> getRange(ReadYourWritesTransaction* ryw,
+	                             KeyRangeRef kr,
+	                             GetRangeLimits limitsHint) const override;
+};
+
 // Use special key prefix "\xff\xff/transaction/conflicting_keys/<some_key>",
 // to retrieve keys which caused latest not_committed(conflicting with another transaction) error.
 // The returned key value pairs are interpreted as :
diff --git a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
index b1b326b56ac..5437ca418ac 100644
--- a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
+++ b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
@@ -39,8 +39,10 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 	double testDuration, absoluteRandomProb, transactionsPerSecond;
 	PerfIntCounter wrongResults, keysCount;
 	Reference<ReadYourWritesTransaction> ryw; // used to store all populated data
-	std::vector<std::shared_ptr<SKSCTestImpl>> impls;
+	std::vector<std::shared_ptr<SKSCTestRWImpl>> rwImpls;
+	std::vector<std::shared_ptr<SKSCTestAsyncReadImpl>> asyncReadImpls;
 	Standalone<VectorRef<KeyRangeRef>> keys;
+	Standalone<VectorRef<KeyRangeRef>> rwKeys;
 
 	SpecialKeySpaceCorrectnessWorkload(WorkloadContext const& wcx)
 	  : TestWorkload(wcx), wrongResults("Wrong Results"), keysCount("Number of generated keys") {
@@ -81,12 +83,20 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 			Key startKey(baseKey + "/");
 			Key endKey(baseKey + "/\xff");
 			self->keys.push_back_deep(self->keys.arena(), KeyRangeRef(startKey, endKey));
-			self->impls.push_back(std::make_shared<SKSCTestImpl>(KeyRangeRef(startKey, endKey)));
-			// Although there are already ranges registered, the testing range will replace them
-			cx->specialKeySpace->registerKeyRange(SpecialKeySpace::MODULE::TESTONLY,
-			                                      SpecialKeySpace::IMPLTYPE::READWRITE,
-			                                      self->keys.back(),
-			                                      self->impls.back().get());
+			if (deterministicRandom()->random01() < 0.2) {
+				self->asyncReadImpls.push_back(std::make_shared<SKSCTestAsyncReadImpl>(KeyRangeRef(startKey, endKey)));
+				cx->specialKeySpace->registerKeyRange(SpecialKeySpace::MODULE::TESTONLY,
+				                                      SpecialKeySpace::IMPLTYPE::READONLY,
+				                                      self->keys.back(),
+				                                      self->asyncReadImpls.back().get());
+			} else {
+				self->rwImpls.push_back(std::make_shared<SKSCTestRWImpl>(KeyRangeRef(startKey, endKey)));
+				// Although there are already ranges registered, the testing range will replace them
+				cx->specialKeySpace->registerKeyRange(SpecialKeySpace::MODULE::TESTONLY,
+				                                      SpecialKeySpace::IMPLTYPE::READWRITE,
+				                                      self->keys.back(),
+				                                      self->rwImpls.back().get());
+			}
 			// generate keys in each key range
 			int keysInRange = deterministicRandom()->randomInt(self->minKeysPerRange, self->maxKeysPerRange + 1);
 			self->keysCount += keysInRange;
@@ -154,7 +164,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 			}
 
 			// check ryw result consistency
-			KeyRange rkr = self->randomKeyRange();
+			KeyRange rkr = self->randomRWKeyRange();
 			KeyRef rkey1 = rkr.begin;
 			KeyRef rkey2 = rkr.end;
 			// randomly set/clear two keys or clear a key range
@@ -238,8 +248,8 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 		return true;
 	}
 
-	KeyRange randomKeyRange() {
-		Key prefix = keys[deterministicRandom()->randomInt(0, rangeCount)].begin;
+	KeyRange randomRWKeyRange() {
+		Key prefix = rwImpls[deterministicRandom()->randomInt(0, rwImpls.size())]->getKeyRange().begin;
 		Key rkey1 = Key(deterministicRandom()->randomAlphaNumeric(deterministicRandom()->randomInt(0, keyBytes)))
 		                .withPrefix(prefix);
 		Key rkey2 = Key(deterministicRandom()->randomAlphaNumeric(deterministicRandom()->randomInt(0, keyBytes)))

From e88da10b471e3533c00a9591d96514d732918b1e Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 8 Aug 2022 14:30:16 -0700
Subject: [PATCH 617/740] Add knobs for min/max Ratekeeper limit

The default has no effects.
---
 fdbclient/ServerKnobs.cpp      | 4 +++-
 fdbclient/ServerKnobs.h        | 2 ++
 fdbserver/Ratekeeper.actor.cpp | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 6024cb2c57f..d7b2af6f193 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -591,9 +591,11 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( SLOW_SMOOTHING_AMOUNT,                                10.0 ); if( slowRatekeeper ) SLOW_SMOOTHING_AMOUNT = 50.0;
 	init( METRIC_UPDATE_RATE,                                     .1 ); if( slowRatekeeper ) METRIC_UPDATE_RATE = 0.5;
 	init( DETAILED_METRIC_UPDATE_RATE,                           5.0 );
-	init (RATEKEEPER_DEFAULT_LIMIT,                              1e6 ); if( randomize && BUGGIFY ) RATEKEEPER_DEFAULT_LIMIT = 0;
+	init( RATEKEEPER_DEFAULT_LIMIT,                              1e6 ); if( randomize && BUGGIFY ) RATEKEEPER_DEFAULT_LIMIT = 0;
 	init( RATEKEEPER_LIMIT_REASON_SAMPLE_RATE,                   0.1 );
 	init( RATEKEEPER_PRINT_LIMIT_REASON,                       false ); if( randomize && BUGGIFY ) RATEKEEPER_PRINT_LIMIT_REASON = true;
+	init( RATEKEEPER_MIN_RATE,                                   0.0 );
+	init( RATEKEEPER_MAX_RATE,                                   1e9 );
 
 	bool smallStorageTarget = randomize && BUGGIFY;
 	init( TARGET_BYTES_PER_STORAGE_SERVER,                    1000e6 ); if( smallStorageTarget ) TARGET_BYTES_PER_STORAGE_SERVER = 3000e3;
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 28aedbc11ea..a3319ae7f90 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -529,6 +529,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	double RATEKEEPER_DEFAULT_LIMIT;
 	double RATEKEEPER_LIMIT_REASON_SAMPLE_RATE;
 	bool RATEKEEPER_PRINT_LIMIT_REASON;
+	double RATEKEEPER_MIN_RATE;
+	double RATEKEEPER_MAX_RATE;
 
 	int64_t TARGET_BYTES_PER_STORAGE_SERVER;
 	int64_t SPRING_BYTES_STORAGE_SERVER;
diff --git a/fdbserver/Ratekeeper.actor.cpp b/fdbserver/Ratekeeper.actor.cpp
index 9b7c3103948..25475c52882 100644
--- a/fdbserver/Ratekeeper.actor.cpp
+++ b/fdbserver/Ratekeeper.actor.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "fdbserver/DataDistribution.actor.h"
+#include "fdbserver/Knobs.h"
 #include "fdbserver/Ratekeeper.h"
 #include "fdbserver/TagThrottler.h"
 #include "fdbserver/WaitFailure.h"
@@ -901,6 +902,11 @@ void Ratekeeper::updateRate(RatekeeperLimits* limits) {
 	limits->tpsLimitMetric = std::min(limits->tpsLimit, 1e6);
 	limits->reasonMetric = limitReason;
 
+	if (limits->priority == TransactionPriority::DEFAULT) {
+		limits->tpsLimit = std::max(limits->tpsLimit, SERVER_KNOBS->RATEKEEPER_MIN_RATE);
+		limits->tpsLimit = std::min(limits->tpsLimit, SERVER_KNOBS->RATEKEEPER_MAX_RATE);
+	}
+
 	if (deterministicRandom()->random01() < 0.1) {
 		const std::string& name = limits->rkUpdateEventCacheHolder.getPtr()->trackingKey;
 		TraceEvent(name.c_str(), id)

From 6c86c2fa43b76f7714f5a0a68629193474c740b1 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 9 Aug 2022 19:55:33 +0000
Subject: [PATCH 618/740] update version after 7.1.17 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8cbf996742..59237697241 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.17
+  VERSION 7.1.18
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 8a001a608ecb55491ee614fcbe0b6717db23010a Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 9 Aug 2022 19:58:02 +0000
Subject: [PATCH 619/740] disable AVX for 7.1.18 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 8b71400ab2a..d898377f26a 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From fb32402ab37c73c3a289bdf151f23cfe02026375 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Tue, 9 Aug 2022 20:03:32 +0000
Subject: [PATCH 620/740] enable AVX and update version for 7.1.19 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59237697241..7c3dcb6d27f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.18
+  VERSION 7.1.19
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index d898377f26a..8b71400ab2a 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From f2e47db3ab5431fbd56e901babc3c5a7645b07f5 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Wed, 17 Aug 2022 14:23:42 +0300
Subject: [PATCH 621/740] Fixed compilation warning about wrong initialization
 list order

---
 fdbserver/RocksDBCheckpointUtils.actor.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fdbserver/RocksDBCheckpointUtils.actor.h b/fdbserver/RocksDBCheckpointUtils.actor.h
index 9596a22ea80..db812998ff3 100644
--- a/fdbserver/RocksDBCheckpointUtils.actor.h
+++ b/fdbserver/RocksDBCheckpointUtils.actor.h
@@ -43,9 +43,11 @@
 struct SstFileMetaData {
 	constexpr static FileIdentifier file_identifier = 3804347;
 	SstFileMetaData()
-	  : size(0), file_number(0), smallest_seqno(0), largest_seqno(0), num_reads_sampled(0), being_compacted(false),
-	    num_entries(0), num_deletions(0), temperature(rocksdb::Temperature::kUnknown), oldest_blob_file_number(0),
-		 oldest_ancester_time(0), file_creation_time(0) {}
+	  : file_number(0), size(0), temperature(rocksdb::Temperature::kUnknown),
+       smallest_seqno(0), largest_seqno(0), num_reads_sampled(0),
+       being_compacted(false), num_entries(0), num_deletions(0),
+       oldest_blob_file_number(0), oldest_ancester_time(0),
+       file_creation_time(0) {}
 
 	SstFileMetaData(const std::string& _file_name,
 	                uint64_t _file_number,

From 62832b2367f8e540dcd0b96c777095efa5c879d1 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Wed, 17 Aug 2022 19:51:05 +0300
Subject: [PATCH 622/740] Fixed ctest update_bindings_go_src_fdb_generated_go

---
 bindings/go/src/fdb/generated.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/bindings/go/src/fdb/generated.go b/bindings/go/src/fdb/generated.go
index b636484408b..e339076389d 100644
--- a/bindings/go/src/fdb/generated.go
+++ b/bindings/go/src/fdb/generated.go
@@ -617,12 +617,12 @@ const (
 	StreamingModeWantAll StreamingMode = -1
 
 	// The default. The client doesn't know how much of the range it is likely
-	// to used and wants different performance concerns to be balanced. Only a
-	// small portion of data is transferred to the client initially (in order to
-	// minimize costs if the client doesn't read the entire range), and as the
-	// caller iterates over more items in the range larger batches will be
-	// transferred in order to minimize latency. After enough iterations, the
-	// iterator mode will eventually reach the same byte limit as “WANT_ALL“
+	// to used and wants different performance concerns to be balanced.
+	// Only a small portion of data is transferred to the client initially (in
+	// order to minimize costs if the client doesn't read the entire range), and
+	// as the caller iterates over more items in the range larger batches will
+	// be transferred in order to minimize latency. After enough iterations,
+	// the iterator mode will eventually reach the same byte limit as “WANT_ALL“
 	StreamingModeIterator StreamingMode = 0
 
 	// Infrequently used. The client has passed a specific row limit and wants
@@ -632,8 +632,8 @@ const (
 	// mode is used.
 	StreamingModeExact StreamingMode = 1
 
-	// Infrequently used. Transfer data in batches small enough to not be much
-	// more expensive than reading individual rows, to minimize cost if
+	// Infrequently used. Transfer data in batches small enough to not be
+	// much more expensive than reading individual rows, to minimize cost if
 	// iteration stops early.
 	StreamingModeSmall StreamingMode = 2
 
@@ -641,16 +641,16 @@ const (
 	// large.
 	StreamingModeMedium StreamingMode = 3
 
-	// Infrequently used. Transfer data in batches large enough to be, in a
-	// high-concurrency environment, nearly as efficient as possible. If the
-	// client stops iteration early, some disk and network bandwidth may be
-	// wasted. The batch size may still be too small to allow a single client to
-	// get high throughput from the database, so if that is what you need
+	// Infrequently used. Transfer data in batches large enough to be,
+	// in a high-concurrency environment, nearly as efficient as possible.
+	// If the client stops iteration early, some disk and network bandwidth may
+	// be wasted. The batch size may still be too small to allow a single client
+	// to get high throughput from the database, so if that is what you need
 	// consider the SERIAL StreamingMode.
 	StreamingModeLarge StreamingMode = 4
 
-	// Transfer data in batches large enough that an individual client can get
-	// reasonable read bandwidth from the database. If the client stops
+	// Transfer data in batches large enough that an individual client can
+	// get reasonable read bandwidth from the database. If the client stops
 	// iteration early, considerable disk and network bandwidth may be wasted.
 	StreamingModeSerial StreamingMode = 5
 )

From d52546ff085eab299c78bcc7245b2fe0d7719521 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Wed, 17 Aug 2022 20:09:53 +0300
Subject: [PATCH 623/740] Fixed compilation warnings about wrong initialization
 list order

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index f6c3fe7198f..fe284ee5c05 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -349,7 +349,7 @@ struct ReadIterator {
 	std::shared_ptr<rocksdb::Iterator> iter;
 	double creationTime;
 	ReadIterator(CF& cf, uint64_t index, DB& db, rocksdb::ReadOptions& options)
-	  : cf(cf), index(index), inUse(true), creationTime(now()), iter(db->NewIterator(options, cf)) {}
+	  : cf(cf), index(index), inUse(true), iter(db->NewIterator(options, cf)), creationTime(now()) {}
 };
 
 /*
@@ -367,7 +367,7 @@ gets deleted as the ref count becomes 0.
 class ReadIteratorPool {
 public:
 	ReadIteratorPool(UID id, DB& db, CF& cf)
-	  : db(db), cf(cf), index(0), iteratorsReuseCount(0), readRangeOptions(getReadOptions()) {
+	  : db(db), cf(cf), readRangeOptions(getReadOptions()), index(0), iteratorsReuseCount(0) {
 		readRangeOptions.background_purge_on_iterator_cleanup = true;
 		readRangeOptions.auto_prefix_mode = (SERVER_KNOBS->ROCKSDB_PREFIX_LEN > 0);
 		TraceEvent("ReadIteratorPool", id)
@@ -912,8 +912,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		                std::shared_ptr<ReadIteratorPool> readIterPool,
 		                std::shared_ptr<PerfContextMetrics> perfContextMetrics,
 		                int threadIndex)
-		  : db(db), cf(cf), id(id), readIterPool(readIterPool), perfContextMetrics(perfContextMetrics),
-		    threadIndex(threadIndex),
+		  : db(db), cf(cf), id(id),
 		    rateLimiter(SERVER_KNOBS->ROCKSDB_WRITE_RATE_LIMITER_BYTES_PER_SEC > 0
 		                    ? rocksdb::NewGenericRateLimiter(
 		                          SERVER_KNOBS->ROCKSDB_WRITE_RATE_LIMITER_BYTES_PER_SEC, // rate_bytes_per_sec
@@ -921,7 +920,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		                          10, // fairness
 		                          rocksdb::RateLimiter::Mode::kWritesOnly,
 		                          SERVER_KNOBS->ROCKSDB_WRITE_RATE_LIMITER_AUTO_TUNE)
-		                    : nullptr) {
+		                    : nullptr),
+          readIterPool(readIterPool), perfContextMetrics(perfContextMetrics), threadIndex(threadIndex) {
 			if (SERVER_KNOBS->ROCKSDB_PERFCONTEXT_ENABLE) {
 				// Enable perf context on the same thread with the db thread
 				rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptForMutex);
@@ -1662,13 +1662,14 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	Counters counters;
 
 	explicit RocksDBKeyValueStore(const std::string& path, UID id)
-	  : path(path), id(id), perfContextMetrics(new PerfContextMetrics()),
-	    readIterPool(new ReadIteratorPool(id, db, defaultFdbCF)),
+	  : perfContextMetrics(new PerfContextMetrics()), path(path), id(id),
+       errorListener(std::make_shared<RocksDBErrorListener>(id)),
+	    errorFuture(errorListener->getFuture()),
 	    readSemaphore(SERVER_KNOBS->ROCKSDB_READ_QUEUE_SOFT_MAX),
-	    fetchSemaphore(SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_SOFT_MAX),
 	    numReadWaiters(SERVER_KNOBS->ROCKSDB_READ_QUEUE_HARD_MAX - SERVER_KNOBS->ROCKSDB_READ_QUEUE_SOFT_MAX),
+	    fetchSemaphore(SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_SOFT_MAX),
 	    numFetchWaiters(SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_HARD_MAX - SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_SOFT_MAX),
-	    errorListener(std::make_shared<RocksDBErrorListener>(id)), errorFuture(errorListener->getFuture()) {
+	    readIterPool(new ReadIteratorPool(id, db, defaultFdbCF)) {
 		// In simluation, run the reader/writer threads as Coro threads (i.e. in the network thread. The storage engine
 		// is still multi-threaded as background compaction threads are still present. Reads/writes to disk will also
 		// block the network thread in a way that would be unacceptable in production but is a necessary evil here. When

From e9c25e546f41c5bcdf5cc2d0485905be0e0e1ded Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Sat, 13 Aug 2022 13:04:59 -0700
Subject: [PATCH 624/740] Remove extremely spammy trace event by only logging
 the re-enabling of load balance in FetchKeys if it was disabled.

---
 fdbserver/storageserver.actor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 9d742989ffe..5bcf54bb0df 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -5913,8 +5913,10 @@ ACTOR Future<Void> fetchKeys(StorageServer* data, AddingShard* shard) {
 		}
 
 		// FIXME: remove when we no longer support upgrades from 5.X
-		data->cx->enableLocalityLoadBalance = EnableLocalityLoadBalance::True;
-		TraceEvent(SevWarnAlways, "FKReenableLB").detail("FKID", fetchKeysID);
+		if (!data->cx->enableLocalityLoadBalance) {
+			data->cx->enableLocalityLoadBalance = EnableLocalityLoadBalance::True;
+			TraceEvent(SevWarnAlways, "FKReenableLB").detail("FKID", fetchKeysID);
+		}
 
 		// We have completed the fetch and write of the data, now we wait for MVCC window to pass.
 		//  As we have finished this work, we will allow more work to start...

From 24e5f6ee44d38044697308256321d467ceb34738 Mon Sep 17 00:00:00 2001
From: Bala Namasivayam <bnamasivayam@apple.com>
Date: Mon, 15 Aug 2022 13:22:17 -0700
Subject: [PATCH 625/740] Fix ErrorCommitInfo event parser

---
 .../transaction_profiling_analyzer.py                       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/transaction_profiling_analyzer/transaction_profiling_analyzer.py b/contrib/transaction_profiling_analyzer/transaction_profiling_analyzer.py
index 2ffc94065a6..25b7834698b 100644
--- a/contrib/transaction_profiling_analyzer/transaction_profiling_analyzer.py
+++ b/contrib/transaction_profiling_analyzer/transaction_profiling_analyzer.py
@@ -277,6 +277,12 @@ def __init__(self, bb, protocol_version, full_output=True):
         if protocol_version >= PROTOCOL_VERSION_6_3:
             self.report_conflicting_keys = bb.get_bool()
 
+        if protocol_version >= PROTOCOL_VERSION_7_1:
+            lock_aware = bb.get_bool()
+            if bb.get_bool():
+                spanId = bb.get_bytes(16)
+
+
 class UnsupportedProtocolVersionError(Exception):
     def __init__(self, protocol_version):
         super().__init__("Unsupported protocol version 0x%0.2X" % protocol_version)

From 0c8497dcec4d565445ecb69793568d99eca35207 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Sun, 21 Aug 2022 18:02:54 +0300
Subject: [PATCH 626/740] Added test for check user foundationdb creation after
 clients installation

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae264373ff7..88828b2f0ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -167,6 +167,7 @@ jobs:
           clients="foundationdb-clients-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
+          podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${clients}" && grep -q foundationdb /etc/passwd || { echo "User foundationdb is not created after $clients installation"; exit 3; }
 
       - name: Test DEBs deploy
         shell: bash
@@ -177,6 +178,7 @@ jobs:
           clients="foundationdb-clients_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
+          podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${clients}" && grep -q foundationdb /etc/passwd || { echo "User foundationdb is not created after $clients installation"; exit 3; }
 
   release:
     needs: [calc_ver, build_linux]

From 77f92f0b6e40ea34540697bba82aeb1c458c000a Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Sun, 21 Aug 2022 18:05:01 +0300
Subject: [PATCH 627/740] setuptools installation moved to separate step
 because pip does not care about package order during processing
 requirements.txt

---
 documentation/CMakeLists.txt          | 3 ++-
 documentation/sphinx/requirements.txt | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
index 7899af22618..23f998e28a8 100644
--- a/documentation/CMakeLists.txt
+++ b/documentation/CMakeLists.txt
@@ -19,7 +19,8 @@ add_custom_command(OUTPUT ${venv_dir}/venv_setup
           ${CMAKE_COMMAND} -E copy ${sphinx_dir}/.pip.conf ${venv_dir}/pip.conf &&
           ${activate_script} &&
           ${python_command} -m pip install --upgrade pip &&
-          ${pip_command} install --upgrade -r ${sphinx_dir}/requirements.txt &&
+          ${pip_command} install --upgrade 'setuptools<=57.4.0,>=20.10.0' -v &&
+          ${pip_command} install --upgrade -r ${sphinx_dir}/requirements.txt -v &&
           ${pip_command} install sphinx-autobuild && # somehow this is missing in requirements.txt
           ${CMAKE_COMMAND} -E touch ${venv_dir}/venv_setup
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/documentation/sphinx/requirements.txt b/documentation/sphinx/requirements.txt
index 06e23ea6d30..ae8cd4c4413 100644
--- a/documentation/sphinx/requirements.txt
+++ b/documentation/sphinx/requirements.txt
@@ -1,5 +1,4 @@
 --index-url https://pypi.python.org/simple
-setuptools>=20.10.0,<=57.4.0
 sphinx==1.5.6
 sphinx-bootstrap-theme==0.4.8
 docutils==0.16

From 0e3e607101535e52c62318251ef85da8dacad132 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Sun, 21 Aug 2022 18:06:44 +0300
Subject: [PATCH 628/740] #XDB-96: Fixed user creation in Debian

---
 cmake/InstallLayout.cmake | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index 5ca4a20dc34..fa28ba8327a 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -335,34 +335,34 @@ set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON)
 set(CPACK_DEBIAN_DEBUGINFO_PACKAGE ${GENERATE_DEBUG_PACKAGES})
 set(CPACK_DEBIAN_PACKAGE_SECTION "database")
 
-set(CPACK_DEBIAN_SERVER-PACKAGE_NAME "${server_package_basename}")
-set(CPACK_DEBIAN_CLIENTS-PACKAGE_NAME "${clients_package_basename}")
+set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_NAME "${server_package_basename}")
+set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_NAME "${clients_package_basename}")
 
 set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_NAME "${server_package_basename}")
 set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_NAME "${clients_package_basename}")
 
-set(CPACK_DEBIAN-SERVER-PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
-set(CPACK_DEBIAN-SERVER-PACKAGE_RECOMMENDS "python (>= 2.6)")
-set(CPACK_DEBIAN-CLIENTS-PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
+set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
+set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_RECOMMENDS "python (>= 2.6)")
+set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 
-set(CPACK_DEBIAN-SERVER_VERSIONED-PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
-set(CPACK_DEBIAN-SERVER_VERSIONED-PACKAGE_RECOMMENDS "python (>= 2.6)")
-set(CPACK_DEBIAN-CLIENTS_VERSIONED-PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
+set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
+set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_RECOMMENDS "python (>= 2.6)")
+set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.foundationdb.org")
-set(CPACK_DEBIAN-CLIENTS-PACKAGE_CONTROL_EXTRA
+set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_CONTROL_EXTRA
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-clients/postinst)
-set(CPACK_DEBIAN-SERVER-PACKAGE_CONTROL_EXTRA
+set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_CONTROL_EXTRA
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/conffiles
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/preinst
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/postinst
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/prerm
   ${CMAKE_SOURCE_DIR}/packaging/deb/DEBIAN-foundationdb-server/postrm)
 
-set(CPACK_DEBIAN-CLIENTS_VERSIONED-PACKAGE_CONTROL_EXTRA
+set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_CONTROL_EXTRA
   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/postinst
   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/prerm)
-set(CPACK_DEBIAN-SERVER_VERSIONED-PACKAGE_CONTROL_EXTRA
+set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_CONTROL_EXTRA
   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst-deb
   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/prerm)
 

From d309f133f3a0a3a7b4e738163c63bdc3b50b0100 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Mon, 22 Aug 2022 13:15:38 +0300
Subject: [PATCH 629/740] #XDB-96: Fixed user creation in Debian

---
 cmake/InstallLayout.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index fa28ba8327a..e868ed2b583 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -363,7 +363,7 @@ set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_CONTROL_EXTRA
   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/postinst
   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/prerm)
 set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_CONTROL_EXTRA
-  ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst-deb
+  ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst
   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/prerm)
 
 ################################################################################

From 9f55851129e46e50d79cbff508dc732b8c8fa97b Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Mon, 22 Aug 2022 13:18:43 +0300
Subject: [PATCH 630/740] Fixed compiler flags setup to skip GCC 7.5.0 in
 github

---
 cmake/ConfigureCompiler.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 8b71400ab2a..1d010384acf 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -342,9 +342,9 @@ else()
     -fvisibility=hidden
     -Wreturn-type
     -fPIC)
-  #if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86" AND CMAKE_COMPILER_IS_GNUCC AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL '8.0.0')
-  #  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wclass-memaccess>)
-  #endif()
+  if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86" AND CMAKE_COMPILER_IS_GNUCC AND NOT CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
+    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wclass-memaccess>)
+  endif()
   if (GPERFTOOLS_FOUND AND GCC)
     add_compile_options(
       -fno-builtin-malloc

From 89154cb4fdfa278c11728aeb41c0b7171893bbed Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Mon, 22 Aug 2022 19:15:15 +0300
Subject: [PATCH 631/740] Fixed user checks after foundationdb-clients deploy

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88828b2f0ed..92a38753d32 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -167,7 +167,7 @@ jobs:
           clients="foundationdb-clients-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
-          podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${clients}" && grep -q foundationdb /etc/passwd || { echo "User foundationdb is not created after $clients installation"; exit 3; }
+          podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${clients} && grep -q foundationdb /etc/passwd" || { echo "User foundationdb is not created after $clients installation"; exit 3; }
 
       - name: Test DEBs deploy
         shell: bash
@@ -178,7 +178,7 @@ jobs:
           clients="foundationdb-clients_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
-          podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${clients}" && grep -q foundationdb /etc/passwd || { echo "User foundationdb is not created after $clients installation"; exit 3; }
+          podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${clients} && grep -q foundationdb /etc/passwd" || { echo "User foundationdb is not created after $clients installation"; exit 3; }
 
   release:
     needs: [calc_ver, build_linux]

From ead4049427ecd463f4309fc6bbb963341f12a127 Mon Sep 17 00:00:00 2001
From: Aaron Molitor <amolitor@apple.com>
Date: Tue, 23 Aug 2022 11:40:33 -0500
Subject: [PATCH 632/740] move global variables into function args/local
 variables, build both regular and debug images by default

---
 packaging/docker/build-images.sh | 54 ++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/packaging/docker/build-images.sh b/packaging/docker/build-images.sh
index 02574515d94..4b306a1535b 100755
--- a/packaging/docker/build-images.sh
+++ b/packaging/docker/build-images.sh
@@ -2,12 +2,17 @@
 set -Eeuo pipefail
 script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
 reset=$(tput sgr0)
+red=$(tput setaf 1)
 blue=$(tput setaf 4)
 
-function logg() {
+function logg () {
     printf "${blue}##### $(date +"%H:%M:%S") #  %-56.55s #####${reset}\n" "${1}"
 }
 
+ function loge () {
+     printf "${red}##### $(date +"%H:%M:%S") #  %-56.55s #####${reset}\n" "${1}"
+ }
+
 function pushd () {
     command pushd "$@" > /dev/null
 }
@@ -16,7 +21,19 @@ function popd () {
     command popd > /dev/null
 }
 
-function create_fake_website_directory() {
+function error_exit () {
+     echo "${red}################################################################################${reset}"
+     loge "${0} FAILED"
+     echo "${red}################################################################################${reset}"
+ }
+
+ trap error_exit ERR
+
+ function create_fake_website_directory () {
+     if [ ${#} -ne 1 ]; then
+         loge "INCORRECT NUMBER OF ARGS FOR ${FUNCNAME[0]}"
+     fi
+     local stripped_binaries_and_from_where="${1}"
     fdb_binaries=( 'fdbbackup' 'fdbcli' 'fdbserver' 'fdbmonitor' )
     logg "PREPARING WEBSITE"
     website_directory="${script_dir}/website"
@@ -112,7 +129,7 @@ function create_fake_website_directory() {
     fdb_website="file:///tmp/website"
 }
 
-function compile_ycsb() {
+function compile_ycsb () {
     logg "COMPILING YCSB"
     if [ "${use_development_java_bindings}" == "true" ]; then
         logg "INSTALL JAVA BINDINGS"
@@ -150,7 +167,13 @@ function compile_ycsb() {
     popd || exit 128
 }
 
-function build_and_push_images(){
+function build_and_push_images () {
+     if [ ${#} -ne 3 ]; then
+         loge "INCORRECT NUMBER OF ARGS FOR ${FUNCNAME[0]}"
+     fi
+     local dockerfile_name="${1}"
+     local use_development_java_bindings="${2}"
+     local push_docker_images="${3}"
     declare -a tags_to_push=()
     for image in "${image_list[@]}"; do
         logg "BUILDING ${image}"
@@ -237,11 +260,6 @@ image_list=(
 )
 registry=""
 tag_base="foundationdb/"
-# THESE CONTROL THE PATH OF FUNCTIONS THAT ARE CALLED BELOW
-stripped_binaries_and_from_where="stripped_local" # MUST BE ONE OF ( "unstripped_artifactory" "stripped_artifactory" "unstripped_local" "stripped_local" )
-dockerfile_name="Dockerfile"
-use_development_java_bindings="false"
-push_docker_images="false"
 
 if [ -n "${OKTETO_NAMESPACE+x}" ]; then
     logg "RUNNING IN OKTETO/AWS"
@@ -258,20 +276,24 @@ if [ -n "${OKTETO_NAMESPACE+x}" ]; then
     else
         tag_postfix="${OKTETO_NAME:-dev}"
     fi
-    stripped_binaries_and_from_where="unstripped_local" # MUST BE ONE OF ( "unstripped_artifactory" "stripped_artifactory" "unstripped_local" "stripped_local" )
-    dockerfile_name="Dockerfile.eks"
-    use_development_java_bindings="true"
-    push_docker_images="true"
+
+    # build regular images
+     create_fake_website_directory stripped_local
+     build_and_push_images Dockerfile true true
+
+     # build debug images
+     create_fake_website_directory unstripped_local
+     build_and_push_images Dockerfile.eks true true
 else
     echo "Dear ${USER}, you probably need to edit this file before running it. "
     echo "${0} has a very narrow set of situations where it will be successful,"
     echo "or even useful, when executed unedited"
     exit 1
+    # this set of options will creat standard images from a local build
+    # create_fake_website_directory stripped_local
+    # build_and_push_images Dockerfile false false
 fi
 
-create_fake_website_directory
-build_and_push_images
-
 echo "${blue}################################################################################${reset}"
 logg "COMPLETED ${0}"
 echo "${blue}################################################################################${reset}"

From 8c15c4f23ec8f85bdbba87f76c630e8666c8f5f5 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Thu, 25 Aug 2022 23:29:38 +0300
Subject: [PATCH 633/740] Try to remove debug information from release packages

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 92a38753d32..6688f44d7b7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -93,7 +93,7 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake -D FDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DGENERATE_DEBUG_PACKAGES=OFF -G Ninja ${{github.workspace}}
+      run: cmake -D FDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -G Ninja ${{github.workspace}}
 
     - name: Build
       working-directory: ${{github.workspace}}/bld

From c3e94e2478797b4c4236131d4202fb68e67e143c Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 25 Aug 2022 13:47:51 -0700
Subject: [PATCH 634/740] Fix missing localities for fdbserver

The localities are stored in ServerDBInfo for calculating distances to other
processes. The localities are not set when creating ServerDBInfo, thus any
distances calculated before UpdateServerDBInfoRequest will be wrong.

This PR fixes this issue, thus preventing unnecessary cross DC calls,
especially for index prefetching on the storage servers.
---
 fdbserver/worker.actor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 4b720a54c01..94ae374f07a 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -2917,7 +2917,9 @@ ACTOR Future<Void> fdbd(Reference<IClusterConnectionRecord> connRecord,
 		auto ci = makeReference<AsyncVar<Optional<ClusterInterface>>>();
 		auto asyncPriorityInfo =
 		    makeReference<AsyncVar<ClusterControllerPriorityInfo>>(getCCPriorityInfo(fitnessFilePath, processClass));
-		auto dbInfo = makeReference<AsyncVar<ServerDBInfo>>();
+		auto serverDBInfo = ServerDBInfo();
+		serverDBInfo.myLocality = localities;
+		auto dbInfo = makeReference<AsyncVar<ServerDBInfo>>(serverDBInfo);
 
 		actors.push_back(reportErrors(monitorAndWriteCCPriorityInfo(fitnessFilePath, asyncPriorityInfo),
 		                              "MonitorAndWriteCCPriorityInfo"));

From 432bc89ce4f7d6d80b65bfe4abe7ccfd4d46731f Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 25 Aug 2022 14:11:37 -0700
Subject: [PATCH 635/740] Add more traces for load balancing

---
 fdbrpc/LoadBalance.actor.h | 32 ++++++++++++++++++++++++++++++++
 fdbrpc/MultiInterface.h    |  1 +
 fdbserver/worker.actor.cpp |  1 +
 3 files changed, 34 insertions(+)

diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 76326c48a4e..6388f81bed3 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -486,6 +486,11 @@ Future<REPLY_TYPE(Request)> loadBalance(
 				// server count is within "LOAD_BALANCE_MAX_BAD_OPTIONS". We
 				// do not need to consider any remote servers.
 				break;
+			} else if (badServers == alternatives->countBest() && i == badServers) {
+				TraceEvent("AllLocalAlternativesFailed")
+				    .detail("Alternatives", alternatives->description())
+				    .detail("Total", alternatives->size())
+				    .detail("Best", alternatives->countBest());
 			}
 
 			RequestStream<Request> const* thisStream = &alternatives->get(i, channel);
@@ -587,6 +592,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 		// nextAlt. This logic matters only if model == nullptr. Otherwise, the
 		// bestAlt and nextAlt have been decided.
 		state RequestStream<Request> const* stream = nullptr;
+		state LBDistance::Type distance;
 		for (int alternativeNum = 0; alternativeNum < alternatives->size(); alternativeNum++) {
 			int useAlt = nextAlt;
 			if (nextAlt == startAlt)
@@ -595,6 +601,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 				useAlt = (nextAlt + alternatives->size() - 1) % alternatives->size();
 
 			stream = &alternatives->get(useAlt, channel);
+			distance = alternatives->getDistance(useAlt);
 			if (!IFailureMonitor::failureMonitor().getState(stream->getEndpoint()).failed &&
 			    (!firstRequestEndpoint.present() || stream->getEndpoint().token.first() != firstRequestEndpoint.get()))
 				break;
@@ -602,6 +609,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 			if (nextAlt == startAlt)
 				triedAllOptions = TriedAllOptions::True;
 			stream = nullptr;
+			distance = LBDistance::DISTANT;
 		}
 
 		if (!stream && !firstRequestData.isValid()) {
@@ -637,6 +645,18 @@ Future<REPLY_TYPE(Request)> loadBalance(
 			firstRequestEndpoint = Optional<uint64_t>();
 		} else if (firstRequestData.isValid()) {
 			// Issue a second request, the first one is taking a long time.
+			if (distance == LBDistance::DISTANT) {
+				TraceEvent("LBDistant2nd")
+				    .suppressFor(0.1)
+				    .detail("Distance", (int)distance)
+				    .detail("BackOff", backoff)
+				    .detail("TriedAllOptions", triedAllOptions)
+				    .detail("Alternatives", alternatives->description())
+				    .detail("Token", stream->getEndpoint().token)
+				    .detail("Total", alternatives->size())
+				    .detail("Best", alternatives->countBest())
+				    .detail("Attempts", numAttempts);
+			}
 			secondRequestData.startRequest(backoff, triedAllOptions, stream, request, model, alternatives, channel);
 			state bool firstFinished = false;
 
@@ -666,6 +686,18 @@ Future<REPLY_TYPE(Request)> loadBalance(
 			}
 		} else {
 			// Issue a request, if it takes too long to get a reply, go around the loop
+			if (distance == LBDistance::DISTANT) {
+				TraceEvent("LBDistant")
+				    .suppressFor(0.1)
+				    .detail("Distance", (int)distance)
+				    .detail("BackOff", backoff)
+				    .detail("TriedAllOptions", triedAllOptions)
+				    .detail("Alternatives", alternatives->description())
+				    .detail("Token", stream->getEndpoint().token)
+				    .detail("Total", alternatives->size())
+				    .detail("Best", alternatives->countBest())
+				    .detail("Attempts", numAttempts);
+			}
 			firstRequestData.startRequest(backoff, triedAllOptions, stream, request, model, alternatives, channel);
 			firstRequestEndpoint = stream->getEndpoint().token.first();
 
diff --git a/fdbrpc/MultiInterface.h b/fdbrpc/MultiInterface.h
index 4f15dbf0873..85fa195206b 100644
--- a/fdbrpc/MultiInterface.h
+++ b/fdbrpc/MultiInterface.h
@@ -226,6 +226,7 @@ class MultiInterface<ReferencedInterface<T>> : public ReferenceCounted<MultiInte
 	}
 
 	T const& getInterface(int index) { return alternatives[index]->interf; }
+	LBDistance::Type getDistance(int index) const { return (LBDistance::Type)alternatives[index]->distance; }
 	UID getId(int index) const { return alternatives[index]->interf.id(); }
 	bool hasInterface(UID id) const {
 		for (const auto& ref : alternatives) {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 94ae374f07a..301a9ed622b 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -2920,6 +2920,7 @@ ACTOR Future<Void> fdbd(Reference<IClusterConnectionRecord> connRecord,
 		auto serverDBInfo = ServerDBInfo();
 		serverDBInfo.myLocality = localities;
 		auto dbInfo = makeReference<AsyncVar<ServerDBInfo>>(serverDBInfo);
+		TraceEvent("MyLocality").detail("Locality", dbInfo->get().myLocality.toString());
 
 		actors.push_back(reportErrors(monitorAndWriteCCPriorityInfo(fitnessFilePath, asyncPriorityInfo),
 		                              "MonitorAndWriteCCPriorityInfo"));

From f99e20b6c38330f4a7bb56b645362138a588904a Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 25 Aug 2022 17:17:16 -0700
Subject: [PATCH 636/740] Suppress AllLocalAlternativesFailed events

---
 fdbrpc/LoadBalance.actor.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 6388f81bed3..b25a1ea73e4 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -488,6 +488,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 				break;
 			} else if (badServers == alternatives->countBest() && i == badServers) {
 				TraceEvent("AllLocalAlternativesFailed")
+				    .suppressFor(1.0)
 				    .detail("Alternatives", alternatives->description())
 				    .detail("Total", alternatives->size())
 				    .detail("Best", alternatives->countBest());

From 53d37cb384d259d17b0d95e8d94271ef68698771 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 30 Aug 2022 13:40:51 -0700
Subject: [PATCH 637/740] Fix a race that check happened before last configure
 command

By adding a delay before start checking.
---
 fdbserver/workloads/ConfigureDatabase.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbserver/workloads/ConfigureDatabase.actor.cpp b/fdbserver/workloads/ConfigureDatabase.actor.cpp
index d648b1d097b..e04ce4c8dc6 100644
--- a/fdbserver/workloads/ConfigureDatabase.actor.cpp
+++ b/fdbserver/workloads/ConfigureDatabase.actor.cpp
@@ -284,6 +284,7 @@ struct ConfigureDatabaseWorkload : TestWorkload {
 	}
 
 	ACTOR Future<bool> _check(ConfigureDatabaseWorkload* self, Database cx) {
+		wait(delay(30.0));
 		// only storage_migration_type=gradual && perpetual_storage_wiggle=1 need this check because in QuietDatabase
 		// perpetual wiggle will be forced to close For other cases, later ConsistencyCheck will check KV store type
 		// there

From 3636907fb3d0fb4cb7b336b9c7357dfd94142199 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 31 Aug 2022 02:04:22 +0000
Subject: [PATCH 638/740] Add 7.1.20, 7.1.21 release notes

---
 .../source/release-notes/release-notes-710.rst      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 4854230c1d0..05a33625e8e 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -1,9 +1,18 @@
-.. _release-notes:
-
 #############
 Release Notes
 #############
 
+7.1.21
+======
+* Same as 7.1.20 release with AVX enabled.
+
+7.1.20
+======
+* Released with AVX disabled.
+* Fixed missing localities for fdbserver that can cause cross DC calls among storage servers. `(PR #7995) <https://github.com/apple/foundationdb/pull/7995>`_
+* Removed extremely spammy trace event in FetchKeys and fixed transaction_profiling_analyzer.py. `(PR #7934) <https://github.com/apple/foundationdb/pull/7934>`_
+* Fixed bugs when GRV proxy returns an error. `(PR #7860) <https://github.com/apple/foundationdb/pull/7860>`_
+
 7.1.19
 ======
 * Same as 7.1.18 release with AVX enabled.

From d0f15fe64b8e01ecb091deb590a90d93d361f44c Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 31 Aug 2022 02:06:21 +0000
Subject: [PATCH 639/740] disable AVX for 7.1.20 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 57ae31f72b3c789f597a7870a6001d39e8331d09 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 31 Aug 2022 02:07:04 +0000
Subject: [PATCH 640/740] enable AVX and update version for 7.1.21 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 740fdded801..df70998a624 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.20
+  VERSION 7.1.21
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From bb8ebc454335f2141ad98f2f2f548fdc6749c268 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 25 Aug 2022 14:11:37 -0700
Subject: [PATCH 641/740] Add more traces for load balancing

---
 fdbrpc/LoadBalance.actor.h | 32 ++++++++++++++++++++++++++++++++
 fdbrpc/MultiInterface.h    |  1 +
 fdbserver/worker.actor.cpp |  1 +
 3 files changed, 34 insertions(+)

diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 76326c48a4e..6388f81bed3 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -486,6 +486,11 @@ Future<REPLY_TYPE(Request)> loadBalance(
 				// server count is within "LOAD_BALANCE_MAX_BAD_OPTIONS". We
 				// do not need to consider any remote servers.
 				break;
+			} else if (badServers == alternatives->countBest() && i == badServers) {
+				TraceEvent("AllLocalAlternativesFailed")
+				    .detail("Alternatives", alternatives->description())
+				    .detail("Total", alternatives->size())
+				    .detail("Best", alternatives->countBest());
 			}
 
 			RequestStream<Request> const* thisStream = &alternatives->get(i, channel);
@@ -587,6 +592,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 		// nextAlt. This logic matters only if model == nullptr. Otherwise, the
 		// bestAlt and nextAlt have been decided.
 		state RequestStream<Request> const* stream = nullptr;
+		state LBDistance::Type distance;
 		for (int alternativeNum = 0; alternativeNum < alternatives->size(); alternativeNum++) {
 			int useAlt = nextAlt;
 			if (nextAlt == startAlt)
@@ -595,6 +601,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 				useAlt = (nextAlt + alternatives->size() - 1) % alternatives->size();
 
 			stream = &alternatives->get(useAlt, channel);
+			distance = alternatives->getDistance(useAlt);
 			if (!IFailureMonitor::failureMonitor().getState(stream->getEndpoint()).failed &&
 			    (!firstRequestEndpoint.present() || stream->getEndpoint().token.first() != firstRequestEndpoint.get()))
 				break;
@@ -602,6 +609,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 			if (nextAlt == startAlt)
 				triedAllOptions = TriedAllOptions::True;
 			stream = nullptr;
+			distance = LBDistance::DISTANT;
 		}
 
 		if (!stream && !firstRequestData.isValid()) {
@@ -637,6 +645,18 @@ Future<REPLY_TYPE(Request)> loadBalance(
 			firstRequestEndpoint = Optional<uint64_t>();
 		} else if (firstRequestData.isValid()) {
 			// Issue a second request, the first one is taking a long time.
+			if (distance == LBDistance::DISTANT) {
+				TraceEvent("LBDistant2nd")
+				    .suppressFor(0.1)
+				    .detail("Distance", (int)distance)
+				    .detail("BackOff", backoff)
+				    .detail("TriedAllOptions", triedAllOptions)
+				    .detail("Alternatives", alternatives->description())
+				    .detail("Token", stream->getEndpoint().token)
+				    .detail("Total", alternatives->size())
+				    .detail("Best", alternatives->countBest())
+				    .detail("Attempts", numAttempts);
+			}
 			secondRequestData.startRequest(backoff, triedAllOptions, stream, request, model, alternatives, channel);
 			state bool firstFinished = false;
 
@@ -666,6 +686,18 @@ Future<REPLY_TYPE(Request)> loadBalance(
 			}
 		} else {
 			// Issue a request, if it takes too long to get a reply, go around the loop
+			if (distance == LBDistance::DISTANT) {
+				TraceEvent("LBDistant")
+				    .suppressFor(0.1)
+				    .detail("Distance", (int)distance)
+				    .detail("BackOff", backoff)
+				    .detail("TriedAllOptions", triedAllOptions)
+				    .detail("Alternatives", alternatives->description())
+				    .detail("Token", stream->getEndpoint().token)
+				    .detail("Total", alternatives->size())
+				    .detail("Best", alternatives->countBest())
+				    .detail("Attempts", numAttempts);
+			}
 			firstRequestData.startRequest(backoff, triedAllOptions, stream, request, model, alternatives, channel);
 			firstRequestEndpoint = stream->getEndpoint().token.first();
 
diff --git a/fdbrpc/MultiInterface.h b/fdbrpc/MultiInterface.h
index 4f15dbf0873..85fa195206b 100644
--- a/fdbrpc/MultiInterface.h
+++ b/fdbrpc/MultiInterface.h
@@ -226,6 +226,7 @@ class MultiInterface<ReferencedInterface<T>> : public ReferenceCounted<MultiInte
 	}
 
 	T const& getInterface(int index) { return alternatives[index]->interf; }
+	LBDistance::Type getDistance(int index) const { return (LBDistance::Type)alternatives[index]->distance; }
 	UID getId(int index) const { return alternatives[index]->interf.id(); }
 	bool hasInterface(UID id) const {
 		for (const auto& ref : alternatives) {
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 94ae374f07a..301a9ed622b 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -2920,6 +2920,7 @@ ACTOR Future<Void> fdbd(Reference<IClusterConnectionRecord> connRecord,
 		auto serverDBInfo = ServerDBInfo();
 		serverDBInfo.myLocality = localities;
 		auto dbInfo = makeReference<AsyncVar<ServerDBInfo>>(serverDBInfo);
+		TraceEvent("MyLocality").detail("Locality", dbInfo->get().myLocality.toString());
 
 		actors.push_back(reportErrors(monitorAndWriteCCPriorityInfo(fitnessFilePath, asyncPriorityInfo),
 		                              "MonitorAndWriteCCPriorityInfo"));

From 252c432136b21fac98670c0448ed50179e980641 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 25 Aug 2022 17:17:16 -0700
Subject: [PATCH 642/740] Suppress AllLocalAlternativesFailed events

---
 fdbrpc/LoadBalance.actor.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbrpc/LoadBalance.actor.h b/fdbrpc/LoadBalance.actor.h
index 6388f81bed3..b25a1ea73e4 100644
--- a/fdbrpc/LoadBalance.actor.h
+++ b/fdbrpc/LoadBalance.actor.h
@@ -488,6 +488,7 @@ Future<REPLY_TYPE(Request)> loadBalance(
 				break;
 			} else if (badServers == alternatives->countBest() && i == badServers) {
 				TraceEvent("AllLocalAlternativesFailed")
+				    .suppressFor(1.0)
 				    .detail("Alternatives", alternatives->description())
 				    .detail("Total", alternatives->size())
 				    .detail("Best", alternatives->countBest());

From a9a52dbfb37c343f8819593499f442d123051f6d Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 31 Aug 2022 02:04:22 +0000
Subject: [PATCH 643/740] Add 7.1.20, 7.1.21 release notes

---
 .../sphinx/source/release-notes/release-notes-710.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 4854230c1d0..570a833cfe8 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,17 @@
 Release Notes
 #############
 
+7.1.21
+======
+* Same as 7.1.20 release with AVX enabled.
+
+7.1.20
+======
+* Released with AVX disabled.
+* Fixed missing localities for fdbserver that can cause cross DC calls among storage servers. `(PR #7995) <https://github.com/apple/foundationdb/pull/7995>`_
+* Removed extremely spammy trace event in FetchKeys and fixed transaction_profiling_analyzer.py. `(PR #7934) <https://github.com/apple/foundationdb/pull/7934>`_
+* Fixed bugs when GRV proxy returns an error. `(PR #7860) <https://github.com/apple/foundationdb/pull/7860>`_
+
 7.1.19
 ======
 * Same as 7.1.18 release with AVX enabled.

From 8f8050a57ad4328ffd2442d36703d567d370e1c9 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 31 Aug 2022 02:06:21 +0000
Subject: [PATCH 644/740] disable AVX for 7.1.20 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From e9f38c7169d21dde901b7b9408e1c5a8df182d64 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 31 Aug 2022 02:07:04 +0000
Subject: [PATCH 645/740] enable AVX and update version for 7.1.21 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 740fdded801..df70998a624 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.20
+  VERSION 7.1.21
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From d910eb864b6ee16a9c2ded8c02965db2ac9f59bf Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 31 Aug 2022 14:03:36 -0700
Subject: [PATCH 646/740] Add back RecoveryAvailable trace event for status

---
 fdbserver/ClusterRecovery.actor.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
index 723c0afec68..2b6695da001 100644
--- a/fdbserver/ClusterRecovery.actor.cpp
+++ b/fdbserver/ClusterRecovery.actor.cpp
@@ -1692,6 +1692,12 @@ ACTOR Future<Void> clusterRecoveryCore(Reference<ClusterRecoveryData> self) {
 	    .detail("RecoveryDuration", recoveryDuration)
 	    .trackLatest(self->clusterRecoveryStateEventHolder->trackingKey);
 
+	TraceEvent(getRecoveryEventName(ClusterRecoveryEventType::CLUSTER_RECOVERY_AVAILABLE_EVENT_NAME).c_str(),
+	           self->dbgid)
+	    .detail("NumOfOldGensOfLogs", self->cstate.myDBState.oldTLogData.size())
+	    .detail("AvailableAtVersion", self->recoveryTransactionVersion)
+	    .trackLatest("MasterRecoveryAvailable");
+
 	self->addActor.send(changeCoordinators(self));
 	Database cx = openDBOnServer(self->dbInfo, TaskPriority::DefaultEndpoint, LockAware::True);
 	self->addActor.send(configurationMonitor(self, cx));

From 44848528559e49d3216a6c6c498ce58c7ae79b59 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Wed, 31 Aug 2022 22:27:24 +0000
Subject: [PATCH 647/740] update version after 7.1.21 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df70998a624..0ff40b9db73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.21
+  VERSION 7.1.22
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From 8c442cd3f717a1aa454a1532764c10bb2c2c82e7 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 31 Aug 2022 21:48:44 -0700
Subject: [PATCH 648/740] Use event holder

---
 fdbserver/ClusterRecovery.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
index 2b6695da001..89c6299f12f 100644
--- a/fdbserver/ClusterRecovery.actor.cpp
+++ b/fdbserver/ClusterRecovery.actor.cpp
@@ -1696,7 +1696,7 @@ ACTOR Future<Void> clusterRecoveryCore(Reference<ClusterRecoveryData> self) {
 	           self->dbgid)
 	    .detail("NumOfOldGensOfLogs", self->cstate.myDBState.oldTLogData.size())
 	    .detail("AvailableAtVersion", self->recoveryTransactionVersion)
-	    .trackLatest("MasterRecoveryAvailable");
+	    .trackLatest(self->clusterRecoveryAvailableEventHolder->trackingKey);
 
 	self->addActor.send(changeCoordinators(self));
 	Database cx = openDBOnServer(self->dbInfo, TaskPriority::DefaultEndpoint, LockAware::True);

From 49463aa6ba7fc9984d375ca4016c10be5020707d Mon Sep 17 00:00:00 2001
From: 1inker <67271937+1inker@users.noreply.github.com>
Date: Tue, 6 Sep 2022 11:54:24 +0300
Subject: [PATCH 649/740] Ow fork 7.1 clang (#11)

XDB-106: Speedup builds with clang
---
 .github/workflows/build.yml   |  6 +++---
 cmake/ConfigureCompiler.cmake | 12 +++++++++++-
 flow/CMakeLists.txt           |  3 +++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6688f44d7b7..0cf8b6051a2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,7 @@ jobs:
       shell: bash
       run: |
         sudo apt update
-        sudo apt install -y sudo git cmake libboost-dev g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm
+        sudo apt install -y sudo git cmake libboost-dev g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm clang-10
         sudo pip3 install virtualenv
         sudo apt install -y dirmngr gnupg apt-transport-https ca-certificates
         sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
@@ -93,12 +93,12 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake -D FDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -G Ninja ${{github.workspace}}
+      run: CC=clang-10 CXX=clang++-10 cmake -D FDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DUSE_LIBCXX=OFF -DSTATIC_LINK_LIBCXX=ON -DENABLE_SIMULATION_TESTS=ON -G Ninja ${{github.workspace}}
 
     - name: Build
       working-directory: ${{github.workspace}}/bld
       shell: bash
-      run: ninja -j 1
+      run: ninja -j 3
 
     #- name: Minimal tests
     #  working-directory: ${{github.workspace}}/bld
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 1d010384acf..f978b653edd 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -286,7 +286,17 @@ else()
         add_link_options(-stdlib=libc++ -Wl,-build-id=sha1)
       endif()
     else()
-      add_link_options(-latomic)
+      execute_process(
+        COMMAND ${CMAKE_C_COMPILER} -print-search-dirs
+        OUTPUT_VARIABLE MY_CLANG_SEARCH_DIRS
+        RESULT_VARIABLE MY_CLANG_SEARCH_DIRS_FOUND
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+      string(REGEX MATCH "libraries: =([^\n].*)" _dummy "${MY_CLANG_SEARCH_DIRS}\n")
+      string(REPLACE ":" ";" MY_CLANG_LIB_DIRS "${CMAKE_MATCH_1}")
+      find_library(Atomic_LIBRARY NAMES libatomic.a PATHS ${MY_CLANG_LIB_DIRS})
+      if(NOT Atomic_LIBRARY)
+        message(FATAL_ERROR "atomic static library not found")
+      endif()
     endif()
     if (OPEN_FOR_IDE)
       add_compile_options(
diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index 5cd37810b5f..358462812c6 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -133,6 +133,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SourceVersion.h.cmake ${CMAKE_CURRENT
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 add_flow_target(STATIC_LIBRARY NAME flow SRCS ${FLOW_SRCS})
+if(Atomic_LIBRARY)
+  target_link_libraries(flow PRIVATE ${Atomic_LIBRARY})
+endif()
 target_link_libraries(flow PRIVATE stacktrace)
 target_link_libraries(flow PUBLIC fmt::fmt)
 

From 8adf931d5c569dd2a901123c9d8f11752776f11d Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 6 Sep 2022 12:35:40 -0700
Subject: [PATCH 650/740] TLog stopped bug fixes and CC leader replacement fix
 [release-7.1] (#8081)

* ClusterCore to handle leader replacement

In current code the leader replacement handling is done by
ClusterControllerWatchDog, it is possible that if the cluster
recruitment is in-progress, the leader replacement handling gets
delayed causing the multiple leaders to present simulateneously
impacting cluster recovery.

Move the cluster leader replacement logic to ClusterController
core to avoid above described scenario.

* 2 TLog stopped bug fixes - one setting stop from dbinfo, the other handling a race between peek and stopping (#8001)

* Fix format

Co-authored-by: Josh Slocum <josh.slocum@snowflake.com>
---
 fdbserver/ClusterController.actor.cpp | 23 +++----
 fdbserver/TLogServer.actor.cpp        | 93 ++++++++++++++++-----------
 2 files changed, 65 insertions(+), 51 deletions(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index bc4f2b37a9d..01e9e5646e4 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -194,21 +194,9 @@ struct EncryptKeyProxySingleton : Singleton<EncryptKeyProxyInterface> {
 	}
 };
 
-ACTOR Future<Void> handleLeaderReplacement(Reference<ClusterRecoveryData> self, Future<Void> leaderFail) {
-	loop choose {
-		when(wait(leaderFail)) {
-			TraceEvent("LeaderReplaced", self->controllerData->id).log();
-			// We are no longer the leader if this has changed.
-			self->controllerData->shouldCommitSuicide = true;
-			throw restart_cluster_controller();
-		}
-	}
-}
-
 ACTOR Future<Void> clusterWatchDatabase(ClusterControllerData* cluster,
                                         ClusterControllerData::DBInfo* db,
-                                        ServerCoordinators coordinators,
-                                        Future<Void> leaderFail) {
+                                        ServerCoordinators coordinators) {
 	state MasterInterface iMaster;
 	state Reference<ClusterRecoveryData> recoveryData;
 	state PromiseStream<Future<Void>> addActor;
@@ -299,7 +287,6 @@ ACTOR Future<Void> clusterWatchDatabase(ClusterControllerData* cluster,
 					TraceEvent(SevDebug, "BackupWorkerDoneRequest", cluster->id).log();
 				}
 				when(wait(collection)) { throw internal_error(); }
-				when(wait(handleLeaderReplacement(recoveryData, leaderFail))) { throw internal_error(); }
 			}
 			// failed master (better master exists) could happen while change-coordinators request processing is
 			// in-progress
@@ -2521,7 +2508,7 @@ ACTOR Future<Void> clusterControllerCore(ClusterControllerFullInterface interf,
 	if (SERVER_KNOBS->ENABLE_ENCRYPTION) {
 		self.addActor.send(monitorEncryptKeyProxy(&self));
 	}
-	self.addActor.send(clusterWatchDatabase(&self, &self.db, coordinators, leaderFail)); // Start the master database
+	self.addActor.send(clusterWatchDatabase(&self, &self.db, coordinators)); // Start the master database
 	self.addActor.send(self.updateWorkerList.init(self.db.db));
 	self.addActor.send(statusServer(interf.clientInterface.databaseStatus.getFuture(),
 	                                &self,
@@ -2631,6 +2618,12 @@ ACTOR Future<Void> clusterControllerCore(ClusterControllerFullInterface interf,
 		when(GetServerDBInfoRequest req = waitNext(interf.getServerDBInfo.getFuture())) {
 			self.addActor.send(clusterGetServerInfo(&self.db, req.knownServerInfoID, req.reply));
 		}
+		when(wait(leaderFail)) {
+			// We are no longer the leader if this has changed.
+			endRole(Role::CLUSTER_CONTROLLER, interf.id(), "Leader Replaced", true);
+			TEST(true); // Leader replaced
+			return Void();
+		}
 		when(ReplyPromise<Void> ping = waitNext(interf.clientInterface.ping.getFuture())) { ping.send(Void()); }
 	}
 }
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index d2fc0a9def9..4665dbd2f9d 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -497,7 +497,8 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	*/
 
 	AsyncTrigger stopCommit;
-	bool stopped, initialized;
+	bool initialized;
+	Promise<Void> stoppedPromise;
 	DBRecoveryCount recoveryCount;
 
 	// If persistentDataVersion != persistentDurableDataVersion,
@@ -641,10 +642,10 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 	                 TLogSpillType logSpillType,
 	                 std::vector<Tag> tags,
 	                 std::string context)
-	  : stopped(false), initialized(false), queueCommittingVersion(0), knownCommittedVersion(0),
-	    durableKnownCommittedVersion(0), minKnownCommittedVersion(0), queuePoppedVersion(0), minPoppedTagVersion(0),
-	    minPoppedTag(invalidTag), unpoppedRecoveredTagCount(0), cc("TLog", interf.id().toString()),
-	    bytesInput("BytesInput", cc), bytesDurable("BytesDurable", cc), blockingPeeks("BlockingPeeks", cc),
+	  : initialized(false), queueCommittingVersion(0), knownCommittedVersion(0), durableKnownCommittedVersion(0),
+	    minKnownCommittedVersion(0), queuePoppedVersion(0), minPoppedTagVersion(0), minPoppedTag(invalidTag),
+	    unpoppedRecoveredTagCount(0), cc("TLog", interf.id().toString()), bytesInput("BytesInput", cc),
+	    bytesDurable("BytesDurable", cc), blockingPeeks("BlockingPeeks", cc),
 	    blockingPeekTimeouts("BlockingPeekTimeouts", cc), emptyPeeks("EmptyPeeks", cc),
 	    nonEmptyPeeks("NonEmptyPeeks", cc), logId(interf.id()), protocolVersion(protocolVersion),
 	    newPersistentDataVersion(invalidVersion), tLogData(tLogData), unrecoveredBefore(1), recoveredAt(1),
@@ -755,6 +756,15 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
 			waitingTags.clear();
 		}
 	}
+
+	bool stopped() const { return stoppedPromise.isSet(); }
+
+	void stop() {
+		if (stoppedPromise.canBeSet()) {
+			TraceEvent(SevDebug, "StoppingTLog", tLogData->dbgid).detail("LogId", logId);
+			stoppedPromise.send(Void());
+		}
+	}
 };
 
 template <class T>
@@ -807,15 +817,15 @@ ACTOR Future<Void> tLogLock(TLogData* self, ReplyPromise<TLogLockResult> reply,
 	state Version stopVersion = logData->version.get();
 
 	TEST(true); // TLog stopped by recovering cluster-controller
-	TEST(logData->stopped); // logData already stopped
-	TEST(!logData->stopped); // logData not yet stopped
+	TEST(logData->stopped()); // logData already stopped
+	TEST(!logData->stopped()); // logData not yet stopped
 
 	TraceEvent("TLogStop", logData->logId)
 	    .detail("Ver", stopVersion)
-	    .detail("IsStopped", logData->stopped)
+	    .detail("IsStopped", logData->stopped())
 	    .detail("QueueCommitted", logData->queueCommittedVersion.get());
 
-	logData->stopped = true;
+	logData->stop();
 	logData->unblockWaitingPeeks();
 	if (!logData->recoveryComplete.isSet()) {
 		logData->recoveryComplete.sendError(end_of_stream());
@@ -835,7 +845,7 @@ ACTOR Future<Void> tLogLock(TLogData* self, ReplyPromise<TLogLockResult> reply,
 	TraceEvent("TLogStop2", self->dbgid)
 	    .detail("LogId", logData->logId)
 	    .detail("Ver", stopVersion)
-	    .detail("IsStopped", logData->stopped)
+	    .detail("IsStopped", logData->stopped())
 	    .detail("QueueCommitted", logData->queueCommittedVersion.get())
 	    .detail("KnownCommitted", result.knownCommittedVersion);
 
@@ -1315,7 +1325,7 @@ ACTOR Future<Void> updateStorage(TLogData* self) {
 	// tag; which is not intended to ever happen.
 	Optional<Version> cachePopVersion;
 	for (auto& it : self->id_data) {
-		if (!it.second->stopped) {
+		if (!it.second->stopped()) {
 			if (it.second->version.get() - it.second->unrecoveredBefore >
 			    SERVER_KNOBS->MAX_VERSIONS_IN_FLIGHT + SERVER_KNOBS->MAX_CACHE_VERSIONS) {
 				cachePopVersion = it.second->version.get() - SERVER_KNOBS->MAX_CACHE_VERSIONS;
@@ -1332,7 +1342,7 @@ ACTOR Future<Void> updateStorage(TLogData* self) {
 		wait(waitForAll(cachePopFutures));
 	}
 
-	if (logData->stopped) {
+	if (logData->stopped()) {
 		if (self->bytesInput - self->bytesDurable >= self->targetVolatileBytes) {
 			while (logData->persistentDataDurableVersion != logData->version.get()) {
 				totalSize = 0;
@@ -1763,19 +1773,20 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 		wait(logData->version.whenAtLeast(reqBegin));
 		wait(delay(SERVER_KNOBS->TLOG_PEEK_DELAY, g_network->getCurrentTask()));
 	}
-	if (!logData->stopped && reqTag.locality != tagLocalityTxs && reqTag != txsTag &&
+	if (!logData->stopped() && reqTag.locality != tagLocalityTxs && reqTag != txsTag &&
 	    logData->version.get() < logData->recoveryTxnVersion) {
 		DisabledTraceEvent("TLogPeekMessages1", self->dbgid)
 		    .detail("LogId", logData->logId)
 		    .detail("Tag", reqTag.toString())
 		    .detail("ReqBegin", reqBegin)
 		    .detail("Version", logData->version.get())
+		    .detail("RecoveryTxnVersion", logData->recoveryTxnVersion)
 		    .detail("RecoveredAt", logData->recoveredAt);
 		// Make sure the peek reply has the recovery txn for the current TLog.
 		// Older generation TLog has been stopped and doesn't wait here.
 		// Similarly during recovery, reading transaction state store
 		// doesn't wait here.
-		wait(logData->version.whenAtLeast(logData->recoveryTxnVersion));
+		wait(logData->version.whenAtLeast(logData->recoveryTxnVersion) || logData->stoppedPromise.getFuture());
 	}
 
 	if (logData->locality != tagLocalitySatellite && reqTag.locality == tagLocalityLogRouter) {
@@ -2192,7 +2203,7 @@ ACTOR Future<Void> commitQueue(TLogData* self) {
 	loop {
 		int foundCount = 0;
 		for (auto it : self->id_data) {
-			if (!it.second->stopped) {
+			if (!it.second->stopped()) {
 				logData = it.second;
 				foundCount++;
 			} else if (it.second->version.get() >
@@ -2217,8 +2228,8 @@ ACTOR Future<Void> commitQueue(TLogData* self) {
 		}
 
 		loop {
-			if (logData->stopped && logData->version.get() == std::max(logData->queueCommittingVersion,
-			                                                           logData->queueCommittedVersion.get())) {
+			if (logData->stopped() && logData->version.get() == std::max(logData->queueCommittingVersion,
+			                                                             logData->queueCommittedVersion.get())) {
 				wait(logData->queueCommittedVersion.whenAtLeast(logData->version.get()));
 				break;
 			}
@@ -2265,7 +2276,7 @@ ACTOR Future<Void> tLogCommit(TLogData* self,
 	}
 
 	state double waitStartT = 0;
-	while (self->bytesInput - self->bytesDurable >= SERVER_KNOBS->TLOG_HARD_LIMIT_BYTES && !logData->stopped) {
+	while (self->bytesInput - self->bytesDurable >= SERVER_KNOBS->TLOG_HARD_LIMIT_BYTES && !logData->stopped()) {
 		if (now() - waitStartT >= 1) {
 			TraceEvent(SevWarn, "TLogUpdateLag", logData->logId)
 			    .detail("Version", logData->version.get())
@@ -2276,7 +2287,7 @@ ACTOR Future<Void> tLogCommit(TLogData* self,
 		wait(delayJittered(.005, TaskPriority::TLogCommit));
 	}
 
-	if (logData->stopped) {
+	if (logData->stopped()) {
 		req.reply.sendError(tlog_stopped());
 		return Void();
 	}
@@ -2325,7 +2336,7 @@ ACTOR Future<Void> tLogCommit(TLogData* self,
 	    timeoutWarning(logData->queueCommittedVersion.whenAtLeast(req.version) || stopped, 0.1, warningCollectorInput));
 
 	if (stopped.isReady()) {
-		ASSERT(logData->stopped);
+		ASSERT(logData->stopped());
 		req.reply.sendError(tlog_stopped());
 		return Void();
 	}
@@ -2401,9 +2412,11 @@ ACTOR Future<UID> getClusterId(TLogData* self) {
 	}
 }
 
+// send stopped promise instead of LogData* to avoid reference cycles
 ACTOR Future<Void> rejoinClusterController(TLogData* self,
                                            TLogInterface tli,
                                            DBRecoveryCount recoveryCount,
+                                           Promise<Void> stoppedPromise,
                                            Future<Void> registerWithCC,
                                            bool isPrimary) {
 	state LifetimeToken lastMasterLifetime;
@@ -2444,6 +2457,13 @@ ACTOR Future<Void> rejoinClusterController(TLogData* self,
 			if (BUGGIFY)
 				wait(delay(SERVER_KNOBS->BUGGIFY_WORKER_REMOVED_MAX_LAG * deterministicRandom()->random01()));
 			throw worker_removed();
+		} else if (inf.recoveryCount > recoveryCount && stoppedPromise.canBeSet()) {
+			TEST(true); // Stopping tlog because new dbinfo has a higher recovery count
+			TraceEvent("StoppingTLog", self->dbgid)
+			    .detail("LogId", tli.id())
+			    .detail("NewRecoveryCount", inf.recoveryCount)
+			    .detail("MyRecoveryCount", recoveryCount);
+			stoppedPromise.send(Void());
 		}
 
 		if (registerWithCC.isReady()) {
@@ -2655,7 +2675,7 @@ ACTOR Future<Void> serveTLogInterface(TLogData* self,
 					                               logData->locality);
 				}
 
-				if (!logData->isPrimary && logData->stopped) {
+				if (!logData->isPrimary && logData->stopped()) {
 					TraceEvent("TLogAlreadyStopped", self->dbgid).detail("LogId", logData->logId);
 					logData->removed = logData->removed && logData->logSystem->get()->endEpoch();
 				}
@@ -2689,8 +2709,8 @@ ACTOR Future<Void> serveTLogInterface(TLogData* self,
 		when(TLogCommitRequest req = waitNext(tli.commit.getFuture())) {
 			//TraceEvent("TLogCommitReq", logData->logId).detail("Ver", req.version).detail("PrevVer", req.prevVersion).detail("LogVer", logData->version.get());
 			ASSERT(logData->isPrimary);
-			TEST(logData->stopped); // TLogCommitRequest while stopped
-			if (!logData->stopped)
+			TEST(logData->stopped()); // TLogCommitRequest while stopped
+			if (!logData->stopped())
 				logData->addActor.send(tLogCommit(self, req, logData, warningCollectorInput));
 			else
 				req.reply.sendError(tlog_stopped());
@@ -2707,7 +2727,7 @@ ACTOR Future<Void> serveTLogInterface(TLogData* self,
 				g_traceBatch.addAttach("TransactionAttachID", req.debugID.get().first(), tlogDebugID.first());
 				g_traceBatch.addEvent("TransactionDebug", tlogDebugID.first(), "TLogServer.TLogConfirmRunningRequest");
 			}
-			if (!logData->stopped)
+			if (!logData->stopped())
 				req.reply.send(Void());
 			else
 				req.reply.sendError(tlog_stopped());
@@ -2743,7 +2763,7 @@ void removeLog(TLogData* self, Reference<LogData> logData) {
 	    .detail("LogId", logData->logId)
 	    .detail("Input", logData->bytesInput.getValue())
 	    .detail("Durable", logData->bytesDurable.getValue());
-	logData->stopped = true;
+	logData->stop();
 	logData->unblockWaitingPeeks();
 	if (!logData->recoveryComplete.isSet()) {
 		logData->recoveryComplete.sendError(end_of_stream());
@@ -2803,7 +2823,7 @@ ACTOR Future<Void> pullAsyncData(TLogData* self,
 		}
 
 		state double waitStartT = 0;
-		while (self->bytesInput - self->bytesDurable >= SERVER_KNOBS->TLOG_HARD_LIMIT_BYTES && !logData->stopped) {
+		while (self->bytesInput - self->bytesDurable >= SERVER_KNOBS->TLOG_HARD_LIMIT_BYTES && !logData->stopped()) {
 			if (now() - waitStartT >= 1) {
 				TraceEvent(SevWarn, "TLogUpdateLag", logData->logId)
 				    .detail("Version", logData->version.get())
@@ -2822,7 +2842,7 @@ ACTOR Future<Void> pullAsyncData(TLogData* self,
 			if (!foundMessage || r->version().version != ver) {
 				ASSERT(r->version().version > lastVer);
 				if (ver) {
-					if (logData->stopped || (endVersion.present() && ver > endVersion.get())) {
+					if (logData->stopped() || (endVersion.present() && ver > endVersion.get())) {
 						return Void();
 					}
 
@@ -2863,7 +2883,7 @@ ACTOR Future<Void> pullAsyncData(TLogData* self,
 				if (!foundMessage) {
 					ver--;
 					if (ver > logData->version.get()) {
-						if (logData->stopped || (endVersion.present() && ver > endVersion.get())) {
+						if (logData->stopped() || (endVersion.present() && ver > endVersion.get())) {
 							return Void();
 						}
 
@@ -3156,7 +3176,7 @@ ACTOR Future<Void> restorePersistentState(TLogData* self,
 		                                 std::vector<Tag>(),
 		                                 "Restored");
 		logData->locality = id_locality[id1];
-		logData->stopped = true;
+		logData->stop();
 		logData->unblockWaitingPeeks();
 		self->id_data[id1] = logData;
 		id_interf[id1] = recruited;
@@ -3168,8 +3188,8 @@ ACTOR Future<Void> restorePersistentState(TLogData* self,
 		logData->version.set(ver);
 		logData->recoveryCount =
 		    BinaryReader::fromStringRef<DBRecoveryCount>(fRecoverCounts.get()[idx].value, Unversioned());
-		logData->removed =
-		    rejoinClusterController(self, recruited, logData->recoveryCount, registerWithCC.getFuture(), false);
+		logData->removed = rejoinClusterController(
+		    self, recruited, logData->recoveryCount, logData->stoppedPromise, registerWithCC.getFuture(), false);
 		removed.push_back(errorOr(logData->removed));
 		logsByVersion.emplace_back(ver, id1);
 
@@ -3362,7 +3382,7 @@ ACTOR Future<Void> updateLogSystem(TLogData* self,
 
 void stopAllTLogs(TLogData* self, UID newLogId) {
 	for (auto it : self->id_data) {
-		if (!it.second->stopped) {
+		if (!it.second->stopped()) {
 			TraceEvent("TLogStoppedByNewRecruitment", self->dbgid)
 			    .detail("LogId", it.second->logId)
 			    .detail("StoppedId", it.first.toString())
@@ -3375,7 +3395,7 @@ void stopAllTLogs(TLogData* self, UID newLogId) {
 				it.second->committingQueue.sendError(worker_removed());
 			}
 		}
-		it.second->stopped = true;
+		it.second->stop();
 		it.second->unblockWaitingPeeks();
 		if (!it.second->recoveryComplete.isSet()) {
 			it.second->recoveryComplete.sendError(end_of_stream());
@@ -3420,7 +3440,8 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 	logData->locality = req.locality;
 	logData->recoveryCount = req.epoch;
 	logData->recoveryTxnVersion = req.recoveryTransactionVersion;
-	logData->removed = rejoinClusterController(self, recruited, req.epoch, Future<Void>(Void()), req.isPrimary);
+	logData->removed = rejoinClusterController(
+	    self, recruited, req.epoch, logData->stoppedPromise, Future<Void>(Void()), req.isPrimary);
 	self->popOrder.push_back(recruited.id());
 	self->spillOrder.push_back(recruited.id());
 
@@ -3467,7 +3488,7 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 			logData->initialized = true;
 			self->newLogData.trigger();
 
-			if ((req.isPrimary || req.recoverFrom.logRouterTags == 0) && !logData->stopped &&
+			if ((req.isPrimary || req.recoverFrom.logRouterTags == 0) && !logData->stopped() &&
 			    logData->unrecoveredBefore <= recoverAt) {
 				if (req.recoverFrom.logRouterTags > 0 && req.locality != tagLocalitySatellite) {
 					logData->logRouterPopToVersion = recoverAt;
@@ -3488,7 +3509,7 @@ ACTOR Future<Void> tLogStart(TLogData* self, InitializeTLogRequest req, Locality
 			state Version lastVersionPrevEpoch = req.recoverAt;
 
 			if ((req.isPrimary || req.recoverFrom.logRouterTags == 0) &&
-			    logData->version.get() < lastVersionPrevEpoch && !logData->stopped) {
+			    logData->version.get() < lastVersionPrevEpoch && !logData->stopped()) {
 				// Log the changes to the persistent queue, to be committed by commitQueue()
 				TLogQueueEntryRef qe;
 				qe.version = lastVersionPrevEpoch;

From 3d94cf07a3119d4050a69d8452e1971ca1d88597 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Wed, 7 Sep 2022 11:57:09 +0300
Subject: [PATCH 651/740] XDB-106: Fixed clang 15 compilation warnings

---
 bindings/c/foundationdb/fdb_c.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bindings/c/foundationdb/fdb_c.h b/bindings/c/foundationdb/fdb_c.h
index cbd90226e7b..1088e786dbc 100644
--- a/bindings/c/foundationdb/fdb_c.h
+++ b/bindings/c/foundationdb/fdb_c.h
@@ -75,12 +75,12 @@ DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_network_set_option(FDBNetworkOption
                                                                 int value_length);
 
 #if FDB_API_VERSION >= 14
-DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_setup_network();
+DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_setup_network(void);
 #endif
 
-DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_run_network();
+DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_run_network(void);
 
-DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_stop_network();
+DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_stop_network(void);
 
 DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_add_network_thread_completion_hook(void (*hook)(void*),
                                                                                 void* hook_parameter);
@@ -476,8 +476,8 @@ DLLEXPORT WARN_UNUSED_RESULT FDBResult* fdb_transaction_read_blob_granules(FDBTr
 
 DLLEXPORT WARN_UNUSED_RESULT fdb_error_t fdb_select_api_version_impl(int runtime_version, int header_version);
 
-DLLEXPORT int fdb_get_max_api_version();
-DLLEXPORT const char* fdb_get_client_version();
+DLLEXPORT int fdb_get_max_api_version(void);
+DLLEXPORT const char* fdb_get_client_version(void);
 
 /* LEGACY API VERSIONS */
 

From ce331d7f3ebe8fc8716e1e3ea373c7fc9ca8ac78 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Wed, 7 Sep 2022 11:58:53 +0300
Subject: [PATCH 652/740] Fixed ctests for builds without openssl
 (TLS_DISABLED)

---
 tests/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3dc6d17595b..7c78b3e4e0d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -142,7 +142,11 @@ if(WITH_PYTHON)
   add_fdb_test(TEST_FILES fast/CycleTest.toml)
   add_fdb_test(TEST_FILES fast/ChangeFeeds.toml)
   add_fdb_test(TEST_FILES fast/DataLossRecovery.toml)
-  add_fdb_test(TEST_FILES fast/EncryptionOps.toml)
+  if(WITH_TLS)
+    add_fdb_test(TEST_FILES fast/EncryptionOps.toml)
+  else()
+    add_fdb_test(TEST_FILES fast/EncryptionOps.toml IGNORE)
+  endif()
   add_fdb_test(TEST_FILES fast/FuzzApiCorrectness.toml)
   add_fdb_test(TEST_FILES fast/FuzzApiCorrectnessClean.toml)
   add_fdb_test(TEST_FILES fast/IncrementalBackup.toml)

From 479f2c84dfe6694906210ef0abf23b08f21a5897 Mon Sep 17 00:00:00 2001
From: 1inker <67271937+1inker@users.noreply.github.com>
Date: Wed, 7 Sep 2022 21:51:33 +0300
Subject: [PATCH 653/740] XDB-104: Strip binaries in RPM/DEB packages (#12)

---
 .github/workflows/build.yml |  2 +-
 cmake/CPackConfig.cmake     | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0cf8b6051a2..0c89976e2eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -93,7 +93,7 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: CC=clang-10 CXX=clang++-10 cmake -D FDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DUSE_LIBCXX=OFF -DSTATIC_LINK_LIBCXX=ON -DENABLE_SIMULATION_TESTS=ON -G Ninja ${{github.workspace}}
+      run: CC=clang-10 CXX=clang++-10 cmake -DFDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DGENERATE_DEBUG_PACKAGES=OFF -DUSE_LIBCXX=OFF -DSTATIC_LINK_LIBCXX=ON -DENABLE_SIMULATION_TESTS=ON -G Ninja ${{github.workspace}}
 
     - name: Build
       working-directory: ${{github.workspace}}/bld
diff --git a/cmake/CPackConfig.cmake b/cmake/CPackConfig.cmake
index f5d836ae908..13dee34e772 100644
--- a/cmake/CPackConfig.cmake
+++ b/cmake/CPackConfig.cmake
@@ -2,18 +2,15 @@
 if(CPACK_GENERATOR MATCHES "RPM")
   set(CPACK_PACKAGING_INSTALL_PREFIX "/")
   set(CPACK_COMPONENTS_ALL clients-el8 server-el8 clients-versioned server-versioned)
-  set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.md)
-  set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
 elseif(CPACK_GENERATOR MATCHES "DEB")
   set(CPACK_PACKAGING_INSTALL_PREFIX "/")
   set(CPACK_COMPONENTS_ALL clients-deb server-deb clients-versioned server-versioned)
-  set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.md)
-  set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
 elseif(CPACK_GENERATOR MATCHES "TGZ")
-  set(CPACK_STRIP_FILES TRUE)
   set(CPACK_COMPONENTS_ALL clients-tgz server-tgz)
-  set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.md)
-  set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
 else()
   message(FATAL_ERROR "Unsupported package format ${CPACK_GENERATOR}")
 endif()
+
+set(CPACK_STRIP_FILES TRUE)
+set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.md)
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)

From 4195aa69d6d1097f9709c1ecc3693689317e7d0e Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <82616783+sbodagala@users.noreply.github.com>
Date: Thu, 8 Sep 2022 14:20:17 -0400
Subject: [PATCH 654/740] - Consider logging a trace event in
 "DatabaseContext::getLatestCommitVersions" (#8084)

only if the version vector doesn't have an entry for a tag.
---
 fdbclient/NativeAPI.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 7f881fc0fa5..d4c8a7047a0 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -267,8 +267,8 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 				}
 			}
 		}
-		// do not log if commitVersion == readVersion as it is common.
-		if (!updatedVersionMap && commitVersion != readVersion) {
+		// Do not log if commitVersion >= readVersion.
+		if (!updatedVersionMap && commitVersion == invalidVersion) {
 			TraceEvent(SevDebug, "CommitVersionNotFoundForSS")
 			    .detail("InSSIDMap", iter != ssidTagMapping.end() ? 1 : 0)
 			    .detail("Tag", tag)

From 70a8f37e3c3b1a118d4b062af6dfdbe7f2066123 Mon Sep 17 00:00:00 2001
From: Meng Xu <meng_xu@apple.com>
Date: Wed, 24 Aug 2022 09:43:27 -0700
Subject: [PATCH 655/740] Add STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT knob to
 reboot SS on io_timeout

---
 fdbclient/ServerKnobs.cpp  | 1 +
 fdbclient/ServerKnobs.h    | 6 ++++++
 fdbserver/worker.actor.cpp | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index d7b2af6f193..6cb89cd27ba 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -748,6 +748,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( PEER_TIMEOUT_PERCENTAGE_DEGRADATION_THRESHOLD,         0.1 );
 	init( PEER_DEGRADATION_CONNECTION_FAILURE_COUNT,               1 );
 	init( WORKER_HEALTH_REPORT_RECENT_DESTROYED_PEER,           true );
+	init( STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT,                 false ); if ( randomize && BUGGIFY ) STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT = true;
 
 	// Test harness
 	init( WORKER_POLL_DELAY,                                     1.0 );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index a3319ae7f90..1c28ad353fc 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -698,6 +698,12 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	bool WORKER_HEALTH_REPORT_RECENT_DESTROYED_PEER; // When enabled, the worker's health monitor also report any recent
 	                                                 // destroyed peers who are part of the transaction system to
 	                                                 // cluster controller.
+	bool STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT; // When enabled, storage server's worker will crash on io_timeout error;
+                                              // this allows fdbmonitor to restart the worker and recreate the same SS.
+                                              // When SS can be temporarily throttled by infrastructure, e.g, k8s,
+                                              // Enabling this can reduce toil of manually restarting the SS.
+                                              // Enable with caution: If io_timeout is caused by disk failure, we won't
+                                              // want to restart the SS, which increases risk of data corruption.
 
 	// Test harness
 	double WORKER_POLL_DELAY;
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 301a9ed622b..54a1372cc04 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -263,7 +263,9 @@ ACTOR Future<Void> workerHandleErrors(FutureStream<ErrorInfo> errors) {
 			if (err.error.code() == error_code_please_reboot ||
 			    err.error.code() == error_code_please_reboot_remote_kv_store ||
 			    (err.role == Role::SHARED_TRANSACTION_LOG &&
-			     (err.error.code() == error_code_io_error || err.error.code() == error_code_io_timeout)))
+			     (err.error.code() == error_code_io_error || err.error.code() == error_code_io_timeout)) ||
+			    (SERVER_KNOBS->STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT && err.role == Role::STORAGE_SERVER &&
+			     err.error.code() == error_code_io_timeout))
 				throw err.error;
 		}
 	}

From 858d1eb9fd788febf0262a6177264200e74d2325 Mon Sep 17 00:00:00 2001
From: Meng Xu <meng_xu@apple.com>
Date: Thu, 8 Sep 2022 14:54:49 -0700
Subject: [PATCH 656/740] Add 7.1 release note

---
 .../sphinx/source/release-notes/release-notes-710.rst         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 570a833cfe8..b54d4323b41 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,10 @@
 Release Notes
 #############
 
+7.1.22
+======
+* Introduce STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT knob to recreate SS at io_timeout errors. `(PR #8122) <https://github.com/apple/foundationdb/pull/8122>`_
+
 7.1.21
 ======
 * Same as 7.1.20 release with AVX enabled.

From 97619902e2e3b64a851dd41366069534e9e6173d Mon Sep 17 00:00:00 2001
From: Meng Xu <meng_xu@apple.com>
Date: Tue, 13 Sep 2022 16:55:00 -0700
Subject: [PATCH 657/740] Format based on repo format style

---
 fdbclient/ServerKnobs.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 1c28ad353fc..f322267863c 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -699,11 +699,11 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	                                                 // destroyed peers who are part of the transaction system to
 	                                                 // cluster controller.
 	bool STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT; // When enabled, storage server's worker will crash on io_timeout error;
-                                              // this allows fdbmonitor to restart the worker and recreate the same SS.
-                                              // When SS can be temporarily throttled by infrastructure, e.g, k8s,
-                                              // Enabling this can reduce toil of manually restarting the SS.
-                                              // Enable with caution: If io_timeout is caused by disk failure, we won't
-                                              // want to restart the SS, which increases risk of data corruption.
+	                                          // this allows fdbmonitor to restart the worker and recreate the same SS.
+	                                          // When SS can be temporarily throttled by infrastructure, e.g, k8s,
+	                                          // Enabling this can reduce toil of manually restarting the SS.
+	                                          // Enable with caution: If io_timeout is caused by disk failure, we won't
+	                                          // want to restart the SS, which increases risk of data corruption.
 
 	// Test harness
 	double WORKER_POLL_DELAY;

From 093a5ed112357ab89f83293044f060f6bb384c75 Mon Sep 17 00:00:00 2001
From: hao fu <hfu5@apple.com>
Date: Thu, 15 Sep 2022 15:00:16 -0400
Subject: [PATCH 658/740] Fix memory bug in index prefetch code path

Same address is being reused for multiple queries incorrectly.
---
 fdbserver/storageserver.actor.cpp | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 5bcf54bb0df..1018ec37f50 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -3598,14 +3598,12 @@ void preprocessMappedKey(Tuple& mappedKeyFormatTuple, std::vector<Optional<Tuple
 	}
 }
 
-Key constructMappedKey(KeyValueRef* keyValue,
-                       std::vector<Optional<Tuple>>& vec,
-                       Tuple& mappedKeyTuple,
-                       Tuple& mappedKeyFormatTuple) {
+Key constructMappedKey(KeyValueRef* keyValue, std::vector<Optional<Tuple>>& vec, Tuple& mappedKeyFormatTuple) {
 	// Lazily parse key and/or value to tuple because they may not need to be a tuple if not used.
 	Optional<Tuple> keyTuple;
 	Optional<Tuple> valueTuple;
-	mappedKeyTuple.clear();
+	Tuple mappedKeyTuple;
+
 	mappedKeyTuple.reserve(vec.size());
 
 	for (int i = 0; i < vec.size(); i++) {
@@ -3656,12 +3654,11 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		                                 .append("{V[0]}"_sr)
 		                                 .append("{...}"_sr);
 
-		Tuple mappedKeyTuple;
 		std::vector<Optional<Tuple>> vt;
 		bool isRangeQuery = false;
 		preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyFormatTuple);
 
 		Key expectedMappedKey = Tuple()
 		                            .append("normal"_sr)
@@ -3677,11 +3674,10 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 	{
 		Tuple mappedKeyFormatTuple = Tuple().append("{{{{}}"_sr).append("}}"_sr);
 
-		Tuple mappedKeyTuple;
 		std::vector<Optional<Tuple>> vt;
 		bool isRangeQuery = false;
 		preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
-		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyFormatTuple);
 
 		Key expectedMappedKey = Tuple().append("{{}"_sr).append("}"_sr).getDataAsStandalone();
 		//		std::cout << printable(mappedKey) << " == " << printable(expectedMappedKey) << std::endl;
@@ -3691,11 +3687,10 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 	{
 		Tuple mappedKeyFormatTuple = Tuple().append("{{{{}}"_sr).append("}}"_sr);
 
-		Tuple mappedKeyTuple;
 		std::vector<Optional<Tuple>> vt;
 		bool isRangeQuery = false;
 		preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
-		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
+		Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyFormatTuple);
 
 		Key expectedMappedKey = Tuple().append("{{}"_sr).append("}"_sr).getDataAsStandalone();
 		//		std::cout << printable(mappedKey) << " == " << printable(expectedMappedKey) << std::endl;
@@ -3706,12 +3701,11 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		Tuple mappedKeyFormatTuple = Tuple().append("{K[100]}"_sr);
 		state bool throwException = false;
 		try {
-			Tuple mappedKeyTuple;
 			std::vector<Optional<Tuple>> vt;
 			bool isRangeQuery = false;
 			preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyFormatTuple);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_index);
 			throwException = true;
@@ -3722,12 +3716,11 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		Tuple mappedKeyFormatTuple = Tuple().append("{...}"_sr).append("last-element"_sr);
 		state bool throwException2 = false;
 		try {
-			Tuple mappedKeyTuple;
 			std::vector<Optional<Tuple>> vt;
 			bool isRangeQuery = false;
 			preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyFormatTuple);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_range_decriptor);
 			throwException2 = true;
@@ -3738,12 +3731,11 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
 		Tuple mappedKeyFormatTuple = Tuple().append("{K[not-a-number]}"_sr);
 		state bool throwException3 = false;
 		try {
-			Tuple mappedKeyTuple;
 			std::vector<Optional<Tuple>> vt;
 			bool isRangeQuery = false;
 			preprocessMappedKey(mappedKeyFormatTuple, vt, isRangeQuery);
 
-			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyTuple, mappedKeyFormatTuple);
+			Key mappedKey = constructMappedKey(&kvr, vt, mappedKeyFormatTuple);
 		} catch (Error& e) {
 			ASSERT(e.code() == error_code_mapper_bad_index);
 			throwException3 = true;
@@ -3790,7 +3782,6 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 		g_traceBatch.addEvent(
 		    "TransactionDebug", pOriginalReq->debugID.get().first(), "storageserver.mapKeyValues.Start");
 	state Tuple mappedKeyFormatTuple;
-	state Tuple mappedKeyTuple;
 
 	try {
 		mappedKeyFormatTuple = Tuple::unpack(mapper);
@@ -3818,7 +3809,7 @@ ACTOR Future<GetMappedKeyValuesReply> mapKeyValues(StorageServer* data,
 			kvm->key = it->key;
 			kvm->value = it->value;
 
-			Key mappedKey = constructMappedKey(it, vt, mappedKeyTuple, mappedKeyFormatTuple);
+			Key mappedKey = constructMappedKey(it, vt, mappedKeyFormatTuple);
 			// Make sure the mappedKey is always available, so that it's good even we want to get key asynchronously.
 			result.arena.dependsOn(mappedKey.arena());
 

From 60ab63eb588a51bba023f73b2fe0a12fb6a091af Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 15 Sep 2022 12:49:11 -0700
Subject: [PATCH 659/740] Make a new memory arena for Tuple::clear

To avoid potential problem of invalidating contents of previously returned from
pack() calls.
---
 fdbclient/Tuple.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fdbclient/Tuple.h b/fdbclient/Tuple.h
index 4c52c1ebc64..53f4141e4d9 100644
--- a/fdbclient/Tuple.h
+++ b/fdbclient/Tuple.h
@@ -63,7 +63,9 @@ struct Tuple {
 	size_t size() const { return offsets.size(); }
 	void reserve(size_t cap) { offsets.reserve(cap); }
 	void clear() {
-		data.clear();
+		// Make a new Standalone to use different memory so that
+		// previously returned objects from pack() are valid.
+		data = Standalone<VectorRef<uint8_t>>();
 		offsets.clear();
 	}
 	// Return a Tuple encoded raw string.

From 1068a149c68a5393c37da1166798da065501fdb3 Mon Sep 17 00:00:00 2001
From: Renxuan Wang <renxuan@apple.com>
Date: Fri, 16 Sep 2022 05:59:41 -0700
Subject: [PATCH 660/740] Complete the proxy support for backup to S3
 (release-7.1). (#8193)

* HTTP proxy for backup.

Only support non-TLS blobs now.

* Commit suggestion.

Co-authored-by: Jingyu Zhou <jingyuzhou@gmail.com>

* Move HTTP from fdbclient/ to fdbrpc/.

* Get network interfaces ready for https proxy.

* Complete the proxy support for backup to S3.

* Address comments.

* Fix the workflow of not using proxy.

Co-authored-by: Jingyu Zhou <jingyuzhou@gmail.com>
---
 fdbbackup/backup.actor.cpp             |   5 +
 fdbclient/AsyncFileS3BlobStore.actor.h |   4 +-
 fdbclient/CMakeLists.txt               |   4 -
 fdbclient/ClientKnobs.cpp              |   4 -
 fdbclient/ClientKnobs.h                |   4 -
 fdbclient/S3BlobStore.actor.cpp        |  48 ++++++--
 fdbclient/S3BlobStore.h                |   2 +-
 fdbrpc/CMakeLists.txt                  |   6 +-
 {fdbclient => fdbrpc}/HTTP.actor.cpp   | 159 +++++++++++++++++++++++--
 {fdbclient => fdbrpc}/HTTP.h           |   8 +-
 fdbrpc/SimExternalConnection.h         |   1 +
 {fdbclient => fdbrpc}/libb64/cdecode.c |   0
 {fdbclient => fdbrpc}/libb64/cdecode.h |   0
 {fdbclient => fdbrpc}/libb64/cencode.c |   0
 {fdbclient => fdbrpc}/libb64/cencode.h |   0
 {fdbclient => fdbrpc}/libb64/decode.h  |   0
 {fdbclient => fdbrpc}/libb64/encode.h  |   0
 {fdbclient => fdbrpc}/md5/md5.c        |   0
 {fdbclient => fdbrpc}/md5/md5.h        |   0
 fdbrpc/sim2.actor.cpp                  |   9 +-
 flow/Knobs.cpp                         |   8 ++
 flow/Knobs.h                           |   8 ++
 flow/Net2.actor.cpp                    |  33 +++--
 flow/network.cpp                       |   2 +-
 flow/network.h                         |   7 +-
 25 files changed, 257 insertions(+), 55 deletions(-)
 rename {fdbclient => fdbrpc}/HTTP.actor.cpp (74%)
 rename {fdbclient => fdbrpc}/HTTP.h (87%)
 rename {fdbclient => fdbrpc}/libb64/cdecode.c (100%)
 rename {fdbclient => fdbrpc}/libb64/cdecode.h (100%)
 rename {fdbclient => fdbrpc}/libb64/cencode.c (100%)
 rename {fdbclient => fdbrpc}/libb64/cencode.h (100%)
 rename {fdbclient => fdbrpc}/libb64/decode.h (100%)
 rename {fdbclient => fdbrpc}/libb64/encode.h (100%)
 rename {fdbclient => fdbrpc}/md5/md5.c (100%)
 rename {fdbclient => fdbrpc}/md5/md5.h (100%)

diff --git a/fdbbackup/backup.actor.cpp b/fdbbackup/backup.actor.cpp
index 40ca160f3e6..81db05f01d6 100644
--- a/fdbbackup/backup.actor.cpp
+++ b/fdbbackup/backup.actor.cpp
@@ -646,6 +646,7 @@ CSimpleOpt::SOption g_rgBackupListOptions[] = {
 #endif
 	{ OPT_BASEURL, "-b", SO_REQ_SEP },
 	{ OPT_BASEURL, "--base-url", SO_REQ_SEP },
+	{ OPT_PROXY, "--proxy", SO_REQ_SEP },
 	{ OPT_TRACE, "--log", SO_NONE },
 	{ OPT_TRACE_DIR, "--logdir", SO_REQ_SEP },
 	{ OPT_TRACE_FORMAT, "--trace-format", SO_REQ_SEP },
@@ -3390,6 +3391,10 @@ int main(int argc, char* argv[]) {
 		}
 
 		Optional<std::string> proxy;
+		std::string p;
+		if (platform::getEnvironmentVar("HTTP_PROXY", p) || platform::getEnvironmentVar("HTTPS_PROXY", p)) {
+			proxy = p;
+		}
 		std::string destinationContainer;
 		bool describeDeep = false;
 		bool describeTimestamps = false;
diff --git a/fdbclient/AsyncFileS3BlobStore.actor.h b/fdbclient/AsyncFileS3BlobStore.actor.h
index 5c11d74f184..1eaaefa6870 100644
--- a/fdbclient/AsyncFileS3BlobStore.actor.h
+++ b/fdbclient/AsyncFileS3BlobStore.actor.h
@@ -36,8 +36,8 @@
 #include "flow/Net2Packet.h"
 #include "fdbrpc/IRateControl.h"
 #include "fdbclient/S3BlobStore.h"
-#include "fdbclient/md5/md5.h"
-#include "fdbclient/libb64/encode.h"
+#include "fdbrpc/md5/md5.h"
+#include "fdbrpc/libb64/encode.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 ACTOR template <typename T>
diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index f4d390879de..c3b626b672e 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -65,7 +65,6 @@ set(FDBCLIENT_SRCS
   GlobalConfig.actor.cpp
   GrvProxyInterface.h
   HighContentionPrefixAllocator.actor.h
-  HTTP.actor.cpp
   IClientApi.h
   IConfigTransaction.cpp
   IConfigTransaction.h
@@ -160,9 +159,6 @@ set(FDBCLIENT_SRCS
   json_spirit/json_spirit_value.h
   json_spirit/json_spirit_writer_options.h
   json_spirit/json_spirit_writer_template.h
-  libb64/cdecode.c
-  libb64/cencode.c
-  md5/md5.c
   sha1/SHA1.cpp
   zipf.c
   zipf.h)
diff --git a/fdbclient/ClientKnobs.cpp b/fdbclient/ClientKnobs.cpp
index 8e1c1a277cd..16c8191cee4 100644
--- a/fdbclient/ClientKnobs.cpp
+++ b/fdbclient/ClientKnobs.cpp
@@ -206,10 +206,6 @@ void ClientKnobs::initialize(Randomize randomize) {
 
 	init( IS_ACCEPTABLE_DELAY,                     1.5 );
 
-	init( HTTP_READ_SIZE,                     128*1024 );
-	init( HTTP_SEND_SIZE,                      32*1024 );
-	init( HTTP_VERBOSE_LEVEL,                        0 );
-	init( HTTP_REQUEST_ID_HEADER,                   "" );
 	init( HTTP_REQUEST_AWS_V4_HEADER,             true );
 	init( BLOBSTORE_ENCRYPTION_TYPE,                "" );
 	init( BLOBSTORE_CONNECT_TRIES,                  10 );
diff --git a/fdbclient/ClientKnobs.h b/fdbclient/ClientKnobs.h
index 5978c43b1fe..9fac83c7b87 100644
--- a/fdbclient/ClientKnobs.h
+++ b/fdbclient/ClientKnobs.h
@@ -217,10 +217,6 @@ class ClientKnobs : public KnobsImpl<ClientKnobs> {
 	int64_t CSI_SIZE_LIMIT;
 	double CSI_STATUS_DELAY;
 
-	int HTTP_SEND_SIZE;
-	int HTTP_READ_SIZE;
-	int HTTP_VERBOSE_LEVEL;
-	std::string HTTP_REQUEST_ID_HEADER;
 	bool HTTP_REQUEST_AWS_V4_HEADER; // setting this knob to true will enable AWS V4 style header.
 	std::string BLOBSTORE_ENCRYPTION_TYPE;
 	int BLOBSTORE_CONNECT_TRIES;
diff --git a/fdbclient/S3BlobStore.actor.cpp b/fdbclient/S3BlobStore.actor.cpp
index 25e4a26ff57..80e3611690e 100644
--- a/fdbclient/S3BlobStore.actor.cpp
+++ b/fdbclient/S3BlobStore.actor.cpp
@@ -20,8 +20,8 @@
 
 #include "fdbclient/S3BlobStore.h"
 
-#include "fdbclient/md5/md5.h"
-#include "fdbclient/libb64/encode.h"
+#include "fdbrpc/md5/md5.h"
+#include "fdbrpc/libb64/encode.h"
 #include "fdbclient/sha1/SHA1.h"
 #include <time.h>
 #include <iomanip>
@@ -179,11 +179,20 @@ Reference<S3BlobStoreEndpoint> S3BlobStoreEndpoint::fromString(const std::string
 
 		Optional<std::string> proxyHost, proxyPort;
 		if (proxy.present()) {
-			if (!Hostname::isHostname(proxy.get()) && !NetworkAddress::parseOptional(proxy.get()).present()) {
+			StringRef proxyRef(proxy.get());
+			if (proxy.get().find("://") != std::string::npos) {
+				StringRef proxyPrefix = proxyRef.eat("://");
+				if (proxyPrefix != "http"_sr) {
+					throw format("Invalid proxy URL prefix '%s'. Either don't use a prefix, or use http://",
+					             proxyPrefix.toString().c_str());
+				}
+			}
+			std::string proxyBody = proxyRef.eat().toString();
+			if (!Hostname::isHostname(proxyBody) && !NetworkAddress::parseOptional(proxyBody).present()) {
 				throw format("'%s' is not a valid value for proxy. Format should be either IP:port or host:port.",
-				             proxy.get().c_str());
+				             proxyBody.c_str());
 			}
-			StringRef p(proxy.get());
+			StringRef p(proxyBody);
 			proxyHost = p.eat(":").toString();
 			proxyPort = p.eat().toString();
 		}
@@ -639,10 +648,29 @@ ACTOR Future<S3BlobStoreEndpoint::ReusableConnection> connect_impl(Reference<S3B
 		}
 	}
 	std::string host = b->host, service = b->service;
-	if (service.empty())
+	if (service.empty()) {
+		if (b->useProxy) {
+			fprintf(stderr, "ERROR: Port can't be empty when using HTTP proxy.\n");
+			throw connection_failed();
+		}
 		service = b->knobs.secure_connection ? "https" : "http";
-	state Reference<IConnection> conn =
-	    wait(INetworkConnections::net()->connect(host, service, b->knobs.secure_connection ? true : false));
+	}
+	bool isTLS = b->knobs.secure_connection == 1;
+	state Reference<IConnection> conn;
+	if (b->useProxy) {
+		if (isTLS) {
+			Reference<IConnection> _conn =
+			    wait(HTTP::proxyConnect(host, service, b->proxyHost.get(), b->proxyPort.get()));
+			conn = _conn;
+		} else {
+			host = b->proxyHost.get();
+			service = b->proxyPort.get();
+			Reference<IConnection> _conn = wait(INetworkConnections::net()->connect(host, service, false));
+			conn = _conn;
+		}
+	} else {
+		wait(store(conn, INetworkConnections::net()->connect(host, service, isTLS)));
+	}
 	wait(conn->connectHandshake());
 
 	TraceEvent("S3BlobStoreEndpointNewConnection")
@@ -746,6 +774,10 @@ ACTOR Future<Reference<HTTP::Response>> doRequest_impl(Reference<S3BlobStoreEndp
 				bstore->setAuthHeaders(verb, resource, headers);
 			}
 
+			if (bstore->useProxy && bstore->knobs.secure_connection == 0) {
+				// Has to be in absolute-form.
+				resource = "http://" + bstore->host + ":" + bstore->service + resource;
+			}
 			remoteAddress = rconn.conn->getPeerAddress();
 			wait(bstore->requestRate->getAllowance(1));
 			Reference<HTTP::Response> _r = wait(timeoutError(HTTP::doRequest(rconn.conn,
diff --git a/fdbclient/S3BlobStore.h b/fdbclient/S3BlobStore.h
index bd29675bae9..a61a5958d85 100644
--- a/fdbclient/S3BlobStore.h
+++ b/fdbclient/S3BlobStore.h
@@ -26,7 +26,7 @@
 #include "flow/Net2Packet.h"
 #include "fdbclient/Knobs.h"
 #include "fdbrpc/IRateControl.h"
-#include "fdbclient/HTTP.h"
+#include "fdbrpc/HTTP.h"
 #include "fdbclient/JSONDoc.h"
 
 // Representation of all the things you need to connect to a blob store instance with some credentials.
diff --git a/fdbrpc/CMakeLists.txt b/fdbrpc/CMakeLists.txt
index 59ae21bc9e7..2da35b99086 100644
--- a/fdbrpc/CMakeLists.txt
+++ b/fdbrpc/CMakeLists.txt
@@ -15,6 +15,7 @@ set(FDBRPC_SRCS
   genericactors.actor.h
   genericactors.actor.cpp
   HealthMonitor.actor.cpp
+  HTTP.actor.cpp
   IAsyncFile.actor.cpp
   LoadBalance.actor.cpp
   LoadBalance.actor.h
@@ -35,7 +36,10 @@ set(FDBRPC_SRCS
   sim_validation.cpp
   TimedRequest.h
   TraceFileIO.cpp
-  TSSComparison.h)
+  TSSComparison.h
+  libb64/cdecode.c
+  libb64/cencode.c
+  md5/md5.c)
 
 if(WITH_TLS)
   set(FDBRPC_SRCS
diff --git a/fdbclient/HTTP.actor.cpp b/fdbrpc/HTTP.actor.cpp
similarity index 74%
rename from fdbclient/HTTP.actor.cpp
rename to fdbrpc/HTTP.actor.cpp
index 70964e7dbc5..b48d36904c4 100644
--- a/fdbclient/HTTP.actor.cpp
+++ b/fdbrpc/HTTP.actor.cpp
@@ -18,9 +18,11 @@
  * limitations under the License.
  */
 
-#include "fdbclient/HTTP.h"
-#include "fdbclient/md5/md5.h"
-#include "fdbclient/libb64/encode.h"
+#include "fdbrpc/HTTP.h"
+
+#include "fdbrpc/md5/md5.h"
+#include "fdbrpc/libb64/encode.h"
+#include "flow/Knobs.h"
 #include <cctype>
 #include "flow/actorcompiler.h" // has to be last include
 
@@ -149,7 +151,7 @@ ACTOR Future<size_t> read_delimited_into_string(Reference<IConnection> conn,
 		// Next search will start at the current end of the buffer - delim size + 1
 		if (sPos >= lookBack)
 			sPos -= lookBack;
-		wait(success(read_into_string(conn, buf, CLIENT_KNOBS->HTTP_READ_SIZE)));
+		wait(success(read_into_string(conn, buf, FLOW_KNOBS->HTTP_READ_SIZE)));
 	}
 }
 
@@ -157,7 +159,7 @@ ACTOR Future<size_t> read_delimited_into_string(Reference<IConnection> conn,
 ACTOR Future<Void> read_fixed_into_string(Reference<IConnection> conn, int len, std::string* buf, size_t pos) {
 	state int stop_size = pos + len;
 	while (buf->size() < stop_size)
-		wait(success(read_into_string(conn, buf, CLIENT_KNOBS->HTTP_READ_SIZE)));
+		wait(success(read_into_string(conn, buf, FLOW_KNOBS->HTTP_READ_SIZE)));
 	return Void();
 }
 
@@ -348,7 +350,7 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
 	// There is no standard http request id header field, so either a global default can be set via a knob
 	// or it can be set per-request with the requestIDHeader argument (which overrides the default)
 	if (requestIDHeader.empty()) {
-		requestIDHeader = CLIENT_KNOBS->HTTP_REQUEST_ID_HEADER;
+		requestIDHeader = FLOW_KNOBS->HTTP_REQUEST_ID_HEADER;
 	}
 
 	state bool earlyResponse = false;
@@ -380,19 +382,19 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
 		// Prepend headers to content packer buffer chain
 		pContent->prependWriteBuffer(pFirst, pLast);
 
-		if (CLIENT_KNOBS->HTTP_VERBOSE_LEVEL > 1)
+		if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 1)
 			printf("[%s] HTTP starting %s %s ContentLen:%d\n",
 			       conn->getDebugID().toString().c_str(),
 			       verb.c_str(),
 			       resource.c_str(),
 			       contentLen);
-		if (CLIENT_KNOBS->HTTP_VERBOSE_LEVEL > 2) {
+		if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 2) {
 			for (auto h : headers)
 				printf("Request Header: %s: %s\n", h.first.c_str(), h.second.c_str());
 		}
 
 		state Reference<HTTP::Response> r(new HTTP::Response());
-		state Future<Void> responseReading = r->read(conn, verb == "HEAD" || verb == "DELETE");
+		state Future<Void> responseReading = r->read(conn, verb == "HEAD" || verb == "DELETE" || verb == "CONNECT");
 
 		send_start = timer();
 
@@ -407,7 +409,7 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
 				break;
 			}
 
-			state int trySend = CLIENT_KNOBS->HTTP_SEND_SIZE;
+			state int trySend = FLOW_KNOBS->HTTP_SEND_SIZE;
 			wait(sendRate->getAllowance(trySend));
 			int len = conn->write(pContent->getUnsent(), trySend);
 			if (pSent != nullptr)
@@ -461,7 +463,7 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
 			}
 		}
 
-		if (CLIENT_KNOBS->HTTP_VERBOSE_LEVEL > 0) {
+		if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 0) {
 			printf("[%s] HTTP %scode=%d early=%d, time=%fs %s %s contentLen=%d [%d out, response content len %d]\n",
 			       conn->getDebugID().toString().c_str(),
 			       (err.present() ? format("*ERROR*=%s ", err.get().name()).c_str() : ""),
@@ -474,7 +476,7 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
 			       total_sent,
 			       (int)r->contentLen);
 		}
-		if (CLIENT_KNOBS->HTTP_VERBOSE_LEVEL > 2) {
+		if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 2) {
 			printf("[%s] HTTP RESPONSE:  %s %s\n%s\n",
 			       conn->getDebugID().toString().c_str(),
 			       verb.c_str(),
@@ -490,7 +492,7 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
 	} catch (Error& e) {
 		double elapsed = timer() - send_start;
 		// A bad_request_id error would have already been logged in verbose mode before err is thrown above.
-		if (CLIENT_KNOBS->HTTP_VERBOSE_LEVEL > 0 && e.code() != error_code_http_bad_request_id) {
+		if (FLOW_KNOBS->HTTP_VERBOSE_LEVEL > 0 && e.code() != error_code_http_bad_request_id) {
 			printf("[%s] HTTP *ERROR*=%s early=%d, time=%fs %s %s contentLen=%d [%d out]\n",
 			       conn->getDebugID().toString().c_str(),
 			       e.name(),
@@ -506,4 +508,135 @@ ACTOR Future<Reference<HTTP::Response>> doRequest(Reference<IConnection> conn,
 	}
 }
 
+ACTOR Future<Void> sendProxyConnectRequest(Reference<IConnection> conn,
+                                           std::string remoteHost,
+                                           std::string remoteService) {
+	state Headers headers;
+	headers["Host"] = remoteHost + ":" + remoteService;
+	headers["Accept"] = "application/xml";
+	headers["Proxy-Connection"] = "Keep-Alive";
+	state int requestTimeout = 60;
+	state int maxTries = FLOW_KNOBS->HTTP_CONNECT_TRIES;
+	state int thisTry = 1;
+	state double nextRetryDelay = 2.0;
+	state Reference<IRateControl> sendReceiveRate = makeReference<Unlimited>();
+	state int64_t bytes_sent = 0;
+
+	loop {
+		state Optional<Error> err;
+		state Reference<Response> r;
+
+		try {
+			Reference<Response> _r = wait(timeoutError(doRequest(conn,
+			                                                     "CONNECT",
+			                                                     remoteHost + ":" + remoteService,
+			                                                     headers,
+			                                                     nullptr,
+			                                                     0,
+			                                                     sendReceiveRate,
+			                                                     &bytes_sent,
+			                                                     sendReceiveRate),
+			                                           requestTimeout));
+			r = _r;
+		} catch (Error& e) {
+			if (e.code() == error_code_actor_cancelled)
+				throw;
+			err = e;
+		}
+
+		// If err is not present then r is valid.
+		// If r->code is in successCodes then record the successful request and return r.
+		if (!err.present() && r->code == 200) {
+			return Void();
+		}
+
+		// All errors in err are potentially retryable as well as certain HTTP response codes...
+		bool retryable = err.present() || r->code == 500 || r->code == 502 || r->code == 503 || r->code == 429;
+
+		// But only if our previous attempt was not the last allowable try.
+		retryable = retryable && (thisTry < maxTries);
+
+		TraceEvent event(SevWarn, retryable ? "ProxyConnectCommandFailedRetryable" : "ProxyConnectCommandFailed");
+
+		// Attach err to trace event if present, otherwise extract some stuff from the response
+		if (err.present()) {
+			event.errorUnsuppressed(err.get());
+		}
+		event.suppressFor(60);
+		if (!err.present()) {
+			event.detail("ResponseCode", r->code);
+		}
+
+		event.detail("ThisTry", thisTry);
+
+		// If r is not valid or not code 429 then increment the try count.  429's will not count against the attempt
+		// limit.
+		if (!r || r->code != 429)
+			++thisTry;
+
+		// We will wait delay seconds before the next retry, start with nextRetryDelay.
+		double delay = nextRetryDelay;
+		// Double but limit the *next* nextRetryDelay.
+		nextRetryDelay = std::min(nextRetryDelay * 2, 60.0);
+
+		if (retryable) {
+			// If r is valid then obey the Retry-After response header if present.
+			if (r) {
+				auto iRetryAfter = r->headers.find("Retry-After");
+				if (iRetryAfter != r->headers.end()) {
+					event.detail("RetryAfterHeader", iRetryAfter->second);
+					char* pEnd;
+					double retryAfter = strtod(iRetryAfter->second.c_str(), &pEnd);
+					if (*pEnd) // If there were other characters then don't trust the parsed value, use a probably safe
+					           // value of 5 minutes.
+						retryAfter = 300;
+					// Update delay
+					delay = std::max(delay, retryAfter);
+				}
+			}
+
+			// Log the delay then wait.
+			event.detail("RetryDelay", delay);
+			wait(::delay(delay));
+		} else {
+			// We can't retry, so throw something.
+
+			// This error code means the authentication header was not accepted, likely the account or key is wrong.
+			if (r && r->code == 406)
+				throw http_not_accepted();
+
+			if (r && r->code == 401)
+				throw http_auth_failed();
+
+			throw connection_failed();
+		}
+	}
+}
+
+ACTOR Future<Reference<IConnection>> proxyConnectImpl(std::string remoteHost,
+                                                      std::string remoteService,
+                                                      std::string proxyHost,
+                                                      std::string proxyService) {
+	state NetworkAddress remoteEndpoint =
+	    wait(map(INetworkConnections::net()->resolveTCPEndpoint(remoteHost, remoteService),
+	             [=](std::vector<NetworkAddress> const& addresses) -> NetworkAddress {
+		             NetworkAddress addr = addresses[deterministicRandom()->randomInt(0, addresses.size())];
+		             addr.fromHostname = true;
+		             addr.flags = NetworkAddress::FLAG_TLS;
+		             return addr;
+	             }));
+	state Reference<IConnection> connection = wait(INetworkConnections::net()->connect(proxyHost, proxyService));
+	wait(sendProxyConnectRequest(connection, remoteHost, remoteService));
+	boost::asio::ip::tcp::socket socket = std::move(connection->getSocket());
+	Reference<IConnection> remoteConnection = wait(INetworkConnections::net()->connect(remoteEndpoint, &socket));
+	return remoteConnection;
+}
+
+Future<Reference<IConnection>> proxyConnect(const std::string& remoteHost,
+                                            const std::string& remoteService,
+                                            const std::string& proxyHost,
+                                            const std::string& proxyService) {
+	return proxyConnectImpl(remoteHost, remoteService, proxyHost, proxyService);
+}
+
 } // namespace HTTP
diff --git a/fdbclient/HTTP.h b/fdbrpc/HTTP.h
similarity index 87%
rename from fdbclient/HTTP.h
rename to fdbrpc/HTTP.h
index d012c30ce8c..cf1a06339c0 100644
--- a/fdbclient/HTTP.h
+++ b/fdbrpc/HTTP.h
@@ -21,7 +21,6 @@
 #include "flow/flow.h"
 #include "flow/Net2Packet.h"
 #include "fdbrpc/IRateControl.h"
-#include "fdbclient/Knobs.h"
 
 namespace HTTP {
 struct is_iless {
@@ -63,4 +62,11 @@ Future<Reference<Response>> doRequest(Reference<IConnection> const& conn,
                                       int64_t* const& pSent,
                                       Reference<IRateControl> const& recvRate,
                                       const std::string& requestHeader = std::string());
+
+// Connect to proxy, send CONNECT command, and connect to the remote host.
+Future<Reference<IConnection>> proxyConnect(const std::string& remoteHost,
+                                            const std::string& remoteService,
+                                            const std::string& proxyHost,
+                                            const std::string& proxyService);
+
 } // namespace HTTP
diff --git a/fdbrpc/SimExternalConnection.h b/fdbrpc/SimExternalConnection.h
index 3726e6d3fa8..00f55b6ab02 100644
--- a/fdbrpc/SimExternalConnection.h
+++ b/fdbrpc/SimExternalConnection.h
@@ -48,6 +48,7 @@ class SimExternalConnection final : public IConnection, public ReferenceCounted<
 	int write(SendBuffer const* buffer, int limit) override;
 	NetworkAddress getPeerAddress() const override;
 	UID getDebugID() const override;
+	boost::asio::ip::tcp::socket& getSocket() override { return socket; }
 	static Future<std::vector<NetworkAddress>> resolveTCPEndpoint(const std::string& host,
 	                                                              const std::string& service,
 	                                                              DNSCache* dnsCache);
diff --git a/fdbclient/libb64/cdecode.c b/fdbrpc/libb64/cdecode.c
similarity index 100%
rename from fdbclient/libb64/cdecode.c
rename to fdbrpc/libb64/cdecode.c
diff --git a/fdbclient/libb64/cdecode.h b/fdbrpc/libb64/cdecode.h
similarity index 100%
rename from fdbclient/libb64/cdecode.h
rename to fdbrpc/libb64/cdecode.h
diff --git a/fdbclient/libb64/cencode.c b/fdbrpc/libb64/cencode.c
similarity index 100%
rename from fdbclient/libb64/cencode.c
rename to fdbrpc/libb64/cencode.c
diff --git a/fdbclient/libb64/cencode.h b/fdbrpc/libb64/cencode.h
similarity index 100%
rename from fdbclient/libb64/cencode.h
rename to fdbrpc/libb64/cencode.h
diff --git a/fdbclient/libb64/decode.h b/fdbrpc/libb64/decode.h
similarity index 100%
rename from fdbclient/libb64/decode.h
rename to fdbrpc/libb64/decode.h
diff --git a/fdbclient/libb64/encode.h b/fdbrpc/libb64/encode.h
similarity index 100%
rename from fdbclient/libb64/encode.h
rename to fdbrpc/libb64/encode.h
diff --git a/fdbclient/md5/md5.c b/fdbrpc/md5/md5.c
similarity index 100%
rename from fdbclient/md5/md5.c
rename to fdbrpc/md5/md5.c
diff --git a/fdbclient/md5/md5.h b/fdbrpc/md5/md5.h
similarity index 100%
rename from fdbclient/md5/md5.h
rename to fdbrpc/md5/md5.h
diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index 7312f6526e9..958fa25e5e7 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -304,6 +304,8 @@ struct Sim2Conn final : IConnection, ReferenceCounted<Sim2Conn> {
 	NetworkAddress getPeerAddress() const override { return peerEndpoint; }
 	UID getDebugID() const override { return dbgid; }
 
+	boost::asio::ip::tcp::socket& getSocket() override { throw operation_failed(); }
+
 	bool opened, closedByCaller, stableConnection;
 
 private:
@@ -927,8 +929,9 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 	TaskPriority getCurrentTask() const override { return currentTaskID; }
 	void setCurrentTask(TaskPriority taskID) override { currentTaskID = taskID; }
 	// Sets the taskID/priority of the current task, without yielding
-	Future<Reference<IConnection>> connect(NetworkAddress toAddr, const std::string& host) override {
-		ASSERT(host.empty());
+	Future<Reference<IConnection>> connect(NetworkAddress toAddr,
+	                                       boost::asio::ip::tcp::socket* existingSocket = nullptr) override {
+		ASSERT(existingSocket == nullptr);
 		if (!addressMap.count(toAddr)) {
 			return waitForProcessAndConnect(toAddr, this);
 		}
@@ -954,7 +957,7 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 		return onConnect(::delay(0.5 * deterministicRandom()->random01()), myc);
 	}
 
-	Future<Reference<IConnection>> connectExternal(NetworkAddress toAddr, const std::string& host) override {
+	Future<Reference<IConnection>> connectExternal(NetworkAddress toAddr) override {
 		return SimExternalConnection::connect(toAddr);
 	}
 
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
index 894b5234bd1..203fa460dec 100644
--- a/flow/Knobs.cpp
+++ b/flow/Knobs.cpp
@@ -166,6 +166,14 @@ void FlowKnobs::initialize(Randomize randomize, IsSimulated isSimulated) {
 	init( LOW_PRIORITY_DELAY_COUNT,                              5 );
 	init( LOW_PRIORITY_MAX_DELAY,                              5.0 );
 
+	// HTTP
+	init( HTTP_READ_SIZE,                                 128*1024 );
+	init( HTTP_SEND_SIZE,                                  32*1024 );
+	init( HTTP_VERBOSE_LEVEL,                                    0 );
+	init( HTTP_REQUEST_ID_HEADER,                               "" );
+	init( HTTP_RESPONSE_SKIP_VERIFY_CHECKSUM_FOR_PARTIAL_CONTENT, false );
+	init( HTTP_CONNECT_TRIES,                                   10 );
+
 	//IAsyncFile
 	init( INCREMENTAL_DELETE_TRUNCATE_AMOUNT,                  5e8 ); //500MB
 	init( INCREMENTAL_DELETE_INTERVAL,                         1.0 ); //every 1 second
diff --git a/flow/Knobs.h b/flow/Knobs.h
index 7075c7c4f4e..b5a81fc325d 100644
--- a/flow/Knobs.h
+++ b/flow/Knobs.h
@@ -233,6 +233,14 @@ class FlowKnobs : public KnobsImpl<FlowKnobs> {
 	int LOW_PRIORITY_DELAY_COUNT;
 	double LOW_PRIORITY_MAX_DELAY;
 
+	// HTTP
+	int HTTP_READ_SIZE;
+	int HTTP_SEND_SIZE;
+	int HTTP_VERBOSE_LEVEL;
+	std::string HTTP_REQUEST_ID_HEADER;
+	bool HTTP_RESPONSE_SKIP_VERIFY_CHECKSUM_FOR_PARTIAL_CONTENT; // skip verify md5 checksum for 206 response
+	int HTTP_CONNECT_TRIES;
+
 	// IAsyncFile
 	int64_t INCREMENTAL_DELETE_TRUNCATE_AMOUNT;
 	double INCREMENTAL_DELETE_INTERVAL;
diff --git a/flow/Net2.actor.cpp b/flow/Net2.actor.cpp
index b2c8c2feb2e..b503c4a45da 100644
--- a/flow/Net2.actor.cpp
+++ b/flow/Net2.actor.cpp
@@ -147,8 +147,8 @@ class Net2 final : public INetwork, public INetworkConnections {
 	void initMetrics() override;
 
 	// INetworkConnections interface
-	Future<Reference<IConnection>> connect(NetworkAddress toAddr, const std::string& host) override;
-	Future<Reference<IConnection>> connectExternal(NetworkAddress toAddr, const std::string& host) override;
+	Future<Reference<IConnection>> connect(NetworkAddress toAddr, tcp::socket* existingSocket = nullptr) override;
+	Future<Reference<IConnection>> connectExternal(NetworkAddress toAddr) override;
 	Future<Reference<IUDPSocket>> createUDPSocket(NetworkAddress toAddr) override;
 	Future<Reference<IUDPSocket>> createUDPSocket(bool isV6) override;
 	// The mock DNS methods should only be used in simulation.
@@ -512,7 +512,7 @@ class Connection final : public IConnection, ReferenceCounted<Connection> {
 
 	UID getDebugID() const override { return id; }
 
-	tcp::socket& getSocket() { return socket; }
+	tcp::socket& getSocket() override { return socket; }
 
 private:
 	UID id;
@@ -845,10 +845,15 @@ class SSLConnection final : public IConnection, ReferenceCounted<SSLConnection>
 	  : id(nondeterministicRandom()->randomUniqueID()), socket(io_service), ssl_sock(socket, context->mutate()),
 	    sslContext(context) {}
 
+	explicit SSLConnection(Reference<ReferencedObject<boost::asio::ssl::context>> context, tcp::socket* existingSocket)
+	  : id(nondeterministicRandom()->randomUniqueID()), socket(std::move(*existingSocket)),
+	    ssl_sock(socket, context->mutate()), sslContext(context) {}
+
 	// This is not part of the IConnection interface, because it is wrapped by INetwork::connect()
 	ACTOR static Future<Reference<IConnection>> connect(boost::asio::io_service* ios,
 	                                                    Reference<ReferencedObject<boost::asio::ssl::context>> context,
-	                                                    NetworkAddress addr) {
+	                                                    NetworkAddress addr,
+	                                                    tcp::socket* existingSocket = nullptr) {
 		std::pair<IPAddress, uint16_t> peerIP = std::make_pair(addr.ip, addr.port);
 		auto iter(g_network->networkInfo.serverTLSConnectionThrottler.find(peerIP));
 		if (iter != g_network->networkInfo.serverTLSConnectionThrottler.end()) {
@@ -863,9 +868,15 @@ class SSLConnection final : public IConnection, ReferenceCounted<SSLConnection>
 			}
 		}
 
+		if (existingSocket != nullptr) {
+			Reference<SSLConnection> self(new SSLConnection(context, existingSocket));
+			self->peer_address = addr;
+			self->init();
+			return self;
+		}
+
 		state Reference<SSLConnection> self(new SSLConnection(*ios, context));
 		self->peer_address = addr;
-
 		try {
 			auto to = tcpEndpoint(self->peer_address);
 			BindPromise p("N2_ConnectError", self->id);
@@ -875,7 +886,7 @@ class SSLConnection final : public IConnection, ReferenceCounted<SSLConnection>
 			wait(onConnected);
 			self->init();
 			return self;
-		} catch (Error& e) {
+		} catch (Error&) {
 			// Either the connection failed, or was cancelled by the caller
 			self->closeSocket();
 			throw;
@@ -1103,7 +1114,7 @@ class SSLConnection final : public IConnection, ReferenceCounted<SSLConnection>
 
 	UID getDebugID() const override { return id; }
 
-	tcp::socket& getSocket() { return socket; }
+	tcp::socket& getSocket() override { return socket; }
 
 	ssl_socket& getSSLSocket() { return ssl_sock; }
 
@@ -1831,19 +1842,19 @@ THREAD_HANDLE Net2::startThread(THREAD_FUNC_RETURN (*func)(void*), void* arg, in
 	return ::startThread(func, arg, stackSize, name);
 }
 
-Future<Reference<IConnection>> Net2::connect(NetworkAddress toAddr, const std::string& host) {
+Future<Reference<IConnection>> Net2::connect(NetworkAddress toAddr, tcp::socket* existingSocket) {
 #ifndef TLS_DISABLED
 	if (toAddr.isTLS()) {
 		initTLS(ETLSInitState::CONNECT);
-		return SSLConnection::connect(&this->reactor.ios, this->sslContextVar.get(), toAddr);
+		return SSLConnection::connect(&this->reactor.ios, this->sslContextVar.get(), toAddr, existingSocket);
 	}
 #endif
 
 	return Connection::connect(&this->reactor.ios, toAddr);
 }
 
-Future<Reference<IConnection>> Net2::connectExternal(NetworkAddress toAddr, const std::string& host) {
-	return connect(toAddr, host);
+Future<Reference<IConnection>> Net2::connectExternal(NetworkAddress toAddr) {
+	return connect(toAddr);
 }
 
 Future<Reference<IUDPSocket>> Net2::createUDPSocket(NetworkAddress toAddr) {
diff --git a/flow/network.cpp b/flow/network.cpp
index ed9b3c80943..a13f0657614 100644
--- a/flow/network.cpp
+++ b/flow/network.cpp
@@ -293,7 +293,7 @@ Future<Reference<IConnection>> INetworkConnections::connect(const std::string& h
 	                std::function<Future<Reference<IConnection>>(NetworkAddress const&)>,
 	                Reference<IConnection>>(
 	    pickEndpoint,
-	    [=](NetworkAddress const& addr) -> Future<Reference<IConnection>> { return connectExternal(addr, host); });
+	    [=](NetworkAddress const& addr) -> Future<Reference<IConnection>> { return connectExternal(addr); });
 }
 
 IUDPSocket::~IUDPSocket() {}
diff --git a/flow/network.h b/flow/network.h
index f6900a648b2..186b91d8fc6 100644
--- a/flow/network.h
+++ b/flow/network.h
@@ -475,6 +475,8 @@ class IConnection {
 	// At present, implemented by Sim2Conn where we want to disable bits flip for connections between parent process and
 	// child process, also reduce latency for this kind of connection
 	virtual bool isStableConnection() const { throw unsupported_operation(); }
+
+	virtual boost::asio::ip::tcp::socket& getSocket() = 0;
 };
 
 class IListener {
@@ -690,9 +692,10 @@ class INetworkConnections {
 
 	// Make an outgoing connection to the given address.  May return an error or block indefinitely in case of
 	// connection problems!
-	virtual Future<Reference<IConnection>> connect(NetworkAddress toAddr, const std::string& host = "") = 0;
+	virtual Future<Reference<IConnection>> connect(NetworkAddress toAddr,
+	                                               boost::asio::ip::tcp::socket* existingSocket = nullptr) = 0;
 
-	virtual Future<Reference<IConnection>> connectExternal(NetworkAddress toAddr, const std::string& host = "") = 0;
+	virtual Future<Reference<IConnection>> connectExternal(NetworkAddress toAddr) = 0;
 
 	// Make an outgoing udp connection and connect to the passed address.
 	virtual Future<Reference<IUDPSocket>> createUDPSocket(NetworkAddress toAddr) = 0;

From 548560ba435825f19d4c97d0dcfdbefe301a0bf8 Mon Sep 17 00:00:00 2001
From: 1inker <67271937+1inker@users.noreply.github.com>
Date: Fri, 16 Sep 2022 17:22:59 +0300
Subject: [PATCH 661/740] Return ctests run on fork 7.1 (#14)

* Re-enable ctests

* Cherrypicked commit #9ef56e0bf2c76f332c87eed6e8d3a0825052c97d from ow-for-6.3 branch

* Revert "Fixed ctest update_bindings_go_src_fdb_generated_go"
This reverts commit 62832b2367f8e540dcd0b96c777095efa5c879d1.

* We do not need in Boost in OS because it is too old (1.65) while we are looking for 1.78
---
 .github/workflows/build.yml      | 10 +++++-----
 bindings/go/src/fdb/generated.go | 30 +++++++++++++++---------------
 tests/TestRunner/TestRunner.py   |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0c89976e2eb..abbf63ddbdf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,7 @@ jobs:
       shell: bash
       run: |
         sudo apt update
-        sudo apt install -y sudo git cmake libboost-dev g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm clang-10
+        sudo apt install -y sudo git cmake g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm clang-10
         sudo pip3 install virtualenv
         sudo apt install -y dirmngr gnupg apt-transport-https ca-certificates
         sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
@@ -100,10 +100,10 @@ jobs:
       shell: bash
       run: ninja -j 3
 
-    #- name: Minimal tests
-    #  working-directory: ${{github.workspace}}/bld
-    #  shell: bash
-    #  run: ctest -V
+    - name: Minimal tests
+      working-directory: ${{github.workspace}}/bld
+      shell: bash
+      run: ctest --output-on-failure -V
 
     - name: Build RPMs
       working-directory: ${{github.workspace}}/bld
diff --git a/bindings/go/src/fdb/generated.go b/bindings/go/src/fdb/generated.go
index e339076389d..b636484408b 100644
--- a/bindings/go/src/fdb/generated.go
+++ b/bindings/go/src/fdb/generated.go
@@ -617,12 +617,12 @@ const (
 	StreamingModeWantAll StreamingMode = -1
 
 	// The default. The client doesn't know how much of the range it is likely
-	// to used and wants different performance concerns to be balanced.
-	// Only a small portion of data is transferred to the client initially (in
-	// order to minimize costs if the client doesn't read the entire range), and
-	// as the caller iterates over more items in the range larger batches will
-	// be transferred in order to minimize latency. After enough iterations,
-	// the iterator mode will eventually reach the same byte limit as “WANT_ALL“
+	// to used and wants different performance concerns to be balanced. Only a
+	// small portion of data is transferred to the client initially (in order to
+	// minimize costs if the client doesn't read the entire range), and as the
+	// caller iterates over more items in the range larger batches will be
+	// transferred in order to minimize latency. After enough iterations, the
+	// iterator mode will eventually reach the same byte limit as “WANT_ALL“
 	StreamingModeIterator StreamingMode = 0
 
 	// Infrequently used. The client has passed a specific row limit and wants
@@ -632,8 +632,8 @@ const (
 	// mode is used.
 	StreamingModeExact StreamingMode = 1
 
-	// Infrequently used. Transfer data in batches small enough to not be
-	// much more expensive than reading individual rows, to minimize cost if
+	// Infrequently used. Transfer data in batches small enough to not be much
+	// more expensive than reading individual rows, to minimize cost if
 	// iteration stops early.
 	StreamingModeSmall StreamingMode = 2
 
@@ -641,16 +641,16 @@ const (
 	// large.
 	StreamingModeMedium StreamingMode = 3
 
-	// Infrequently used. Transfer data in batches large enough to be,
-	// in a high-concurrency environment, nearly as efficient as possible.
-	// If the client stops iteration early, some disk and network bandwidth may
-	// be wasted. The batch size may still be too small to allow a single client
-	// to get high throughput from the database, so if that is what you need
+	// Infrequently used. Transfer data in batches large enough to be, in a
+	// high-concurrency environment, nearly as efficient as possible. If the
+	// client stops iteration early, some disk and network bandwidth may be
+	// wasted. The batch size may still be too small to allow a single client to
+	// get high throughput from the database, so if that is what you need
 	// consider the SERIAL StreamingMode.
 	StreamingModeLarge StreamingMode = 4
 
-	// Transfer data in batches large enough that an individual client can
-	// get reasonable read bandwidth from the database. If the client stops
+	// Transfer data in batches large enough that an individual client can get
+	// reasonable read bandwidth from the database. If the client stops
 	// iteration early, considerable disk and network bandwidth may be wasted.
 	StreamingModeSerial StreamingMode = 5
 )
diff --git a/tests/TestRunner/TestRunner.py b/tests/TestRunner/TestRunner.py
index 1301111f5b0..d1a1afb5993 100755
--- a/tests/TestRunner/TestRunner.py
+++ b/tests/TestRunner/TestRunner.py
@@ -276,7 +276,7 @@ def __init__(self, name, old_binary, new_binary):
         if old_binary is None:
             _logger.info("No old binary provided")
         old_binary_version_raw = subprocess.check_output([old_binary, '--version']).decode('utf-8')
-        match = re.match('FoundationDB.*\(v([0-9]+\.[0-9]+\.[0-9]+)(-0\.[0-9a-f]{40}\.PRERELEASE|-[0-9]+\.ow)?\)', old_binary_version_raw)
+        match = re.match('FoundationDB.*\(v([0-9]+\.[0-9]+\.[0-9]+)(-0\.[0-9a-f]{40}\.PRERELEASE|-[0-9]+\.ow.*)?\)', old_binary_version_raw)
         assert match, old_binary_version_raw
         old_binary_version = tuple(map(int, match.group(1).split('.')))
         match = re.match('.*/restarting/from_([0-9]+\.[0-9]+\.[0-9]+)/', name)

From 104b8cb286e39620667629bc28f2065e01b13596 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Fri, 16 Sep 2022 12:19:07 -0700
Subject: [PATCH 662/740] fix: persistentData->commit() was not protected by
 the persistentDataCommitLock, meaning it is possible for inconsistent data to
 be made durable on the tlog

---
 fdbserver/TLogServer.actor.cpp | 50 ++++++++++++++++------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 4665dbd2f9d..52ede1164a3 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -2648,6 +2648,27 @@ ACTOR Future<Void> tLogEnablePopReq(TLogEnablePopRequest enablePopReq, TLogData*
 	return Void();
 }
 
+ACTOR Future<Void> updateDurableClusterID(TLogData* self) {
+	loop {
+		// Persist cluster ID once cluster has recovered.
+		if (self->dbInfo->get().recoveryState == RecoveryState::FULLY_RECOVERED) {
+			ASSERT(!self->durableClusterId.isValid());
+			state UID ccClusterId = self->dbInfo->get().clusterId;
+			self->durableClusterId = ccClusterId;
+			ASSERT(ccClusterId.isValid());
+
+			wait(self->persistentDataCommitLock.take());
+			state FlowLock::Releaser commitLockReleaser(self->persistentDataCommitLock);
+			self->persistentData->set(
+			    KeyValueRef(persistClusterIdKey, BinaryWriter::toValue(ccClusterId, Unversioned())));
+			wait(self->persistentData->commit());
+
+			return Void();
+		}
+		wait(self->dbInfo->onChange());
+	}
+}
+
 ACTOR Future<Void> serveTLogInterface(TLogData* self,
                                       TLogInterface tli,
                                       Reference<LogData> logData,
@@ -2682,17 +2703,6 @@ ACTOR Future<Void> serveTLogInterface(TLogData* self,
 			} else {
 				logData->logSystem->set(Reference<ILogSystem>());
 			}
-
-			// Persist cluster ID once cluster has recovered.
-			auto ccClusterId = self->dbInfo->get().clusterId;
-			if (self->dbInfo->get().recoveryState == RecoveryState::FULLY_RECOVERED &&
-			    !self->durableClusterId.isValid()) {
-				ASSERT(ccClusterId.isValid());
-				self->durableClusterId = ccClusterId;
-				self->persistentData->set(
-				    KeyValueRef(persistClusterIdKey, BinaryWriter::toValue(ccClusterId, Unversioned())));
-				wait(self->persistentData->commit());
-			}
 		}
 		when(TLogPeekStreamRequest req = waitNext(tli.peekStreamMessages.getFuture())) {
 			TraceEvent(SevDebug, "TLogPeekStream", logData->logId)
@@ -3617,6 +3627,9 @@ ACTOR Future<Void> tLog(IKeyValueStore* persistentData,
 			if (recovered.canBeSet())
 				recovered.send(Void());
 
+			// if (!self.durableClusterId.isValid()) {
+			//	self.sharedActors.send(updateDurableClusterID(&self));
+			// }
 			self.sharedActors.send(commitQueue(&self));
 			self.sharedActors.send(updateStorageLoop(&self));
 			self.sharedActors.send(traceRole(Role::SHARED_TRANSACTION_LOG, tlogId));
@@ -3625,21 +3638,6 @@ ACTOR Future<Void> tLog(IKeyValueStore* persistentData,
 			loop {
 				choose {
 					when(state InitializeTLogRequest req = waitNext(tlogRequests.getFuture())) {
-						ASSERT(req.clusterId.isValid());
-						// Durably persist the cluster ID if it is not already
-						// durable and the cluster has progressed far enough
-						// through recovery. To avoid different partitions from
-						// persisting different cluster IDs, we need to wait
-						// until a single cluster ID has been persisted in the
-						// txnStateStore before finally writing it to disk.
-						auto recoveryState = self.dbInfo->get().recoveryState;
-						if (!self.durableClusterId.isValid() && recoveryState >= RecoveryState::ACCEPTING_COMMITS) {
-							self.durableClusterId = req.clusterId;
-							// Will let commit loop durably write the cluster ID.
-							self.persistentData->set(
-							    KeyValueRef(persistClusterIdKey, BinaryWriter::toValue(req.clusterId, Unversioned())));
-						}
-
 						if (!self.tlogCache.exists(req.recruitmentID)) {
 							self.tlogCache.set(req.recruitmentID, req.reply.getFuture());
 							self.sharedActors.send(

From 34170253b7e9a858490c93fa23ebdc1c40713332 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Wed, 14 Sep 2022 01:26:31 -0700
Subject: [PATCH 663/740] Add new latency samples for GetValue, GetRange,
 QueueWait which is the time between request receipt and when it starts to be
 processed, and VersionWait which is the time after QueueWait spent waiting
 for the necessary data version to arrive.

---
 fdbserver/storageserver.actor.cpp | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 1018ec37f50..6d75f119d3b 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -939,6 +939,11 @@ struct StorageServer {
 		Counter kvCommits;
 
 		LatencySample readLatencySample;
+		LatencySample readValueLatencySample;
+		LatencySample readRangeLatencySample;
+		LatencySample readVersionWaitSample;
+		LatencySample readQueueWaitSample;
+
 		LatencyBands readLatencyBands;
 		LatencySample mappedRangeSample; // Samples getMappedRange latency
 		LatencySample mappedRangeRemoteSample; // Samples getMappedRange remote subquery latency
@@ -974,6 +979,22 @@ struct StorageServer {
 		                      self->thisServerID,
 		                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    readValueLatencySample("ReadValueLatencyMetrics",
+		                           self->thisServerID,
+		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    readRangeLatencySample("ReadRangeLatencyMetrics",
+		                           self->thisServerID,
+		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    readVersionWaitSample("ReadVersionWaitMetrics",
+		                          self->thisServerID,
+		                          SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                          SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    readQueueWaitSample("ReadQueueWaitMetrics",
+		                        self->thisServerID,
+		                        SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                        SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY),
 		    mappedRangeSample("GetMappedRangeMetrics",
 		                      self->thisServerID,
@@ -1562,6 +1583,10 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 		// so we need to downgrade here
 		wait(data->getQueryDelay());
 
+		// Track time from requestTime through now as read queueing wait time
+		state double queueWaitEnd = g_network->timer();
+		data->counters.readQueueWaitSample.addMeasurement(queueWaitEnd - req.requestTime());
+
 		if (req.debugID.present())
 			g_traceBatch.addEvent("GetValueDebug",
 			                      req.debugID.get().first(),
@@ -1570,6 +1595,9 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 		state Optional<Value> v;
 		Version commitVersion = getLatestCommitVersion(req.ssLatestCommitVersions, data->tag);
 		state Version version = wait(waitForVersion(data, commitVersion, req.version, req.spanContext));
+
+		data->counters.readVersionWaitSample.addMeasurement(g_network->timer() - queueWaitEnd);
+
 		if (req.debugID.present())
 			g_traceBatch.addEvent("GetValueDebug",
 			                      req.debugID.get().first(),
@@ -1666,6 +1694,7 @@ ACTOR Future<Void> getValueQ(StorageServer* data, GetValueRequest req) {
 
 	double duration = g_network->timer() - req.requestTime();
 	data->counters.readLatencySample.addMeasurement(duration);
+	data->counters.readValueLatencySample.addMeasurement(duration);
 	if (data->latencyBandConfig.present()) {
 		int maxReadBytes =
 		    data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());
@@ -3263,12 +3292,17 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 		wait(data->getQueryDelay());
 	}
 
+	// Track time from requestTime through now as read queueing wait time
+	state double queueWaitEnd = g_network->timer();
+	data->counters.readQueueWaitSample.addMeasurement(queueWaitEnd - req.requestTime());
+
 	try {
 		if (req.debugID.present())
 			g_traceBatch.addEvent("TransactionDebug", req.debugID.get().first(), "storageserver.getKeyValues.Before");
 
 		Version commitVersion = getLatestCommitVersion(req.ssLatestCommitVersions, data->tag);
 		state Version version = wait(waitForVersion(data, commitVersion, req.version, span.context));
+		data->counters.readVersionWaitSample.addMeasurement(g_network->timer() - queueWaitEnd);
 
 		state Optional<TenantMapEntry> tenantEntry = data->getTenantEntry(version, req.tenantInfo);
 		state Optional<Key> tenantPrefix = tenantEntry.map<Key>([](TenantMapEntry e) { return e.prefix; });
@@ -3410,6 +3444,7 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 
 	double duration = g_network->timer() - req.requestTime();
 	data->counters.readLatencySample.addMeasurement(duration);
+	data->counters.readRangeLatencySample.addMeasurement(duration);
 	if (data->latencyBandConfig.present()) {
 		int maxReadBytes =
 		    data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());
@@ -3865,6 +3900,10 @@ ACTOR Future<Void> getMappedKeyValuesQ(StorageServer* data, GetMappedKeyValuesRe
 		wait(data->getQueryDelay());
 	}
 
+	// Track time from requestTime through now as read queueing wait time
+	state double queueWaitEnd = g_network->timer();
+	data->counters.readQueueWaitSample.addMeasurement(queueWaitEnd - req.requestTime());
+
 	try {
 		if (req.debugID.present())
 			g_traceBatch.addEvent(
@@ -3872,6 +3911,7 @@ ACTOR Future<Void> getMappedKeyValuesQ(StorageServer* data, GetMappedKeyValuesRe
 		// VERSION_VECTOR change
 		Version commitVersion = getLatestCommitVersion(req.ssLatestCommitVersions, data->tag);
 		state Version version = wait(waitForVersion(data, commitVersion, req.version, span.context));
+		data->counters.readVersionWaitSample.addMeasurement(g_network->timer() - queueWaitEnd);
 
 		state Optional<TenantMapEntry> tenantEntry = data->getTenantEntry(req.version, req.tenantInfo);
 		state Optional<Key> tenantPrefix = tenantEntry.map<Key>([](TenantMapEntry e) { return e.prefix; });
@@ -4276,9 +4316,14 @@ ACTOR Future<Void> getKeyQ(StorageServer* data, GetKeyRequest req) {
 	// so we need to downgrade here
 	wait(data->getQueryDelay());
 
+	// Track time from requestTime through now as read queueing wait time
+	state double queueWaitEnd = g_network->timer();
+	data->counters.readQueueWaitSample.addMeasurement(queueWaitEnd - req.requestTime());
+
 	try {
 		Version commitVersion = getLatestCommitVersion(req.ssLatestCommitVersions, data->tag);
 		state Version version = wait(waitForVersion(data, commitVersion, req.version, req.spanContext));
+		data->counters.readVersionWaitSample.addMeasurement(g_network->timer() - queueWaitEnd);
 
 		state Optional<TenantMapEntry> tenantEntry = data->getTenantEntry(version, req.tenantInfo);
 		if (tenantEntry.present()) {

From 8c16977fb4f05b2c57f015f814b9a61d82d6b108 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Wed, 14 Sep 2022 13:22:16 -0700
Subject: [PATCH 664/740] Add latency sample for getKey.

---
 fdbserver/storageserver.actor.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index 6d75f119d3b..fb953af9bea 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -939,6 +939,7 @@ struct StorageServer {
 		Counter kvCommits;
 
 		LatencySample readLatencySample;
+		LatencySample readKeyLatencySample;
 		LatencySample readValueLatencySample;
 		LatencySample readRangeLatencySample;
 		LatencySample readVersionWaitSample;
@@ -979,6 +980,10 @@ struct StorageServer {
 		                      self->thisServerID,
 		                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    readKeyLatencySample("ReadKeyLatencyMetrics",
+		                         self->thisServerID,
+		                         SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                         SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 		    readValueLatencySample("ReadValueLatencyMetrics",
 		                           self->thisServerID,
 		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
@@ -4389,6 +4394,8 @@ ACTOR Future<Void> getKeyQ(StorageServer* data, GetKeyRequest req) {
 
 	double duration = g_network->timer() - req.requestTime();
 	data->counters.readLatencySample.addMeasurement(duration);
+	data->counters.readKeyLatencySample.addMeasurement(duration);
+
 	if (data->latencyBandConfig.present()) {
 		int maxReadBytes =
 		    data->latencyBandConfig.get().readConfig.maxReadBytes.orDefault(std::numeric_limits<int>::max());

From 9b90a5ea8725313188b71c9c3d871d2838d68f56 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Wed, 14 Sep 2022 16:16:23 -0700
Subject: [PATCH 665/740] Rename read latency trace events to a different
 scheme.

---
 fdbserver/storageserver.actor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index fb953af9bea..b3cce51eff9 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -980,15 +980,15 @@ struct StorageServer {
 		                      self->thisServerID,
 		                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
-		    readKeyLatencySample("ReadKeyLatencyMetrics",
+		    readKeyLatencySample("GetKeyMetrics",
 		                         self->thisServerID,
 		                         SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                         SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
-		    readValueLatencySample("ReadValueLatencyMetrics",
+		    readValueLatencySample("GetValueMetrics",
 		                           self->thisServerID,
 		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
-		    readRangeLatencySample("ReadRangeLatencyMetrics",
+		    readRangeLatencySample("GetRangeMetrics",
 		                           self->thisServerID,
 		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE),

From 541a9c46bd630b00f94cf72cc2887f67b86d739b Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 19 Sep 2022 11:42:06 +0000
Subject: [PATCH 666/740] disable AVX for 7.1.22 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From dd2e68b9b3175667914673539f06b8e1071c07d6 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 19 Sep 2022 11:42:41 +0000
Subject: [PATCH 667/740] enable AVX and update version for 7.1.23 release

---
 CMakeLists.txt                | 2 +-
 cmake/ConfigureCompiler.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ff40b9db73..942f5dff8b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.22
+  VERSION 7.1.23
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 982240c1c160443c24e27f778be2d5485ebde6e5 Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 19 Sep 2022 21:45:25 +0000
Subject: [PATCH 668/740] update version after 7.1.23 release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 942f5dff8b1..c712cdfae0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.23
+  VERSION 7.1.24
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From f1106c6f7964f25e6bbf792f23be64524f33c943 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 19 Sep 2022 20:40:02 -0700
Subject: [PATCH 669/740] Added 7.1.22, 7.1.23 release notes

---
 .../source/release-notes/release-notes-710.rst      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index b54d4323b41..0edeccf5199 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,9 +4,20 @@
 Release Notes
 #############
 
+7.1.23
+======
+* Same as 7.1.22 release with AVX enabled.
+
 7.1.22
 ======
-* Introduce STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT knob to recreate SS at io_timeout errors. `(PR #8122) <https://github.com/apple/foundationdb/pull/8122>`_
+* Released with AVX disabled.
+* Added new latency samples for GetValue, GetRange, QueueWait, and VersionWait in storage servers. `(PR #8215) <https://github.com/apple/foundationdb/pull/8215>`_
+* Fixed a rare partial data write for TLogs. `(PR #8210) <https://github.com/apple/foundationdb/pull/8210>`_
+* Added HTTP proxy support for backup agents. `(PR #8193) <https://github.com/apple/foundationdb/pull/8193>`_
+* Fixed a memory bug of secondary queries in index prefetch. `(PR #8195) <https://github.com/apple/foundationdb/pull/8195>`_, `(PR #8190) <https://github.com/apple/foundationdb/pull/8190>`_
+* Introduced STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT knob to recreate SS at io_timeout errors. `(PR #8123) <https://github.com/apple/foundationdb/pull/8123>`_
+* Fixed two TLog stopped bugs and a CC leader replacement bug. `(PR #8081) <https://github.com/apple/foundationdb/pull/8081>`_
+* Added back RecoveryAvailable trace event for status's seconds_since_last_recovered field. `(PR #8068) <https://github.com/apple/foundationdb/pull/8068>`_
 
 7.1.21
 ======

From 4c137f8be86060dcef12a24e32270129f4933a5d Mon Sep 17 00:00:00 2001
From: He Liu <heliu05023@gmail.com>
Date: Wed, 21 Sep 2022 09:38:45 -0700
Subject: [PATCH 670/740] Added RocksDB latency samples and priority knobs.

---
 fdbclient/ServerKnobs.cpp                |  2 +
 fdbclient/ServerKnobs.h                  |  2 +
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 70 +++++++++++++++++++-----
 3 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 6cb89cd27ba..95c6c2c67fb 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -359,6 +359,8 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( REPLACE_CONTENTS_BYTES,                                1e5 );
 
 	// KeyValueStoreRocksDB
+	init( ROCKSDB_READER_THREAD_PRIORITY,                          0 );
+ 	init( ROCKSDB_WRITER_THREAD_PRIORITY,                          0 );
 	init( ROCKSDB_BACKGROUND_PARALLELISM,                          4 );
 	init( ROCKSDB_READ_PARALLELISM,                                4 );
 	// Use a smaller memtable in simulation to avoid OOMs.
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index f322267863c..8179aa14706 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -290,6 +290,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int64_t REPLACE_CONTENTS_BYTES;
 
 	// KeyValueStoreRocksDB
+	int ROCKSDB_READER_THREAD_PRIORITY;
+	int ROCKSDB_WRITER_THREAD_PRIORITY;
 	int ROCKSDB_BACKGROUND_PARALLELISM;
 	int ROCKSDB_READ_PARALLELISM;
 	int64_t ROCKSDB_MEMTABLE_BYTES;
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index b3cfa7d7f8f..b82bc20df0b 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -77,6 +77,34 @@ static_assert((ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR == 27) ? ROCKSDB_PATCH >= 3 :
 
 namespace {
 using rocksdb::BackgroundErrorReason;
+class SharedRocksDBState {
+public:
+	SharedRocksDBState(UID id);
+
+	std::vector<std::shared_ptr<LatencySample>> readLatency;
+	std::vector<std::shared_ptr<LatencySample>> scanLatency;
+	std::vector<std::shared_ptr<LatencySample>> readQueueLatency;
+
+private:
+	const UID id;
+};
+
+SharedRocksDBState::SharedRocksDBState(UID id) : id(id) {
+	for (int i = 0; i < SERVER_KNOBS->ROCKSDB_READ_PARALLELISM; i++) {
+		readLatency.push_back(std::make_shared<LatencySample>(format("RocksDBReadLatency-%d", i),
+		                                                      id,
+		                                                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                                                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE));
+		scanLatency.push_back(std::make_shared<LatencySample>(format("RocksDBScanLatency-%d", i),
+		                                                      id,
+		                                                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                                                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE));
+		readQueueLatency.push_back(std::make_shared<LatencySample>(format("RocksDBReadQueueLatency-%d", i),
+		                                                           id,
+		                                                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                                                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE));
+	}
+}
 
 // Returns string representation of RocksDB background error reason.
 // Error reason code:
@@ -1306,6 +1334,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		UID id;
 		DB& db;
 		CF& cf;
+		std::shared_ptr<SharedRocksDBState> sharedState;
 		double readValueTimeout;
 		double readValuePrefixTimeout;
 		double readRangeTimeout;
@@ -1317,11 +1346,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		explicit Reader(UID id,
 		                DB& db,
 		                CF& cf,
+		                std::shared_ptr<SharedRocksDBState> sharedState,
 		                std::shared_ptr<ReadIteratorPool> readIterPool,
 		                std::shared_ptr<PerfContextMetrics> perfContextMetrics,
 		                int threadIndex)
-		  : id(id), db(db), cf(cf), readIterPool(readIterPool), perfContextMetrics(perfContextMetrics),
-		    threadIndex(threadIndex) {
+		  : id(id), db(db), cf(cf), sharedState(sharedState), readIterPool(readIterPool),
+		    perfContextMetrics(perfContextMetrics), threadIndex(threadIndex) {
 			if (g_network->isSimulated()) {
 				// In simulation, increasing the read operation timeouts to 5 minutes, as some of the tests have
 				// very high load and single read thread cannot process all the load within the timeouts.
@@ -1368,6 +1398,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				metricPromiseStream.send(std::make_tuple(
 				    threadIndex, ROCKSDB_READVALUE_QUEUEWAIT_HISTOGRAM.toString(), readBeginTime - a.startTime));
 			}
+			sharedState->readQueueLatency[threadIndex]->addMeasurement(readBeginTime - a.startTime);
 			Optional<TraceBatch> traceBatch;
 			if (a.debugID.present()) {
 				traceBatch = { TraceBatch{} };
@@ -1397,10 +1428,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				return;
 			}
 
+			const double endTime = timer_monotonic();
 			if (a.getHistograms) {
-				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_READVALUE_GET_HISTOGRAM.toString(), timer_monotonic() - dbGetBeginTime));
+				metricPromiseStream.send(
+				    std::make_tuple(threadIndex, ROCKSDB_READVALUE_GET_HISTOGRAM.toString(), endTime - dbGetBeginTime));
 			}
+			sharedState->readLatency[threadIndex]->addMeasurement(endTime - readBeginTime);
 
 			if (a.debugID.present()) {
 				traceBatch.get().addEvent("GetValueDebug", a.debugID.get().first(), "Reader.After");
@@ -1453,6 +1486,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				metricPromiseStream.send(std::make_tuple(
 				    threadIndex, ROCKSDB_READPREFIX_QUEUEWAIT_HISTOGRAM.toString(), readBeginTime - a.startTime));
 			}
+			sharedState->readQueueLatency[threadIndex]->addMeasurement(readBeginTime - a.startTime);
 			Optional<TraceBatch> traceBatch;
 			if (a.debugID.present()) {
 				traceBatch = { TraceBatch{} };
@@ -1478,10 +1512,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 
 			double dbGetBeginTime = a.getHistograms ? timer_monotonic() : 0;
 			auto s = db->Get(options, cf, toSlice(a.key), &value);
+			const double endTime = timer_monotonic();
 			if (a.getHistograms) {
 				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_READPREFIX_GET_HISTOGRAM.toString(), timer_monotonic() - dbGetBeginTime));
+				    threadIndex, ROCKSDB_READPREFIX_GET_HISTOGRAM.toString(), endTime - dbGetBeginTime));
 			}
+			sharedState->readLatency[threadIndex]->addMeasurement(endTime - readBeginTime);
 
 			if (a.debugID.present()) {
 				traceBatch.get().addEvent("GetValuePrefixDebug",
@@ -1535,6 +1571,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				metricPromiseStream.send(std::make_tuple(
 				    threadIndex, ROCKSDB_READRANGE_QUEUEWAIT_HISTOGRAM.toString(), readBeginTime - a.startTime));
 			}
+			sharedState->readQueueLatency[threadIndex]->addMeasurement(readBeginTime - a.startTime);
 			if (readBeginTime - a.startTime > readRangeTimeout) {
 				TraceEvent(SevWarn, "KVSTimeout", id)
 				    .detail("Error", "Read range request timedout")
@@ -1626,13 +1663,14 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				result.readThrough = result[result.size() - 1].key;
 			}
 			a.result.send(result);
+			const double endTime = timer_monotonic();
 			if (a.getHistograms) {
-				double currTime = timer_monotonic();
 				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_READRANGE_ACTION_HISTOGRAM.toString(), currTime - readBeginTime));
+				    threadIndex, ROCKSDB_READRANGE_ACTION_HISTOGRAM.toString(), endTime - readBeginTime));
 				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_READRANGE_LATENCY_HISTOGRAM.toString(), currTime - a.startTime));
+				    threadIndex, ROCKSDB_READRANGE_LATENCY_HISTOGRAM.toString(), endTime - a.startTime));
 			}
+			sharedState->scanLatency[threadIndex]->addMeasurement(endTime - readBeginTime);
 			if (doPerfContextMetrics) {
 				perfContextMetrics->set(threadIndex);
 			}
@@ -1640,10 +1678,11 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	};
 
 	DB db = nullptr;
-	std::shared_ptr<PerfContextMetrics> perfContextMetrics;
 	std::string path;
-	rocksdb::ColumnFamilyHandle* defaultFdbCF = nullptr;
 	UID id;
+	std::shared_ptr<SharedRocksDBState> sharedState;
+	std::shared_ptr<PerfContextMetrics> perfContextMetrics;
+	rocksdb::ColumnFamilyHandle* defaultFdbCF = nullptr;
 	Reference<IThreadPool> writeThread;
 	Reference<IThreadPool> readThreads;
 	std::shared_ptr<RocksDBErrorListener> errorListener;
@@ -1661,8 +1700,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	Counters counters;
 
 	explicit RocksDBKeyValueStore(const std::string& path, UID id)
-	  : path(path), id(id), perfContextMetrics(new PerfContextMetrics()),
-	    readIterPool(new ReadIteratorPool(id, db, defaultFdbCF)),
+	  : path(path), id(id), sharedState(std::make_shared<SharedRocksDBState>(id)),
+	    perfContextMetrics(new PerfContextMetrics()), readIterPool(new ReadIteratorPool(id, db, defaultFdbCF)),
 	    readSemaphore(SERVER_KNOBS->ROCKSDB_READ_QUEUE_SOFT_MAX),
 	    fetchSemaphore(SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_SOFT_MAX),
 	    numReadWaiters(SERVER_KNOBS->ROCKSDB_READ_QUEUE_HARD_MAX - SERVER_KNOBS->ROCKSDB_READ_QUEUE_SOFT_MAX),
@@ -1682,8 +1721,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			writeThread = CoroThreadPool::createThreadPool();
 			readThreads = CoroThreadPool::createThreadPool();
 		} else {
-			writeThread = createGenericThreadPool();
-			readThreads = createGenericThreadPool();
+			writeThread = createGenericThreadPool(/*stackSize=*/0, SERVER_KNOBS->ROCKSDB_WRITER_THREAD_PRIORITY);
+			readThreads = createGenericThreadPool(/*stackSize=*/0, SERVER_KNOBS->ROCKSDB_READER_THREAD_PRIORITY);
 		}
 		struct Writer* writer =
 		    new Writer(db, defaultFdbCF, id, readIterPool, perfContextMetrics, SERVER_KNOBS->ROCKSDB_READ_PARALLELISM);
@@ -1694,7 +1733,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		TraceEvent("RocksDBReadThreads", id)
 		    .detail("KnobRocksDBReadParallelism", SERVER_KNOBS->ROCKSDB_READ_PARALLELISM);
 		for (unsigned i = 0; i < SERVER_KNOBS->ROCKSDB_READ_PARALLELISM; ++i) {
-			struct Reader* reader = new Reader(id, db, defaultFdbCF, readIterPool, perfContextMetrics, i);
+			struct Reader* reader =
+			    new Reader(id, db, defaultFdbCF, this->sharedState, readIterPool, perfContextMetrics, i);
 			if (SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE > 0) {
 				actors.push_back(updateHistogram(reader->metricPromiseStream.getFuture()));
 			}

From 73f79bf8cd625367f778785b1b1ddc5ad1793b8f Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Wed, 21 Sep 2022 07:37:15 -0700
Subject: [PATCH 671/740] RocksDB block cache size increase.

---
 fdbclient/ServerKnobs.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 6cb89cd27ba..2e0c351ff5a 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -367,7 +367,9 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( ROCKSDB_UNSAFE_AUTO_FSYNC,                           false );
 	init( ROCKSDB_PERIODIC_COMPACTION_SECONDS,                     0 );
 	init( ROCKSDB_PREFIX_LEN,                                      0 );
-	init( ROCKSDB_BLOCK_CACHE_SIZE,                                0 );
+	// If rocksdb block cache size is 0, the default 8MB is used.
+	int64_t blockCacheSize = isSimulated ? 0 : 1024 * 1024 * 1024 /* 1GB */;
+	init( ROCKSDB_BLOCK_CACHE_SIZE,                   blockCacheSize );
 	init( ROCKSDB_METRICS_DELAY,                                60.0 );
 	init( ROCKSDB_READ_VALUE_TIMEOUT,                            5.0 );
 	init( ROCKSDB_READ_VALUE_PREFIX_TIMEOUT,                     5.0 );

From 11f1a5d10f3e884d91e96b1586485e116cfa9bfc Mon Sep 17 00:00:00 2001
From: He Liu <heliu05023@gmail.com>
Date: Sun, 25 Sep 2022 18:21:10 -0700
Subject: [PATCH 672/740] Added Histogram for ThreadReturnPromise latency in
 RocksDB.

---
 fdbclient/ServerKnobs.cpp                |  2 +
 fdbclient/ServerKnobs.h                  |  2 +
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 94 ++++++++++++++----------
 flow/IThreadPool.h                       | 18 ++++-
 flow/genericactors.actor.h               | 18 ++++-
 5 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 95c6c2c67fb..d7f2801b15c 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -359,6 +359,8 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( REPLACE_CONTENTS_BYTES,                                1e5 );
 
 	// KeyValueStoreRocksDB
+	init( ROCKSDB_SAMPLE_THREAD_RETURN_PROMISE_LATENCY,         true );
+ 	init( ROCKSDB_THREAD_PROMISE_PRIORITY,                      7500 );
 	init( ROCKSDB_READER_THREAD_PRIORITY,                          0 );
  	init( ROCKSDB_WRITER_THREAD_PRIORITY,                          0 );
 	init( ROCKSDB_BACKGROUND_PARALLELISM,                          4 );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 8179aa14706..acd9ce3ed95 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -290,6 +290,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int64_t REPLACE_CONTENTS_BYTES;
 
 	// KeyValueStoreRocksDB
+	bool ROCKSDB_SAMPLE_THREAD_RETURN_PROMISE_LATENCY;
+	int ROCKSDB_THREAD_PROMISE_PRIORITY;
 	int ROCKSDB_READER_THREAD_PRIORITY;
 	int ROCKSDB_WRITER_THREAD_PRIORITY;
 	int ROCKSDB_BACKGROUND_PARALLELISM;
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index b82bc20df0b..f44ee70e811 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -77,6 +77,33 @@ static_assert((ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR == 27) ? ROCKSDB_PATCH >= 3 :
 
 namespace {
 using rocksdb::BackgroundErrorReason;
+using DB = rocksdb::DB*;
+using CF = rocksdb::ColumnFamilyHandle*;
+
+#define PERSIST_PREFIX "\xff\xff"
+const KeyRef persistVersion = LiteralStringRef(PERSIST_PREFIX "Version");
+const StringRef ROCKSDBSTORAGE_HISTOGRAM_GROUP = LiteralStringRef("RocksDBStorage");
+const StringRef ROCKSDB_COMMIT_LATENCY_HISTOGRAM = LiteralStringRef("RocksDBCommitLatency");
+const StringRef ROCKSDB_COMMIT_ACTION_HISTOGRAM = LiteralStringRef("RocksDBCommitAction");
+const StringRef ROCKSDB_COMMIT_QUEUEWAIT_HISTOGRAM = LiteralStringRef("RocksDBCommitQueueWait");
+const StringRef ROCKSDB_WRITE_HISTOGRAM = LiteralStringRef("RocksDBWrite");
+const StringRef ROCKSDB_DELETE_COMPACTRANGE_HISTOGRAM = LiteralStringRef("RocksDBDeleteCompactRange");
+const StringRef ROCKSDB_READRANGE_LATENCY_HISTOGRAM = LiteralStringRef("RocksDBReadRangeLatency");
+const StringRef ROCKSDB_READVALUE_LATENCY_HISTOGRAM = LiteralStringRef("RocksDBReadValueLatency");
+const StringRef ROCKSDB_READPREFIX_LATENCY_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixLatency");
+const StringRef ROCKSDB_READRANGE_ACTION_HISTOGRAM = LiteralStringRef("RocksDBReadRangeAction");
+const StringRef ROCKSDB_READVALUE_ACTION_HISTOGRAM = LiteralStringRef("RocksDBReadValueAction");
+const StringRef ROCKSDB_READPREFIX_ACTION_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixAction");
+const StringRef ROCKSDB_READRANGE_QUEUEWAIT_HISTOGRAM = LiteralStringRef("RocksDBReadRangeQueueWait");
+const StringRef ROCKSDB_READVALUE_QUEUEWAIT_HISTOGRAM = LiteralStringRef("RocksDBReadValueQueueWait");
+const StringRef ROCKSDB_READPREFIX_QUEUEWAIT_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixQueueWait");
+const StringRef ROCKSDB_READRANGE_NEWITERATOR_HISTOGRAM = LiteralStringRef("RocksDBReadRangeNewIterator");
+const StringRef ROCKSDB_READVALUE_GET_HISTOGRAM = LiteralStringRef("RocksDBReadValueGet");
+const StringRef ROCKSDB_READPREFIX_GET_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixGet");
+const StringRef ROCKSDB_READ_RETURN_LATENCY_HISTOGRAM = "RocksDBReadReturn"_sr;
+
+std::shared_ptr<rocksdb::Cache> rocksdb_block_cache = nullptr;
+
 class SharedRocksDBState {
 public:
 	SharedRocksDBState(UID id);
@@ -84,12 +111,18 @@ class SharedRocksDBState {
 	std::vector<std::shared_ptr<LatencySample>> readLatency;
 	std::vector<std::shared_ptr<LatencySample>> scanLatency;
 	std::vector<std::shared_ptr<LatencySample>> readQueueLatency;
+	Reference<Histogram> readReturnHistogram;
 
 private:
 	const UID id;
 };
 
-SharedRocksDBState::SharedRocksDBState(UID id) : id(id) {
+SharedRocksDBState::SharedRocksDBState(UID id)
+  : id(id), readReturnHistogram(SERVER_KNOBS->ROCKSDB_SAMPLE_THREAD_RETURN_PROMISE_LATENCY
+                                    ? Histogram::getHistogram(ROCKSDBSTORAGE_HISTOGRAM_GROUP,
+                                                              ROCKSDB_READ_RETURN_LATENCY_HISTOGRAM,
+                                                              Histogram::Unit::microseconds)
+                                    : Reference<Histogram>()) {
 	for (int i = 0; i < SERVER_KNOBS->ROCKSDB_READ_PARALLELISM; i++) {
 		readLatency.push_back(std::make_shared<LatencySample>(format("RocksDBReadLatency-%d", i),
 		                                                      id,
@@ -174,30 +207,6 @@ class RocksDBErrorListener : public rocksdb::EventListener {
 	std::mutex mutex;
 	UID id;
 };
-using DB = rocksdb::DB*;
-using CF = rocksdb::ColumnFamilyHandle*;
-std::shared_ptr<rocksdb::Cache> rocksdb_block_cache = nullptr;
-
-#define PERSIST_PREFIX "\xff\xff"
-const KeyRef persistVersion = LiteralStringRef(PERSIST_PREFIX "Version");
-const StringRef ROCKSDBSTORAGE_HISTOGRAM_GROUP = LiteralStringRef("RocksDBStorage");
-const StringRef ROCKSDB_COMMIT_LATENCY_HISTOGRAM = LiteralStringRef("RocksDBCommitLatency");
-const StringRef ROCKSDB_COMMIT_ACTION_HISTOGRAM = LiteralStringRef("RocksDBCommitAction");
-const StringRef ROCKSDB_COMMIT_QUEUEWAIT_HISTOGRAM = LiteralStringRef("RocksDBCommitQueueWait");
-const StringRef ROCKSDB_WRITE_HISTOGRAM = LiteralStringRef("RocksDBWrite");
-const StringRef ROCKSDB_DELETE_COMPACTRANGE_HISTOGRAM = LiteralStringRef("RocksDBDeleteCompactRange");
-const StringRef ROCKSDB_READRANGE_LATENCY_HISTOGRAM = LiteralStringRef("RocksDBReadRangeLatency");
-const StringRef ROCKSDB_READVALUE_LATENCY_HISTOGRAM = LiteralStringRef("RocksDBReadValueLatency");
-const StringRef ROCKSDB_READPREFIX_LATENCY_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixLatency");
-const StringRef ROCKSDB_READRANGE_ACTION_HISTOGRAM = LiteralStringRef("RocksDBReadRangeAction");
-const StringRef ROCKSDB_READVALUE_ACTION_HISTOGRAM = LiteralStringRef("RocksDBReadValueAction");
-const StringRef ROCKSDB_READPREFIX_ACTION_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixAction");
-const StringRef ROCKSDB_READRANGE_QUEUEWAIT_HISTOGRAM = LiteralStringRef("RocksDBReadRangeQueueWait");
-const StringRef ROCKSDB_READVALUE_QUEUEWAIT_HISTOGRAM = LiteralStringRef("RocksDBReadValueQueueWait");
-const StringRef ROCKSDB_READPREFIX_QUEUEWAIT_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixQueueWait");
-const StringRef ROCKSDB_READRANGE_NEWITERATOR_HISTOGRAM = LiteralStringRef("RocksDBReadRangeNewIterator");
-const StringRef ROCKSDB_READVALUE_GET_HISTOGRAM = LiteralStringRef("RocksDBReadValueGet");
-const StringRef ROCKSDB_READPREFIX_GET_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixGet");
 
 rocksdb::ExportImportFilesMetaData getMetaData(const CheckpointMetaData& checkpoint) {
 	rocksdb::ExportImportFilesMetaData metaData;
@@ -1378,11 +1387,11 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			double startTime;
 			bool getHistograms;
 			ThreadReturnPromise<Optional<Value>> result;
-			ReadValueAction(KeyRef key, Optional<UID> debugID)
+			ReadValueAction(KeyRef key, Optional<UID> debugID, Reference<Histogram> returnPromiseHistogram)
 			  : key(key), debugID(debugID), startTime(timer_monotonic()),
 			    getHistograms(
-			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false) {
-			}
+			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
+			    result(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY, returnPromiseHistogram) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_VALUE_TIME_ESTIMATE; }
 		};
 		void action(ReadValueAction& a) {
@@ -1467,11 +1476,14 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			double startTime;
 			bool getHistograms;
 			ThreadReturnPromise<Optional<Value>> result;
-			ReadValuePrefixAction(Key key, int maxLength, Optional<UID> debugID)
+			ReadValuePrefixAction(Key key,
+			                      int maxLength,
+			                      Optional<UID> debugID,
+			                      Reference<Histogram> returnPromiseHistogram)
 			  : key(key), maxLength(maxLength), debugID(debugID), startTime(timer_monotonic()),
 			    getHistograms(
-			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false) {
-			}
+			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
+			    result(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY, returnPromiseHistogram) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_VALUE_TIME_ESTIMATE; }
 		};
 		void action(ReadValuePrefixAction& a) {
@@ -1552,11 +1564,11 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			double startTime;
 			bool getHistograms;
 			ThreadReturnPromise<RangeResult> result;
-			ReadRangeAction(KeyRange keys, int rowLimit, int byteLimit)
+			ReadRangeAction(KeyRange keys, int rowLimit, int byteLimit, Reference<Histogram> returnPromiseHistogram)
 			  : keys(keys), rowLimit(rowLimit), byteLimit(byteLimit), startTime(timer_monotonic()),
 			    getHistograms(
-			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false) {
-			}
+			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
+			    result(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY, returnPromiseHistogram) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_RANGE_TIME_ESTIMATE; }
 		};
 		void action(ReadRangeAction& a) {
@@ -1944,7 +1956,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 
 	Future<Optional<Value>> readValue(KeyRef key, IKeyValueStore::ReadType type, Optional<UID> debugID) override {
 		if (!shouldThrottle(type, key)) {
-			auto a = new Reader::ReadValueAction(key, debugID);
+			auto a = new Reader::ReadValueAction(key, debugID, this->sharedState->readReturnHistogram);
 			auto res = a->result.getFuture();
 			readThreads->post(a);
 			return res;
@@ -1954,7 +1966,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		int maxWaiters = (type == IKeyValueStore::ReadType::FETCH) ? numFetchWaiters : numReadWaiters;
 
 		checkWaiters(semaphore, maxWaiters);
-		auto a = std::make_unique<Reader::ReadValueAction>(key, debugID);
+		auto a = std::make_unique<Reader::ReadValueAction>(key, debugID, this->sharedState->readReturnHistogram);
 		return read(a.release(), &semaphore, readThreads.getPtr(), &counters.failedToAcquire);
 	}
 
@@ -1963,7 +1975,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	                                        IKeyValueStore::ReadType type,
 	                                        Optional<UID> debugID) override {
 		if (!shouldThrottle(type, key)) {
-			auto a = new Reader::ReadValuePrefixAction(key, maxLength, debugID);
+			auto a = new Reader::ReadValuePrefixAction(key, maxLength, debugID, this->sharedState->readReturnHistogram);
 			auto res = a->result.getFuture();
 			readThreads->post(a);
 			return res;
@@ -1973,7 +1985,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		int maxWaiters = (type == IKeyValueStore::ReadType::FETCH) ? numFetchWaiters : numReadWaiters;
 
 		checkWaiters(semaphore, maxWaiters);
-		auto a = std::make_unique<Reader::ReadValuePrefixAction>(key, maxLength, debugID);
+		auto a = std::make_unique<Reader::ReadValuePrefixAction>(
+		    key, maxLength, debugID, this->sharedState->readReturnHistogram);
 		return read(a.release(), &semaphore, readThreads.getPtr(), &counters.failedToAcquire);
 	}
 
@@ -2002,7 +2015,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	                              int byteLimit,
 	                              IKeyValueStore::ReadType type) override {
 		if (!shouldThrottle(type, keys.begin)) {
-			auto a = new Reader::ReadRangeAction(keys, rowLimit, byteLimit);
+			auto a = new Reader::ReadRangeAction(keys, rowLimit, byteLimit, this->sharedState->readReturnHistogram);
 			auto res = a->result.getFuture();
 			readThreads->post(a);
 			return res;
@@ -2012,7 +2025,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		int maxWaiters = (type == IKeyValueStore::ReadType::FETCH) ? numFetchWaiters : numReadWaiters;
 
 		checkWaiters(semaphore, maxWaiters);
-		auto a = std::make_unique<Reader::ReadRangeAction>(keys, rowLimit, byteLimit);
+		auto a = std::make_unique<Reader::ReadRangeAction>(
+		    keys, rowLimit, byteLimit, this->sharedState->readReturnHistogram);
 		return read(a.release(), &semaphore, readThreads.getPtr(), &counters.failedToAcquire);
 	}
 
diff --git a/flow/IThreadPool.h b/flow/IThreadPool.h
index 0ef1bf19691..3977d48fd27 100644
--- a/flow/IThreadPool.h
+++ b/flow/IThreadPool.h
@@ -25,6 +25,7 @@
 #include <string_view>
 
 #include "flow/flow.h"
+#include "flow/Histogram.h"
 
 // The IThreadPool interface represents a thread pool suitable for doing blocking disk-intensive work
 // (as opposed to a one-thread-per-core pool for CPU-intensive work)
@@ -82,7 +83,10 @@ class TypedAction : public ThreadAction {
 template <class T>
 class ThreadReturnPromise : NonCopyable {
 public:
-	ThreadReturnPromise() {}
+	ThreadReturnPromise() : priority(TaskPriority::DefaultOnMainThread) {}
+	ThreadReturnPromise(TaskPriority priority) : priority(priority) {}
+	ThreadReturnPromise(TaskPriority priority, Reference<Histogram> latencyHistogram)
+	  : priority(priority), latencyHistogram(latencyHistogram) {}
 	~ThreadReturnPromise() {
 		if (promise.isValid())
 			sendError(broken_promise());
@@ -95,22 +99,28 @@ class ThreadReturnPromise : NonCopyable {
 	template <class U>
 	void send(U&& t) { // Can be called safely from another thread.  Call send or sendError at most once.
 		Promise<Void> signal;
-		tagAndForward(&promise, t, signal.getFuture());
+		if (latencyHistogram.isValid()) {
+			tagAndForward(&promise, t, signal.getFuture(), timer_monotonic(), latencyHistogram);
+		} else {
+			tagAndForward(&promise, t, signal.getFuture());
+		}
 		g_network->onMainThread(std::move(signal),
 		                        g_network->isOnMainThread() ? incrementPriorityIfEven(g_network->getCurrentTask())
-		                                                    : TaskPriority::DefaultOnMainThread);
+		                                                    : this->priority);
 	}
 	void sendError(Error e) { // Can be called safely from another thread.  Call send or sendError at most once.
 		Promise<Void> signal;
 		tagAndForwardError(&promise, e, signal.getFuture());
 		g_network->onMainThread(std::move(signal),
 		                        g_network->isOnMainThread() ? incrementPriorityIfEven(g_network->getCurrentTask())
-		                                                    : TaskPriority::DefaultOnMainThread);
+		                                                    : this->priority);
 	}
 	bool isValid() { return promise.isValid(); }
 
 private:
 	Promise<T> promise;
+	TaskPriority priority;
+	Reference<Histogram> latencyHistogram;
 };
 
 template <class T>
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 434ddcd18c0..1c13fcf2044 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -32,10 +32,12 @@
 #include <list>
 #include <utility>
 
-#include "flow/flow.h"
+#include "flow/Histogram.h"
+#include "flow/IndexedSet.h"
 #include "flow/Knobs.h"
 #include "flow/Util.h"
-#include "flow/IndexedSet.h"
+#include "flow/flow.h"
+
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 #ifdef _MSC_VER
@@ -1209,6 +1211,18 @@ Future<T> brokenPromiseToMaybeDelivered(Future<T> in) {
 	}
 }
 
+ACTOR template <class T, class U>
+void tagAndForward(Promise<T>* pOutputPromise,
+                   U value,
+                   Future<Void> signal,
+                   double startTime,
+                   Reference<Histogram> latencyHistogram) {
+	state Promise<T> out(std::move(*pOutputPromise));
+	wait(signal);
+	latencyHistogram->sampleSeconds(timer_monotonic() - startTime);
+	out.send(std::move(value));
+}
+
 ACTOR template <class T, class U>
 void tagAndForward(Promise<T>* pOutputPromise, U value, Future<Void> signal) {
 	state Promise<T> out(std::move(*pOutputPromise));

From 5e714c970dbe8be2e0c725b4f9bc9d31d570695a Mon Sep 17 00:00:00 2001
From: He Liu <86634338+liquid-helium@users.noreply.github.com>
Date: Mon, 26 Sep 2022 12:41:30 -0700
Subject: [PATCH 673/740] Added RocksDB latency samples and priority knobs.
 (#8263)

---
 fdbclient/ServerKnobs.cpp                |  2 +
 fdbclient/ServerKnobs.h                  |  2 +
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 70 +++++++++++++++++++-----
 3 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 6cb89cd27ba..95c6c2c67fb 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -359,6 +359,8 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( REPLACE_CONTENTS_BYTES,                                1e5 );
 
 	// KeyValueStoreRocksDB
+	init( ROCKSDB_READER_THREAD_PRIORITY,                          0 );
+ 	init( ROCKSDB_WRITER_THREAD_PRIORITY,                          0 );
 	init( ROCKSDB_BACKGROUND_PARALLELISM,                          4 );
 	init( ROCKSDB_READ_PARALLELISM,                                4 );
 	// Use a smaller memtable in simulation to avoid OOMs.
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index f322267863c..8179aa14706 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -290,6 +290,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int64_t REPLACE_CONTENTS_BYTES;
 
 	// KeyValueStoreRocksDB
+	int ROCKSDB_READER_THREAD_PRIORITY;
+	int ROCKSDB_WRITER_THREAD_PRIORITY;
 	int ROCKSDB_BACKGROUND_PARALLELISM;
 	int ROCKSDB_READ_PARALLELISM;
 	int64_t ROCKSDB_MEMTABLE_BYTES;
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index b3cfa7d7f8f..b82bc20df0b 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -77,6 +77,34 @@ static_assert((ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR == 27) ? ROCKSDB_PATCH >= 3 :
 
 namespace {
 using rocksdb::BackgroundErrorReason;
+class SharedRocksDBState {
+public:
+	SharedRocksDBState(UID id);
+
+	std::vector<std::shared_ptr<LatencySample>> readLatency;
+	std::vector<std::shared_ptr<LatencySample>> scanLatency;
+	std::vector<std::shared_ptr<LatencySample>> readQueueLatency;
+
+private:
+	const UID id;
+};
+
+SharedRocksDBState::SharedRocksDBState(UID id) : id(id) {
+	for (int i = 0; i < SERVER_KNOBS->ROCKSDB_READ_PARALLELISM; i++) {
+		readLatency.push_back(std::make_shared<LatencySample>(format("RocksDBReadLatency-%d", i),
+		                                                      id,
+		                                                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                                                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE));
+		scanLatency.push_back(std::make_shared<LatencySample>(format("RocksDBScanLatency-%d", i),
+		                                                      id,
+		                                                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                                                      SERVER_KNOBS->LATENCY_SAMPLE_SIZE));
+		readQueueLatency.push_back(std::make_shared<LatencySample>(format("RocksDBReadQueueLatency-%d", i),
+		                                                           id,
+		                                                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                                                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE));
+	}
+}
 
 // Returns string representation of RocksDB background error reason.
 // Error reason code:
@@ -1306,6 +1334,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		UID id;
 		DB& db;
 		CF& cf;
+		std::shared_ptr<SharedRocksDBState> sharedState;
 		double readValueTimeout;
 		double readValuePrefixTimeout;
 		double readRangeTimeout;
@@ -1317,11 +1346,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		explicit Reader(UID id,
 		                DB& db,
 		                CF& cf,
+		                std::shared_ptr<SharedRocksDBState> sharedState,
 		                std::shared_ptr<ReadIteratorPool> readIterPool,
 		                std::shared_ptr<PerfContextMetrics> perfContextMetrics,
 		                int threadIndex)
-		  : id(id), db(db), cf(cf), readIterPool(readIterPool), perfContextMetrics(perfContextMetrics),
-		    threadIndex(threadIndex) {
+		  : id(id), db(db), cf(cf), sharedState(sharedState), readIterPool(readIterPool),
+		    perfContextMetrics(perfContextMetrics), threadIndex(threadIndex) {
 			if (g_network->isSimulated()) {
 				// In simulation, increasing the read operation timeouts to 5 minutes, as some of the tests have
 				// very high load and single read thread cannot process all the load within the timeouts.
@@ -1368,6 +1398,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				metricPromiseStream.send(std::make_tuple(
 				    threadIndex, ROCKSDB_READVALUE_QUEUEWAIT_HISTOGRAM.toString(), readBeginTime - a.startTime));
 			}
+			sharedState->readQueueLatency[threadIndex]->addMeasurement(readBeginTime - a.startTime);
 			Optional<TraceBatch> traceBatch;
 			if (a.debugID.present()) {
 				traceBatch = { TraceBatch{} };
@@ -1397,10 +1428,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				return;
 			}
 
+			const double endTime = timer_monotonic();
 			if (a.getHistograms) {
-				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_READVALUE_GET_HISTOGRAM.toString(), timer_monotonic() - dbGetBeginTime));
+				metricPromiseStream.send(
+				    std::make_tuple(threadIndex, ROCKSDB_READVALUE_GET_HISTOGRAM.toString(), endTime - dbGetBeginTime));
 			}
+			sharedState->readLatency[threadIndex]->addMeasurement(endTime - readBeginTime);
 
 			if (a.debugID.present()) {
 				traceBatch.get().addEvent("GetValueDebug", a.debugID.get().first(), "Reader.After");
@@ -1453,6 +1486,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				metricPromiseStream.send(std::make_tuple(
 				    threadIndex, ROCKSDB_READPREFIX_QUEUEWAIT_HISTOGRAM.toString(), readBeginTime - a.startTime));
 			}
+			sharedState->readQueueLatency[threadIndex]->addMeasurement(readBeginTime - a.startTime);
 			Optional<TraceBatch> traceBatch;
 			if (a.debugID.present()) {
 				traceBatch = { TraceBatch{} };
@@ -1478,10 +1512,12 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 
 			double dbGetBeginTime = a.getHistograms ? timer_monotonic() : 0;
 			auto s = db->Get(options, cf, toSlice(a.key), &value);
+			const double endTime = timer_monotonic();
 			if (a.getHistograms) {
 				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_READPREFIX_GET_HISTOGRAM.toString(), timer_monotonic() - dbGetBeginTime));
+				    threadIndex, ROCKSDB_READPREFIX_GET_HISTOGRAM.toString(), endTime - dbGetBeginTime));
 			}
+			sharedState->readLatency[threadIndex]->addMeasurement(endTime - readBeginTime);
 
 			if (a.debugID.present()) {
 				traceBatch.get().addEvent("GetValuePrefixDebug",
@@ -1535,6 +1571,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				metricPromiseStream.send(std::make_tuple(
 				    threadIndex, ROCKSDB_READRANGE_QUEUEWAIT_HISTOGRAM.toString(), readBeginTime - a.startTime));
 			}
+			sharedState->readQueueLatency[threadIndex]->addMeasurement(readBeginTime - a.startTime);
 			if (readBeginTime - a.startTime > readRangeTimeout) {
 				TraceEvent(SevWarn, "KVSTimeout", id)
 				    .detail("Error", "Read range request timedout")
@@ -1626,13 +1663,14 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				result.readThrough = result[result.size() - 1].key;
 			}
 			a.result.send(result);
+			const double endTime = timer_monotonic();
 			if (a.getHistograms) {
-				double currTime = timer_monotonic();
 				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_READRANGE_ACTION_HISTOGRAM.toString(), currTime - readBeginTime));
+				    threadIndex, ROCKSDB_READRANGE_ACTION_HISTOGRAM.toString(), endTime - readBeginTime));
 				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_READRANGE_LATENCY_HISTOGRAM.toString(), currTime - a.startTime));
+				    threadIndex, ROCKSDB_READRANGE_LATENCY_HISTOGRAM.toString(), endTime - a.startTime));
 			}
+			sharedState->scanLatency[threadIndex]->addMeasurement(endTime - readBeginTime);
 			if (doPerfContextMetrics) {
 				perfContextMetrics->set(threadIndex);
 			}
@@ -1640,10 +1678,11 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	};
 
 	DB db = nullptr;
-	std::shared_ptr<PerfContextMetrics> perfContextMetrics;
 	std::string path;
-	rocksdb::ColumnFamilyHandle* defaultFdbCF = nullptr;
 	UID id;
+	std::shared_ptr<SharedRocksDBState> sharedState;
+	std::shared_ptr<PerfContextMetrics> perfContextMetrics;
+	rocksdb::ColumnFamilyHandle* defaultFdbCF = nullptr;
 	Reference<IThreadPool> writeThread;
 	Reference<IThreadPool> readThreads;
 	std::shared_ptr<RocksDBErrorListener> errorListener;
@@ -1661,8 +1700,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	Counters counters;
 
 	explicit RocksDBKeyValueStore(const std::string& path, UID id)
-	  : path(path), id(id), perfContextMetrics(new PerfContextMetrics()),
-	    readIterPool(new ReadIteratorPool(id, db, defaultFdbCF)),
+	  : path(path), id(id), sharedState(std::make_shared<SharedRocksDBState>(id)),
+	    perfContextMetrics(new PerfContextMetrics()), readIterPool(new ReadIteratorPool(id, db, defaultFdbCF)),
 	    readSemaphore(SERVER_KNOBS->ROCKSDB_READ_QUEUE_SOFT_MAX),
 	    fetchSemaphore(SERVER_KNOBS->ROCKSDB_FETCH_QUEUE_SOFT_MAX),
 	    numReadWaiters(SERVER_KNOBS->ROCKSDB_READ_QUEUE_HARD_MAX - SERVER_KNOBS->ROCKSDB_READ_QUEUE_SOFT_MAX),
@@ -1682,8 +1721,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			writeThread = CoroThreadPool::createThreadPool();
 			readThreads = CoroThreadPool::createThreadPool();
 		} else {
-			writeThread = createGenericThreadPool();
-			readThreads = createGenericThreadPool();
+			writeThread = createGenericThreadPool(/*stackSize=*/0, SERVER_KNOBS->ROCKSDB_WRITER_THREAD_PRIORITY);
+			readThreads = createGenericThreadPool(/*stackSize=*/0, SERVER_KNOBS->ROCKSDB_READER_THREAD_PRIORITY);
 		}
 		struct Writer* writer =
 		    new Writer(db, defaultFdbCF, id, readIterPool, perfContextMetrics, SERVER_KNOBS->ROCKSDB_READ_PARALLELISM);
@@ -1694,7 +1733,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		TraceEvent("RocksDBReadThreads", id)
 		    .detail("KnobRocksDBReadParallelism", SERVER_KNOBS->ROCKSDB_READ_PARALLELISM);
 		for (unsigned i = 0; i < SERVER_KNOBS->ROCKSDB_READ_PARALLELISM; ++i) {
-			struct Reader* reader = new Reader(id, db, defaultFdbCF, readIterPool, perfContextMetrics, i);
+			struct Reader* reader =
+			    new Reader(id, db, defaultFdbCF, this->sharedState, readIterPool, perfContextMetrics, i);
 			if (SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE > 0) {
 				actors.push_back(updateHistogram(reader->metricPromiseStream.getFuture()));
 			}

From d7d22fe4971cdb102d9dc749ca3a4ab85538132e Mon Sep 17 00:00:00 2001
From: He Liu <heliu05023@gmail.com>
Date: Mon, 26 Sep 2022 13:40:30 -0700
Subject: [PATCH 674/740] Cast to TaskPriority.

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index f44ee70e811..4a8a6daa886 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -1391,7 +1391,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			  : key(key), debugID(debugID), startTime(timer_monotonic()),
 			    getHistograms(
 			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
-			    result(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY, returnPromiseHistogram) {}
+			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY),
+			           returnPromiseHistogram) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_VALUE_TIME_ESTIMATE; }
 		};
 		void action(ReadValueAction& a) {
@@ -1483,7 +1484,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			  : key(key), maxLength(maxLength), debugID(debugID), startTime(timer_monotonic()),
 			    getHistograms(
 			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
-			    result(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY, returnPromiseHistogram) {}
+			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY),
+			           returnPromiseHistogram) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_VALUE_TIME_ESTIMATE; }
 		};
 		void action(ReadValuePrefixAction& a) {
@@ -1568,7 +1570,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			  : keys(keys), rowLimit(rowLimit), byteLimit(byteLimit), startTime(timer_monotonic()),
 			    getHistograms(
 			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
-			    result(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY, returnPromiseHistogram) {}
+			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY),
+			           returnPromiseHistogram) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_RANGE_TIME_ESTIMATE; }
 		};
 		void action(ReadRangeAction& a) {

From a5171d245c360b3c1d02865ef6b446d5d5ac0368 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Tue, 27 Sep 2022 14:23:19 +0300
Subject: [PATCH 675/740] Added 7.1.22, 7.1.23 release notes (cherrypeek commit
 #f1106c6f7964f25e6bbf792f23be64524f33c943)

---
 .../source/release-notes/release-notes-710.rst    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 0187ccc4cc1..0edeccf5199 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -1,14 +1,23 @@
+.. _release-notes:
+
 #############
 Release Notes
 #############
 
 7.1.23
-=======
-* Same as 7.1.21 release with AVX enabled.
+======
+* Same as 7.1.22 release with AVX enabled.
 
 7.1.22
 ======
-* Introduce STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT knob to recreate SS at io_timeout errors. `(PR #8122) <https://github.com/apple/foundationdb/pull/8122>`_
+* Released with AVX disabled.
+* Added new latency samples for GetValue, GetRange, QueueWait, and VersionWait in storage servers. `(PR #8215) <https://github.com/apple/foundationdb/pull/8215>`_
+* Fixed a rare partial data write for TLogs. `(PR #8210) <https://github.com/apple/foundationdb/pull/8210>`_
+* Added HTTP proxy support for backup agents. `(PR #8193) <https://github.com/apple/foundationdb/pull/8193>`_
+* Fixed a memory bug of secondary queries in index prefetch. `(PR #8195) <https://github.com/apple/foundationdb/pull/8195>`_, `(PR #8190) <https://github.com/apple/foundationdb/pull/8190>`_
+* Introduced STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT knob to recreate SS at io_timeout errors. `(PR #8123) <https://github.com/apple/foundationdb/pull/8123>`_
+* Fixed two TLog stopped bugs and a CC leader replacement bug. `(PR #8081) <https://github.com/apple/foundationdb/pull/8081>`_
+* Added back RecoveryAvailable trace event for status's seconds_since_last_recovered field. `(PR #8068) <https://github.com/apple/foundationdb/pull/8068>`_
 
 7.1.21
 ======

From db905fc88bdf186fc3498b35139375da84d63cd7 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:45:47 -0700
Subject: [PATCH 676/740] Update default
 PEER_DEGRADATION_CONNECTION_FAILURE_COUNT value

---
 fdbclient/ServerKnobs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 9d931c4556b..7bbc8173c81 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -750,7 +750,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( PEER_LATENCY_DEGRADATION_PERCENTILE_SATELLITE,        0.90 );
 	init( PEER_LATENCY_DEGRADATION_THRESHOLD_SATELLITE,          0.1 );
 	init( PEER_TIMEOUT_PERCENTAGE_DEGRADATION_THRESHOLD,         0.1 );
-	init( PEER_DEGRADATION_CONNECTION_FAILURE_COUNT,               1 );
+	init( PEER_DEGRADATION_CONNECTION_FAILURE_COUNT,               5 );
 	init( WORKER_HEALTH_REPORT_RECENT_DESTROYED_PEER,           true );
 	init( STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT,                 false ); if ( randomize && BUGGIFY ) STORAGE_SERVER_REBOOT_ON_IO_TIMEOUT = true;
 

From 53e2dde1387f3552ef6de3865f6a6b5b666ce6f6 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Thu, 29 Sep 2022 09:57:08 +0300
Subject: [PATCH 677/740] Building release documentation

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index abbf63ddbdf..fbd43f82923 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,7 +98,7 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}/bld
       shell: bash
-      run: ninja -j 3
+      run: ninja -j 3 all documentation/package_html
 
     - name: Minimal tests
       working-directory: ${{github.workspace}}/bld

From e60dc707940673f90883143329f49ebc88ee0bd1 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Thu, 29 Sep 2022 10:03:46 +0300
Subject: [PATCH 678/740] Bumped to the new revision to fix some ctests

---
 cmake/Jemalloc.cmake | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cmake/Jemalloc.cmake b/cmake/Jemalloc.cmake
index e1a91c39794..7f076394e37 100644
--- a/cmake/Jemalloc.cmake
+++ b/cmake/Jemalloc.cmake
@@ -8,11 +8,10 @@ add_library(im_jemalloc_pic STATIC IMPORTED)
 include(ExternalProject)
 set(JEMALLOC_DIR "${CMAKE_BINARY_DIR}/jemalloc")
 ExternalProject_add(Jemalloc_project
-  URL "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"
-  URL_HASH SHA256=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
+  URL "https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2"
+  URL_HASH SHA256=2db82d1e7119df3e71b7640219b6dfe84789bc0537983c3b7ac4f7189aecfeaa
   BUILD_BYPRODUCTS "${JEMALLOC_DIR}/include/jemalloc/jemalloc.h"
   "${JEMALLOC_DIR}/lib/libjemalloc_pic.a"
-  PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/cmake/jemalloc.patch
   CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --prefix=${JEMALLOC_DIR} --enable-static --disable-cxx --enable-prof --disable-initial-exec-tls
   BUILD_IN_SOURCE ON
   BUILD_COMMAND make

From 613aa76ef78f2d811116510689c2bfdc3a373dbc Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Thu, 29 Sep 2022 10:06:24 +0300
Subject: [PATCH 679/740] Link with openssl's librcypto wich was found during
 configuration step with it's path

---
 fdbclient/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index 7a318cec239..ae2c6a07658 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -217,7 +217,7 @@ endif()
 
 add_flow_target(STATIC_LIBRARY NAME fdbclient SRCS ${FDBCLIENT_SRCS} ADDL_SRCS ${options_srcs})
 add_dependencies(fdbclient fdboptions)
-target_link_libraries(fdbclient PUBLIC fdbrpc msgpack PRIVATE crypto)
+target_link_libraries(fdbclient PUBLIC fdbrpc msgpack PRIVATE OpenSSL::Crypto)
 
 # Create a separate fdbclient library with sampling enabled. This lets
 # fdbserver retain sampling functionality in client code while disabling

From 131ab4aa3486a10f80a53bc46bd84d1ab82902a7 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Thu, 29 Sep 2022 14:40:47 +0300
Subject: [PATCH 680/740] Fixed boost search: set Boost_iostreams_FOUND
 variable before check it (#8203)

---
 cmake/CompileBoost.cmake | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/cmake/CompileBoost.cmake b/cmake/CompileBoost.cmake
index f50d82e7bfd..8d93bc8f4db 100644
--- a/cmake/CompileBoost.cmake
+++ b/cmake/CompileBoost.cmake
@@ -57,15 +57,25 @@ function(compile_boost)
     INSTALL_COMMAND ""
     UPDATE_COMMAND ""
     BUILD_BYPRODUCTS "${BOOST_INSTALL_DIR}/boost/config.hpp"
-                     "${BOOST_INSTALL_DIR}/lib/libboost_context.a")
+                     "${BOOST_INSTALL_DIR}/lib/libboost_context.a"
+                     "${BOOST_INSTALL_DIR}/lib/libboost_filesystem.a"
+                     "${BOOST_INSTALL_DIR}/lib/libboost_iostreams.a")
 
   add_library(${COMPILE_BOOST_TARGET}_context STATIC IMPORTED)
   add_dependencies(${COMPILE_BOOST_TARGET}_context ${COMPILE_BOOST_TARGET}Project)
   set_target_properties(${COMPILE_BOOST_TARGET}_context PROPERTIES IMPORTED_LOCATION "${BOOST_INSTALL_DIR}/lib/libboost_context.a")
 
+  add_library(${COMPILE_BOOST_TARGET}_filesystem STATIC IMPORTED)
+  add_dependencies(${COMPILE_BOOST_TARGET}_filesystem ${COMPILE_BOOST_TARGET}Project)
+  set_target_properties(${COMPILE_BOOST_TARGET}_filesystem PROPERTIES IMPORTED_LOCATION "${BOOST_INSTALL_DIR}/lib/libboost_filesystem.a")
+
+  add_library(${COMPILE_BOOST_TARGET}_iostreams STATIC IMPORTED)
+  add_dependencies(${COMPILE_BOOST_TARGET}_iostreams ${COMPILE_BOOST_TARGET}Project)
+  set_target_properties(${COMPILE_BOOST_TARGET}_iostreams PROPERTIES IMPORTED_LOCATION "${BOOST_INSTALL_DIR}/lib/libboost_iostreams.a")
+
   add_library(${COMPILE_BOOST_TARGET} INTERFACE)
   target_include_directories(${COMPILE_BOOST_TARGET} SYSTEM INTERFACE ${BOOST_INSTALL_DIR}/include)
-  target_link_libraries(${COMPILE_BOOST_TARGET} INTERFACE ${COMPILE_BOOST_TARGET}_context)
+  target_link_libraries(${COMPILE_BOOST_TARGET} INTERFACE ${COMPILE_BOOST_TARGET}_context ${COMPILE_BOOST_TARGET}_filesystem ${COMPILE_BOOST_TARGET}_iostreams)
 
 endfunction(compile_boost)
 
@@ -91,11 +101,11 @@ set(Boost_USE_STATIC_LIBS ON)
 if (UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang$")
   list(APPEND CMAKE_PREFIX_PATH /opt/boost_1_78_0_clang)
   set(BOOST_HINT_PATHS /opt/boost_1_78_0_clang)
-  message(STATUS "Using Clang version of boost::context")
+  message(STATUS "Using Clang version of boost::context boost::filesystem and boost::iostreams")
 else ()
   list(APPEND CMAKE_PREFIX_PATH /opt/boost_1_78_0)
   set(BOOST_HINT_PATHS /opt/boost_1_78_0)
-  message(STATUS "Using g++ version of boost::context")
+  message(STATUS "Using g++ version of boost::context boost::filesystem and boost::iostreams")
 endif ()
 
 if(BOOST_ROOT)
@@ -107,18 +117,18 @@ if(WIN32)
   # properly for config mode. So we use the old way on Windows
   #  find_package(Boost 1.72.0 EXACT QUIET REQUIRED CONFIG PATHS ${BOOST_HINT_PATHS})
   # I think depending on the cmake version this will cause weird warnings
-  find_package(Boost 1.72)
+  find_package(Boost 1.72 COMPONENTS filesystem iostreams)
   add_library(boost_target INTERFACE)
-  target_link_libraries(boost_target INTERFACE Boost::boost)
+  target_link_libraries(boost_target INTERFACE Boost::boost Boost::filesystem Boost::iostreams)
   return()
 endif()
 
-find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})
+find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context filesystem iostreams CONFIG PATHS ${BOOST_HINT_PATHS})
 set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores any installed boost")
 
-if(Boost_FOUND AND NOT FORCE_BOOST_BUILD)
+if(Boost_FOUND AND Boost_filesystem_FOUND AND Boost_context_FOUND AND Boost_iostreams_FOUND AND NOT FORCE_BOOST_BUILD)
   add_library(boost_target INTERFACE)
-  target_link_libraries(boost_target INTERFACE Boost::boost Boost::context)
+  target_link_libraries(boost_target INTERFACE Boost::boost Boost::context Boost::filesystem Boost::iostreams)
 elseif(WIN32)
   message(FATAL_ERROR "Could not find Boost")
 else()

From d5be1da45b2a9c150f5d1d9fe9f42c6fadd5e5a6 Mon Sep 17 00:00:00 2001
From: Vishesh Yadav <vishesh_yadav@apple.com>
Date: Thu, 29 Sep 2022 11:29:06 -0700
Subject: [PATCH 681/740] Make exclusion less pessimistic when warning about
 low space usage

Tries to account for shared disks by looking at disk_id if available.
---
 fdbclient/SpecialKeySpace.actor.cpp | 87 ++++++++++++++++-------------
 1 file changed, 49 insertions(+), 38 deletions(-)

diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
index e084b329a6d..6d2d717e49b 100644
--- a/fdbclient/SpecialKeySpace.actor.cpp
+++ b/fdbclient/SpecialKeySpace.actor.cpp
@@ -21,10 +21,12 @@
 #include "boost/lexical_cast.hpp"
 #include "boost/algorithm/string.hpp"
 
+#include <string>
 #include <time.h>
 #include <msgpack.hpp>
 
 #include <exception>
+#include <unordered_set>
 
 #include "fdbclient/ActorLineageProfiler.h"
 #include "fdbclient/ClusterConnectionMemoryRecord.h"
@@ -970,21 +972,13 @@ ACTOR Future<bool> checkExclusion(Database db,
 
 	state int ssTotalCount = 0;
 	state int ssExcludedCount = 0;
-	state double worstFreeSpaceRatio = 1.0;
+
+	state std::unordered_set<std::string> diskLocalities();
+	state int64_t totalKvStoreFreeBytes = 0;
+	state int64_t totalKvStoreUsedBytes = 0;
+	state int64_t totalKvStoreUsedBytesNonExcluded = 0;
 	try {
 		for (auto proc : processesMap.obj()) {
-			bool storageServer = false;
-			StatusArray rolesArray = proc.second.get_obj()["roles"].get_array();
-			for (StatusObjectReader role : rolesArray) {
-				if (role["role"].get_str() == "storage") {
-					storageServer = true;
-					break;
-				}
-			}
-			// Skip non-storage servers in free space calculation
-			if (!storageServer)
-				continue;
-
 			StatusObjectReader process(proc.second);
 			std::string addrStr;
 			if (!process.get("address", addrStr)) {
@@ -994,33 +988,49 @@ ACTOR Future<bool> checkExclusion(Database db,
 			NetworkAddress addr = NetworkAddress::parse(addrStr);
 			bool excluded =
 			    (process.has("excluded") && process.last().get_bool()) || addressExcluded(*exclusions, addr);
-			ssTotalCount++;
-			if (excluded)
-				ssExcludedCount++;
-
-			if (!excluded) {
-				StatusObjectReader disk;
-				if (!process.get("disk", disk)) {
-					*msg =
-					    ManagementAPIError::toJsonString(false, markFailed ? "exclude failed" : "exclude", errorString);
-					return false;
-				}
 
-				int64_t total_bytes;
-				if (!disk.get("total_bytes", total_bytes)) {
-					*msg =
-					    ManagementAPIError::toJsonString(false, markFailed ? "exclude failed" : "exclude", errorString);
-					return false;
-				}
+			StatusObjectReader localityObj;
+			std::string disk_id;
+			if (process.get("locality", localityObj)) {
+				process.get("disk_id", disk_id); // its ok if we don't have this field
+			}
+
+			StatusArray rolesArray = proc.second.get_obj()["roles"].get_array();
+			for (StatusObjectReader role : rolesArray) {
+				if (role["role"].get_str() == "storage") {
+					ssTotalCount++;
+
+					int64_t used_bytes;
+					if (!role.get("kvstore_used_bytes", used_bytes)) {
+						*msg = ManagementAPIError::toJsonString(
+						    false, markFailed ? "exclude failed" : "exclude", errorString);
+						return false;
+					}
+
+					int64_t free_bytes;
+					if (!role.get("kvstore_free_bytes", free_bytes)) {
+						*msg = ManagementAPIError::toJsonString(
+						    false, markFailed ? "exclude failed" : "exclude", errorString);
+						return false;
+					}
+
+					totalKvStoreUsedBytes += used_bytes;
+
+					if (!excluded) {
+						totalKvStoreUsedBytesNonExcluded += used_bytes;
 
-				int64_t free_bytes;
-				if (!disk.get("free_bytes", free_bytes)) {
-					*msg =
-					    ManagementAPIError::toJsonString(false, markFailed ? "exclude failed" : "exclude", errorString);
-					return false;
+						if (disk_id.empty() || diskLocalities.find(disk_id) == diskLocalities.end()) {
+							totalKvStoreFreeBytes += free_bytes;
+							if (!disk_id.empty()) {
+								diskLocalities.insert(disk_id);
+							}
+						}
+					}
 				}
 
-				worstFreeSpaceRatio = std::min(worstFreeSpaceRatio, double(free_bytes) / total_bytes);
+				if (excluded) {
+					ssExcludedCount++;
+				}
 			}
 		}
 	} catch (...) // std::exception
@@ -1029,14 +1039,15 @@ ACTOR Future<bool> checkExclusion(Database db,
 		return false;
 	}
 
-	if (ssExcludedCount == ssTotalCount ||
-	    (1 - worstFreeSpaceRatio) * ssTotalCount / (ssTotalCount - ssExcludedCount) > 0.9) {
+	double finalFreeRatio = 1 - (totalKvStoreUsedBytes / (totalKvStoreUsedBytesNonExcluded + totalKvStoreFreeBytes));
+	if (ssExcludedCount == ssTotalCount || finalFreeRatio <= 0.1) {
 		std::string temp = "ERROR: This exclude may cause the total free space in the cluster to drop below 10%.\n"
 		                   "Call set(\"0xff0xff/management/options/exclude/force\", ...) first to exclude without "
 		                   "checking free space.\n";
 		*msg = ManagementAPIError::toJsonString(false, markFailed ? "exclude failed" : "exclude", temp);
 		return false;
 	}
+
 	return true;
 }
 

From dee4a4f46c548e3f58404f40e812aa6ec19e1ae0 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Thu, 29 Sep 2022 12:35:07 -0700
Subject: [PATCH 682/740] Storage server readrange and update latency. (#8353)

---
 fdbserver/storageserver.actor.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index b3cce51eff9..bb10258b48c 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -944,6 +944,8 @@ struct StorageServer {
 		LatencySample readRangeLatencySample;
 		LatencySample readVersionWaitSample;
 		LatencySample readQueueWaitSample;
+		LatencySample kvReadRangeLatencySample;
+		LatencySample updateLatencySample;
 
 		LatencyBands readLatencyBands;
 		LatencySample mappedRangeSample; // Samples getMappedRange latency
@@ -1012,7 +1014,15 @@ struct StorageServer {
 		    mappedRangeLocalSample("GetMappedRangeLocalMetrics",
 		                           self->thisServerID,
 		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE) {
+		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    kvReadRangeLatencySample("KVGetRangeMetrics",
+		                             self->thisServerID,
+		                             SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                             SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    updateLatencySample("UpdateLatencyMetrics",
+		                        self->thisServerID,
+		                        SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                        SERVER_KNOBS->LATENCY_SAMPLE_SIZE) {
 			specialCounter(cc, "LastTLogVersion", [self]() { return self->lastTLogVersion; });
 			specialCounter(cc, "Version", [self]() { return self->version.get(); });
 			specialCounter(cc, "StorageVersion", [self]() { return self->storageVersion(); });
@@ -3384,6 +3394,7 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 		} else {
 			state int remainingLimitBytes = req.limitBytes;
 
+			state double kvReadRange = g_network->timer();
 			GetKeyValuesReply _r = wait(readRange(data,
 			                                      version,
 			                                      KeyRangeRef(begin, end),
@@ -3392,6 +3403,8 @@ ACTOR Future<Void> getKeyValuesQ(StorageServer* data, GetKeyValuesRequest req)
 			                                      span.context,
 			                                      type,
 			                                      tenantPrefix));
+			double duration = g_network->timer() - kvReadRange;
+			data->counters.kvReadRangeLatencySample.addMeasurement(duration);
 			GetKeyValuesReply r = _r;
 
 			if (req.debugID.present())
@@ -6932,6 +6945,7 @@ ACTOR Future<Void> tssDelayForever() {
 }
 
 ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
+	state double updateStart = g_network->timer();
 	state double start;
 	try {
 
@@ -7356,6 +7370,9 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 			data->behind = false;
 		}
 
+		double duration = g_network->timer() - updateStart;
+		data->counters.updateLatencySample.addMeasurement(duration);
+
 		return Void(); // update will get called again ASAP
 	} catch (Error& err) {
 		state Error e = err;

From a4e10d4f88c06a66acd7c3b37f6c80b36c92c781 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Thu, 29 Sep 2022 14:18:26 -0700
Subject: [PATCH 683/740] Update default PEER_LATENCY_DEGRADATION_PERCENTILE to
 0.5

---
 fdbclient/ServerKnobs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 8fafabb43ff..2967261097d 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -747,9 +747,9 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( ENABLE_WORKER_HEALTH_MONITOR,                        false );
 	init( WORKER_HEALTH_MONITOR_INTERVAL,                       60.0 );
 	init( PEER_LATENCY_CHECK_MIN_POPULATION,                      30 );
-	init( PEER_LATENCY_DEGRADATION_PERCENTILE,                  0.90 );
+	init( PEER_LATENCY_DEGRADATION_PERCENTILE,                  0.50 );
 	init( PEER_LATENCY_DEGRADATION_THRESHOLD,                   0.05 );
-	init( PEER_LATENCY_DEGRADATION_PERCENTILE_SATELLITE,        0.90 );
+	init( PEER_LATENCY_DEGRADATION_PERCENTILE_SATELLITE,        0.50 );
 	init( PEER_LATENCY_DEGRADATION_THRESHOLD_SATELLITE,          0.1 );
 	init( PEER_TIMEOUT_PERCENTAGE_DEGRADATION_THRESHOLD,         0.1 );
 	init( PEER_DEGRADATION_CONNECTION_FAILURE_COUNT,               5 );

From 6d2f06cd1276cbdb2def90f242ddb1a7df29ee1f Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Sat, 1 Oct 2022 22:10:18 +0300
Subject: [PATCH 684/740] Try to fix Python 3.11 incapability with Sphinx 1.5.6

---
 cmake/FDBComponents.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/FDBComponents.cmake b/cmake/FDBComponents.cmake
index 865e2f79dc9..31bb9133a3b 100644
--- a/cmake/FDBComponents.cmake
+++ b/cmake/FDBComponents.cmake
@@ -107,7 +107,7 @@ endif()
 ################################################################################
 
 option(BUILD_DOCUMENTATION "build documentation" ON)
-find_package(Python3 COMPONENTS Interpreter)
+find_package(Python3 3.0...<3.11 COMPONENTS Interpreter)
 if (WITH_PYTHON AND Python3_Interpreter_FOUND AND BUILD_DOCUMENTATION)
   set(WITH_DOCUMENTATION ON)
 else()

From e426a2e99676b61d58f6b744bd1da3ed42cb0be6 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Sat, 1 Oct 2022 22:13:44 +0300
Subject: [PATCH 685/740] Disbale ctests again. Also make yamllint almost
 happy.

---
 .github/workflows/build.yml | 232 ++++++++++++++++++------------------
 1 file changed, 116 insertions(+), 116 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fbd43f82923..2952cb603b3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,121 +18,121 @@ jobs:
       release_upload_url: ${{ steps.create_release.outputs.upload_url }}
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Calculate versions
-      id: vers
-      shell: bash
-      run: |
-        git fetch --prune --unshallow --tags --force
-        GIT_VERSION=`git describe --tags`
-        PROJECT_VERSION=`echo $GIT_VERSION | cut -d- -f1`
-        BUILD_VERSION=`echo $GIT_VERSION | cut -d- -f2-3 --output-delimiter=.`
-        GIT_CHANGE_NUM=`echo $GIT_VERSION | cut -d- -f3`
-        if [[ -n "$GIT_CHANGE_NUM" ]] || [[ "$BUILD_VERSION" < "1" ]]; then
-          RELEASE_FLAG=OFF
-        else
-          RELEASE_FLAG=ON
-        fi
-
-        echo "::set-output name=project_ver::$PROJECT_VERSION"
-        echo "::set-output name=build_ver::$BUILD_VERSION"
-        echo "::set-output name=full_ver::$PROJECT_VERSION-$BUILD_VERSION"
-        echo "::set-output name=release_flag::$RELEASE_FLAG"
-
-    - name: Display versions
-      run: |
-        echo "project_ver=${{steps.vers.outputs.project_ver}}"
-        echo "build_ver=${{steps.vers.outputs.build_ver}}"
-        echo "full_ver=${{steps.vers.outputs.full_ver}}"
-        echo "release_flag=${{steps.vers.outputs.release_flag}}"
-
-    - name: Create Draft Release
-      if: ${{ steps.vers.outputs.release_flag == 'ON' }}
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: "${{ steps.vers.outputs.full_ver }}"
-        release_name:  "v${{ steps.vers.outputs.full_ver }}"
-        draft: true
-        prerelease: false
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Calculate versions
+        id: vers
+        shell: bash
+        run: |
+          git fetch --prune --unshallow --tags --force
+          GIT_VERSION=`git describe --tags`
+          PROJECT_VERSION=`echo $GIT_VERSION | cut -d- -f1`
+          BUILD_VERSION=`echo $GIT_VERSION | cut -d- -f2-3 --output-delimiter=.`
+          GIT_CHANGE_NUM=`echo $GIT_VERSION | cut -d- -f3`
+          if [[ -n "$GIT_CHANGE_NUM" ]] || [[ "$BUILD_VERSION" < "1" ]]; then
+            RELEASE_FLAG=OFF
+          else
+            RELEASE_FLAG=ON
+          fi
+
+          echo "::set-output name=project_ver::$PROJECT_VERSION"
+          echo "::set-output name=build_ver::$BUILD_VERSION"
+          echo "::set-output name=full_ver::$PROJECT_VERSION-$BUILD_VERSION"
+          echo "::set-output name=release_flag::$RELEASE_FLAG"
+
+      - name: Display versions
+        run: |
+          echo "project_ver=${{steps.vers.outputs.project_ver}}"
+          echo "build_ver=${{steps.vers.outputs.build_ver}}"
+          echo "full_ver=${{steps.vers.outputs.full_ver}}"
+          echo "release_flag=${{steps.vers.outputs.release_flag}}"
+
+      - name: Create Draft Release
+        if: ${{ steps.vers.outputs.release_flag == 'ON' }}
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: "${{ steps.vers.outputs.full_ver }}"
+          release_name: "v${{ steps.vers.outputs.full_ver }}"
+          draft: true
+          prerelease: false
 
   build_linux:
     runs-on: ubuntu-18.04
     needs: [calc_ver]
 
     steps:
-    - name: Install Dependencies
-      shell: bash
-      run: |
-        sudo apt update
-        sudo apt install -y sudo git cmake g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm clang-10
-        sudo pip3 install virtualenv
-        sudo apt install -y dirmngr gnupg apt-transport-https ca-certificates
-        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-        sudo sh -c 'echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" > /etc/apt/sources.list.d/mono-official-stable.list'
-        sudo apt update
-        sudo apt install -y mono-complete
-
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Create Build Environment
-      # Some projects don't allow in-source building, so create a separate build directory
-      # We'll use this as our working directory for all subsequent commands
-      run: cmake -E make_directory ${{github.workspace}}/bld
-
-    - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
-      shell: bash
-      working-directory: ${{github.workspace}}/bld
-      # Note the current convention is to use the -S and -B options here to specify source
-      # and build directories, but this is only available with CMake 3.13 and higher.
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: CC=clang-10 CXX=clang++-10 cmake -DFDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DGENERATE_DEBUG_PACKAGES=OFF -DUSE_LIBCXX=OFF -DSTATIC_LINK_LIBCXX=ON -DENABLE_SIMULATION_TESTS=ON -G Ninja ${{github.workspace}}
-
-    - name: Build
-      working-directory: ${{github.workspace}}/bld
-      shell: bash
-      run: ninja -j 3 all documentation/package_html
-
-    - name: Minimal tests
-      working-directory: ${{github.workspace}}/bld
-      shell: bash
-      run: ctest --output-on-failure -V
-
-    - name: Build RPMs
-      working-directory: ${{github.workspace}}/bld
-      shell: bash
-      run: |
-        cpack -G RPM
-        for fn in packages/*.rpm; do echo "$fn:"; rpm -qpRv $fn; echo; done
-
-    - name: Build DEBs
-      working-directory: ${{github.workspace}}/bld
-      shell: bash
-      run: |
-        cpack -G DEB
-        for fn in packages/*.deb; do echo "$fn:"; dpkg -I $fn; done
-
-    #- name: Remove versioned
-    #  shell: bash
-    #  run: rm -rf ${{github.workspace}}bld/packages/*${{needs.calc_ver.outputs.full_ver}}.versioned*
-
-    - name: Upload result
-      uses: nanoufo/action-upload-artifacts-and-release-assets@v1.4
-      with:
-        path: |
-          ${{github.workspace}}/bld/packages/*${{needs.calc_ver.outputs.full_ver}}*
-        upload-release-files: ${{ needs.calc_ver.outputs.release_flag }}
-        release-upload-url: ${{ needs.calc_ver.outputs.release_upload_url }}
-        if-no-files-found: error
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install Dependencies
+        shell: bash
+        run: |
+          sudo apt update
+          sudo apt install -y sudo git cmake g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm clang-10
+          sudo pip3 install virtualenv
+          sudo apt install -y dirmngr gnupg apt-transport-https ca-certificates
+          sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+          sudo sh -c 'echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" > /etc/apt/sources.list.d/mono-official-stable.list'
+          sudo apt update
+          sudo apt install -y mono-complete
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Create Build Environment
+        # Some projects don't allow in-source building, so create a separate build directory
+        # We'll use this as our working directory for all subsequent commands
+        run: cmake -E make_directory ${{github.workspace}}/bld
+
+      - name: Configure CMake
+        # Use a bash shell so we can use the same syntax for environment variable
+        # access regardless of the host operating system
+        shell: bash
+        working-directory: ${{github.workspace}}/bld
+        # Note the current convention is to use the -S and -B options here to specify source
+        # and build directories, but this is only available with CMake 3.13 and higher.
+        # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+        run: CC=clang-10 CXX=clang++-10 cmake -DFDB_RELEASE=${{needs.calc_ver.outputs.release_flag}} -DBUILD_VERSION=${{needs.calc_ver.outputs.build_ver}} -DGENERATE_DEBUG_PACKAGES=OFF -DUSE_LIBCXX=OFF -DSTATIC_LINK_LIBCXX=ON -DENABLE_SIMULATION_TESTS=ON -G Ninja ${{github.workspace}}
+
+      - name: Build
+        working-directory: ${{github.workspace}}/bld
+        shell: bash
+        run: ninja -j 3 all documentation/package_html
+
+      # - name: Minimal tests
+      #  working-directory: ${{github.workspace}}/bld
+      #  shell: bash
+      #  run: ctest --output-on-failure -V
+
+      - name: Build RPMs
+        working-directory: ${{github.workspace}}/bld
+        shell: bash
+        run: |
+          cpack -G RPM
+          for fn in packages/*.rpm; do echo "$fn:"; rpm -qpRv $fn; echo; done
+
+      - name: Build DEBs
+        working-directory: ${{github.workspace}}/bld
+        shell: bash
+        run: |
+          cpack -G DEB
+          for fn in packages/*.deb; do echo "$fn:"; dpkg -I $fn; done
+
+      # - name: Remove versioned
+      #  shell: bash
+      #  run: rm -rf ${{github.workspace}}bld/packages/*${{needs.calc_ver.outputs.full_ver}}.versioned*
+
+      - name: Upload result
+        uses: nanoufo/action-upload-artifacts-and-release-assets@v1.4
+        with:
+          path: |
+            ${{github.workspace}}/bld/packages/*${{needs.calc_ver.outputs.full_ver}}*
+          upload-release-files: ${{ needs.calc_ver.outputs.release_flag }}
+          release-upload-url: ${{ needs.calc_ver.outputs.release_upload_url }}
+          if-no-files-found: error
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   test_deploy:
     needs: [calc_ver, build_linux]
@@ -184,20 +184,20 @@ jobs:
     needs: [calc_ver, build_linux]
     if: ${{ needs.calc_ver.outputs.release_flag == 'ON' }}
     runs-on: ubuntu-latest
-    steps:
 
-    - uses: eregon/publish-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        release_id: ${{ needs.calc_ver.outputs.release_id }}
+    steps:
+      - uses: eregon/publish-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          release_id: ${{ needs.calc_ver.outputs.release_id }}
 
   tests:
     needs: [calc_ver, build_linux]
     runs-on: ubuntu-latest
     env:
       JOSHUA_DB_VER: "6.3.15"
-      N_OF_TESTS: 600 # to fit in 360 minutes job run limit
+      N_OF_TESTS: 600  # to fit in 360 minutes job run limit
       JOSHUA_AGENT_URL: "docker.io/1inker"
       JOSHUA_AGENT_TAG: "rhel8-20220816"
 

From 32d218c81bc21588afa510b9cb3c2c7439454a2b Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Wed, 28 Sep 2022 14:24:14 -0700
Subject: [PATCH 686/740] differentiate degraded peers and disconnected peers
 in gray failure

---
 fdbserver/ClusterController.actor.h | 12 ++++-
 fdbserver/WorkerInterface.actor.h   |  3 +-
 fdbserver/worker.actor.cpp          | 84 +++++++++++++++++++----------
 3 files changed, 68 insertions(+), 31 deletions(-)

diff --git a/fdbserver/ClusterController.actor.h b/fdbserver/ClusterController.actor.h
index cb64fa91854..6f7a4a072e6 100644
--- a/fdbserver/ClusterController.actor.h
+++ b/fdbserver/ClusterController.actor.h
@@ -2903,9 +2903,14 @@ class ClusterControllerData {
 		for (int i = 0; i < req.degradedPeers.size(); ++i) {
 			degradedPeersString += (i == 0 ? "" : " ") + req.degradedPeers[i].toString();
 		}
+		std::string disconnectedPeersString;
+		for (int i = 0; i < req.disconnectedPeers.size(); ++i) {
+			disconnectedPeersString += (i == 0 ? "" : " ") + req.disconnectedPeers[i].toString();
+		}
 		TraceEvent("ClusterControllerUpdateWorkerHealth")
 		    .detail("WorkerAddress", req.address)
-		    .detail("DegradedPeers", degradedPeersString);
+		    .detail("DegradedPeers", degradedPeersString)
+		    .detail("DisconnectedPeers", disconnectedPeersString);
 
 		double currentTime = now();
 
@@ -2917,6 +2922,11 @@ class ClusterControllerData {
 				workerHealth[req.address].degradedPeers[degradedPeer] = { currentTime, currentTime };
 			}
 
+			// TODO(zhewu): add disconnected peers in worker health.
+			for (const auto& degradedPeer : req.disconnectedPeers) {
+				workerHealth[req.address].degradedPeers[degradedPeer] = { currentTime, currentTime };
+			}
+
 			return;
 		}
 
diff --git a/fdbserver/WorkerInterface.actor.h b/fdbserver/WorkerInterface.actor.h
index 5ae49317123..47b9e7f926e 100644
--- a/fdbserver/WorkerInterface.actor.h
+++ b/fdbserver/WorkerInterface.actor.h
@@ -498,13 +498,14 @@ struct UpdateWorkerHealthRequest {
 	constexpr static FileIdentifier file_identifier = 5789927;
 	NetworkAddress address;
 	std::vector<NetworkAddress> degradedPeers;
+	std::vector<NetworkAddress> disconnectedPeers;
 
 	template <class Ar>
 	void serialize(Ar& ar) {
 		if constexpr (!is_fb_function<Ar>) {
 			ASSERT(ar.protocolVersion().isValid());
 		}
-		serializer(ar, address, degradedPeers);
+		serializer(ar, address, degradedPeers, disconnectedPeers);
 	}
 };
 
diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 54a1372cc04..987b72bd8ee 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -972,48 +972,74 @@ ACTOR Future<Void> healthMonitor(Reference<AsyncVar<Optional<ClusterControllerFu
 						continue;
 					}
 					bool degradedPeer = false;
+					bool disconnectedPeer = false;
 					if ((workerLocation == Primary && addressInDbAndPrimaryDc(address, dbInfo)) ||
 					    (workerLocation == Remote && addressInDbAndRemoteDc(address, dbInfo))) {
 						// Monitors intra DC latencies between servers that in the primary or remote DC's transaction
 						// systems. Note that currently we are not monitor storage servers, since lagging in storage
 						// servers today already can trigger server exclusion by data distributor.
 
-						if (peer->connectFailedCount >= SERVER_KNOBS->PEER_DEGRADATION_CONNECTION_FAILURE_COUNT ||
-						    peer->pingLatencies.percentile(SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE) >
-						        SERVER_KNOBS->PEER_LATENCY_DEGRADATION_THRESHOLD ||
-						    peer->timeoutCount / (double)(peer->pingLatencies.getPopulationSize()) >
-						        SERVER_KNOBS->PEER_TIMEOUT_PERCENTAGE_DEGRADATION_THRESHOLD) {
+						if (peer->connectFailedCount >= SERVER_KNOBS->PEER_DEGRADATION_CONNECTION_FAILURE_COUNT) {
+							disconnectedPeer = true;
+						} else if (peer->pingLatencies.percentile(SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE) >
+						               SERVER_KNOBS->PEER_LATENCY_DEGRADATION_THRESHOLD ||
+						           peer->timeoutCount / (double)(peer->pingLatencies.getPopulationSize()) >
+						               SERVER_KNOBS->PEER_TIMEOUT_PERCENTAGE_DEGRADATION_THRESHOLD) {
 							degradedPeer = true;
 						}
+						if (disconnectedPeer || degradedPeer) {
+							TraceEvent("HealthMonitorDetectDegradedPeer")
+							    .detail("Peer", address)
+							    .detail("Elapsed", now() - peer->lastLoggedTime)
+							    .detail("Disconnected", disconnectedPeer)
+							    .detail("MinLatency", peer->pingLatencies.min())
+							    .detail("MaxLatency", peer->pingLatencies.max())
+							    .detail("MeanLatency", peer->pingLatencies.mean())
+							    .detail("MedianLatency", peer->pingLatencies.median())
+							    .detail("CheckedPercentile", SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE)
+							    .detail(
+							        "CheckedPercentileLatency",
+							        peer->pingLatencies.percentile(SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE))
+							    .detail("PingCount", peer->pingLatencies.getPopulationSize())
+							    .detail("PingTimeoutCount", peer->timeoutCount)
+							    .detail("ConnectionFailureCount", peer->connectFailedCount);
+						}
 					} else if (workerLocation == Primary && addressInDbAndPrimarySatelliteDc(address, dbInfo)) {
 						// Monitors inter DC latencies between servers in primary and primary satellite DC. Note that
 						// TLog workers in primary satellite DC are on the critical path of serving a commit.
-						if (peer->connectFailedCount >= SERVER_KNOBS->PEER_DEGRADATION_CONNECTION_FAILURE_COUNT ||
-						    peer->pingLatencies.percentile(
-						        SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE_SATELLITE) >
-						        SERVER_KNOBS->PEER_LATENCY_DEGRADATION_THRESHOLD_SATELLITE ||
-						    peer->timeoutCount / (double)(peer->pingLatencies.getPopulationSize()) >
-						        SERVER_KNOBS->PEER_TIMEOUT_PERCENTAGE_DEGRADATION_THRESHOLD) {
+						if (peer->connectFailedCount >= SERVER_KNOBS->PEER_DEGRADATION_CONNECTION_FAILURE_COUNT) {
+							disconnectedPeer = true;
+						} else if (peer->pingLatencies.percentile(
+						               SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE_SATELLITE) >
+						               SERVER_KNOBS->PEER_LATENCY_DEGRADATION_THRESHOLD_SATELLITE ||
+						           peer->timeoutCount / (double)(peer->pingLatencies.getPopulationSize()) >
+						               SERVER_KNOBS->PEER_TIMEOUT_PERCENTAGE_DEGRADATION_THRESHOLD) {
 							degradedPeer = true;
 						}
-					}
 
-					if (degradedPeer) {
-						TraceEvent("HealthMonitorDetectDegradedPeer")
-						    .suppressFor(30)
-						    .detail("Peer", address)
-						    .detail("Elapsed", now() - peer->lastLoggedTime)
-						    .detail("MinLatency", peer->pingLatencies.min())
-						    .detail("MaxLatency", peer->pingLatencies.max())
-						    .detail("MeanLatency", peer->pingLatencies.mean())
-						    .detail("MedianLatency", peer->pingLatencies.median())
-						    .detail("CheckedPercentile", SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE)
-						    .detail("CheckedPercentileLatency",
-						            peer->pingLatencies.percentile(SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE))
-						    .detail("PingCount", peer->pingLatencies.getPopulationSize())
-						    .detail("PingTimeoutCount", peer->timeoutCount)
-						    .detail("ConnectionFailureCount", peer->connectFailedCount);
+						if (disconnectedPeer || degradedPeer) {
+							TraceEvent("HealthMonitorDetectDegradedPeer")
+							    .detail("Peer", address)
+							    .detail("Elapsed", now() - peer->lastLoggedTime)
+							    .detail("Disconnected", disconnectedPeer)
+							    .detail("MinLatency", peer->pingLatencies.min())
+							    .detail("MaxLatency", peer->pingLatencies.max())
+							    .detail("MeanLatency", peer->pingLatencies.mean())
+							    .detail("MedianLatency", peer->pingLatencies.median())
+							    .detail("CheckedPercentile",
+							            SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE_SATELLITE)
+							    .detail("CheckedPercentileLatency",
+							            peer->pingLatencies.percentile(
+							                SERVER_KNOBS->PEER_LATENCY_DEGRADATION_PERCENTILE_SATELLITE))
+							    .detail("PingCount", peer->pingLatencies.getPopulationSize())
+							    .detail("PingTimeoutCount", peer->timeoutCount)
+							    .detail("ConnectionFailureCount", peer->connectFailedCount);
+						}
+					}
 
+					if (disconnectedPeer) {
+						req.disconnectedPeers.push_back(address);
+					} else if (degradedPeer) {
 						req.degradedPeers.push_back(address);
 					}
 				}
@@ -1034,13 +1060,13 @@ ACTOR Future<Void> healthMonitor(Reference<AsyncVar<Optional<ClusterControllerFu
 						    (workerLocation == Remote && addressInDbAndRemoteDc(address, dbInfo)) ||
 						    (workerLocation == Primary && addressInDbAndPrimarySatelliteDc(address, dbInfo))) {
 							TraceEvent("HealthMonitorDetectRecentClosedPeer").suppressFor(30).detail("Peer", address);
-							req.degradedPeers.push_back(address);
+							req.disconnectedPeers.push_back(address);
 						}
 					}
 				}
 			}
 
-			if (!req.degradedPeers.empty()) {
+			if (!req.disconnectedPeers.empty() || !req.degradedPeers.empty()) {
 				req.address = FlowTransport::transport().getLocalAddress();
 				ccInterface->get().get().updateWorkerHealth.send(req);
 			}

From 095322e492c977db78ae274562305ee4127f9627 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Thu, 29 Sep 2022 10:19:19 -0700
Subject: [PATCH 687/740] Add unit test

---
 fdbserver/ClusterController.actor.cpp | 14 ++++++++++++++
 fdbserver/ClusterController.actor.h   | 19 ++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 01e9e5646e4..d2604a84929 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -2783,6 +2783,20 @@ TEST_CASE("/fdbserver/clustercontroller/updateWorkerHealth") {
 		ASSERT_EQ(health.degradedPeers[badPeer3].lastRefreshTime, previousRefreshTime);
 	}
 
+	// Create a `UpdateWorkerHealthRequest` with disconnected peers, which should update the bad peer's lastRefreshTime.
+	{
+		wait(delay(0.001));
+		UpdateWorkerHealthRequest req;
+		req.address = workerAddress;
+		req.disconnectedPeers.push_back(badPeer3);
+		data.updateWorkerHealth(req);
+		ASSERT(data.workerHealth.find(workerAddress) != data.workerHealth.end());
+		auto& health = data.workerHealth[workerAddress];
+		ASSERT_EQ(health.degradedPeers.size(), 3);
+		ASSERT(health.degradedPeers.find(badPeer3) != health.degradedPeers.end());
+		ASSERT_LT(health.degradedPeers[badPeer3].startTime, health.degradedPeers[badPeer3].lastRefreshTime);
+	}
+
 	return Void();
 }
 
diff --git a/fdbserver/ClusterController.actor.h b/fdbserver/ClusterController.actor.h
index 6f7a4a072e6..297699c282d 100644
--- a/fdbserver/ClusterController.actor.h
+++ b/fdbserver/ClusterController.actor.h
@@ -2934,14 +2934,23 @@ class ClusterControllerData {
 
 		auto& health = workerHealth[req.address];
 
-		// Update the worker's degradedPeers.
-		for (const auto& peer : req.degradedPeers) {
-			auto it = health.degradedPeers.find(peer);
+		auto updateDegradedPeer = [&health, &currentTime](const NetworkAddress& degradedPeer) {
+			auto it = health.degradedPeers.find(degradedPeer);
 			if (it == health.degradedPeers.end()) {
-				health.degradedPeers[peer] = { currentTime, currentTime };
-				continue;
+				health.degradedPeers[degradedPeer] = { currentTime, currentTime };
+				return;
 			}
 			it->second.lastRefreshTime = currentTime;
+		};
+
+		// Update the worker's degradedPeers.
+		for (const auto& peer : req.degradedPeers) {
+			updateDegradedPeer(peer);
+		}
+
+		// TODO(zhewu): add disconnected peers in worker health.
+		for (const auto& peer : req.disconnectedPeers) {
+			updateDegradedPeer(peer);
 		}
 	}
 

From 270f30a209be2f0c65330d59bf61052f05dd2ed2 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Thu, 29 Sep 2022 13:03:25 -0700
Subject: [PATCH 688/740] Address comments by passing currentTime by value

---
 fdbserver/ClusterController.actor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/ClusterController.actor.h b/fdbserver/ClusterController.actor.h
index 297699c282d..696f9338aaf 100644
--- a/fdbserver/ClusterController.actor.h
+++ b/fdbserver/ClusterController.actor.h
@@ -2934,7 +2934,7 @@ class ClusterControllerData {
 
 		auto& health = workerHealth[req.address];
 
-		auto updateDegradedPeer = [&health, &currentTime](const NetworkAddress& degradedPeer) {
+		auto updateDegradedPeer = [&health, currentTime](const NetworkAddress& degradedPeer) {
 			auto it = health.degradedPeers.find(degradedPeer);
 			if (it == health.degradedPeers.end()) {
 				health.degradedPeers[degradedPeer] = { currentTime, currentTime };

From ef15ad1316c08f1b01cbfed0c43681e9016c7674 Mon Sep 17 00:00:00 2001
From: He Liu <86634338+liquid-helium@users.noreply.github.com>
Date: Tue, 4 Oct 2022 14:25:21 -0700
Subject: [PATCH 689/740] Added knobs: (#8372)

ROCKSDB_SUGGEST_COMPACT_CLEAR_RANGE
ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES
---
 fdbclient/ServerKnobs.cpp                |  2 ++
 fdbclient/ServerKnobs.h                  |  2 ++
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 24 +++++++++++++-----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 2967261097d..62c50732b63 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -359,6 +359,8 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( REPLACE_CONTENTS_BYTES,                                1e5 );
 
 	// KeyValueStoreRocksDB
+	init( ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES,         true ); if( randomize && BUGGIFY )  ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES = false;
+ 	init( ROCKSDB_SUGGEST_COMPACT_CLEAR_RANGE,                  true ); if( randomize && BUGGIFY )  ROCKSDB_SUGGEST_COMPACT_CLEAR_RANGE = false;
 	init( ROCKSDB_SAMPLE_THREAD_RETURN_PROMISE_LATENCY,         true );
  	init( ROCKSDB_THREAD_PROMISE_PRIORITY,                      7500 );
 	init( ROCKSDB_READER_THREAD_PRIORITY,                          0 );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index acd9ce3ed95..1333c037bce 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -290,6 +290,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int64_t REPLACE_CONTENTS_BYTES;
 
 	// KeyValueStoreRocksDB
+	bool ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES;
+	int ROCKSDB_SUGGEST_COMPACT_CLEAR_RANGE;
 	bool ROCKSDB_SAMPLE_THREAD_RETURN_PROMISE_LATENCY;
 	int ROCKSDB_THREAD_PROMISE_PRIORITY;
 	int ROCKSDB_READER_THREAD_PRIORITY;
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 4a8a6daa886..dc5846602d9 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -286,7 +286,7 @@ StringRef toStringRef(rocksdb::Slice s) {
 
 rocksdb::ColumnFamilyOptions getCFOptions() {
 	rocksdb::ColumnFamilyOptions options;
-	options.level_compaction_dynamic_level_bytes = true;
+	options.level_compaction_dynamic_level_bytes = SERVER_KNOBS->ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES;
 	options.OptimizeLevelStyleCompaction(SERVER_KNOBS->ROCKSDB_MEMTABLE_BYTES);
 	if (SERVER_KNOBS->ROCKSDB_PERIODIC_COMPACTION_SECONDS > 0) {
 		options.periodic_compaction_seconds = SERVER_KNOBS->ROCKSDB_PERIODIC_COMPACTION_SECONDS;
@@ -1157,16 +1157,18 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			} else {
 				a.done.send(Void());
 
-				double compactRangeBeginTime = a.getHistograms ? timer_monotonic() : 0;
-				for (const auto& keyRange : deletes) {
-					auto begin = toSlice(keyRange.begin);
-					auto end = toSlice(keyRange.end);
-					ASSERT(db->SuggestCompactRange(cf, &begin, &end).ok());
-				}
-				if (a.getHistograms) {
-					metricPromiseStream.send(std::make_tuple(threadIndex,
-					                                         ROCKSDB_DELETE_COMPACTRANGE_HISTOGRAM.toString(),
-					                                         timer_monotonic() - compactRangeBeginTime));
+				if (SERVER_KNOBS->ROCKSDB_SUGGEST_COMPACT_CLEAR_RANGE) {
+					double compactRangeBeginTime = a.getHistograms ? timer_monotonic() : 0;
+					for (const auto& keyRange : deletes) {
+						auto begin = toSlice(keyRange.begin);
+						auto end = toSlice(keyRange.end);
+						ASSERT(db->SuggestCompactRange(cf, &begin, &end).ok());
+					}
+					if (a.getHistograms) {
+						metricPromiseStream.send(std::make_tuple(threadIndex,
+						                                         ROCKSDB_DELETE_COMPACTRANGE_HISTOGRAM.toString(),
+						                                         timer_monotonic() - compactRangeBeginTime));
+					}
 				}
 			}
 			if (a.getHistograms) {

From 56bd721ea6a4b7947c314fcc5054d26606c9b602 Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <82616783+sbodagala@users.noreply.github.com>
Date: Wed, 5 Oct 2022 16:23:56 -0400
Subject: [PATCH 690/740] - Version vector specific: Propagate the latest
 commit version, as part of the read request, when reading from a storage
 server.

---
 fdbclient/DatabaseContext.h                   | 14 ++++
 fdbclient/NativeAPI.actor.cpp                 | 68 +++++++++++++++----
 .../workloads/ConsistencyCheck.actor.cpp      | 12 ++++
 3 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index 470e3488386..455f7606bda 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -627,6 +627,12 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	// Adds or updates the specified (UID, Tag) pair in the tag mapping.
 	void addSSIdTagMapping(const UID& uid, const Tag& tag);
 
+	// Returns the latest commit version that mutated the specified storage server.
+	// @in ssid id of the storage server interface
+	// @out tag storage server's tag, if an entry exists for "ssid" in "ssidTagMapping"
+	// @out commitVersion latest commit version that mutated the storage server
+	void getLatestCommitVersionForSSID(const UID& ssid, Tag& tag, Version& commitVersion);
+
 	// Returns the latest commit versions that mutated the specified storage servers
 	/// @note returns the latest commit version for a storage server only if the latest
 	// commit version of that storage server is below the specified "readVersion".
@@ -635,6 +641,14 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	                             Reference<TransactionState> info,
 	                             VersionVector& latestCommitVersions);
 
+	// Returns the latest commit version that mutated the specified storage server.
+	// @note this is a lightweight version of "getLatestCommitVersions()", to be used
+	// when the state ("TransactionState") of the transaction that fetched the read
+	// version is not available.
+	void getLatestCommitVersion(const StorageServerInterface& ssi,
+	                            Version readVersion,
+	                            VersionVector& latestCommitVersion);
+
 	// used in template functions to create a transaction
 	using TransactionT = ReadYourWritesTransaction;
 	Reference<TransactionT> createTransaction();
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index d4c8a7047a0..978c708c643 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -222,6 +222,52 @@ void DatabaseContext::addSSIdTagMapping(const UID& uid, const Tag& tag) {
 	ssidTagMapping[uid] = tag;
 }
 
+void DatabaseContext::getLatestCommitVersionForSSID(const UID& ssid, Tag& tag, Version& commitVersion) {
+	// initialization
+	tag = invalidTag;
+	commitVersion = invalidVersion;
+
+	auto iter = ssidTagMapping.find(ssid);
+	if (iter != ssidTagMapping.end()) {
+		tag = iter->second;
+
+		if (ssVersionVectorCache.hasVersion(tag)) {
+			commitVersion = ssVersionVectorCache.getVersion(tag);
+		}
+	}
+}
+
+void DatabaseContext::getLatestCommitVersion(const StorageServerInterface& ssi,
+                                             Version readVersion,
+                                             VersionVector& latestCommitVersion) {
+	latestCommitVersion.clear();
+
+	if (ssVersionVectorCache.getMaxVersion() == invalidVersion) {
+		return;
+	}
+
+	// Error checking (based on the assumption that the read version was not obtained
+	// from the client's grv cache).
+	if (readVersion > ssVersionVectorCache.getMaxVersion()) {
+		TraceEvent(SevError, "ReadVersionExceedsVersionVectorMax")
+		    .detail("ReadVersion", readVersion)
+		    .detail("VersionVector", ssVersionVectorCache.toString());
+		if (g_network->isSimulated()) {
+			ASSERT(false);
+		} else {
+			return; // Do not return a stale commit version in production.
+		}
+	}
+
+	Tag tag = invalidTag;
+	Version commitVersion = invalidVersion;
+	getLatestCommitVersionForSSID(ssi.id(), tag, commitVersion);
+
+	if (tag != invalidTag && commitVersion != invalidVersion && commitVersion < readVersion) {
+		latestCommitVersion.setVersion(tag, commitVersion);
+	}
+}
+
 void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& locationInfo,
                                               Version readVersion,
                                               Reference<TransactionState> info,
@@ -253,24 +299,20 @@ void DatabaseContext::getLatestCommitVersions(const Reference<LocationInfo>& loc
 
 	std::map<Version, std::set<Tag>> versionMap; // order the versions to be returned
 	for (int i = 0; i < locationInfo->locations()->size(); i++) {
-		bool updatedVersionMap = false;
-		Version commitVersion = invalidVersion;
 		Tag tag = invalidTag;
-		auto iter = ssidTagMapping.find(locationInfo->locations()->getId(i));
-		if (iter != ssidTagMapping.end()) {
-			tag = iter->second;
-			if (ssVersionVectorCache.hasVersion(tag)) {
-				commitVersion = ssVersionVectorCache.getVersion(tag); // latest commit version
-				if (commitVersion < readVersion) {
-					updatedVersionMap = true;
-					versionMap[commitVersion].insert(tag);
-				}
-			}
+		Version commitVersion = invalidVersion; // latest commit version
+		getLatestCommitVersionForSSID(locationInfo->locations()->getId(i), tag, commitVersion);
+
+		bool updatedVersionMap = false;
+		if (tag != invalidTag && commitVersion != invalidVersion && commitVersion < readVersion) {
+			updatedVersionMap = true;
+			versionMap[commitVersion].insert(tag);
 		}
+
 		// Do not log if commitVersion >= readVersion.
 		if (!updatedVersionMap && commitVersion == invalidVersion) {
 			TraceEvent(SevDebug, "CommitVersionNotFoundForSS")
-			    .detail("InSSIDMap", iter != ssidTagMapping.end() ? 1 : 0)
+			    .detail("InSSIDMap", tag != invalidTag ? 1 : 0)
 			    .detail("Tag", tag)
 			    .detail("CommitVersion", commitVersion)
 			    .detail("ReadVersion", readVersion)
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 35952cc7c61..4b54bc765f3 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -539,6 +539,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 					state int j = 0;
 					for (j = 0; j < iter_ss.size(); j++) {
 						resetReply(req);
+						if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+							cx->getLatestCommitVersion(iter_ss[j], req.version, req.ssLatestCommitVersions);
+						}
 						keyValueFutures.push_back(iter_ss[j].getKeyValues.getReplyUnlessFailedFor(req, 2, 0));
 					}
 
@@ -776,6 +779,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 					state std::vector<Future<ErrorOr<GetKeyValuesReply>>> keyValueFutures;
 					for (const auto& kv : shards[i].second) {
 						resetReply(req);
+						if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+							cx->getLatestCommitVersion(kv, req.version, req.ssLatestCommitVersions);
+						}
 						keyValueFutures.push_back(kv.getKeyValues.getReplyUnlessFailedFor(req, 2, 0));
 					}
 
@@ -965,6 +971,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 					state std::vector<Future<ErrorOr<GetKeyValuesReply>>> keyValueFutures;
 					for (const auto& kv : shards[i].second) {
 						resetReply(req);
+                        if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+                            cx->getLatestCommitVersion(kv, req.version, req.ssLatestCommitVersions);
+                        }
 						keyValueFutures.push_back(kv.getKeyValues.getReplyUnlessFailedFor(req, 2, 0));
 					}
 
@@ -1338,6 +1347,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 						state int j = 0;
 						for (j = 0; j < storageServerInterfaces.size(); j++) {
 							resetReply(req);
+                            if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+                                cx->getLatestCommitVersion(storageServerInterfaces[j], req.version, req.ssLatestCommitVersions);
+                            }
 							keyValueFutures.push_back(
 							    storageServerInterfaces[j].getKeyValues.getReplyUnlessFailedFor(req, 2, 0));
 						}

From 609433bb2cdb6b8d305958fa13cbec151e7c42cd Mon Sep 17 00:00:00 2001
From: Sreenath Bodagala <sbodagala@apple.com>
Date: Thu, 6 Oct 2022 16:32:14 +0000
Subject: [PATCH 691/740] - Code formatting.

---
 fdbserver/workloads/ConsistencyCheck.actor.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 4b54bc765f3..42d597ea1ac 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -971,9 +971,9 @@ struct ConsistencyCheckWorkload : TestWorkload {
 					state std::vector<Future<ErrorOr<GetKeyValuesReply>>> keyValueFutures;
 					for (const auto& kv : shards[i].second) {
 						resetReply(req);
-                        if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
-                            cx->getLatestCommitVersion(kv, req.version, req.ssLatestCommitVersions);
-                        }
+						if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+							cx->getLatestCommitVersion(kv, req.version, req.ssLatestCommitVersions);
+						}
 						keyValueFutures.push_back(kv.getKeyValues.getReplyUnlessFailedFor(req, 2, 0));
 					}
 
@@ -1347,9 +1347,10 @@ struct ConsistencyCheckWorkload : TestWorkload {
 						state int j = 0;
 						for (j = 0; j < storageServerInterfaces.size(); j++) {
 							resetReply(req);
-                            if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
-                                cx->getLatestCommitVersion(storageServerInterfaces[j], req.version, req.ssLatestCommitVersions);
-                            }
+							if (SERVER_KNOBS->ENABLE_VERSION_VECTOR) {
+								cx->getLatestCommitVersion(
+								    storageServerInterfaces[j], req.version, req.ssLatestCommitVersions);
+							}
 							keyValueFutures.push_back(
 							    storageServerInterfaces[j].getKeyValues.getReplyUnlessFailedFor(req, 2, 0));
 						}

From 3c200cb3d6e44897ea4629f06107662c4dade096 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Thu, 6 Oct 2022 13:26:53 -0400
Subject: [PATCH 692/740] Enable buggify for version_vector feature (#8407)

* Enable buggify for version vector

* Fix buggfyUseResolverPrivateMutations switch
---
 fdbclient/ServerKnobs.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 62c50732b63..a79fdb6ce34 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -35,8 +35,8 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( VERSIONS_PER_SECOND,                                   1e6 );
 	init( MAX_VERSIONS_IN_FLIGHT,                100 * VERSIONS_PER_SECOND );
 	init( MAX_VERSIONS_IN_FLIGHT_FORCED,         6e5 * VERSIONS_PER_SECOND ); //one week of versions
-	init( ENABLE_VERSION_VECTOR_TLOG_UNICAST,                  false );
-	init( ENABLE_VERSION_VECTOR,                               false );
+	init( ENABLE_VERSION_VECTOR_TLOG_UNICAST,                  false ); if (randomize && BUGGIFY) ENABLE_VERSION_VECTOR_TLOG_UNICAST = true;
+	init( ENABLE_VERSION_VECTOR,                               false ); if (ENABLE_VERSION_VECTOR_TLOG_UNICAST == true) ENABLE_VERSION_VECTOR = true;
 
 	bool buggifyShortReadWindow = randomize && BUGGIFY && !ENABLE_VERSION_VECTOR;
 	init( MAX_READ_TRANSACTION_LIFE_VERSIONS,      5 * VERSIONS_PER_SECOND ); if (randomize && BUGGIFY) MAX_READ_TRANSACTION_LIFE_VERSIONS = VERSIONS_PER_SECOND; else if (buggifyShortReadWindow) MAX_READ_TRANSACTION_LIFE_VERSIONS = std::max<int>(1, 0.1 * VERSIONS_PER_SECOND); else if( randomize && BUGGIFY ) MAX_READ_TRANSACTION_LIFE_VERSIONS = 10 * VERSIONS_PER_SECOND;
@@ -471,7 +471,9 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( PROXY_REJECT_BATCH_QUEUED_TOO_LONG,                    true );
 
 	bool buggfyUseResolverPrivateMutations = randomize && BUGGIFY && !ENABLE_VERSION_VECTOR_TLOG_UNICAST;
+
 	init( PROXY_USE_RESOLVER_PRIVATE_MUTATIONS,                 false ); if( buggfyUseResolverPrivateMutations ) PROXY_USE_RESOLVER_PRIVATE_MUTATIONS = deterministicRandom()->coinflip();
+	if (ENABLE_VERSION_VECTOR_TLOG_UNICAST == true) PROXY_USE_RESOLVER_PRIVATE_MUTATIONS = true;
 
 	init( RESET_MASTER_BATCHES,                                   200 );
 	init( RESET_RESOLVER_BATCHES,                                 200 );

From 53bc1c14cbc8d1a49a9c2af774d9838cc0b4ec21 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Mon, 3 Oct 2022 10:04:27 -0700
Subject: [PATCH 693/740] RocksDB compaction knobs and stats.

---
 fdbclient/ServerKnobs.cpp                |  2 +
 fdbclient/ServerKnobs.h                  |  2 +
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 83 ++++++++++++++++++++----
 3 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index a79fdb6ce34..516df8c2e1c 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -370,6 +370,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	// Use a smaller memtable in simulation to avoid OOMs.
 	int64_t memtableBytes = isSimulated ? 32 * 1024 : 512 * 1024 * 1024;
 	init( ROCKSDB_MEMTABLE_BYTES,                      memtableBytes );
+	init( ROCKSDB_LEVEL_STYLE_COMPACTION,                       true );
 	init( ROCKSDB_UNSAFE_AUTO_FSYNC,                           false );
 	init( ROCKSDB_PERIODIC_COMPACTION_SECONDS,                     0 );
 	init( ROCKSDB_PREFIX_LEN,                                      0 );
@@ -393,6 +394,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	// If true, enables dynamic adjustment of ROCKSDB_WRITE_RATE_LIMITER_BYTES according to the recent demand of background IO.
 	init( ROCKSDB_WRITE_RATE_LIMITER_AUTO_TUNE,                 true );
 	init( DEFAULT_FDB_ROCKSDB_COLUMN_FAMILY,                    "fdb");
+	init( ROCKSDB_DISABLE_AUTO_COMPACTIONS,                    false ); // RocksDB default
 
 	init( ROCKSDB_PERFCONTEXT_ENABLE,                          false ); if( randomize && BUGGIFY ) ROCKSDB_PERFCONTEXT_ENABLE = deterministicRandom()->coinflip() ? false : true;
 	init( ROCKSDB_PERFCONTEXT_SAMPLE_RATE, 					  0.0001 );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 1333c037bce..c83d172065b 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -299,6 +299,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int ROCKSDB_BACKGROUND_PARALLELISM;
 	int ROCKSDB_READ_PARALLELISM;
 	int64_t ROCKSDB_MEMTABLE_BYTES;
+	bool ROCKSDB_LEVEL_STYLE_COMPACTION;
 	bool ROCKSDB_UNSAFE_AUTO_FSYNC;
 	int64_t ROCKSDB_PERIODIC_COMPACTION_SECONDS;
 	int ROCKSDB_PREFIX_LEN;
@@ -320,6 +321,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int64_t ROCKSDB_WRITE_RATE_LIMITER_BYTES_PER_SEC;
 	bool ROCKSDB_WRITE_RATE_LIMITER_AUTO_TUNE;
 	std::string DEFAULT_FDB_ROCKSDB_COLUMN_FAMILY;
+	bool ROCKSDB_DISABLE_AUTO_COMPACTIONS;
 	bool ROCKSDB_PERFCONTEXT_ENABLE; // Enable rocks perf context metrics. May cause performance overhead
 	double ROCKSDB_PERFCONTEXT_SAMPLE_RATE;
 	int ROCKSDB_MAX_SUBCOMPACTIONS;
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index dc5846602d9..12ff9e793e4 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -111,6 +111,9 @@ class SharedRocksDBState {
 	std::vector<std::shared_ptr<LatencySample>> readLatency;
 	std::vector<std::shared_ptr<LatencySample>> scanLatency;
 	std::vector<std::shared_ptr<LatencySample>> readQueueLatency;
+	LatencySample commitLatency;
+	LatencySample commitQueueLatency;
+	LatencySample dbWriteLatency;
 	Reference<Histogram> readReturnHistogram;
 
 private:
@@ -122,7 +125,19 @@ SharedRocksDBState::SharedRocksDBState(UID id)
                                     ? Histogram::getHistogram(ROCKSDBSTORAGE_HISTOGRAM_GROUP,
                                                               ROCKSDB_READ_RETURN_LATENCY_HISTOGRAM,
                                                               Histogram::Unit::microseconds)
-                                    : Reference<Histogram>()) {
+                                    : Reference<Histogram>()),
+    commitLatency(LatencySample("RocksDBCommitLatency",
+                                id,
+                                SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+                                SERVER_KNOBS->LATENCY_SAMPLE_SIZE)),
+    commitQueueLatency(LatencySample("RocksDBCommitQueueLatency",
+                                     id,
+                                     SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+                                     SERVER_KNOBS->LATENCY_SAMPLE_SIZE)),
+    dbWriteLatency(LatencySample("RocksDBWriteLatency",
+                                 id,
+                                 SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+                                 SERVER_KNOBS->LATENCY_SAMPLE_SIZE)) {
 	for (int i = 0; i < SERVER_KNOBS->ROCKSDB_READ_PARALLELISM; i++) {
 		readLatency.push_back(std::make_shared<LatencySample>(format("RocksDBReadLatency-%d", i),
 		                                                      id,
@@ -287,7 +302,16 @@ StringRef toStringRef(rocksdb::Slice s) {
 rocksdb::ColumnFamilyOptions getCFOptions() {
 	rocksdb::ColumnFamilyOptions options;
 	options.level_compaction_dynamic_level_bytes = SERVER_KNOBS->ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES;
-	options.OptimizeLevelStyleCompaction(SERVER_KNOBS->ROCKSDB_MEMTABLE_BYTES);
+	if (SERVER_KNOBS->ROCKSDB_LEVEL_STYLE_COMPACTION) {
+		options.OptimizeLevelStyleCompaction(SERVER_KNOBS->ROCKSDB_MEMTABLE_BYTES);
+	} else {
+		options.OptimizeUniversalStyleCompaction(SERVER_KNOBS->ROCKSDB_MEMTABLE_BYTES);
+	}
+
+	if (SERVER_KNOBS->ROCKSDB_DISABLE_AUTO_COMPACTIONS) {
+		options.disable_auto_compactions = SERVER_KNOBS->ROCKSDB_DISABLE_AUTO_COMPACTIONS;
+	}
+
 	if (SERVER_KNOBS->ROCKSDB_PERIODIC_COMPACTION_SECONDS > 0) {
 		options.periodic_compaction_seconds = SERVER_KNOBS->ROCKSDB_PERIODIC_COMPACTION_SECONDS;
 	}
@@ -807,14 +831,29 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
 		{ "CountWalFileSyncs", rocksdb::WAL_FILE_SYNCED, 0 },
 		{ "CountWalFileBytes", rocksdb::WAL_FILE_BYTES, 0 },
 		{ "CompactReadBytes", rocksdb::COMPACT_READ_BYTES, 0 },
+		{ "CompactReadBytesMarked", rocksdb::COMPACT_READ_BYTES_MARKED, 0 },
+		{ "CompactReadBytesPeriodic", rocksdb::COMPACT_READ_BYTES_PERIODIC, 0 },
+		{ "CompactReadBytesTtl", rocksdb::COMPACT_READ_BYTES_TTL, 0 },
 		{ "CompactWriteBytes", rocksdb::COMPACT_WRITE_BYTES, 0 },
+		{ "CompactWriteBytesMarked", rocksdb::COMPACT_WRITE_BYTES_MARKED, 0 },
+		{ "CompactWriteBytesPeriodic", rocksdb::COMPACT_WRITE_BYTES_PERIODIC, 0 },
+		{ "CompactWriteBytesTtl", rocksdb::COMPACT_WRITE_BYTES_TTL, 0 },
 		{ "FlushWriteBytes", rocksdb::FLUSH_WRITE_BYTES, 0 },
 		{ "CountBlocksCompressed", rocksdb::NUMBER_BLOCK_COMPRESSED, 0 },
 		{ "CountBlocksDecompressed", rocksdb::NUMBER_BLOCK_DECOMPRESSED, 0 },
 		{ "RowCacheHit", rocksdb::ROW_CACHE_HIT, 0 },
 		{ "RowCacheMiss", rocksdb::ROW_CACHE_MISS, 0 },
 		{ "CountIterSkippedKeys", rocksdb::NUMBER_ITER_SKIP, 0 },
+	};
 
+	state std::vector<std::pair<const char*, uint32_t>> histogramStats = {
+		{ "CompactionTime", rocksdb::COMPACTION_TIME },
+		{ "CompactionCPUTime", rocksdb::COMPACTION_CPU_TIME },
+		{ "CompressionTimeNanos", rocksdb::COMPRESSION_TIMES_NANOS },
+		{ "DecompressionTimeNanos", rocksdb::DECOMPRESSION_TIMES_NANOS },
+		{ "HardRateLimitDelayCount", rocksdb::HARD_RATE_LIMIT_DELAY_COUNT },
+		{ "SoftRateLimitDelayCount", rocksdb::SOFT_RATE_LIMIT_DELAY_COUNT },
+		{ "WriteStall", rocksdb::WRITE_STALL },
 	};
 	state std::vector<std::pair<const char*, std::string>> intPropertyStats = {
 		{ "NumImmutableMemtables", rocksdb::DB::Properties::kNumImmutableMemTable },
@@ -867,6 +906,13 @@ ACTOR Future<Void> rocksDBMetricLogger(UID id,
 			cum = stat;
 		}
 
+		for (auto& [name, histogram] : histogramStats) {
+			rocksdb::HistogramData histogram_data;
+			statistics->histogramData(histogram, &histogram_data);
+			e.detail(format("%s%d", name, "P95"), histogram_data.percentile95);
+			e.detail(format("%s%d", name, "P99"), histogram_data.percentile99);
+		}
+
 		for (const auto& [name, property] : intPropertyStats) {
 			stat = 0;
 			// GetAggregatedIntProperty gets the aggregated int property from all column families.
@@ -941,15 +987,17 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		std::shared_ptr<PerfContextMetrics> perfContextMetrics;
 		int threadIndex;
 		ThreadReturnPromiseStream<std::tuple<int, std::string, double>> metricPromiseStream;
+		std::shared_ptr<SharedRocksDBState> sharedState;
 
 		explicit Writer(DB& db,
 		                CF& cf,
 		                UID id,
+		                std::shared_ptr<SharedRocksDBState> sharedState,
 		                std::shared_ptr<ReadIteratorPool> readIterPool,
 		                std::shared_ptr<PerfContextMetrics> perfContextMetrics,
 		                int threadIndex)
-		  : db(db), cf(cf), id(id), readIterPool(readIterPool), perfContextMetrics(perfContextMetrics),
-		    threadIndex(threadIndex),
+		  : db(db), cf(cf), id(id), sharedState(sharedState), readIterPool(readIterPool),
+		    perfContextMetrics(perfContextMetrics), threadIndex(threadIndex),
 		    rateLimiter(SERVER_KNOBS->ROCKSDB_WRITE_RATE_LIMITER_BYTES_PER_SEC > 0
 		                    ? rocksdb::NewGenericRateLimiter(
 		                          SERVER_KNOBS->ROCKSDB_WRITE_RATE_LIMITER_BYTES_PER_SEC, // rate_bytes_per_sec
@@ -1103,10 +1151,9 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			double startTime;
 			bool getHistograms;
 			double getTimeEstimate() const override { return SERVER_KNOBS->COMMIT_TIME_ESTIMATE; }
-			CommitAction() {
+			CommitAction() : startTime(timer_monotonic()) {
 				if (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) {
 					getHistograms = true;
-					startTime = timer_monotonic();
 				} else {
 					getHistograms = false;
 				}
@@ -1119,9 +1166,9 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			if (doPerfContextMetrics) {
 				perfContextMetrics->reset();
 			}
-			double commitBeginTime;
+			double commitBeginTime = timer_monotonic();
+			sharedState->commitQueueLatency.addMeasurement(commitBeginTime - a.startTime);
 			if (a.getHistograms) {
-				commitBeginTime = timer_monotonic();
 				metricPromiseStream.send(std::make_tuple(
 				    threadIndex, ROCKSDB_COMMIT_QUEUEWAIT_HISTOGRAM.toString(), commitBeginTime - a.startTime));
 			}
@@ -1138,7 +1185,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			rocksdb::WriteOptions options;
 			options.sync = !SERVER_KNOBS->ROCKSDB_UNSAFE_AUTO_FSYNC;
 
-			double writeBeginTime = a.getHistograms ? timer_monotonic() : 0;
+			double writeBeginTime = timer_monotonic();
 			if (rateLimiter) {
 				// Controls the total write rate of compaction and flush in bytes per second.
 				// Request for batchToCommit bytes. If this request cannot be satisfied, the call is blocked.
@@ -1146,9 +1193,11 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			}
 			s = db->Write(options, a.batchToCommit.get());
 			readIterPool->update();
+			double currTime = timer_monotonic();
+			sharedState->dbWriteLatency.addMeasurement(currTime - writeBeginTime);
 			if (a.getHistograms) {
-				metricPromiseStream.send(std::make_tuple(
-				    threadIndex, ROCKSDB_WRITE_HISTOGRAM.toString(), timer_monotonic() - writeBeginTime));
+				metricPromiseStream.send(
+				    std::make_tuple(threadIndex, ROCKSDB_WRITE_HISTOGRAM.toString(), currTime - writeBeginTime));
 			}
 
 			if (!s.ok()) {
@@ -1171,8 +1220,9 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 					}
 				}
 			}
+			currTime = timer_monotonic();
+			sharedState->commitLatency.addMeasurement(currTime - a.startTime);
 			if (a.getHistograms) {
-				double currTime = timer_monotonic();
 				metricPromiseStream.send(std::make_tuple(
 				    threadIndex, ROCKSDB_COMMIT_ACTION_HISTOGRAM.toString(), currTime - commitBeginTime));
 				metricPromiseStream.send(
@@ -1741,8 +1791,13 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			writeThread = createGenericThreadPool(/*stackSize=*/0, SERVER_KNOBS->ROCKSDB_WRITER_THREAD_PRIORITY);
 			readThreads = createGenericThreadPool(/*stackSize=*/0, SERVER_KNOBS->ROCKSDB_READER_THREAD_PRIORITY);
 		}
-		struct Writer* writer =
-		    new Writer(db, defaultFdbCF, id, readIterPool, perfContextMetrics, SERVER_KNOBS->ROCKSDB_READ_PARALLELISM);
+		struct Writer* writer = new Writer(db,
+		                                   defaultFdbCF,
+		                                   id,
+		                                   this->sharedState,
+		                                   readIterPool,
+		                                   perfContextMetrics,
+		                                   SERVER_KNOBS->ROCKSDB_READ_PARALLELISM);
 		if (SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE > 0) {
 			actors.push_back(updateHistogram(writer->metricPromiseStream.getFuture()));
 		}

From 772c48f057481f2baab637addc15dd702fafa917 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Mon, 3 Oct 2022 14:47:17 -0700
Subject: [PATCH 694/740] Ignore CC_DEGRADED_PEER_DEGREE_TO_EXCLUDE for
 disconnected peers. Core logic

---
 fdbserver/ClusterController.actor.cpp |  14 ++-
 fdbserver/ClusterController.actor.h   | 134 ++++++++++++++++++--------
 2 files changed, 104 insertions(+), 44 deletions(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index d2604a84929..a1924463e33 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -2428,23 +2428,31 @@ ACTOR Future<Void> workerHealthMonitor(ClusterControllerData* self) {
 
 			self->degradationInfo = self->getDegradationInfo();
 
-			// Compare `self->degradedServers` with `self->excludedDegradedServers` and remove those that have
+			// Compare `self->degradationInfo` with `self->excludedDegradedServers` and remove those that have
 			// recovered.
 			for (auto it = self->excludedDegradedServers.begin(); it != self->excludedDegradedServers.end();) {
-				if (self->degradationInfo.degradedServers.find(*it) == self->degradationInfo.degradedServers.end()) {
+				if (self->degradationInfo.degradedServers.find(*it) == self->degradationInfo.degradedServers.end() &&
+				    self->degradationInfo.disconnectedServers.find(*it) ==
+				        self->degradationInfo.disconnectedServers.end()) {
 					self->excludedDegradedServers.erase(it++);
 				} else {
 					++it;
 				}
 			}
 
-			if (!self->degradationInfo.degradedServers.empty() || self->degradationInfo.degradedSatellite) {
+			if (!self->degradationInfo.degradedServers.empty() || !self->degradationInfo.disconnectedServers.empty() ||
+			    self->degradationInfo.degradedSatellite) {
 				std::string degradedServerString;
 				for (const auto& server : self->degradationInfo.degradedServers) {
 					degradedServerString += server.toString() + " ";
 				}
+				std::string disconnectedServerString;
+				for (const auto& server : self->degradationInfo.disconnectedServers) {
+					disconnectedServerString += server.toString() + " ";
+				}
 				TraceEvent("ClusterControllerHealthMonitor")
 				    .detail("DegradedServers", degradedServerString)
+				    .detail("DisconnectedServers", disconnectedServerString)
 				    .detail("DegradedSatellite", self->degradationInfo.degradedSatellite);
 
 				// Check if the cluster controller should trigger a recovery to exclude any degraded servers from
diff --git a/fdbserver/ClusterController.actor.h b/fdbserver/ClusterController.actor.h
index 696f9338aaf..e82200ba1ef 100644
--- a/fdbserver/ClusterController.actor.h
+++ b/fdbserver/ClusterController.actor.h
@@ -2922,9 +2922,8 @@ class ClusterControllerData {
 				workerHealth[req.address].degradedPeers[degradedPeer] = { currentTime, currentTime };
 			}
 
-			// TODO(zhewu): add disconnected peers in worker health.
 			for (const auto& degradedPeer : req.disconnectedPeers) {
-				workerHealth[req.address].degradedPeers[degradedPeer] = { currentTime, currentTime };
+				workerHealth[req.address].disconnectedPeers[degradedPeer] = { currentTime, currentTime };
 			}
 
 			return;
@@ -2934,23 +2933,24 @@ class ClusterControllerData {
 
 		auto& health = workerHealth[req.address];
 
-		auto updateDegradedPeer = [&health, currentTime](const NetworkAddress& degradedPeer) {
-			auto it = health.degradedPeers.find(degradedPeer);
+		// Update the worker's degradedPeers.
+		for (const auto& peer : req.degradedPeers) {
+			auto it = health.degradedPeers.find(peer);
 			if (it == health.degradedPeers.end()) {
-				health.degradedPeers[degradedPeer] = { currentTime, currentTime };
-				return;
+				health.degradedPeers[peer] = { currentTime, currentTime };
+				continue;
 			}
 			it->second.lastRefreshTime = currentTime;
-		};
-
-		// Update the worker's degradedPeers.
-		for (const auto& peer : req.degradedPeers) {
-			updateDegradedPeer(peer);
 		}
 
-		// TODO(zhewu): add disconnected peers in worker health.
+		// Update the worker's disconnectedPeers.
 		for (const auto& peer : req.disconnectedPeers) {
-			updateDegradedPeer(peer);
+			auto it = health.disconnectedPeers.find(peer);
+			if (it == health.disconnectedPeers.end()) {
+				health.disconnectedPeers[peer] = { currentTime, currentTime };
+				continue;
+			}
+			it->second.lastRefreshTime = currentTime;
 		}
 	}
 
@@ -2966,10 +2966,18 @@ class ClusterControllerData {
 					++it;
 				}
 			}
+			for (auto it = health.disconnectedPeers.begin(); it != health.disconnectedPeers.end();) {
+				if (currentTime - it->second.lastRefreshTime > SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL) {
+					TraceEvent("WorkerPeerHealthRecovered").detail("Worker", workerAddress).detail("Peer", it->first);
+					health.disconnectedPeers.erase(it++);
+				} else {
+					++it;
+				}
+			}
 		}
 
 		for (auto it = workerHealth.begin(); it != workerHealth.end();) {
-			if (it->second.degradedPeers.empty()) {
+			if (it->second.degradedPeers.empty() && it->second.disconnectedPeers.empty()) {
 				TraceEvent("WorkerAllPeerHealthRecovered").detail("Worker", it->first);
 				workerHealth.erase(it++);
 			} else {
@@ -2982,6 +2990,7 @@ class ClusterControllerData {
 		std::unordered_set<NetworkAddress>
 		    degradedServers; // The servers that the cluster controller is considered as degraded. The servers in this
 		                     // list are not excluded unless they are added to `excludedDegradedServers`.
+		std::unordered_set<NetworkAddress> disconnectedServers;
 
 		bool degradedSatellite = false; // Indicates that the entire satellite DC is degraded.
 	};
@@ -2992,6 +3001,7 @@ class ClusterControllerData {
 
 		// Build a map keyed by measured degraded peer. This map gives the info that who complains a particular server.
 		std::unordered_map<NetworkAddress, std::unordered_set<NetworkAddress>> degradedLinkDst2Src;
+		std::unordered_map<NetworkAddress, std::unordered_set<NetworkAddress>> disconnectedLinkDst2Src;
 		double currentTime = now();
 		for (const auto& [server, health] : workerHealth) {
 			for (const auto& [degradedPeer, times] : health.degradedPeers) {
@@ -3001,6 +3011,13 @@ class ClusterControllerData {
 				}
 				degradedLinkDst2Src[degradedPeer].insert(server);
 			}
+			for (const auto& [disconnectedPeer, times] : health.disconnectedPeers) {
+				if (currentTime - times.startTime < SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL) {
+					// This degraded link is not long enough to be considered as degraded.
+					continue;
+				}
+				disconnectedLinkDst2Src[disconnectedPeer].insert(server);
+			}
 		}
 
 		// Sort degraded peers based on the number of workers complaining about it.
@@ -3010,6 +3027,12 @@ class ClusterControllerData {
 		}
 		std::sort(count2DegradedPeer.begin(), count2DegradedPeer.end(), std::greater<>());
 
+		std::vector<std::pair<int, NetworkAddress>> count2DisconnectedPeer;
+		for (const auto& [disconnectedPeer, complainers] : disconnectedLinkDst2Src) {
+			count2DisconnectedPeer.push_back({ complainers.size(), disconnectedPeer });
+		}
+		std::sort(count2DisconnectedPeer.begin(), count2DisconnectedPeer.end(), std::greater<>());
+
 		// Go through all reported degraded peers by decreasing order of the number of complainers. For a particular
 		// degraded peer, if a complainer has already be considered as degraded, we skip the current examine degraded
 		// peer since there has been one endpoint on the link between degradedPeer and complainer considered as
@@ -3038,9 +3061,25 @@ class ClusterControllerData {
 			}
 		}
 
+		DegradationInfo currentDegradationInfo;
+		for (const auto& [complainerCount, badServer] : count2DisconnectedPeer) {
+			for (const auto& complainer : disconnectedLinkDst2Src[badServer]) {
+				if (currentDegradationInfo.disconnectedServers.find(complainer) ==
+				    currentDegradationInfo.disconnectedServers.end()) {
+					currentDegradationInfo.disconnectedServers.insert(badServer);
+					break;
+				}
+			}
+
+			if (SERVER_KNOBS->CC_ENABLE_ENTIRE_SATELLITE_MONITORING &&
+			    addressInDbAndPrimarySatelliteDc(badServer, db.serverInfo) &&
+			    complainerCount >= SERVER_KNOBS->CC_SATELLITE_DEGRADATION_MIN_COMPLAINER) {
+				++satelliteBadServerCount;
+			}
+		}
+
 		// For degraded server that are complained by more than SERVER_KNOBS->CC_DEGRADED_PEER_DEGREE_TO_EXCLUDE, we
 		// don't know if it is a hot server, or the network is bad. We remove from the returned degraded server list.
-		DegradationInfo currentDegradationInfo;
 		for (const auto& badServer : currentDegradedServers) {
 			if (degradedLinkDst2Src[badServer].size() <= SERVER_KNOBS->CC_DEGRADED_PEER_DEGREE_TO_EXCLUDE) {
 				currentDegradationInfo.degradedServers.insert(badServer);
@@ -3058,43 +3097,48 @@ class ClusterControllerData {
 
 	// Whether the transaction system (in primary DC if in HA setting) contains degraded servers.
 	bool transactionSystemContainsDegradedServers() {
-		const ServerDBInfo dbi = db.serverInfo->get();
-		for (const auto& excludedServer : degradationInfo.degradedServers) {
-			if (dbi.master.addresses().contains(excludedServer)) {
-				return true;
-			}
+		const ServerDBInfo& dbi = db.serverInfo->get();
+		auto transactionWorkerInList = [&dbi](const std::unordered_set<NetworkAddress>& serverList) -> bool {
+			for (const auto& server : serverList) {
+				if (dbi.master.addresses().contains(server)) {
+					return true;
+				}
 
-			for (auto& logSet : dbi.logSystemConfig.tLogs) {
-				if (!logSet.isLocal || logSet.locality == tagLocalitySatellite) {
-					continue;
+				for (const auto& logSet : dbi.logSystemConfig.tLogs) {
+					if (!logSet.isLocal || logSet.locality == tagLocalitySatellite) {
+						continue;
+					}
+					for (const auto& tlog : logSet.tLogs) {
+						if (tlog.present() && tlog.interf().addresses().contains(server)) {
+							return true;
+						}
+					}
 				}
-				for (const auto& tlog : logSet.tLogs) {
-					if (tlog.present() && tlog.interf().addresses().contains(excludedServer)) {
+
+				for (const auto& proxy : dbi.client.grvProxies) {
+					if (proxy.addresses().contains(server)) {
 						return true;
 					}
 				}
-			}
 
-			for (auto& proxy : dbi.client.grvProxies) {
-				if (proxy.addresses().contains(excludedServer)) {
-					return true;
+				for (const auto& proxy : dbi.client.commitProxies) {
+					if (proxy.addresses().contains(server)) {
+						return true;
+					}
 				}
-			}
 
-			for (auto& proxy : dbi.client.commitProxies) {
-				if (proxy.addresses().contains(excludedServer)) {
-					return true;
+				for (const auto& resolver : dbi.resolvers) {
+					if (resolver.addresses().contains(server)) {
+						return true;
+					}
 				}
 			}
 
-			for (auto& resolver : dbi.resolvers) {
-				if (resolver.addresses().contains(excludedServer)) {
-					return true;
-				}
-			}
-		}
+			return false;
+		};
 
-		return false;
+		return transactionWorkerInList(degradationInfo.degradedServers) ||
+		       transactionWorkerInList(degradationInfo.disconnectedServers);
 	}
 
 	// Whether transaction system in the remote DC, e.g. log router and tlogs in the remote DC, contains degraded
@@ -3110,6 +3154,12 @@ class ClusterControllerData {
 			}
 		}
 
+		for (const auto& excludedServer : degradationInfo.disconnectedServers) {
+			if (addressInDbAndRemoteDc(excludedServer, db.serverInfo)) {
+				return true;
+			}
+		}
+
 		return false;
 	}
 
@@ -3142,7 +3192,8 @@ class ClusterControllerData {
 	// Returns true when the cluster controller should trigger a recovery due to degraded servers used in the
 	// transaction system in the primary data center.
 	bool shouldTriggerRecoveryDueToDegradedServers() {
-		if (degradationInfo.degradedServers.size() > SERVER_KNOBS->CC_MAX_EXCLUSION_DUE_TO_HEALTH) {
+		if (degradationInfo.degradedServers.size() + degradationInfo.disconnectedServers.size() >
+		    SERVER_KNOBS->CC_MAX_EXCLUSION_DUE_TO_HEALTH) {
 			return false;
 		}
 
@@ -3271,6 +3322,7 @@ class ClusterControllerData {
 			double lastRefreshTime = 0;
 		};
 		std::unordered_map<NetworkAddress, DegradedTimes> degradedPeers;
+		std::unordered_map<NetworkAddress, DegradedTimes> disconnectedPeers;
 
 		// TODO(zhewu): Include disk and CPU signals.
 	};

From 8fec29511f8a370c0c874300276ad72138155d6e Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Tue, 4 Oct 2022 13:19:06 -0700
Subject: [PATCH 695/740] Add tests

---
 fdbserver/ClusterController.actor.cpp | 139 +++++++++++++++++++++++---
 fdbserver/ClusterController.actor.h   |   5 +-
 2 files changed, 128 insertions(+), 16 deletions(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index a1924463e33..4a3e542ae9e 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -2739,6 +2739,8 @@ TEST_CASE("/fdbserver/clustercontroller/updateWorkerHealth") {
 		req.address = workerAddress;
 		req.degradedPeers.push_back(badPeer1);
 		req.degradedPeers.push_back(badPeer2);
+		req.disconnectedPeers.push_back(badPeer1);
+		req.disconnectedPeers.push_back(badPeer2);
 		data.updateWorkerHealth(req);
 		ASSERT(data.workerHealth.find(workerAddress) != data.workerHealth.end());
 		auto& health = data.workerHealth[workerAddress];
@@ -2747,6 +2749,11 @@ TEST_CASE("/fdbserver/clustercontroller/updateWorkerHealth") {
 		ASSERT_EQ(health.degradedPeers[badPeer1].startTime, health.degradedPeers[badPeer1].lastRefreshTime);
 		ASSERT(health.degradedPeers.find(badPeer2) != health.degradedPeers.end());
 		ASSERT_EQ(health.degradedPeers[badPeer2].startTime, health.degradedPeers[badPeer2].lastRefreshTime);
+		ASSERT_EQ(health.disconnectedPeers.size(), 2);
+		ASSERT(health.disconnectedPeers.find(badPeer1) != health.disconnectedPeers.end());
+		ASSERT_EQ(health.disconnectedPeers[badPeer1].startTime, health.disconnectedPeers[badPeer1].lastRefreshTime);
+		ASSERT(health.disconnectedPeers.find(badPeer2) != health.disconnectedPeers.end());
+		ASSERT_EQ(health.disconnectedPeers[badPeer2].startTime, health.disconnectedPeers[badPeer2].lastRefreshTime);
 	}
 
 	// Create a `UpdateWorkerHealthRequest` with two bad peers, one from the previous test and a new one.
@@ -2761,6 +2768,8 @@ TEST_CASE("/fdbserver/clustercontroller/updateWorkerHealth") {
 		req.address = workerAddress;
 		req.degradedPeers.push_back(badPeer1);
 		req.degradedPeers.push_back(badPeer3);
+		req.disconnectedPeers.push_back(badPeer1);
+		req.disconnectedPeers.push_back(badPeer3);
 		data.updateWorkerHealth(req);
 		ASSERT(data.workerHealth.find(workerAddress) != data.workerHealth.end());
 		auto& health = data.workerHealth[workerAddress];
@@ -2772,6 +2781,15 @@ TEST_CASE("/fdbserver/clustercontroller/updateWorkerHealth") {
 		ASSERT_EQ(health.degradedPeers[badPeer2].startTime, health.degradedPeers[badPeer1].startTime);
 		ASSERT(health.degradedPeers.find(badPeer3) != health.degradedPeers.end());
 		ASSERT_EQ(health.degradedPeers[badPeer3].startTime, health.degradedPeers[badPeer3].lastRefreshTime);
+		ASSERT_EQ(health.disconnectedPeers.size(), 3);
+		ASSERT(health.disconnectedPeers.find(badPeer1) != health.disconnectedPeers.end());
+		ASSERT_LT(health.disconnectedPeers[badPeer1].startTime, health.disconnectedPeers[badPeer1].lastRefreshTime);
+		ASSERT(health.disconnectedPeers.find(badPeer2) != health.disconnectedPeers.end());
+		ASSERT_EQ(health.disconnectedPeers[badPeer2].startTime, health.disconnectedPeers[badPeer2].lastRefreshTime);
+		ASSERT_EQ(health.disconnectedPeers[badPeer2].startTime, health.disconnectedPeers[badPeer1].startTime);
+		ASSERT(health.disconnectedPeers.find(badPeer3) != health.disconnectedPeers.end());
+		ASSERT_EQ(health.disconnectedPeers[badPeer3].startTime, health.disconnectedPeers[badPeer3].lastRefreshTime);
+
 		previousStartTime = health.degradedPeers[badPeer3].startTime;
 		previousRefreshTime = health.degradedPeers[badPeer3].lastRefreshTime;
 	}
@@ -2789,20 +2807,10 @@ TEST_CASE("/fdbserver/clustercontroller/updateWorkerHealth") {
 		ASSERT(health.degradedPeers.find(badPeer3) != health.degradedPeers.end());
 		ASSERT_EQ(health.degradedPeers[badPeer3].startTime, previousStartTime);
 		ASSERT_EQ(health.degradedPeers[badPeer3].lastRefreshTime, previousRefreshTime);
-	}
-
-	// Create a `UpdateWorkerHealthRequest` with disconnected peers, which should update the bad peer's lastRefreshTime.
-	{
-		wait(delay(0.001));
-		UpdateWorkerHealthRequest req;
-		req.address = workerAddress;
-		req.disconnectedPeers.push_back(badPeer3);
-		data.updateWorkerHealth(req);
-		ASSERT(data.workerHealth.find(workerAddress) != data.workerHealth.end());
-		auto& health = data.workerHealth[workerAddress];
-		ASSERT_EQ(health.degradedPeers.size(), 3);
-		ASSERT(health.degradedPeers.find(badPeer3) != health.degradedPeers.end());
-		ASSERT_LT(health.degradedPeers[badPeer3].startTime, health.degradedPeers[badPeer3].lastRefreshTime);
+		ASSERT_EQ(health.disconnectedPeers.size(), 3);
+		ASSERT(health.disconnectedPeers.find(badPeer3) != health.disconnectedPeers.end());
+		ASSERT_EQ(health.disconnectedPeers[badPeer3].startTime, previousStartTime);
+		ASSERT_EQ(health.disconnectedPeers[badPeer3].lastRefreshTime, previousRefreshTime);
 	}
 
 	return Void();
@@ -2818,11 +2826,14 @@ TEST_CASE("/fdbserver/clustercontroller/updateRecoveredWorkers") {
 	NetworkAddress worker2(IPAddress(0x11111111), 1);
 	NetworkAddress badPeer1(IPAddress(0x02020202), 1);
 	NetworkAddress badPeer2(IPAddress(0x03030303), 1);
+	NetworkAddress disconnectedPeer3(IPAddress(0x04040404), 1);
 
 	// Create following test scenario:
 	// 	 worker1 -> badPeer1 active
 	// 	 worker1 -> badPeer2 recovered
+	//   worker1 -> disconnectedPeer3 active
 	// 	 worker2 -> badPeer2 recovered
+	//   worker2 -> disconnectedPeer3 recovered
 	data.workerHealth[worker1].degradedPeers[badPeer1] = {
 		now() - SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL - 1, now()
 	};
@@ -2830,16 +2841,25 @@ TEST_CASE("/fdbserver/clustercontroller/updateRecoveredWorkers") {
 		now() - SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL - 1,
 		now() - SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL - 1
 	};
+	data.workerHealth[worker1].degradedPeers[disconnectedPeer3] = {
+		now() - SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL - 1, now()
+	};
 	data.workerHealth[worker2].degradedPeers[badPeer2] = {
 		now() - SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL - 1,
 		now() - SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL - 1
 	};
+	data.workerHealth[worker2].degradedPeers[disconnectedPeer3] = {
+		now() - SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL - 1,
+		now() - SERVER_KNOBS->CC_DEGRADED_LINK_EXPIRATION_INTERVAL - 1
+	};
 	data.updateRecoveredWorkers();
 
 	ASSERT_EQ(data.workerHealth.size(), 1);
 	ASSERT(data.workerHealth.find(worker1) != data.workerHealth.end());
 	ASSERT(data.workerHealth[worker1].degradedPeers.find(badPeer1) != data.workerHealth[worker1].degradedPeers.end());
 	ASSERT(data.workerHealth[worker1].degradedPeers.find(badPeer2) == data.workerHealth[worker1].degradedPeers.end());
+	ASSERT(data.workerHealth[worker1].degradedPeers.find(disconnectedPeer3) !=
+	       data.workerHealth[worker1].degradedPeers.end());
 	ASSERT(data.workerHealth.find(worker2) == data.workerHealth.end());
 
 	return Void();
@@ -2861,6 +2881,7 @@ TEST_CASE("/fdbserver/clustercontroller/getDegradationInfo") {
 	// cluster controller.
 	{
 		data.workerHealth[worker].degradedPeers[badPeer1] = { now(), now() };
+		data.workerHealth[worker].disconnectedPeers[badPeer2] = { now(), now() };
 		ASSERT(data.getDegradationInfo().degradedServers.empty());
 		data.workerHealth.clear();
 	}
@@ -2873,6 +2894,19 @@ TEST_CASE("/fdbserver/clustercontroller/getDegradationInfo") {
 		auto degradationInfo = data.getDegradationInfo();
 		ASSERT(degradationInfo.degradedServers.size() == 1);
 		ASSERT(degradationInfo.degradedServers.find(badPeer1) != degradationInfo.degradedServers.end());
+		ASSERT(degradationInfo.disconnectedServers.empty());
+		data.workerHealth.clear();
+	}
+
+	// Test that when there is only one reported disconnected link, getDegradationInfo can return correct
+	// degraded server.
+	{
+		data.workerHealth[worker].disconnectedPeers[badPeer1] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		auto degradationInfo = data.getDegradationInfo();
+		ASSERT(degradationInfo.disconnectedServers.size() == 1);
+		ASSERT(degradationInfo.disconnectedServers.find(badPeer1) != degradationInfo.disconnectedServers.end());
+		ASSERT(degradationInfo.degradedServers.empty());
 		data.workerHealth.clear();
 	}
 
@@ -2882,16 +2916,25 @@ TEST_CASE("/fdbserver/clustercontroller/getDegradationInfo") {
 			                                                  now() };
 		data.workerHealth[badPeer1].degradedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
 			                                                  now() };
+		data.workerHealth[worker].disconnectedPeers[badPeer2] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		data.workerHealth[badPeer2].disconnectedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
 		auto degradationInfo = data.getDegradationInfo();
 		ASSERT(degradationInfo.degradedServers.size() == 1);
 		ASSERT(degradationInfo.degradedServers.find(worker) != degradationInfo.degradedServers.end() ||
 		       degradationInfo.degradedServers.find(badPeer1) != degradationInfo.degradedServers.end());
+		ASSERT(degradationInfo.disconnectedServers.size() == 1);
+		ASSERT(degradationInfo.disconnectedServers.find(worker) != degradationInfo.disconnectedServers.end() ||
+		       degradationInfo.disconnectedServers.find(badPeer2) != degradationInfo.disconnectedServers.end());
 		data.workerHealth.clear();
 	}
 
 	// Test that if B complains A and C complains A, A is selected as degraded server instead of B or C.
 	{
 		ASSERT(SERVER_KNOBS->CC_DEGRADED_PEER_DEGREE_TO_EXCLUDE < 4);
+
+		// test for both degraded peers and disconnected peers.
 		data.workerHealth[worker].degradedPeers[badPeer1] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
 			                                                  now() };
 		data.workerHealth[badPeer1].degradedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
@@ -2900,9 +2943,19 @@ TEST_CASE("/fdbserver/clustercontroller/getDegradationInfo") {
 			                                                  now() };
 		data.workerHealth[badPeer2].degradedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
 			                                                  now() };
+		data.workerHealth[worker].disconnectedPeers[badPeer3] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		data.workerHealth[badPeer3].disconnectedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		data.workerHealth[worker].disconnectedPeers[badPeer4] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		data.workerHealth[badPeer4].disconnectedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
 		auto degradationInfo = data.getDegradationInfo();
 		ASSERT(degradationInfo.degradedServers.size() == 1);
 		ASSERT(degradationInfo.degradedServers.find(worker) != degradationInfo.degradedServers.end());
+		ASSERT(degradationInfo.disconnectedServers.size() == 1);
+		ASSERT(degradationInfo.disconnectedServers.find(worker) != degradationInfo.disconnectedServers.end());
 		data.workerHealth.clear();
 	}
 
@@ -2921,6 +2974,23 @@ TEST_CASE("/fdbserver/clustercontroller/getDegradationInfo") {
 		data.workerHealth.clear();
 	}
 
+	// Test that CC_DEGRADED_PEER_DEGREE_TO_EXCLUDE doesn't affect disconnectedServers calculation.
+	{
+		ASSERT(SERVER_KNOBS->CC_DEGRADED_PEER_DEGREE_TO_EXCLUDE < 4);
+		data.workerHealth[badPeer1].disconnectedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		data.workerHealth[badPeer2].disconnectedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		data.workerHealth[badPeer3].disconnectedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		data.workerHealth[badPeer4].disconnectedPeers[worker] = { now() - SERVER_KNOBS->CC_MIN_DEGRADATION_INTERVAL - 1,
+			                                                      now() };
+		ASSERT(data.getDegradationInfo().disconnectedServers.size() == 1);
+		ASSERT(data.getDegradationInfo().disconnectedServers.find(worker) !=
+		       data.getDegradationInfo().disconnectedServers.end());
+		data.workerHealth.clear();
+	}
+
 	// Test that if the degradation is reported both ways between A and other 4 servers, no degraded server is
 	// returned.
 	{
@@ -3041,40 +3111,65 @@ TEST_CASE("/fdbserver/clustercontroller/shouldTriggerRecoveryDueToDegradedServer
 	data.degradationInfo.degradedServers.insert(master);
 	ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(master);
+	ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// Trigger recovery when primary TLog is degraded.
 	data.degradationInfo.degradedServers.insert(tlog);
 	ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(tlog);
+	ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// No recovery when satellite Tlog is degraded.
 	data.degradationInfo.degradedServers.insert(satelliteTlog);
 	ASSERT(!data.shouldTriggerRecoveryDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(satelliteTlog);
+	ASSERT(!data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// No recovery when remote tlog is degraded.
 	data.degradationInfo.degradedServers.insert(remoteTlog);
 	ASSERT(!data.shouldTriggerRecoveryDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(remoteTlog);
+	ASSERT(!data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// No recovery when log router is degraded.
 	data.degradationInfo.degradedServers.insert(logRouter);
 	ASSERT(!data.shouldTriggerRecoveryDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(logRouter);
+	ASSERT(!data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// No recovery when backup worker is degraded.
 	data.degradationInfo.degradedServers.insert(backup);
 	ASSERT(!data.shouldTriggerRecoveryDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(backup);
+	ASSERT(!data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// Trigger recovery when proxy is degraded.
 	data.degradationInfo.degradedServers.insert(proxy);
 	ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(proxy);
+	ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// Trigger recovery when resolver is degraded.
 	data.degradationInfo.degradedServers.insert(resolver);
 	ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(resolver);
+	ASSERT(data.shouldTriggerRecoveryDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	return Void();
 }
@@ -3154,6 +3249,9 @@ TEST_CASE("/fdbserver/clustercontroller/shouldTriggerFailoverDueToDegradedServer
 	data.degradationInfo.degradedServers.insert(master);
 	ASSERT(!data.shouldTriggerFailoverDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(master);
+	ASSERT(!data.shouldTriggerFailoverDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// Trigger failover when enough servers in the txn system are degraded.
 	data.degradationInfo.degradedServers.insert(master);
@@ -3162,6 +3260,13 @@ TEST_CASE("/fdbserver/clustercontroller/shouldTriggerFailoverDueToDegradedServer
 	data.degradationInfo.degradedServers.insert(proxy2);
 	data.degradationInfo.degradedServers.insert(resolver);
 	ASSERT(data.shouldTriggerFailoverDueToDegradedServers());
+	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(master);
+	data.degradationInfo.disconnectedServers.insert(tlog);
+	data.degradationInfo.disconnectedServers.insert(proxy);
+	data.degradationInfo.disconnectedServers.insert(proxy2);
+	data.degradationInfo.disconnectedServers.insert(resolver);
+	ASSERT(data.shouldTriggerFailoverDueToDegradedServers());
 
 	// No failover when usable region is 1.
 	data.db.config.usableRegions = 1;
@@ -3172,6 +3277,9 @@ TEST_CASE("/fdbserver/clustercontroller/shouldTriggerFailoverDueToDegradedServer
 	data.degradationInfo.degradedServers.insert(remoteTlog);
 	ASSERT(!data.shouldTriggerFailoverDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(remoteTlog);
+	ASSERT(!data.shouldTriggerFailoverDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	// No failover when some are not from transaction system
 	data.degradationInfo.degradedServers.insert(NetworkAddress(IPAddress(0x13131313), 1));
@@ -3192,6 +3300,9 @@ TEST_CASE("/fdbserver/clustercontroller/shouldTriggerFailoverDueToDegradedServer
 	data.degradationInfo.degradedServers.insert(remoteTlog);
 	ASSERT(!data.shouldTriggerFailoverDueToDegradedServers());
 	data.degradationInfo.degradedServers.clear();
+	data.degradationInfo.disconnectedServers.insert(remoteTlog);
+	ASSERT(!data.shouldTriggerFailoverDueToDegradedServers());
+	data.degradationInfo.disconnectedServers.clear();
 
 	return Void();
 }
diff --git a/fdbserver/ClusterController.actor.h b/fdbserver/ClusterController.actor.h
index e82200ba1ef..28dcc2d8f22 100644
--- a/fdbserver/ClusterController.actor.h
+++ b/fdbserver/ClusterController.actor.h
@@ -3232,8 +3232,9 @@ class ClusterControllerData {
 			return true;
 		}
 
-		if (degradationInfo.degradedServers.size() < SERVER_KNOBS->CC_FAILOVER_DUE_TO_HEALTH_MIN_DEGRADATION ||
-		    degradationInfo.degradedServers.size() > SERVER_KNOBS->CC_FAILOVER_DUE_TO_HEALTH_MAX_DEGRADATION) {
+		int degradedServerSize = degradationInfo.degradedServers.size() + degradationInfo.disconnectedServers.size();
+		if (degradedServerSize < SERVER_KNOBS->CC_FAILOVER_DUE_TO_HEALTH_MIN_DEGRADATION ||
+		    degradedServerSize > SERVER_KNOBS->CC_FAILOVER_DUE_TO_HEALTH_MAX_DEGRADATION) {
 			return false;
 		}
 

From dac4f2e549bc415a6ad5133ad7469f70dcb9cd64 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Tue, 4 Oct 2022 13:36:23 -0700
Subject: [PATCH 696/740] Comments cleanup

---
 fdbserver/ClusterController.actor.cpp | 2 ++
 fdbserver/ClusterController.actor.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fdbserver/ClusterController.actor.cpp b/fdbserver/ClusterController.actor.cpp
index 4a3e542ae9e..3deee6c8593 100644
--- a/fdbserver/ClusterController.actor.cpp
+++ b/fdbserver/ClusterController.actor.cpp
@@ -2462,6 +2462,8 @@ ACTOR Future<Void> workerHealthMonitor(ClusterControllerData* self) {
 						if (self->recentRecoveryCountDueToHealth() < SERVER_KNOBS->CC_MAX_HEALTH_RECOVERY_COUNT) {
 							self->recentHealthTriggeredRecoveryTime.push(now());
 							self->excludedDegradedServers = self->degradationInfo.degradedServers;
+							self->excludedDegradedServers.insert(self->degradationInfo.disconnectedServers.begin(),
+							                                     self->degradationInfo.disconnectedServers.end());
 							TraceEvent("DegradedServerDetectedAndTriggerRecovery")
 							    .detail("RecentRecoveryCountDueToHealth", self->recentRecoveryCountDueToHealth());
 							self->db.forceMasterFailure.trigger();
diff --git a/fdbserver/ClusterController.actor.h b/fdbserver/ClusterController.actor.h
index 28dcc2d8f22..d60a050292d 100644
--- a/fdbserver/ClusterController.actor.h
+++ b/fdbserver/ClusterController.actor.h
@@ -2990,7 +2990,7 @@ class ClusterControllerData {
 		std::unordered_set<NetworkAddress>
 		    degradedServers; // The servers that the cluster controller is considered as degraded. The servers in this
 		                     // list are not excluded unless they are added to `excludedDegradedServers`.
-		std::unordered_set<NetworkAddress> disconnectedServers;
+		std::unordered_set<NetworkAddress> disconnectedServers; // Similar to the above list, but the servers experiencing connection issue.
 
 		bool degradedSatellite = false; // Indicates that the entire satellite DC is degraded.
 	};

From b800d1c3155b6b30d6a31965d7431289824ee162 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Tue, 4 Oct 2022 15:37:47 -0700
Subject: [PATCH 697/740] Format clean

---
 fdbserver/ClusterController.actor.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdbserver/ClusterController.actor.h b/fdbserver/ClusterController.actor.h
index d60a050292d..f1ef75c3e2e 100644
--- a/fdbserver/ClusterController.actor.h
+++ b/fdbserver/ClusterController.actor.h
@@ -2990,7 +2990,8 @@ class ClusterControllerData {
 		std::unordered_set<NetworkAddress>
 		    degradedServers; // The servers that the cluster controller is considered as degraded. The servers in this
 		                     // list are not excluded unless they are added to `excludedDegradedServers`.
-		std::unordered_set<NetworkAddress> disconnectedServers; // Similar to the above list, but the servers experiencing connection issue.
+		std::unordered_set<NetworkAddress>
+		    disconnectedServers; // Similar to the above list, but the servers experiencing connection issue.
 
 		bool degradedSatellite = false; // Indicates that the entire satellite DC is degraded.
 	};

From bd4f40f9ea16c0c335ed43ffff1336b92a37d391 Mon Sep 17 00:00:00 2001
From: Dan Lambright <dlambrig@gmail.com>
Date: Fri, 7 Oct 2022 23:57:29 -0400
Subject: [PATCH 698/740] Cherry pick 8340 - add knob to disable eager delete
 of client shared libs

---
 fdbclient/ClientKnobs.cpp                   | 1 +
 fdbclient/ClientKnobs.h                     | 1 +
 fdbclient/MultiVersionTransaction.actor.cpp | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/fdbclient/ClientKnobs.cpp b/fdbclient/ClientKnobs.cpp
index 16c8191cee4..7fa8d890294 100644
--- a/fdbclient/ClientKnobs.cpp
+++ b/fdbclient/ClientKnobs.cpp
@@ -203,6 +203,7 @@ void ClientKnobs::initialize(Randomize randomize) {
 	init( DEFAULT_AUTO_LOGS,                         3 );
 	init( DEFAULT_COMMIT_GRV_PROXIES_RATIO,          3 );
 	init( DEFAULT_MAX_GRV_PROXIES,                   4 );
+	init( UNLINKONLOAD_FDBCLIB,                   true ); // if false, don't delete libfdb_c in tmp directory on client connect.
 
 	init( IS_ACCEPTABLE_DELAY,                     1.5 );
 
diff --git a/fdbclient/ClientKnobs.h b/fdbclient/ClientKnobs.h
index 9fac83c7b87..f4cf417672c 100644
--- a/fdbclient/ClientKnobs.h
+++ b/fdbclient/ClientKnobs.h
@@ -203,6 +203,7 @@ class ClientKnobs : public KnobsImpl<ClientKnobs> {
 	int32_t DEFAULT_AUTO_GRV_PROXIES;
 	int32_t DEFAULT_COMMIT_GRV_PROXIES_RATIO;
 	int32_t DEFAULT_MAX_GRV_PROXIES;
+	bool UNLINKONLOAD_FDBCLIB;
 	int32_t DEFAULT_AUTO_RESOLVERS;
 	int32_t DEFAULT_AUTO_LOGS;
 
diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp
index cdbdbd30d99..c21273975ca 100644
--- a/fdbclient/MultiVersionTransaction.actor.cpp
+++ b/fdbclient/MultiVersionTransaction.actor.cpp
@@ -2177,8 +2177,12 @@ void MultiVersionApi::setupNetwork() {
 			if (externalClients.count(filename) == 0) {
 				externalClients[filename] = {};
 				for (const auto& tmp : copyExternalLibraryPerThread(path)) {
+					bool unlinkOnLoad = tmp.second;
+					if (!CLIENT_KNOBS->UNLINKONLOAD_FDBCLIB) {
+						unlinkOnLoad = false;
+					}
 					externalClients[filename].push_back(Reference<ClientInfo>(
-					    new ClientInfo(new DLApi(tmp.first, tmp.second /*unlink on load*/), path)));
+					    new ClientInfo(new DLApi(tmp.first, unlinkOnLoad /*unlink on load*/), path)));
 				}
 			}
 		}

From 4bc21ce6495bd24b27c374a96ffe32df9e08c6cd Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Tue, 4 Oct 2022 23:09:30 -0700
Subject: [PATCH 699/740] Add info in HealthMonitorDetectDegradedPeer to
 indicate whether a peer is in satellite DC

---
 fdbserver/worker.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 987b72bd8ee..491ca451ac8 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -1020,6 +1020,7 @@ ACTOR Future<Void> healthMonitor(Reference<AsyncVar<Optional<ClusterControllerFu
 						if (disconnectedPeer || degradedPeer) {
 							TraceEvent("HealthMonitorDetectDegradedPeer")
 							    .detail("Peer", address)
+							    .detail("Satellite", true)
 							    .detail("Elapsed", now() - peer->lastLoggedTime)
 							    .detail("Disconnected", disconnectedPeer)
 							    .detail("MinLatency", peer->pingLatencies.min())

From d8fe16a57e91c7a1283834880f98f136ac376fe1 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 10 Oct 2022 10:05:09 -0700
Subject: [PATCH 700/740] Fix clang compiling errors

---
 fdbserver/storageserver.actor.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index bb10258b48c..c0976acb4fb 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1002,6 +1002,14 @@ struct StorageServer {
 		                        self->thisServerID,
 		                        SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
 		                        SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    kvReadRangeLatencySample("KVGetRangeMetrics",
+		                             self->thisServerID,
+		                             SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                             SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
+		    updateLatencySample("UpdateLatencyMetrics",
+		                        self->thisServerID,
+		                        SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+		                        SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
 		    readLatencyBands("ReadLatencyBands", self->thisServerID, SERVER_KNOBS->STORAGE_LOGGING_DELAY),
 		    mappedRangeSample("GetMappedRangeMetrics",
 		                      self->thisServerID,
@@ -1014,15 +1022,7 @@ struct StorageServer {
 		    mappedRangeLocalSample("GetMappedRangeLocalMetrics",
 		                           self->thisServerID,
 		                           SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
-		    kvReadRangeLatencySample("KVGetRangeMetrics",
-		                             self->thisServerID,
-		                             SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-		                             SERVER_KNOBS->LATENCY_SAMPLE_SIZE),
-		    updateLatencySample("UpdateLatencyMetrics",
-		                        self->thisServerID,
-		                        SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-		                        SERVER_KNOBS->LATENCY_SAMPLE_SIZE) {
+		                           SERVER_KNOBS->LATENCY_SAMPLE_SIZE) {
 			specialCounter(cc, "LastTLogVersion", [self]() { return self->lastTLogVersion; });
 			specialCounter(cc, "Version", [self]() { return self->version.get(); });
 			specialCounter(cc, "StorageVersion", [self]() { return self->storageVersion(); });

From 484614f7a78638c46d8c18379a8cc780a8d2b9e9 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 20 Sep 2022 12:38:53 -0700
Subject: [PATCH 701/740] Fix rare/CheckRelocation setup failure

To ignore timed_out error from getDataInFlight() calls.
---
 fdbserver/workloads/BulkSetup.actor.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdbserver/workloads/BulkSetup.actor.h b/fdbserver/workloads/BulkSetup.actor.h
index 07f30052af1..3e7cb084dbc 100644
--- a/fdbserver/workloads/BulkSetup.actor.h
+++ b/fdbserver/workloads/BulkSetup.actor.h
@@ -177,7 +177,8 @@ Future<Void> waitForLowInFlight(Database cx, T* workload) {
 				break;
 			}
 		} catch (Error& e) {
-			if (e.code() == error_code_attribute_not_found) {
+			if (e.code() == error_code_attribute_not_found ||
+			    (e.code() == error_code_timed_out && !timeout.isReady())) {
 				// DD may not be initialized yet and attribute "DataInFlight" can be missing
 				wait(delay(1.0));
 			} else {

From c294f2404bd1bc7a682c34b9371fd68e06f84a1f Mon Sep 17 00:00:00 2001
From: Evan Tschannen <evan.tschannen@snowflake.com>
Date: Mon, 26 Sep 2022 09:19:53 -0700
Subject: [PATCH 702/740] Fixed a bug where rollbackVersion >=
 data->storageVersion() (#8290)

* fix: the log router could see popped() versions between recoveredAt and the recovery txn version which cause remote tlogs to be stopped at a version in this range, which causes storage servers to read at versions in this range

* fix: a spurious correctness bug resulted from the consistency check running during a recovery
---
 fdbserver/ClusterRecovery.actor.cpp            | 2 +-
 fdbserver/LogRouter.actor.cpp                  | 2 +-
 fdbserver/workloads/ConsistencyCheck.actor.cpp | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fdbserver/ClusterRecovery.actor.cpp b/fdbserver/ClusterRecovery.actor.cpp
index 89c6299f12f..b604220390b 100644
--- a/fdbserver/ClusterRecovery.actor.cpp
+++ b/fdbserver/ClusterRecovery.actor.cpp
@@ -1089,7 +1089,7 @@ ACTOR Future<Void> readTransactionSystemState(Reference<ClusterRecoveryData> sel
 		self->recoveryTransactionVersion += deterministicRandom()->randomInt64(0, 10000000);
 	}
 
-	TraceEvent(getRecoveryEventName(ClusterRecoveryEventType::CLUSTER_RECOVERY_RECOVERED_EVENT_NAME).c_str(),
+	TraceEvent(getRecoveryEventName(ClusterRecoveryEventType::CLUSTER_RECOVERY_RECOVERING_EVENT_NAME).c_str(),
 	           self->dbgid)
 	    .detail("LastEpochEnd", self->lastEpochEnd)
 	    .detail("RecoveryTransactionVersion", self->recoveryTransactionVersion);
diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp
index 6e13e35abfb..f0c5a5fc4a0 100644
--- a/fdbserver/LogRouter.actor.cpp
+++ b/fdbserver/LogRouter.actor.cpp
@@ -373,7 +373,7 @@ ACTOR Future<Void> pullAsyncData(LogRouterData* self) {
 
 				if (!foundMessage) {
 					ver--; // ver is the next possible version we will get data for
-					if (ver > self->version.get()) {
+					if (ver > self->version.get() && ver >= r->popped()) {
 						wait(waitForVersion(self, ver));
 
 						self->version.set(ver);
diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 42d597ea1ac..925168ee964 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -1968,6 +1968,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		}
 
 		if (foundExtraDataStore) {
+			wait(delay(10)); // let the cluster get to fully_recovered after the reboot before retrying
 			self->testFailure("Extra data stores present on workers");
 			return false;
 		}

From 2befc2c97703c73876fa7f1bd4fa42badcba1666 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Thu, 20 Oct 2022 19:54:56 -0700
Subject: [PATCH 703/740] Bug fix: If a disk queue reader drops its future
 memory corruption could occur (Cherry-pick #8522 to release-7.1)

---
 fdbserver/DiskQueue.actor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbserver/DiskQueue.actor.cpp b/fdbserver/DiskQueue.actor.cpp
index 2ea74508d02..f992c6fb4e0 100644
--- a/fdbserver/DiskQueue.actor.cpp
+++ b/fdbserver/DiskQueue.actor.cpp
@@ -749,8 +749,8 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 		state Standalone<StringRef> result = makeAlignedString(sizeof(Page), bytesRequested);
 		if (file == 1)
 			ASSERT_WE_THINK(pageOffset * sizeof(Page) + bytesRequested <= self->writingPos);
-		int bytesRead =
-		    wait(self->files[file].f->read(mutateString(result), bytesRequested, pageOffset * sizeof(Page)));
+		int bytesRead = wait(uncancellable(holdWhile(
+		    result, self->files[file].f->read(mutateString(result), bytesRequested, pageOffset * sizeof(Page)))));
 		ASSERT_WE_THINK(bytesRead == bytesRequested);
 		return result;
 	}

From 39fbbf81c9700864355ca743afaf6775562378c5 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Thu, 20 Oct 2022 14:25:52 -0700
Subject: [PATCH 704/740] Thread return promise histogram code uncommit

---
 fdbclient/ServerKnobs.cpp                |  3 +-
 fdbclient/ServerKnobs.h                  |  1 -
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 47 ++++++++----------------
 flow/IThreadPool.h                       | 13 +------
 flow/genericactors.actor.h               | 13 -------
 5 files changed, 19 insertions(+), 58 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 516df8c2e1c..82dbb396fb1 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -361,8 +361,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	// KeyValueStoreRocksDB
 	init( ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES,         true ); if( randomize && BUGGIFY )  ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES = false;
  	init( ROCKSDB_SUGGEST_COMPACT_CLEAR_RANGE,                  true ); if( randomize && BUGGIFY )  ROCKSDB_SUGGEST_COMPACT_CLEAR_RANGE = false;
-	init( ROCKSDB_SAMPLE_THREAD_RETURN_PROMISE_LATENCY,         true );
- 	init( ROCKSDB_THREAD_PROMISE_PRIORITY,                      7500 );
+	init( ROCKSDB_THREAD_PROMISE_PRIORITY,                      7500 );
 	init( ROCKSDB_READER_THREAD_PRIORITY,                          0 );
  	init( ROCKSDB_WRITER_THREAD_PRIORITY,                          0 );
 	init( ROCKSDB_BACKGROUND_PARALLELISM,                          4 );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index c83d172065b..5740da71974 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -292,7 +292,6 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	// KeyValueStoreRocksDB
 	bool ROCKSDB_LEVEL_COMPACTION_DYNAMIC_LEVEL_BYTES;
 	int ROCKSDB_SUGGEST_COMPACT_CLEAR_RANGE;
-	bool ROCKSDB_SAMPLE_THREAD_RETURN_PROMISE_LATENCY;
 	int ROCKSDB_THREAD_PROMISE_PRIORITY;
 	int ROCKSDB_READER_THREAD_PRIORITY;
 	int ROCKSDB_WRITER_THREAD_PRIORITY;
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 12ff9e793e4..7f235512e90 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -100,7 +100,6 @@ const StringRef ROCKSDB_READPREFIX_QUEUEWAIT_HISTOGRAM = LiteralStringRef("Rocks
 const StringRef ROCKSDB_READRANGE_NEWITERATOR_HISTOGRAM = LiteralStringRef("RocksDBReadRangeNewIterator");
 const StringRef ROCKSDB_READVALUE_GET_HISTOGRAM = LiteralStringRef("RocksDBReadValueGet");
 const StringRef ROCKSDB_READPREFIX_GET_HISTOGRAM = LiteralStringRef("RocksDBReadPrefixGet");
-const StringRef ROCKSDB_READ_RETURN_LATENCY_HISTOGRAM = "RocksDBReadReturn"_sr;
 
 std::shared_ptr<rocksdb::Cache> rocksdb_block_cache = nullptr;
 
@@ -114,22 +113,16 @@ class SharedRocksDBState {
 	LatencySample commitLatency;
 	LatencySample commitQueueLatency;
 	LatencySample dbWriteLatency;
-	Reference<Histogram> readReturnHistogram;
 
 private:
 	const UID id;
 };
 
 SharedRocksDBState::SharedRocksDBState(UID id)
-  : id(id), readReturnHistogram(SERVER_KNOBS->ROCKSDB_SAMPLE_THREAD_RETURN_PROMISE_LATENCY
-                                    ? Histogram::getHistogram(ROCKSDBSTORAGE_HISTOGRAM_GROUP,
-                                                              ROCKSDB_READ_RETURN_LATENCY_HISTOGRAM,
-                                                              Histogram::Unit::microseconds)
-                                    : Reference<Histogram>()),
-    commitLatency(LatencySample("RocksDBCommitLatency",
-                                id,
-                                SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
-                                SERVER_KNOBS->LATENCY_SAMPLE_SIZE)),
+  : id(id), commitLatency(LatencySample("RocksDBCommitLatency",
+                                        id,
+                                        SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
+                                        SERVER_KNOBS->LATENCY_SAMPLE_SIZE)),
     commitQueueLatency(LatencySample("RocksDBCommitQueueLatency",
                                      id,
                                      SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL,
@@ -1439,12 +1432,11 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			double startTime;
 			bool getHistograms;
 			ThreadReturnPromise<Optional<Value>> result;
-			ReadValueAction(KeyRef key, Optional<UID> debugID, Reference<Histogram> returnPromiseHistogram)
+			ReadValueAction(KeyRef key, Optional<UID> debugID)
 			  : key(key), debugID(debugID), startTime(timer_monotonic()),
 			    getHistograms(
 			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
-			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY),
-			           returnPromiseHistogram) {}
+			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY)) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_VALUE_TIME_ESTIMATE; }
 		};
 		void action(ReadValueAction& a) {
@@ -1529,15 +1521,11 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			double startTime;
 			bool getHistograms;
 			ThreadReturnPromise<Optional<Value>> result;
-			ReadValuePrefixAction(Key key,
-			                      int maxLength,
-			                      Optional<UID> debugID,
-			                      Reference<Histogram> returnPromiseHistogram)
+			ReadValuePrefixAction(Key key, int maxLength, Optional<UID> debugID)
 			  : key(key), maxLength(maxLength), debugID(debugID), startTime(timer_monotonic()),
 			    getHistograms(
 			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
-			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY),
-			           returnPromiseHistogram) {}
+			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY)) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_VALUE_TIME_ESTIMATE; }
 		};
 		void action(ReadValuePrefixAction& a) {
@@ -1618,12 +1606,11 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			double startTime;
 			bool getHistograms;
 			ThreadReturnPromise<RangeResult> result;
-			ReadRangeAction(KeyRange keys, int rowLimit, int byteLimit, Reference<Histogram> returnPromiseHistogram)
+			ReadRangeAction(KeyRange keys, int rowLimit, int byteLimit)
 			  : keys(keys), rowLimit(rowLimit), byteLimit(byteLimit), startTime(timer_monotonic()),
 			    getHistograms(
 			        (deterministicRandom()->random01() < SERVER_KNOBS->ROCKSDB_HISTOGRAMS_SAMPLE_RATE) ? true : false),
-			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY),
-			           returnPromiseHistogram) {}
+			    result(static_cast<TaskPriority>(SERVER_KNOBS->ROCKSDB_THREAD_PROMISE_PRIORITY)) {}
 			double getTimeEstimate() const override { return SERVER_KNOBS->READ_RANGE_TIME_ESTIMATE; }
 		};
 		void action(ReadRangeAction& a) {
@@ -2016,7 +2003,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 
 	Future<Optional<Value>> readValue(KeyRef key, IKeyValueStore::ReadType type, Optional<UID> debugID) override {
 		if (!shouldThrottle(type, key)) {
-			auto a = new Reader::ReadValueAction(key, debugID, this->sharedState->readReturnHistogram);
+			auto a = new Reader::ReadValueAction(key, debugID);
 			auto res = a->result.getFuture();
 			readThreads->post(a);
 			return res;
@@ -2026,7 +2013,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		int maxWaiters = (type == IKeyValueStore::ReadType::FETCH) ? numFetchWaiters : numReadWaiters;
 
 		checkWaiters(semaphore, maxWaiters);
-		auto a = std::make_unique<Reader::ReadValueAction>(key, debugID, this->sharedState->readReturnHistogram);
+		auto a = std::make_unique<Reader::ReadValueAction>(key, debugID);
 		return read(a.release(), &semaphore, readThreads.getPtr(), &counters.failedToAcquire);
 	}
 
@@ -2035,7 +2022,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	                                        IKeyValueStore::ReadType type,
 	                                        Optional<UID> debugID) override {
 		if (!shouldThrottle(type, key)) {
-			auto a = new Reader::ReadValuePrefixAction(key, maxLength, debugID, this->sharedState->readReturnHistogram);
+			auto a = new Reader::ReadValuePrefixAction(key, maxLength, debugID);
 			auto res = a->result.getFuture();
 			readThreads->post(a);
 			return res;
@@ -2045,8 +2032,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		int maxWaiters = (type == IKeyValueStore::ReadType::FETCH) ? numFetchWaiters : numReadWaiters;
 
 		checkWaiters(semaphore, maxWaiters);
-		auto a = std::make_unique<Reader::ReadValuePrefixAction>(
-		    key, maxLength, debugID, this->sharedState->readReturnHistogram);
+		auto a = std::make_unique<Reader::ReadValuePrefixAction>(key, maxLength, debugID);
 		return read(a.release(), &semaphore, readThreads.getPtr(), &counters.failedToAcquire);
 	}
 
@@ -2075,7 +2061,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	                              int byteLimit,
 	                              IKeyValueStore::ReadType type) override {
 		if (!shouldThrottle(type, keys.begin)) {
-			auto a = new Reader::ReadRangeAction(keys, rowLimit, byteLimit, this->sharedState->readReturnHistogram);
+			auto a = new Reader::ReadRangeAction(keys, rowLimit, byteLimit);
 			auto res = a->result.getFuture();
 			readThreads->post(a);
 			return res;
@@ -2085,8 +2071,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		int maxWaiters = (type == IKeyValueStore::ReadType::FETCH) ? numFetchWaiters : numReadWaiters;
 
 		checkWaiters(semaphore, maxWaiters);
-		auto a = std::make_unique<Reader::ReadRangeAction>(
-		    keys, rowLimit, byteLimit, this->sharedState->readReturnHistogram);
+		auto a = std::make_unique<Reader::ReadRangeAction>(keys, rowLimit, byteLimit);
 		return read(a.release(), &semaphore, readThreads.getPtr(), &counters.failedToAcquire);
 	}
 
diff --git a/flow/IThreadPool.h b/flow/IThreadPool.h
index 3977d48fd27..8aea2723265 100644
--- a/flow/IThreadPool.h
+++ b/flow/IThreadPool.h
@@ -25,7 +25,6 @@
 #include <string_view>
 
 #include "flow/flow.h"
-#include "flow/Histogram.h"
 
 // The IThreadPool interface represents a thread pool suitable for doing blocking disk-intensive work
 // (as opposed to a one-thread-per-core pool for CPU-intensive work)
@@ -83,10 +82,7 @@ class TypedAction : public ThreadAction {
 template <class T>
 class ThreadReturnPromise : NonCopyable {
 public:
-	ThreadReturnPromise() : priority(TaskPriority::DefaultOnMainThread) {}
-	ThreadReturnPromise(TaskPriority priority) : priority(priority) {}
-	ThreadReturnPromise(TaskPriority priority, Reference<Histogram> latencyHistogram)
-	  : priority(priority), latencyHistogram(latencyHistogram) {}
+	ThreadReturnPromise(TaskPriority priority = TaskPriority::DefaultOnMainThread) : priority(priority) {}
 	~ThreadReturnPromise() {
 		if (promise.isValid())
 			sendError(broken_promise());
@@ -99,11 +95,7 @@ class ThreadReturnPromise : NonCopyable {
 	template <class U>
 	void send(U&& t) { // Can be called safely from another thread.  Call send or sendError at most once.
 		Promise<Void> signal;
-		if (latencyHistogram.isValid()) {
-			tagAndForward(&promise, t, signal.getFuture(), timer_monotonic(), latencyHistogram);
-		} else {
-			tagAndForward(&promise, t, signal.getFuture());
-		}
+		tagAndForward(&promise, t, signal.getFuture());
 		g_network->onMainThread(std::move(signal),
 		                        g_network->isOnMainThread() ? incrementPriorityIfEven(g_network->getCurrentTask())
 		                                                    : this->priority);
@@ -120,7 +112,6 @@ class ThreadReturnPromise : NonCopyable {
 private:
 	Promise<T> promise;
 	TaskPriority priority;
-	Reference<Histogram> latencyHistogram;
 };
 
 template <class T>
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 1c13fcf2044..3049589d3c1 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -32,7 +32,6 @@
 #include <list>
 #include <utility>
 
-#include "flow/Histogram.h"
 #include "flow/IndexedSet.h"
 #include "flow/Knobs.h"
 #include "flow/Util.h"
@@ -1211,18 +1210,6 @@ Future<T> brokenPromiseToMaybeDelivered(Future<T> in) {
 	}
 }
 
-ACTOR template <class T, class U>
-void tagAndForward(Promise<T>* pOutputPromise,
-                   U value,
-                   Future<Void> signal,
-                   double startTime,
-                   Reference<Histogram> latencyHistogram) {
-	state Promise<T> out(std::move(*pOutputPromise));
-	wait(signal);
-	latencyHistogram->sampleSeconds(timer_monotonic() - startTime);
-	out.send(std::move(value));
-}
-
 ACTOR template <class T, class U>
 void tagAndForward(Promise<T>* pOutputPromise, U value, Future<Void> signal) {
 	state Promise<T> out(std::move(*pOutputPromise));

From 31c60cdbeba26cd42e61820e3c5b18abcc450012 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Mon, 24 Oct 2022 20:22:44 -0700
Subject: [PATCH 705/740] Bug fixes in IO buffer and class lifetimes in
 Redwood, DiskQueue, AsyncFileChaos, AsyncFileWriteChecker, BackupFile,
 AsyncFileEncrypted. Generic actor improvements. (Cherry-Pick #8526 to
 release-7.1)

---
 .../BackupContainerLocalDirectory.actor.cpp   |   2 +-
 fdbclient/FileBackupAgent.actor.cpp           |   2 +-
 fdbrpc/AsyncFileChaos.actor.h                 |  24 ++--
 fdbrpc/AsyncFileEncrypted.actor.cpp           |  28 ++--
 fdbrpc/AsyncFileNonDurable.actor.h            |  24 ++--
 fdbrpc/AsyncFileReadAhead.actor.h             |   2 +-
 fdbrpc/AsyncFileWriteChecker.h                |  24 ++--
 fdbrpc/IAsyncFile.h                           |   4 +
 fdbserver/DiskQueue.actor.cpp                 |   4 +-
 fdbserver/VersionedBTree.actor.cpp            | 129 +++++++++++-------
 flow/genericactors.actor.h                    |  50 +++++--
 11 files changed, 196 insertions(+), 97 deletions(-)

diff --git a/fdbclient/BackupContainerLocalDirectory.actor.cpp b/fdbclient/BackupContainerLocalDirectory.actor.cpp
index 45e7ef29ab4..3dd9632174e 100644
--- a/fdbclient/BackupContainerLocalDirectory.actor.cpp
+++ b/fdbclient/BackupContainerLocalDirectory.actor.cpp
@@ -63,7 +63,7 @@ class BackupFile : public IBackupFile, ReferenceCounted<BackupFile> {
 		m_buffer = Standalone<VectorRef<uint8_t>>(old.slice(size, old.size()));
 
 		// Write the old buffer to the underlying file and update the write offset
-		Future<Void> r = holdWhile(old, m_file->write(old.begin(), size, m_writeOffset));
+		Future<Void> r = uncancellable(holdWhile(old, m_file->write(old.begin(), size, m_writeOffset)));
 		m_writeOffset += size;
 
 		return r;
diff --git a/fdbclient/FileBackupAgent.actor.cpp b/fdbclient/FileBackupAgent.actor.cpp
index b451747f08a..e53042bdc7d 100644
--- a/fdbclient/FileBackupAgent.actor.cpp
+++ b/fdbclient/FileBackupAgent.actor.cpp
@@ -588,7 +588,7 @@ ACTOR Future<Standalone<VectorRef<KeyValueRef>>> decodeRangeFileBlock(Reference<
                                                                       int64_t offset,
                                                                       int len) {
 	state Standalone<StringRef> buf = makeString(len);
-	int rLen = wait(file->read(mutateString(buf), len, offset));
+	int rLen = wait(uncancellable(holdWhile(buf, file->read(mutateString(buf), len, offset))));
 	if (rLen != len)
 		throw restore_bad_read();
 
diff --git a/fdbrpc/AsyncFileChaos.actor.h b/fdbrpc/AsyncFileChaos.actor.h
index 2e5cb4ff475..2a20019ba46 100644
--- a/fdbrpc/AsyncFileChaos.actor.h
+++ b/fdbrpc/AsyncFileChaos.actor.h
@@ -71,8 +71,9 @@ class AsyncFileChaos final : public IAsyncFile, public ReferenceCounted<AsyncFil
 
 		// Wait for diskDelay before submitting the I/O
 		// Template types are being provided explicitly because they can't be automatically deduced for some reason.
+		// Capture file by value in case this is destroyed during the delay
 		return mapAsync<Void, std::function<Future<int>(Void)>, int>(
-		    delay(diskDelay), [=](Void _) -> Future<int> { return file->read(data, length, offset); });
+		    delay(diskDelay), [=, file = file](Void _) -> Future<int> { return file->read(data, length, offset); });
 	}
 
 	Future<Void> write(void const* data, int length, int64_t offset) override {
@@ -111,12 +112,14 @@ class AsyncFileChaos final : public IAsyncFile, public ReferenceCounted<AsyncFil
 		}
 
 		// Wait for diskDelay before submitting the I/O
-		return mapAsync<Void, std::function<Future<Void>(Void)>, Void>(delay(diskDelay), [=](Void _) -> Future<Void> {
-			if (pdata)
-				return holdWhile(arena, file->write(pdata, length, offset));
+		// Capture file by value in case this is destroyed during the delay
+		return mapAsync<Void, std::function<Future<Void>(Void)>, Void>(
+		    delay(diskDelay), [=, file = file](Void _) -> Future<Void> {
+			    if (pdata)
+				    return holdWhile(arena, file->write(pdata, length, offset));
 
-			return file->write(data, length, offset);
-		});
+			    return file->write(data, length, offset);
+		    });
 	}
 
 	Future<Void> truncate(int64_t size) override {
@@ -125,8 +128,9 @@ class AsyncFileChaos final : public IAsyncFile, public ReferenceCounted<AsyncFil
 			return file->truncate(size);
 
 		// Wait for diskDelay before submitting the I/O
+		// Capture file by value in case this is destroyed during the delay
 		return mapAsync<Void, std::function<Future<Void>(Void)>, Void>(
-		    delay(diskDelay), [=](Void _) -> Future<Void> { return file->truncate(size); });
+		    delay(diskDelay), [=, file = file](Void _) -> Future<Void> { return file->truncate(size); });
 	}
 
 	Future<Void> sync() override {
@@ -135,8 +139,9 @@ class AsyncFileChaos final : public IAsyncFile, public ReferenceCounted<AsyncFil
 			return file->sync();
 
 		// Wait for diskDelay before submitting the I/O
+		// Capture file by value in case this is destroyed during the delay
 		return mapAsync<Void, std::function<Future<Void>(Void)>, Void>(
-		    delay(diskDelay), [=](Void _) -> Future<Void> { return file->sync(); });
+		    delay(diskDelay), [=, file = file](Void _) -> Future<Void> { return file->sync(); });
 	}
 
 	Future<int64_t> size() const override {
@@ -145,8 +150,9 @@ class AsyncFileChaos final : public IAsyncFile, public ReferenceCounted<AsyncFil
 			return file->size();
 
 		// Wait for diskDelay before submitting the I/O
+		// Capture file by value in case this is destroyed during the delay
 		return mapAsync<Void, std::function<Future<int64_t>(Void)>, int64_t>(
-		    delay(diskDelay), [=](Void _) -> Future<int64_t> { return file->size(); });
+		    delay(diskDelay), [=, file = file](Void _) -> Future<int64_t> { return file->size(); });
 	}
 
 	int64_t debugFD() const override { return file->debugFD(); }
diff --git a/fdbrpc/AsyncFileEncrypted.actor.cpp b/fdbrpc/AsyncFileEncrypted.actor.cpp
index bf1c44da59f..4f3db0df2a7 100644
--- a/fdbrpc/AsyncFileEncrypted.actor.cpp
+++ b/fdbrpc/AsyncFileEncrypted.actor.cpp
@@ -48,15 +48,17 @@ class AsyncFileEncryptedImpl {
 	ACTOR static Future<Standalone<StringRef>> readBlock(AsyncFileEncrypted* self, uint32_t block) {
 		state Arena arena;
 		state unsigned char* encrypted = new (arena) unsigned char[FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE];
-		int bytes = wait(
-		    self->file->read(encrypted, FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE, FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE * block));
+		int bytes = wait(uncancellable(holdWhile(arena,
+		                                         self->file->read(encrypted,
+		                                                          FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE,
+		                                                          FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE * block))));
 		StreamCipherKey const* cipherKey = StreamCipherKey::getGlobalCipherKey();
 		DecryptionStreamCipher decryptor(cipherKey, self->getIV(block));
 		auto decrypted = decryptor.decrypt(encrypted, bytes, arena);
 		return Standalone<StringRef>(decrypted, arena);
 	}
 
-	ACTOR static Future<int> read(AsyncFileEncrypted* self, void* data, int length, int64_t offset) {
+	ACTOR static Future<int> read(Reference<AsyncFileEncrypted> self, void* data, int length, int64_t offset) {
 		state const uint32_t firstBlock = offset / FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE;
 		state const uint32_t lastBlock = (offset + length - 1) / FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE;
 		state uint32_t block;
@@ -70,7 +72,7 @@ class AsyncFileEncryptedImpl {
 			if (cachedBlock.present()) {
 				plaintext = cachedBlock.get();
 			} else {
-				wait(store(plaintext, readBlock(self, block)));
+				wait(store(plaintext, readBlock(self.getPtr(), block)));
 				self->readBuffers.insert(block, plaintext);
 			}
 			auto start = (block == firstBlock) ? plaintext.begin() + (offset % FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE)
@@ -96,7 +98,7 @@ class AsyncFileEncryptedImpl {
 		return bytesRead;
 	}
 
-	ACTOR static Future<Void> write(AsyncFileEncrypted* self, void const* data, int length, int64_t offset) {
+	ACTOR static Future<Void> write(Reference<AsyncFileEncrypted> self, void const* data, int length, int64_t offset) {
 		ASSERT(self->mode == AsyncFileEncrypted::Mode::APPEND_ONLY);
 		// All writes must append to the end of the file:
 		ASSERT_EQ(offset, self->currentBlock * FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE + self->offsetInBlock);
@@ -122,7 +124,7 @@ class AsyncFileEncryptedImpl {
 		return Void();
 	}
 
-	ACTOR static Future<Void> sync(AsyncFileEncrypted* self) {
+	ACTOR static Future<Void> sync(Reference<AsyncFileEncrypted> self) {
 		ASSERT(self->mode == AsyncFileEncrypted::Mode::APPEND_ONLY);
 		wait(self->writeLastBlockToFile());
 		wait(self->file->sync());
@@ -135,7 +137,7 @@ class AsyncFileEncryptedImpl {
 		Arena arena;
 		auto zeroes = new (arena) unsigned char[length];
 		memset(zeroes, 0, length);
-		wait(self->write(zeroes, length, offset));
+		wait(uncancellable(holdWhile(arena, self->write(zeroes, length, offset))));
 		return Void();
 	}
 };
@@ -159,11 +161,11 @@ void AsyncFileEncrypted::delref() {
 }
 
 Future<int> AsyncFileEncrypted::read(void* data, int length, int64_t offset) {
-	return AsyncFileEncryptedImpl::read(this, data, length, offset);
+	return AsyncFileEncryptedImpl::read(Reference<AsyncFileEncrypted>::addRef(this), data, length, offset);
 }
 
 Future<Void> AsyncFileEncrypted::write(void const* data, int length, int64_t offset) {
-	return AsyncFileEncryptedImpl::write(this, data, length, offset);
+	return AsyncFileEncryptedImpl::write(Reference<AsyncFileEncrypted>::addRef(this), data, length, offset);
 }
 
 Future<Void> AsyncFileEncrypted::zeroRange(int64_t offset, int64_t length) {
@@ -177,7 +179,7 @@ Future<Void> AsyncFileEncrypted::truncate(int64_t size) {
 
 Future<Void> AsyncFileEncrypted::sync() {
 	ASSERT(mode == Mode::APPEND_ONLY);
-	return AsyncFileEncryptedImpl::sync(this);
+	return AsyncFileEncryptedImpl::sync(Reference<AsyncFileEncrypted>::addRef(this));
 }
 
 Future<Void> AsyncFileEncrypted::flush() {
@@ -217,7 +219,11 @@ StreamCipher::IV AsyncFileEncrypted::getIV(uint32_t block) const {
 }
 
 Future<Void> AsyncFileEncrypted::writeLastBlockToFile() {
-	return file->write(&writeBuffer[0], offsetInBlock, currentBlock * FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE);
+	// The source buffer for the write is owned by *this so this must be kept alive by reference count until the write
+	// is finished.
+	return uncancellable(
+	    holdWhile(Reference<AsyncFileEncrypted>::addRef(this),
+	              file->write(&writeBuffer[0], offsetInBlock, currentBlock * FLOW_KNOBS->ENCRYPTION_BLOCK_SIZE)));
 }
 
 size_t AsyncFileEncrypted::RandomCache::evict() {
diff --git a/fdbrpc/AsyncFileNonDurable.actor.h b/fdbrpc/AsyncFileNonDurable.actor.h
index 3f884585d10..99a314ea300 100644
--- a/fdbrpc/AsyncFileNonDurable.actor.h
+++ b/fdbrpc/AsyncFileNonDurable.actor.h
@@ -46,12 +46,17 @@ ACTOR Future<Void> sendErrorOnProcess(ISimulator::ProcessInfo* process,
                                       TaskPriority taskID);
 
 ACTOR template <class T>
-Future<T> sendErrorOnShutdown(Future<T> in) {
-	choose {
-		when(wait(success(g_simulator.getCurrentProcess()->shutdownSignal.getFuture()))) {
-			throw io_error().asInjectedFault();
+Future<T> sendErrorOnShutdown(Future<T> in, bool assertOnCancel = false) {
+	try {
+		choose {
+			when(wait(success(g_simulator.getCurrentProcess()->shutdownSignal.getFuture()))) {
+				throw io_error().asInjectedFault();
+			}
+			when(T rep = wait(in)) { return rep; }
 		}
-		when(T rep = wait(in)) { return rep; }
+	} catch (Error& e) {
+		ASSERT(e.code() != error_code_actor_cancelled || !assertOnCancel);
+		throw;
 	}
 }
 
@@ -59,9 +64,12 @@ class AsyncFileDetachable final : public IAsyncFile, public ReferenceCounted<Asy
 private:
 	Reference<IAsyncFile> file;
 	Future<Void> shutdown;
+	bool assertOnReadWriteCancel;
 
 public:
-	explicit AsyncFileDetachable(Reference<IAsyncFile> file) : file(file) { shutdown = doShutdown(this); }
+	explicit AsyncFileDetachable(Reference<IAsyncFile> file) : file(file), assertOnReadWriteCancel(true) {
+		shutdown = doShutdown(this);
+	}
 
 	ACTOR Future<Void> doShutdown(AsyncFileDetachable* self) {
 		wait(success(g_simulator.getCurrentProcess()->shutdownSignal.getFuture()));
@@ -84,13 +92,13 @@ class AsyncFileDetachable final : public IAsyncFile, public ReferenceCounted<Asy
 	Future<int> read(void* data, int length, int64_t offset) override {
 		if (!file.getPtr() || g_simulator.getCurrentProcess()->shutdownSignal.getFuture().isReady())
 			return io_error().asInjectedFault();
-		return sendErrorOnShutdown(file->read(data, length, offset));
+		return sendErrorOnShutdown(file->read(data, length, offset), assertOnReadWriteCancel);
 	}
 
 	Future<Void> write(void const* data, int length, int64_t offset) override {
 		if (!file.getPtr() || g_simulator.getCurrentProcess()->shutdownSignal.getFuture().isReady())
 			return io_error().asInjectedFault();
-		return sendErrorOnShutdown(file->write(data, length, offset));
+		return sendErrorOnShutdown(file->write(data, length, offset), assertOnReadWriteCancel);
 	}
 
 	Future<Void> truncate(int64_t size) override {
diff --git a/fdbrpc/AsyncFileReadAhead.actor.h b/fdbrpc/AsyncFileReadAhead.actor.h
index 48be5f92f35..b26e2a5e585 100644
--- a/fdbrpc/AsyncFileReadAhead.actor.h
+++ b/fdbrpc/AsyncFileReadAhead.actor.h
@@ -52,7 +52,7 @@ class AsyncFileReadAheadCache final : public IAsyncFile, public ReferenceCounted
 
 		state Reference<CacheBlock> block(new CacheBlock(length));
 		try {
-			int len = wait(f->m_f->read(block->data, length, offset));
+			int len = wait(uncancellable(holdWhile(block, f->m_f->read(block->data, length, offset))));
 			block->len = len;
 		} catch (Error& e) {
 			f->m_max_concurrent_reads.release(1);
diff --git a/fdbrpc/AsyncFileWriteChecker.h b/fdbrpc/AsyncFileWriteChecker.h
index d474e2ca920..fa082bcf796 100644
--- a/fdbrpc/AsyncFileWriteChecker.h
+++ b/fdbrpc/AsyncFileWriteChecker.h
@@ -32,14 +32,18 @@ class AsyncFileWriteChecker : public IAsyncFile, public ReferenceCounted<AsyncFi
 
 	// For read() and write(), the data buffer must remain valid until the future is ready
 	Future<int> read(void* data, int length, int64_t offset) override {
-		return map(m_f->read(data, length, offset), [=](int r) {
-			updateChecksumHistory(false, offset, r, (uint8_t*)data);
+		// Lambda must hold a reference to this to keep it alive until after the read
+		auto self = Reference<AsyncFileWriteChecker>::addRef(this);
+		return map(m_f->read(data, length, offset), [self, data, offset](int r) {
+			self->updateChecksumHistory(false, offset, r, (uint8_t*)data);
 			return r;
 		});
 	}
 	Future<Void> readZeroCopy(void** data, int* length, int64_t offset) override {
-		return map(m_f->readZeroCopy(data, length, offset), [=](Void r) {
-			updateChecksumHistory(false, offset, *length, (uint8_t*)data);
+		// Lambda must hold a reference to this to keep it alive until after the read
+		auto self = Reference<AsyncFileWriteChecker>::addRef(this);
+		return map(m_f->readZeroCopy(data, length, offset), [self, data, length, offset](Void r) {
+			self->updateChecksumHistory(false, offset, *length, (uint8_t*)data);
 			return r;
 		});
 	}
@@ -50,12 +54,14 @@ class AsyncFileWriteChecker : public IAsyncFile, public ReferenceCounted<AsyncFi
 	}
 
 	Future<Void> truncate(int64_t size) override {
-		return map(m_f->truncate(size), [=](Void r) {
+		// Lambda must hold a reference to this to keep it alive until after the read
+		auto self = Reference<AsyncFileWriteChecker>::addRef(this);
+		return map(m_f->truncate(size), [self, size](Void r) {
 			// Truncate the page checksum history if it is in use
-			if ((size / checksumHistoryPageSize) < checksumHistory.size()) {
-				int oldCapacity = checksumHistory.capacity();
-				checksumHistory.resize(size / checksumHistoryPageSize);
-				checksumHistoryBudget.get() -= (checksumHistory.capacity() - oldCapacity);
+			if ((size / checksumHistoryPageSize) < self->checksumHistory.size()) {
+				int oldCapacity = self->checksumHistory.capacity();
+				self->checksumHistory.resize(size / checksumHistoryPageSize);
+				checksumHistoryBudget.get() -= (self->checksumHistory.capacity() - oldCapacity);
 			}
 			return r;
 		});
diff --git a/fdbrpc/IAsyncFile.h b/fdbrpc/IAsyncFile.h
index 31067fb637a..c95b79d477b 100644
--- a/fdbrpc/IAsyncFile.h
+++ b/fdbrpc/IAsyncFile.h
@@ -33,6 +33,10 @@
 // AsyncFileCached) maintain references, while others (AsyncFileNonDurable) don't, and the comment
 // is unapplicable to some others as well (AsyncFileKAIO). It's safest to assume that all operations
 // must complete or cancel, but you should probably look at the file implementations you'll be using.
+//
+// Wrapper classes such as AsyncFileWriteChecker and AsyncFileChaos ideally should be safe to destroy with
+// pending operations as they are inserted randomly into file opens in simulation and some use cases
+// will drop file references while operations are still pending.
 class IAsyncFile {
 public:
 	virtual ~IAsyncFile();
diff --git a/fdbserver/DiskQueue.actor.cpp b/fdbserver/DiskQueue.actor.cpp
index f992c6fb4e0..7664be784d4 100644
--- a/fdbserver/DiskQueue.actor.cpp
+++ b/fdbserver/DiskQueue.actor.cpp
@@ -429,7 +429,7 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 		waitfor.push_back(self->files[1].f->write(pageData.begin(), pageData.size(), self->writingPos));
 		self->writingPos += pageData.size();
 
-		return waitForAll(waitfor);
+		return waitForAllReadyThenThrow(waitfor);
 	}
 
 	// Write the given data (pageData) to the queue files of self, sync data to disk, and delete the memory (pageMem)
@@ -655,7 +655,7 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 			for (int i = 0; i < 2; i++)
 				if (self->files[i].size > 0)
 					reads.push_back(self->files[i].f->read(self->firstPages[i], sizeof(Page), 0));
-			wait(waitForAll(reads));
+			wait(waitForAllReadyThenThrow(reads));
 
 			// Determine which file comes first
 			if (compare(self->firstPages[1], self->firstPages[0])) {
diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp
index 6eb2ac09726..3ce16af146c 100644
--- a/fdbserver/VersionedBTree.actor.cpp
+++ b/fdbserver/VersionedBTree.actor.cpp
@@ -151,6 +151,15 @@ class PriorityMultiLock {
 
 	~PriorityMultiLock() { prioritylock_printf("destruct"); }
 
+	void kill() {
+		brokenOnDestruct.sendError(broken_promise());
+		fRunner.cancel();
+		runners.clear();
+		for (auto& w : waiters) {
+			w.clear();
+		}
+	}
+
 	Future<Lock> lock(int priority = 0) {
 		prioritylock_printf("lock begin %s\n", toString().c_str());
 
@@ -1804,9 +1813,17 @@ ACTOR Future<Void> redwoodMetricsLogger() {
 }
 
 // Holds an index of recently used objects.
-// ObjectType must have the methods
-//   bool evictable() const;            // return true if the entry can be evicted
-//   Future<Void> onEvictable() const;  // ready when entry can be evicted
+// ObjectType must have these methods
+//
+//   // Returns true iff the entry can be evicted
+//   bool evictable() const;
+//
+//	 // Ready when object is safe to evict from cache
+//   Future<Void> onEvictable() const;
+//
+//   // Ready when object destruction is safe
+//   // Should cancel pending async operations that are safe to cancel when cache is being destroyed
+//   Future<Void> cancel() const;
 template <class IndexType, class ObjectType>
 class ObjectCache : NonCopyable {
 	struct Entry;
@@ -2029,7 +2046,7 @@ class ObjectCache : NonCopyable {
 	}
 
 	// Clears the cache, saving the entries to second cache, then waits for each item to be evictable and evicts it.
-	ACTOR static Future<Void> clear_impl(ObjectCache* self) {
+	ACTOR static Future<Void> clear_impl(ObjectCache* self, bool waitForSafeEviction) {
 		// Claim ownership of all of our cached items, removing them from the evictor's control and quota.
 		for (auto& ie : self->cache) {
 			self->pEvictor->reclaim(ie.second);
@@ -2041,16 +2058,15 @@ class ObjectCache : NonCopyable {
 
 		state typename CacheT::iterator i = self->cache.begin();
 		while (i != self->cache.end()) {
-			if (!i->second.item.evictable()) {
-				wait(i->second.item.onEvictable());
-			}
+			wait(waitForSafeEviction ? i->second.item.onEvictable() : i->second.item.cancel());
 			++i;
 		}
+		self->cache.clear();
 
 		return Void();
 	}
 
-	Future<Void> clear() { return clear_impl(this); }
+	Future<Void> clear(bool waitForSafeEviction = false) { return clear_impl(this, waitForSafeEviction); }
 
 	// Move the prioritized evictions queued to the front of the eviction order
 	void flushPrioritizedEvictions() { pEvictor->moveIn(prioritizedEvictions); }
@@ -2111,6 +2127,13 @@ class DWALPager final : public IPager2 {
 		// Entry is evictable when its write and read futures are ready, even if they are
 		// errors, so any buffers they hold are no longer needed by the underlying file actors
 		Future<Void> onEvictable() const { return ready(readFuture) && ready(writeFuture); }
+
+		// Read and write futures are safe to cancel so just cancel them and return
+		Future<Void> cancel() {
+			writeFuture.cancel();
+			readFuture.cancel();
+			return Void();
+		}
 	};
 	typedef ObjectCache<LogicalPageID, PageCacheEntry> PageCacheT;
 
@@ -2658,14 +2681,15 @@ class DWALPager final : public IPager2 {
 
 	Future<LogicalPageID> newExtentPageID(QueueID queueID) override { return newExtentPageID_impl(this, queueID); }
 
-	ACTOR static Future<Void> writePhysicalBlock(DWALPager* self,
-	                                             Reference<ArenaPage> page,
-	                                             int blockNum,
-	                                             int blockSize,
-	                                             PhysicalPageID pageID,
-	                                             PagerEventReasons reason,
-	                                             unsigned int level,
-	                                             bool header) {
+	// Write one block of a page of a physical page in the page file.  Futures returned must be allowed to complete.
+	ACTOR static UNCANCELLABLE Future<Void> writePhysicalBlock(DWALPager* self,
+	                                                           Reference<ArenaPage> page,
+	                                                           int blockNum,
+	                                                           int blockSize,
+	                                                           PhysicalPageID pageID,
+	                                                           PagerEventReasons reason,
+	                                                           unsigned int level,
+	                                                           bool header) {
 
 		state PriorityMultiLock::Lock lock = wait(self->ioLock.lock(header ? ioMaxPriority : ioMinPriority));
 		++g_redwoodMetrics.metric.pagerDiskWrite;
@@ -2689,7 +2713,11 @@ class DWALPager final : public IPager2 {
 		// Note:  Not using forwardError here so a write error won't be discovered until commit time.
 		debug_printf("DWALPager(%s) op=writeBlock %s\n", self->filename.c_str(), toString(pageID).c_str());
 		wait(self->pageFile->write(page->rawData() + (blockNum * blockSize), blockSize, (int64_t)pageID * blockSize));
-		debug_printf("DWALPager(%s) op=writeBlockDone %s\n", self->filename.c_str(), toString(pageID).c_str());
+
+		// This next line could crash on shutdown because this actor can't be cancelled so self could be destroyed after
+		// write, so enable this line with caution when debugging.
+		// debug_printf("DWALPager(%s) op=writeBlockDone %s\n", self->filename.c_str(), toString(pageID).c_str());
+
 		return Void();
 	}
 
@@ -2713,6 +2741,7 @@ class DWALPager final : public IPager2 {
 		return Void();
 	}
 
+	// All returned futures are added to the operations vector
 	Future<Void> writePhysicalPage(PagerEventReasons reason,
 	                               unsigned int level,
 	                               Standalone<VectorRef<PhysicalPageID>> pageIDs,
@@ -2936,18 +2965,19 @@ class DWALPager final : public IPager2 {
 	}
 	void freeExtent(LogicalPageID pageID) override { freeExtent_impl(this, pageID); }
 
-	ACTOR static Future<int> readPhysicalBlock(DWALPager* self,
-	                                           uint8_t* data,
-	                                           int blockSize,
-	                                           int64_t offset,
-	                                           int priority) {
+	ACTOR static UNCANCELLABLE Future<int> readPhysicalBlock(DWALPager* self,
+	                                                         Reference<ArenaPage> pageBuffer,
+	                                                         int pageOffset,
+	                                                         int blockSize,
+	                                                         int64_t offset,
+	                                                         int priority) {
 		state PriorityMultiLock::Lock lock = wait(self->ioLock.lock(std::min(priority, ioMaxPriority)));
 		++g_redwoodMetrics.metric.pagerDiskRead;
-		int bytes = wait(self->pageFile->read(data, blockSize, offset));
+		int bytes = wait(self->pageFile->read(pageBuffer->rawData() + pageOffset, blockSize, offset));
 		return bytes;
 	}
 
-	// Read a physical page from the page file.  Note that header pages use a page size of smallestPhysicalBlock
+	// Read a physical page from the page file.  Note that header pages use a page size of smallestPhysicalBlock.
 	// If the user chosen physical page size is larger, then there will be a gap of unused space after the header pages
 	// and before the user-chosen sized pages.
 	ACTOR static Future<Reference<ArenaPage>> readPhysicalPage(DWALPager* self,
@@ -2964,11 +2994,8 @@ class DWALPager final : public IPager2 {
 		             page->rawData(),
 		             header);
 
-		int readBytes = wait(readPhysicalBlock(self,
-		                                       page->rawData(),
-		                                       page->rawSize(),
-		                                       (int64_t)pageID * page->rawSize(),
-		                                       std::min(priority, ioMaxPriority)));
+		int readBytes = wait(readPhysicalBlock(
+		    self, page, 0, page->rawSize(), (int64_t)pageID * page->rawSize(), std::min(priority, ioMaxPriority)));
 		debug_printf("DWALPager(%s) op=readPhysicalDiskReadComplete %s ptr=%p bytes=%d\n",
 		             self->filename.c_str(),
 		             toString(pageID).c_str(),
@@ -3031,8 +3058,8 @@ class DWALPager final : public IPager2 {
 		state int blockSize = self->physicalPageSize;
 		std::vector<Future<int>> reads;
 		for (int i = 0; i < pageIDs.size(); ++i) {
-			reads.push_back(readPhysicalBlock(
-			    self, page->rawData() + (i * blockSize), blockSize, ((int64_t)pageIDs[i]) * blockSize, priority));
+			reads.push_back(
+			    readPhysicalBlock(self, page, i * blockSize, blockSize, ((int64_t)pageIDs[i]) * blockSize, priority));
 		}
 		// wait for all the parallel read futures
 		wait(waitForAll(reads));
@@ -3269,8 +3296,8 @@ class DWALPager final : public IPager2 {
 			currentOffset = i * physicalReadSize;
 			debug_printf("DWALPager(%s) current offset %" PRId64 "\n", self->filename.c_str(), currentOffset);
 			++g_redwoodMetrics.metric.pagerDiskRead;
-			reads.push_back(
-			    self->pageFile->read(extent->rawData() + currentOffset, physicalReadSize, startOffset + currentOffset));
+			reads.push_back(self->readPhysicalBlock(
+			    self, extent, currentOffset, physicalReadSize, startOffset + currentOffset, ioMaxPriority));
 		}
 
 		// Handle the last read separately as it may be smaller than physicalReadSize
@@ -3282,8 +3309,8 @@ class DWALPager final : public IPager2 {
 			             currentOffset,
 			             lastReadSize);
 			++g_redwoodMetrics.metric.pagerDiskRead;
-			reads.push_back(
-			    self->pageFile->read(extent->rawData() + currentOffset, lastReadSize, startOffset + currentOffset));
+			reads.push_back(self->readPhysicalBlock(
+			    self, extent, currentOffset, lastReadSize, startOffset + currentOffset, ioMaxPriority));
 		}
 
 		// wait for all the parallel read futures for the given extent
@@ -3748,30 +3775,36 @@ class DWALPager final : public IPager2 {
 	Value getCommitRecord() const override { return lastCommittedHeader.userCommitRecord; }
 
 	ACTOR void shutdown(DWALPager* self, bool dispose) {
+		// Send to the error promise first and then delay(0) to give users a chance to cancel
+		// any outstanding operations
+		if (self->errorPromise.canBeSet()) {
+			debug_printf("DWALPager(%s) shutdown sending error\n", self->filename.c_str());
+			self->errorPromise.sendError(actor_cancelled()); // Ideally this should be shutdown_in_progress
+		}
+		wait(delay(0));
+
+		// The next section explicitly cancels all pending operations held in the pager
+		debug_printf("DWALPager(%s) shutdown kill ioLock\n", self->filename.c_str());
+		self->ioLock.kill();
+
 		debug_printf("DWALPager(%s) shutdown cancel recovery\n", self->filename.c_str());
 		self->recoverFuture.cancel();
 		debug_printf("DWALPager(%s) shutdown cancel commit\n", self->filename.c_str());
 		self->commitFuture.cancel();
 		debug_printf("DWALPager(%s) shutdown cancel remap\n", self->filename.c_str());
 		self->remapCleanupFuture.cancel();
+		debug_printf("DWALPager(%s) shutdown kill file extension\n", self->filename.c_str());
+		self->fileExtension.cancel();
 
-		if (self->errorPromise.canBeSet()) {
-			debug_printf("DWALPager(%s) shutdown sending error\n", self->filename.c_str());
-			self->errorPromise.sendError(actor_cancelled()); // Ideally this should be shutdown_in_progress
+		debug_printf("DWALPager(%s) shutdown cancel operations\n", self->filename.c_str());
+		for (auto& f : self->operations) {
+			f.cancel();
 		}
-
-		// Must wait for pending operations to complete, canceling them can cause a crash because the underlying
-		// operations may be uncancellable and depend on memory from calling scope's page reference
-		debug_printf("DWALPager(%s) shutdown wait for operations\n", self->filename.c_str());
-
-		// Pending ops must be all ready, errors are okay
-		wait(waitForAllReady(self->operations));
 		self->operations.clear();
 
 		debug_printf("DWALPager(%s) shutdown destroy page cache\n", self->filename.c_str());
 		wait(self->extentCache.clear());
 		wait(self->pageCache.clear());
-		wait(delay(0));
 
 		debug_printf("DWALPager(%s) shutdown remappedPagesMap: %s\n",
 		             self->filename.c_str(),
@@ -3996,7 +4029,11 @@ class DWALPager final : public IPager2 {
 	Promise<Void> closedPromise;
 	Promise<Void> errorPromise;
 	Future<Void> commitFuture;
+
+	// The operations vector is used to hold all disk writes made by the Pager, but could also hold
+	// other operations that need to be waited on before a commit can finish.
 	std::vector<Future<Void>> operations;
+
 	Future<Void> recoverFuture;
 	Future<Void> remapCleanupFuture;
 	bool remapCleanupStop;
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
index 1c13fcf2044..dc3307ef6f3 100644
--- a/flow/genericactors.actor.h
+++ b/flow/genericactors.actor.h
@@ -176,7 +176,8 @@ Future<Void> waitForAllReady(std::vector<Future<T>> results) {
 		if (i == results.size())
 			return Void();
 		try {
-			wait(success(results[i]));
+			T t = wait(results[i]);
+			(void)t;
 		} catch (...) {
 		}
 		i++;
@@ -399,6 +400,20 @@ Future<Void> map(FutureStream<T> input, F func, PromiseStream<std::invoke_result
 	return Void();
 }
 
+// X + Y will wait for X, then wait for and return the result of Y
+ACTOR template <class A, class B>
+Future<B> operatorPlus(Future<A> a, Future<B> b) {
+	A resultA = wait(a);
+	(void)resultA;
+	B resultB = wait(b);
+	return resultB;
+}
+
+template <class A, class B>
+Future<B> operator+(Future<A> a, Future<B> b) {
+	return operatorPlus(a, b);
+}
+
 // Returns if the future returns true, otherwise waits forever.
 ACTOR Future<Void> returnIfTrue(Future<bool> f);
 
@@ -933,21 +948,22 @@ class QuorumCallback : public Callback<T> {
 
 private:
 	template <class U>
-	friend Future<Void> quorum(std::vector<Future<U>> const& results, int n);
+	friend Future<Void> quorum(const Future<U>* pItems, int itemCount, int n);
 	Quorum<T>* head;
 	QuorumCallback() = default;
 	QuorumCallback(Future<T> future, Quorum<T>* head) : head(head) { future.addCallbackAndClear(this); }
 };
 
 template <class T>
-Future<Void> quorum(std::vector<Future<T>> const& results, int n) {
-	ASSERT(n >= 0 && n <= results.size());
+Future<Void> quorum(const Future<T>* pItems, int itemCount, int n) {
+	ASSERT(n >= 0 && n <= itemCount);
 
-	int size = Quorum<T>::sizeFor(results.size());
-	Quorum<T>* q = new (allocateFast(size)) Quorum<T>(n, results.size());
+	int size = Quorum<T>::sizeFor(itemCount);
+	Quorum<T>* q = new (allocateFast(size)) Quorum<T>(n, itemCount);
 
 	QuorumCallback<T>* nextCallback = q->callbacks();
-	for (auto& r : results) {
+	for (int i = 0; i < itemCount; ++i) {
+		auto& r = pItems[i];
 		if (r.isReady()) {
 			new (nextCallback) QuorumCallback<T>();
 			nextCallback->next = 0;
@@ -962,6 +978,11 @@ Future<Void> quorum(std::vector<Future<T>> const& results, int n) {
 	return Future<Void>(q);
 }
 
+template <class T>
+Future<Void> quorum(std::vector<Future<T>> const& results, int n) {
+	return quorum(&results.front(), results.size(), n);
+}
+
 ACTOR template <class T>
 Future<Void> smartQuorum(std::vector<Future<T>> results,
                          int required,
@@ -983,6 +1004,15 @@ Future<Void> waitForAll(std::vector<Future<T>> const& results) {
 	return quorum(results, (int)results.size());
 }
 
+// Wait for all futures in results to be ready and then throw the first (in execution order) error
+// if any of them resulted in an error.
+template <class T>
+Future<Void> waitForAllReadyThenThrow(std::vector<Future<T>> const& results) {
+	Future<Void> f = waitForAll(results);
+	Future<Void> fReady = waitForAllReady(results);
+	return fReady + f;
+}
+
 template <class T>
 Future<Void> waitForAny(std::vector<Future<T>> const& results) {
 	if (results.empty())
@@ -1042,7 +1072,8 @@ Future<Void> success(Future<T> of) {
 ACTOR template <class T>
 Future<Void> ready(Future<T> f) {
 	try {
-		wait(success(f));
+		T t = wait(f);
+		(void)t;
 	} catch (...) {
 	}
 	return Void();
@@ -1167,7 +1198,8 @@ inline Future<Void> operator&&(Future<Void> const& lhs, Future<Void> const& rhs)
 			return lhs;
 	}
 
-	return waitForAll(std::vector<Future<Void>>{ lhs, rhs });
+	Future<Void> x[] = { lhs, rhs };
+	return quorum(x, 2, 2);
 }
 
 // error || unset -> error

From c0ec8d91375e31c5c2887b36db0dea40969aa5d3 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Mon, 24 Oct 2022 20:27:54 -0700
Subject: [PATCH 706/740] Updated more simple but equivalent bug fix for disk
 queue read buffer lifetime (Cherry-pick #8522 to release-7.2)

---
 fdbserver/DiskQueue.actor.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fdbserver/DiskQueue.actor.cpp b/fdbserver/DiskQueue.actor.cpp
index 7664be784d4..03f30be7317 100644
--- a/fdbserver/DiskQueue.actor.cpp
+++ b/fdbserver/DiskQueue.actor.cpp
@@ -743,14 +743,17 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 	}
 
 	// Read nPages from pageOffset*sizeof(Page) offset in file self->files[file]
-	ACTOR static Future<Standalone<StringRef>> read(RawDiskQueue_TwoFiles* self, int file, int pageOffset, int nPages) {
+	ACTOR static UNCANCELLABLE Future<Standalone<StringRef>> read(RawDiskQueue_TwoFiles* self,
+	                                                              int file,
+	                                                              int pageOffset,
+	                                                              int nPages) {
 		state TrackMe trackMe(self);
 		state const size_t bytesRequested = nPages * sizeof(Page);
 		state Standalone<StringRef> result = makeAlignedString(sizeof(Page), bytesRequested);
 		if (file == 1)
 			ASSERT_WE_THINK(pageOffset * sizeof(Page) + bytesRequested <= self->writingPos);
-		int bytesRead = wait(uncancellable(holdWhile(
-		    result, self->files[file].f->read(mutateString(result), bytesRequested, pageOffset * sizeof(Page)))));
+		int bytesRead =
+		    wait(self->files[file].f->read(mutateString(result), bytesRequested, pageOffset * sizeof(Page)));
 		ASSERT_WE_THINK(bytesRead == bytesRequested);
 		return result;
 	}

From bf2dd2947ae697cd9f67aa2aec19254047fabc6b Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Tue, 25 Oct 2022 08:56:07 -0700
Subject: [PATCH 707/740] RocksDB disable WAL for experimentation. (#8554)

---
 fdbclient/ServerKnobs.cpp                | 3 +++
 fdbclient/ServerKnobs.h                  | 1 +
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 516df8c2e1c..429634b6942 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -402,6 +402,9 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( ROCKSDB_SOFT_PENDING_COMPACT_BYTES_LIMIT,      64000000000 ); // 64GB, Rocksdb option, Writes will slow down.
 	init( ROCKSDB_HARD_PENDING_COMPACT_BYTES_LIMIT,     100000000000 ); // 100GB, Rocksdb option, Writes will stall.
 	init( ROCKSDB_CAN_COMMIT_COMPACT_BYTES_LIMIT,        50000000000 ); // 50GB, Commit waits.
+	// Enable this knob only for experminatal purpose, never enable this in production.
+	// If enabled, all the committed in-memory memtable writes are lost on a crash.
+	init( ROCKSDB_DISABLE_WAL_EXPERIMENTAL,                    false );
 	// Can commit will delay ROCKSDB_CAN_COMMIT_DELAY_ON_OVERLOAD seconds for
 	// ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD times, if rocksdb overloaded.
 	// Set ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD to 0, to disable
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index c83d172065b..d0fbdca6c78 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -330,6 +330,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int64_t ROCKSDB_CAN_COMMIT_COMPACT_BYTES_LIMIT;
 	int ROCKSDB_CAN_COMMIT_DELAY_ON_OVERLOAD;
 	int ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD;
+	bool ROCKSDB_DISABLE_WAL_EXPERIMENTAL;
 	int64_t ROCKSDB_COMPACTION_READAHEAD_SIZE;
 	int64_t ROCKSDB_BLOCK_SIZE;
 
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 12ff9e793e4..42ce242c449 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -1184,6 +1184,9 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			ASSERT(!deletes.empty() || !a.batchToCommit->HasDeleteRange());
 			rocksdb::WriteOptions options;
 			options.sync = !SERVER_KNOBS->ROCKSDB_UNSAFE_AUTO_FSYNC;
+			if (SERVER_KNOBS->ROCKSDB_DISABLE_WAL_EXPERIMENTAL) {
+				options.disableWAL = true;
+			}
 
 			double writeBeginTime = timer_monotonic();
 			if (rateLimiter) {

From 070ad8f1bb2fe868b411f8df283451e28dfd657f Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Tue, 25 Oct 2022 10:43:32 -0700
Subject: [PATCH 708/740] Setting sync to false when wal enabled.

---
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 42ce242c449..19c0777e7f1 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -1186,6 +1186,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			options.sync = !SERVER_KNOBS->ROCKSDB_UNSAFE_AUTO_FSYNC;
 			if (SERVER_KNOBS->ROCKSDB_DISABLE_WAL_EXPERIMENTAL) {
 				options.disableWAL = true;
+				options.sync = false;
 			}
 
 			double writeBeginTime = timer_monotonic();

From 30a1e999b4b5d903ad5cd0664808073300646f03 Mon Sep 17 00:00:00 2001
From: Vishesh Yadav <vishesh_yadav@apple.com>
Date: Fri, 21 Oct 2022 17:02:02 -0700
Subject: [PATCH 709/740] Don't fail ConsistencyCheck on first mismatch

ConsistencyCheck fails when it sees the first corrupted shard. We may want to
keep it running so that we can see all the corrupted data in logs.
---
 fdbserver/workloads/ConsistencyCheck.actor.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp
index 925168ee964..3d57e9fc5b4 100644
--- a/fdbserver/workloads/ConsistencyCheck.actor.cpp
+++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp
@@ -370,6 +370,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		state Standalone<VectorRef<KeyValueRef>>
 		    serverList; // "\xff/serverList/[[serverID]]" := "[[StorageServerInterface]]"
 		state Standalone<VectorRef<KeyValueRef>> serverTag; // "\xff/serverTag/[[serverID]]" = "[[Tag]]"
+		state bool testResult = true;
 
 		std::vector<Future<bool>> cacheResultsPromise;
 		cacheResultsPromise.push_back(self->fetchKeyValuesFromSS(cx, self, storageCacheKeys, cacheKeyPromise, true));
@@ -557,7 +558,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 					for (j = 0; j < keyValueFutures.size(); j++) {
 						ErrorOr<GetKeyValuesReply> rangeResult = keyValueFutures[j].get();
 						// if (rangeResult.isError()) {
-						// 	throw rangeResult.getError();
+						//	throw rangeResult.getError();
 						// }
 
 						// Compare the results with other storage servers
@@ -685,7 +686,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 									    .detail("MatchingKVPairs", matchingKVPairs);
 
 									self->testFailure("Data inconsistent", true);
-									return false;
+									testResult = false;
 								}
 							}
 						}
@@ -731,7 +732,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 				    .detail("BytesRead", bytesReadInRange);
 			}
 		}
-		return true;
+		return testResult;
 	}
 
 	// Directly fetch key/values from storage servers through GetKeyValuesRequest
@@ -1178,6 +1179,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		state Reference<IRateControl> rateLimiter = Reference<IRateControl>(new SpeedLimit(rateLimitForThisRound, 1));
 		state double rateLimiterStartTime = now();
 		state int64_t bytesReadInthisRound = 0;
+		state bool testResult = true;
 
 		state double dbSize = 100e12;
 		if (g_network->isSimulated()) {
@@ -1501,7 +1503,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 										    (!storageServerInterfaces[j].isTss() &&
 										     !storageServerInterfaces[firstValidServer].isTss())) {
 											self->testFailure("Data inconsistent", true);
-											return false;
+											testResult = false;
 										}
 									}
 								}
@@ -1731,7 +1733,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
 		}*/
 
 		self->bytesReadInPreviousRound = bytesReadInthisRound;
-		return true;
+		return testResult;
 	}
 
 	// Returns true if any storage servers have the exact same network address or are not using the correct key value

From 0e1dd9f82c022c32af6b151cf8bcdbaae4e62c32 Mon Sep 17 00:00:00 2001
From: Aaron Molitor <amolitor@apple.com>
Date: Tue, 25 Oct 2022 19:19:54 -0500
Subject: [PATCH 710/740] cleanup shell script, remove set -x, add more
 detailed logging

---
 packaging/docker/run_ycsb.sh | 48 ++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/packaging/docker/run_ycsb.sh b/packaging/docker/run_ycsb.sh
index deb065a7288..bfe3e8df6e1 100755
--- a/packaging/docker/run_ycsb.sh
+++ b/packaging/docker/run_ycsb.sh
@@ -1,22 +1,44 @@
 #!/usr/bin/env bash
-set -Eeuxo pipefail
+set -Eeuo pipefail
+
+function logg () {
+    printf "##### $(date +'%Y-%m-%dT%H:%M:%SZ') #  %-56.55s #####\n" "${1}"
+}
+
+function error_exit () {
+    echo "################################################################################"
+    logg "${0} FAILED"
+    logg "RUN_ID: ${RUN_ID}"
+    logg "WORKLOAD: ${WORKLOAD}"
+    logg "ENVIRONMENT IS:"
+    env
+    echo "################################################################################"
+}
+
+trap error_exit ERR
 
 namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
-POD_NUM=$(echo $POD_NAME | cut -d - -f3)
-KEY="ycsb_load_${POD_NUM}_of_${NUM_PODS}_complete"
-CLI=$(ls /var/dynamic-conf/bin/*/fdbcli | head -n1)
 
-echo "WAITING FOR ALL PODS TO COME UP"
-while [[ $(kubectl get pods -n ${namespace} -l name=ycsb,run=${RUN_ID} --field-selector=status.phase=Running | grep -cv NAME) -lt ${NUM_PODS} ]]; do
+logg "WAITING FOR ${NUM_PODS} PODS TO COME UP IN ${namespace}"
+while [[ $(kubectl get pods -n "${namespace}" -l name=ycsb,run="${RUN_ID}" --field-selector=status.phase=Running | grep -cv NAME) -lt ${NUM_PODS} ]]; do
     sleep 1
 done
-echo "ALL PODS ARE UP"
+logg "${NUM_PODS} PODS ARE UP IN ${namespace}"
 
-echo "RUNNING YCSB"
-./bin/ycsb.sh ${MODE} foundationdb -s -P workloads/${WORKLOAD} ${YCSB_ARGS}
-echo "YCSB FINISHED"
+logg "RUNNING YCSB ${WORKLOAD}"
+set -x
+./bin/ycsb.sh "${MODE}" foundationdb -s -P "workloads/${WORKLOAD}" "${YCSB_ARGS}"
+set +x
+logg "YCSB ${WORKLOAD} FINISHED"
 
-echo "COPYING HISTOGRAMS TO S3"
-aws s3 sync --sse aws:kms --exclude "*" --include "histogram.*" /tmp s3://${BUCKET}/ycsb_histograms/${namespace}/${POD_NAME}
-echo "COPYING HISTOGRAMS TO S3 FINISHED"
+logg "COPYING HISTOGRAMS TO S3"
+set -x
+aws s3 sync --sse aws:kms --exclude "*" --include "histogram.*" /tmp "s3://${BUCKET}/ycsb_histograms/${namespace}/${POD_NAME}"
+set +x
+logg "COPYING HISTOGRAMS TO S3 FINISHED"
 
+echo "################################################################################"
+logg "COMPLETED ${0}"
+logg "RUN_ID: ${RUN_ID}"
+logg "WORKLOAD: ${WORKLOAD}"
+echo "################################################################################"

From 31a9182165f9eb74f8aba8edab53ba08dac19137 Mon Sep 17 00:00:00 2001
From: Aaron Molitor <amolitor@apple.com>
Date: Wed, 26 Oct 2022 08:16:27 -0500
Subject: [PATCH 711/740] update kubectl and awscli

---
 packaging/docker/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index d0adc045d4e..bc9396678af 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -178,13 +178,13 @@ RUN yum -y install \
     rm -rf /var/cache/yum
 
 WORKDIR /tmp
-RUN curl -Ls https://amazon-eks.s3.amazonaws.com/1.19.6/2021-01-05/bin/linux/amd64/kubectl -o kubectl && \
-    echo "08ff68159bbcb844455167abb1d0de75bbfe5ae1b051f81ab060a1988027868a  kubectl" > kubectl.txt && \
+RUN curl -Ls https://s3.us-west-2.amazonaws.com/amazon-eks/1.22.6/2022-03-09/bin/linux/amd64/kubectl -o kubectl && \
+    echo "860c3d37a5979491895767e7332404d28dc0d7797c7673c33df30ca80e215a07  kubectl" > kubectl.txt && \
     sha256sum --quiet -c kubectl.txt && \
     mv kubectl /usr/local/bin/kubectl && \
     chmod 755 /usr/local/bin/kubectl && \
-    curl -Ls https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.2.43.zip -o "awscliv2.zip" && \
-    echo "9a8b3c4e7f72bbcc55e341dce3af42479f2730c225d6d265ee6f9162cfdebdfd  awscliv2.zip" > awscliv2.txt && \
+    curl -Ls https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-2.7.34.zip -o "awscliv2.zip" && \
+    echo "daf9253f0071b5cfee9532bc5220bedd7a5d29d4e0f92b42b9e3e4c496341e88  awscliv2.zip" > awscliv2.txt && \
     sha256sum --quiet -c awscliv2.txt && \
     unzip -qq awscliv2.zip && \
     ./aws/install && \

From a4c6d0b703d30028e83c88f91d17de6f460b895d Mon Sep 17 00:00:00 2001
From: Aaron Molitor <amolitor@apple.com>
Date: Wed, 26 Oct 2022 11:07:04 -0500
Subject: [PATCH 712/740] make same change to Dockerfile.eks (from #8583)

---
 packaging/docker/Dockerfile     | 2 +-
 packaging/docker/Dockerfile.eks | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index bc9396678af..5075e81054e 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -183,7 +183,7 @@ RUN curl -Ls https://s3.us-west-2.amazonaws.com/amazon-eks/1.22.6/2022-03-09/bin
     sha256sum --quiet -c kubectl.txt && \
     mv kubectl /usr/local/bin/kubectl && \
     chmod 755 /usr/local/bin/kubectl && \
-    curl -Ls https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m)-2.7.34.zip -o "awscliv2.zip" && \
+    curl -Ls https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.7.34.zip -o "awscliv2.zip" && \
     echo "daf9253f0071b5cfee9532bc5220bedd7a5d29d4e0f92b42b9e3e4c496341e88  awscliv2.zip" > awscliv2.txt && \
     sha256sum --quiet -c awscliv2.txt && \
     unzip -qq awscliv2.zip && \
diff --git a/packaging/docker/Dockerfile.eks b/packaging/docker/Dockerfile.eks
index 50da54a3ae8..0aae38dcc57 100644
--- a/packaging/docker/Dockerfile.eks
+++ b/packaging/docker/Dockerfile.eks
@@ -53,13 +53,13 @@ RUN curl -Ls https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd6
     mv tini /usr/bin/ && \
     rm -rf /tmp/*
 
-RUN curl -Ls https://amazon-eks.s3.amazonaws.com/1.19.6/2021-01-05/bin/linux/amd64/kubectl -o kubectl && \
-    echo "08ff68159bbcb844455167abb1d0de75bbfe5ae1b051f81ab060a1988027868a  kubectl" > kubectl.txt && \
+RUN curl -Ls https://s3.us-west-2.amazonaws.com/amazon-eks/1.22.6/2022-03-09/bin/linux/amd64/kubectl -o kubectl && \
+    echo "860c3d37a5979491895767e7332404d28dc0d7797c7673c33df30ca80e215a07  kubectl" > kubectl.txt && \
     sha256sum --quiet -c kubectl.txt && \
     mv kubectl /usr/local/bin/kubectl && \
     chmod 755 /usr/local/bin/kubectl && \
-    curl -Ls https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.2.43.zip -o "awscliv2.zip" && \
-    echo "9a8b3c4e7f72bbcc55e341dce3af42479f2730c225d6d265ee6f9162cfdebdfd  awscliv2.zip" > awscliv2.txt && \
+    curl -Ls https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.7.34.zip -o "awscliv2.zip" && \
+    echo "daf9253f0071b5cfee9532bc5220bedd7a5d29d4e0f92b42b9e3e4c496341e88  awscliv2.zip" > awscliv2.txt && \
     sha256sum --quiet -c awscliv2.txt && \
     unzip -qq awscliv2.zip && \
     ./aws/install && \

From 2630c1708b05c4dfb8d0afa96377e3e23b011801 Mon Sep 17 00:00:00 2001
From: 1inker <67271937+1inker@users.noreply.github.com>
Date: Thu, 27 Oct 2022 02:12:11 +0300
Subject: [PATCH 713/740] XDB-104 and XDB-128: Remove debug info from releases
 but keep it for the regular builds (#19)

* XDB-104: Remove debug information from releases but keep it for the regular builds
* XDB-128: Versioned packages renamed
---
 .github/workflows/build.yml | 24 +++++++++++++++++++++++
 cmake/CPackConfig.cmake     |  6 +++++-
 cmake/InstallLayout.cmake   | 38 +++++++++++++++++++++----------------
 3 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2952cb603b3..e664f42b920 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -169,6 +169,18 @@ jobs:
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
           podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${clients} && grep -q foundationdb /etc/passwd" || { echo "User foundationdb is not created after $clients installation"; exit 3; }
 
+      - name: Test versioned RPMs deploy
+        shell: bash
+        run: |
+          MY_ARCH=`uname -m`
+          curr_path="${{ github.workspace }}"
+          server="foundationdb-server-versioned-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
+          clients="foundationdb-clients-versioned-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
+          podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${clients} && grep -q foundationdb /etc/passwd" && { echo "User foundationdb was created after $clients installation"; exit 3; }
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server} /home/${clients} && grep -q foundationdb /etc/passwd" || { echo "User foundationdb is not created after $server installation"; exit 4; }
+
       - name: Test DEBs deploy
         shell: bash
         run: |
@@ -180,6 +192,18 @@ jobs:
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
           podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${clients} && grep -q foundationdb /etc/passwd" || { echo "User foundationdb is not created after $clients installation"; exit 3; }
 
+      - name: Test versioned DEBs deploy
+        shell: bash
+        run: |
+          MY_ARCH=`dpkg-architecture -q DEB_BUILD_ARCH`
+          curr_path="${{ github.workspace }}"
+          server="foundationdb-server-versioned_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
+          clients="foundationdb-clients-versioned_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
+          podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${clients} && grep -q foundationdb /etc/passwd" && { echo "User foundationdb was created after $clients installation"; exit 3; }
+          podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server} /home/${clients} && grep -q foundationdb /etc/passwd" || { echo "User foundationdb is not created after $server installation"; exit 4; }
+
   release:
     needs: [calc_ver, build_linux]
     if: ${{ needs.calc_ver.outputs.release_flag == 'ON' }}
diff --git a/cmake/CPackConfig.cmake b/cmake/CPackConfig.cmake
index 13dee34e772..026ae40b4d9 100644
--- a/cmake/CPackConfig.cmake
+++ b/cmake/CPackConfig.cmake
@@ -11,6 +11,10 @@ else()
   message(FATAL_ERROR "Unsupported package format ${CPACK_GENERATOR}")
 endif()
 
-set(CPACK_STRIP_FILES TRUE)
+if(${FDB_RELEASE} STREQUAL "ON")
+  message("Strip binaries for release")
+  set(CPACK_STRIP_FILES TRUE)
+endif()
+
 set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.md)
 set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index e868ed2b583..a2a22137dad 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -205,12 +205,12 @@ set(CPACK_COMPONENT_SERVER-VERSIONED_DEPENDS clients-versioned)
 set(CPACK_COMPONENT_SERVER-EL8_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-DEB_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-TGZ_DISPLAY_NAME "foundationdb-server")
-set(CPACK_COMPONENT_SERVER-VERSIONED_DISPLAY_NAME "foundationdb-server-${FDB_VERSION}")
+set(CPACK_COMPONENT_SERVER-VERSIONED_DISPLAY_NAME "foundationdb${FDB_VERSION}-server")
 
 set(CPACK_COMPONENT_CLIENTS-EL8_DISPLAY_NAME "foundationdb-clients")
 set(CPACK_COMPONENT_CLIENTS-DEB_DISPLAY_NAME "foundationdb-clients")
 set(CPACK_COMPONENT_CLIENTS-TGZ_DISPLAY_NAME "foundationdb-clients")
-set(CPACK_COMPONENT_CLIENTS-VERSIONED_DISPLAY_NAME "foundationdb-clients-${FDB_VERSION}")
+set(CPACK_COMPONENT_CLIENTS-VERSIONED_DISPLAY_NAME "foundationdb${FDB_VERSION}-clients")
 
 
 # MacOS needs a file extension for the LICENSE file
@@ -237,9 +237,11 @@ endif()
 #############
 # Filenames #
 #############
-set(package_basename         "foundationdb")
-set(clients_package_basename "${package_basename}-clients")
-set(server_package_basename  "${package_basename}-server")
+set(package_basename                   "foundationdb")
+set(clients_package_basename           "${package_basename}-clients")
+set(server_package_basename            "${package_basename}-server")
+set(clients_versioned_package_basename "${package_basename}${FDB_VERSION}-clients")
+set(server_versioned_package_basename  "${package_basename}${FDB_VERSION}-server")
 
 string(REPLACE "-" "_" FDB_PACKAGE_VERSION ${FDB_VERSION})
 set(unversioned_postfix "${FDB_VERSION}${not_fdb_release_string}")
@@ -247,10 +249,14 @@ set(unversioned_postfix "${FDB_VERSION}${not_fdb_release_string}")
 # RPM filenames
 set(rpm-clients-filename "${clients_package_basename}-${unversioned_postfix}")
 set(rpm-server-filename "${server_package_basename}-${unversioned_postfix}")
+set(rpm-clients-versioned-filename "${clients_package_basename}-versioned-${unversioned_postfix}")
+set(rpm-server-versioned-filename "${server_package_basename}-versioned-${unversioned_postfix}")
 
 # Deb filenames
 set(deb-clients-filename "${clients_package_basename}_${unversioned_postfix}")
 set(deb-server-filename "${server_package_basename}_${unversioned_postfix}")
+set(deb-clients-versioned-filename "${clients_package_basename}-versioned_${unversioned_postfix}")
+set(deb-server-versioned-filename "${server_package_basename}-versioned_${unversioned_postfix}")
 
 ################################################################################
 # Configuration for RPM
@@ -273,13 +279,13 @@ set(CPACK_RPM_SERVER-EL8_USER_FILELIST                     "%config(noreplace) /
                                                            "%attr(0700,foundationdb,foundationdb) /var/log/foundationdb"
                                                            "%attr(0700,foundationdb,foundationdb) /var/lib/foundationdb")
 
-set(CPACK_RPM_CLIENTS-VERSIONED_PACKAGE_NAME               "${clients_package_basename}")
-set(CPACK_RPM_CLIENTS-VERSIONED_FILE_NAME                  "${rpm-clients-filename}.versioned.${CMAKE_SYSTEM_PROCESSOR}.rpm")
+set(CPACK_RPM_CLIENTS-VERSIONED_PACKAGE_NAME               "${clients_versioned_package_basename}")
+set(CPACK_RPM_CLIENTS-VERSIONED_FILE_NAME                  "${rpm-clients-versioned-filename}.el8.${CMAKE_SYSTEM_PROCESSOR}.rpm")
 set(CPACK_RPM_CLIENTS-VERSIONED_POST_INSTALL_SCRIPT_FILE   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/postinst)
 set(CPACK_RPM_CLIENTS-VERSIONED_PRE_UNINSTALL_SCRIPT_FILE  ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/prerm)
 
-set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_NAME                "${server_package_basename}")
-set(CPACK_RPM_SERVER-VERSIONED_FILE_NAME                   "${rpm-server-filename}.versioned.${CMAKE_SYSTEM_PROCESSOR}.rpm")
+set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_NAME                "${server_versioned_package_basename}")
+set(CPACK_RPM_SERVER-VERSIONED_FILE_NAME                   "${rpm-server-versioned-filename}.el8.${CMAKE_SYSTEM_PROCESSOR}.rpm")
 set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_REQUIRES            "${CPACK_RPM_CLIENTS-VERSIONED_PACKAGE_NAME} = ${FDB_VERSION}")
 set(CPACK_RPM_SERVER-VERSIONED_POST_INSTALL_SCRIPT_FILE    ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst-rpm)
 set(CPACK_RPM_SERVER-VERSIONED_PRE_UNINSTALL_SCRIPT_FILE   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/prerm)
@@ -321,13 +327,13 @@ set(CPACK_RPM_COMPONENT_INSTALL ON)
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
   set(CPACK_DEBIAN_CLIENTS-DEB_FILE_NAME       "${deb-clients-filename}_amd64.deb")
   set(CPACK_DEBIAN_SERVER-DEB_FILE_NAME        "${deb-server-filename}_amd64.deb")
-  set(CPACK_DEBIAN_CLIENTS-VERSIONED_FILE_NAME "${deb-clients-filename}.versioned_amd64.deb")
-  set(CPACK_DEBIAN_SERVER-VERSIONED_FILE_NAME  "${deb-server-filename}.versioned_amd64.deb")
+  set(CPACK_DEBIAN_CLIENTS-VERSIONED_FILE_NAME "${deb-clients-versioned-filename}_amd64.deb")
+  set(CPACK_DEBIAN_SERVER-VERSIONED_FILE_NAME  "${deb-server-versioned-filename}_amd64.deb")
 else()
   set(CPACK_DEBIAN_CLIENTS-DEB_FILE_NAME       "${deb-clients-filename}_${CMAKE_SYSTEM_PROCESSOR}.deb")
   set(CPACK_DEBIAN_SERVER-DEB_FILE_NAME        "${deb-server-filename}_${CMAKE_SYSTEM_PROCESSOR}.deb")
-  set(CPACK_DEBIAN_CLIENTS-VERSIONED_FILE_NAME "${deb-clients-filename}.versioned_${CMAKE_SYSTEM_PROCESSOR}.deb")
-  set(CPACK_DEBIAN_SERVER-VERSIONED_FILE_NAME  "${deb-server-filename}.versioned_${CMAKE_SYSTEM_PROCESSOR}.deb")
+  set(CPACK_DEBIAN_CLIENTS-VERSIONED_FILE_NAME "${deb-clients-versioned-filename}_${CMAKE_SYSTEM_PROCESSOR}.deb")
+  set(CPACK_DEBIAN_SERVER-VERSIONED_FILE_NAME  "${deb-server-versioned-filename}_${CMAKE_SYSTEM_PROCESSOR}.deb")
 endif()
 
 set(CPACK_DEB_COMPONENT_INSTALL ON)
@@ -338,14 +344,14 @@ set(CPACK_DEBIAN_PACKAGE_SECTION "database")
 set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_NAME "${server_package_basename}")
 set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_NAME "${clients_package_basename}")
 
-set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_NAME "${server_package_basename}")
-set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_NAME "${clients_package_basename}")
+set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_NAME  "${server_versioned_package_basename}")
+set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_NAME "${clients_versioned_package_basename}")
 
 set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
 set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_RECOMMENDS "python (>= 2.6)")
 set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 
-set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
+set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb${FDB_VERSION}-clients")
 set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_RECOMMENDS "python (>= 2.6)")
 set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 

From dcdb70c1da67849974001103d7a9bfcc29df4af6 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Thu, 27 Oct 2022 14:04:51 -0700
Subject: [PATCH 714/740] Rocksdb storage using single_key_deletes instead of
 deleterange on clearrange operation. (#8596)

---
 fdbclient/ServerKnobs.cpp                     |  6 ++-
 fdbclient/ServerKnobs.h                       |  2 +
 fdbserver/IKeyValueStore.h                    |  5 ++-
 .../KeyValueStoreCompressTestData.actor.cpp   |  6 ++-
 fdbserver/KeyValueStoreMemory.actor.cpp       |  2 +-
 fdbserver/KeyValueStoreRocksDB.actor.cpp      | 38 +++++++++++++++++--
 fdbserver/KeyValueStoreSQLite.actor.cpp       |  6 ++-
 fdbserver/RemoteIKeyValueStore.actor.h        |  4 +-
 fdbserver/Resolver.actor.cpp                  |  2 -
 fdbserver/VersionedBTree.actor.cpp            |  4 +-
 fdbserver/storageserver.actor.cpp             |  9 ++---
 11 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 01a29eb7c11..eb50e601c40 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -404,6 +404,10 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	// Enable this knob only for experminatal purpose, never enable this in production.
 	// If enabled, all the committed in-memory memtable writes are lost on a crash.
 	init( ROCKSDB_DISABLE_WAL_EXPERIMENTAL,                    false );
+	// If ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE is enabled, disable ENABLE_CLEAR_RANGE_EAGER_READS knob.
+	// These knobs have contrary functionality.
+	init( ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE,             false ); if( randomize && BUGGIFY ) ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE = deterministicRandom()->coinflip() ? false : true;
+	init( ROCKSDB_SINGLEKEY_DELETES_BYTES_LIMIT,              200000 ); // 200KB
 	// Can commit will delay ROCKSDB_CAN_COMMIT_DELAY_ON_OVERLOAD seconds for
 	// ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD times, if rocksdb overloaded.
 	// Set ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD to 0, to disable
@@ -728,7 +732,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( RANGESTREAM_LIMIT_BYTES,                               2e6 ); if( randomize && BUGGIFY ) RANGESTREAM_LIMIT_BYTES = 1;
 	init( CHANGEFEEDSTREAM_LIMIT_BYTES,                          1e6 ); if( randomize && BUGGIFY ) CHANGEFEEDSTREAM_LIMIT_BYTES = 1;
 	init( BLOBWORKERSTATUSSTREAM_LIMIT_BYTES,                    1e4 ); if( randomize && BUGGIFY ) BLOBWORKERSTATUSSTREAM_LIMIT_BYTES = 1;
-	init( ENABLE_CLEAR_RANGE_EAGER_READS,                       true );
+	init( ENABLE_CLEAR_RANGE_EAGER_READS,                       true ); if( randomize && BUGGIFY ) ENABLE_CLEAR_RANGE_EAGER_READS = deterministicRandom()->coinflip() ? false : true;
 	init( CHECKPOINT_TRANSFER_BLOCK_BYTES,                      40e6 );
 	init( QUICK_GET_VALUE_FALLBACK,                             true );
 	init( QUICK_GET_KEY_VALUES_FALLBACK,                        true );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 41c2b24e8b1..f94a4ff803c 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -330,6 +330,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	int ROCKSDB_CAN_COMMIT_DELAY_ON_OVERLOAD;
 	int ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD;
 	bool ROCKSDB_DISABLE_WAL_EXPERIMENTAL;
+	bool ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE;
+	int64_t ROCKSDB_SINGLEKEY_DELETES_BYTES_LIMIT;
 	int64_t ROCKSDB_COMPACTION_READAHEAD_SIZE;
 	int64_t ROCKSDB_BLOCK_SIZE;
 
diff --git a/fdbserver/IKeyValueStore.h b/fdbserver/IKeyValueStore.h
index 2020eebb1ae..9c0f3afaa91 100644
--- a/fdbserver/IKeyValueStore.h
+++ b/fdbserver/IKeyValueStore.h
@@ -25,6 +25,7 @@
 #include "fdbclient/FDBTypes.h"
 #include "fdbserver/Knobs.h"
 #include "fdbclient/StorageCheckpoint.h"
+#include "fdbserver/StorageMetrics.h"
 
 struct CheckpointRequest {
 	const Version version; // The FDB version at which the checkpoint is created.
@@ -61,7 +62,9 @@ class IKeyValueStore : public IClosable {
 public:
 	virtual KeyValueStoreType getType() const = 0;
 	virtual void set(KeyValueRef keyValue, const Arena* arena = nullptr) = 0;
-	virtual void clear(KeyRangeRef range, const Arena* arena = nullptr) = 0;
+	virtual void clear(KeyRangeRef range,
+	                   const StorageServerMetrics* storageMetrics = nullptr,
+	                   const Arena* arena = nullptr) = 0;
 	virtual Future<Void> canCommit() { return Void(); }
 	virtual Future<Void> commit(
 	    bool sequential = false) = 0; // returns when prior sets and clears are (atomically) durable
diff --git a/fdbserver/KeyValueStoreCompressTestData.actor.cpp b/fdbserver/KeyValueStoreCompressTestData.actor.cpp
index 3121232b581..38ddd785e65 100644
--- a/fdbserver/KeyValueStoreCompressTestData.actor.cpp
+++ b/fdbserver/KeyValueStoreCompressTestData.actor.cpp
@@ -53,7 +53,11 @@ struct KeyValueStoreCompressTestData final : IKeyValueStore {
 	void set(KeyValueRef keyValue, const Arena* arena = nullptr) override {
 		store->set(KeyValueRef(keyValue.key, pack(keyValue.value)), arena);
 	}
-	void clear(KeyRangeRef range, const Arena* arena = nullptr) override { store->clear(range, arena); }
+	void clear(KeyRangeRef range,
+	           const StorageServerMetrics* storageMetrics = nullptr,
+	           const Arena* arena = nullptr) override {
+		store->clear(range, storageMetrics, arena);
+	}
 	Future<Void> commit(bool sequential = false) override { return store->commit(sequential); }
 
 	Future<Optional<Value>> readValue(KeyRef key, IKeyValueStore::ReadType, Optional<UID> debugID) override {
diff --git a/fdbserver/KeyValueStoreMemory.actor.cpp b/fdbserver/KeyValueStoreMemory.actor.cpp
index 4ded4f67492..616aaed8585 100644
--- a/fdbserver/KeyValueStoreMemory.actor.cpp
+++ b/fdbserver/KeyValueStoreMemory.actor.cpp
@@ -124,7 +124,7 @@ class KeyValueStoreMemory final : public IKeyValueStore, NonCopyable {
 		}
 	}
 
-	void clear(KeyRangeRef range, const Arena* arena) override {
+	void clear(KeyRangeRef range, const StorageServerMetrics* storageMetrics, const Arena* arena) override {
 		// A commit that occurs with no available space returns Never, so we can throw out all modifications
 		if (getAvailableSize() <= 0)
 			return;
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 834febb2b41..9e92ae3b740 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -1748,6 +1748,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	Promise<Void> closePromise;
 	Future<Void> openFuture;
 	std::unique_ptr<rocksdb::WriteBatch> writeBatch;
+	std::set<Key> keysSet;
 	Optional<Future<Void>> metrics;
 	FlowLock readSemaphore;
 	int numReadWaiters;
@@ -1925,22 +1926,52 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 	void set(KeyValueRef kv, const Arena*) override {
 		if (writeBatch == nullptr) {
 			writeBatch.reset(new rocksdb::WriteBatch());
+			keysSet.clear();
 		}
 		ASSERT(defaultFdbCF != nullptr);
 		writeBatch->Put(defaultFdbCF, toSlice(kv.key), toSlice(kv.value));
+		if (SERVER_KNOBS->ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE) {
+			keysSet.insert(kv.key);
+		}
 	}
 
-	void clear(KeyRangeRef keyRange, const Arena*) override {
+	void clear(KeyRangeRef keyRange, const StorageServerMetrics* storageMetrics, const Arena*) override {
 		if (writeBatch == nullptr) {
 			writeBatch.reset(new rocksdb::WriteBatch());
+			keysSet.clear();
 		}
 
 		ASSERT(defaultFdbCF != nullptr);
-
 		if (keyRange.singleKeyRange()) {
 			writeBatch->Delete(defaultFdbCF, toSlice(keyRange.begin));
 		} else {
-			writeBatch->DeleteRange(defaultFdbCF, toSlice(keyRange.begin), toSlice(keyRange.end));
+			if (SERVER_KNOBS->ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE && storageMetrics != nullptr &&
+			    storageMetrics->byteSample.getEstimate(keyRange) <
+			        SERVER_KNOBS->ROCKSDB_SINGLEKEY_DELETES_BYTES_LIMIT) {
+				rocksdb::ReadOptions options = getReadOptions();
+				auto beginSlice = toSlice(keyRange.begin);
+				auto endSlice = toSlice(keyRange.end);
+				options.iterate_lower_bound = &beginSlice;
+				options.iterate_upper_bound = &endSlice;
+				auto cursor = std::unique_ptr<rocksdb::Iterator>(db->NewIterator(options, defaultFdbCF));
+				cursor->Seek(toSlice(keyRange.begin));
+				while (cursor->Valid() && toStringRef(cursor->key()) < keyRange.end) {
+					writeBatch->Delete(defaultFdbCF, cursor->key());
+					cursor->Next();
+				}
+				if (!cursor->status().ok()) {
+					// if readrange iteration fails, then do a deleteRange.
+					writeBatch->DeleteRange(defaultFdbCF, toSlice(keyRange.begin), toSlice(keyRange.end));
+				} else {
+					auto it = keysSet.lower_bound(keyRange.begin);
+					while (it != keysSet.end() && *it < keyRange.end) {
+						writeBatch->Delete(defaultFdbCF, toSlice(*it));
+						it++;
+					}
+				}
+			} else {
+				writeBatch->DeleteRange(defaultFdbCF, toSlice(keyRange.begin), toSlice(keyRange.end));
+			}
 		}
 	}
 
@@ -1969,6 +2000,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 		}
 		auto a = new Writer::CommitAction();
 		a->batchToCommit = std::move(writeBatch);
+		keysSet.clear();
 		auto res = a->done.getFuture();
 		writeThread->post(a);
 		return res;
diff --git a/fdbserver/KeyValueStoreSQLite.actor.cpp b/fdbserver/KeyValueStoreSQLite.actor.cpp
index 47c69e9764e..1c24ce44d13 100644
--- a/fdbserver/KeyValueStoreSQLite.actor.cpp
+++ b/fdbserver/KeyValueStoreSQLite.actor.cpp
@@ -1586,7 +1586,9 @@ class KeyValueStoreSQLite final : public IKeyValueStore {
 	StorageBytes getStorageBytes() const override;
 
 	void set(KeyValueRef keyValue, const Arena* arena = nullptr) override;
-	void clear(KeyRangeRef range, const Arena* arena = nullptr) override;
+	void clear(KeyRangeRef range,
+	           const StorageServerMetrics* storageMetrics = nullptr,
+	           const Arena* arena = nullptr) override;
 	Future<Void> commit(bool sequential = false) override;
 
 	Future<Optional<Value>> readValue(KeyRef key, IKeyValueStore::ReadType, Optional<UID> debugID) override;
@@ -2205,7 +2207,7 @@ void KeyValueStoreSQLite::set(KeyValueRef keyValue, const Arena* arena) {
 	++writesRequested;
 	writeThread->post(new Writer::SetAction(keyValue));
 }
-void KeyValueStoreSQLite::clear(KeyRangeRef range, const Arena* arena) {
+void KeyValueStoreSQLite::clear(KeyRangeRef range, const StorageServerMetrics* storageMetrics, const Arena* arena) {
 	++writesRequested;
 	writeThread->post(new Writer::ClearAction(range));
 }
diff --git a/fdbserver/RemoteIKeyValueStore.actor.h b/fdbserver/RemoteIKeyValueStore.actor.h
index 0465e4afbb2..de7cd362649 100644
--- a/fdbserver/RemoteIKeyValueStore.actor.h
+++ b/fdbserver/RemoteIKeyValueStore.actor.h
@@ -392,7 +392,9 @@ struct RemoteIKeyValueStore : public IKeyValueStore {
 	void set(KeyValueRef keyValue, const Arena* arena = nullptr) override {
 		interf.set.send(IKVSSetRequest{ keyValue, ReplyPromise<Void>() });
 	}
-	void clear(KeyRangeRef range, const Arena* arena = nullptr) override {
+	void clear(KeyRangeRef range,
+	           const StorageServerMetrics* storageMetrics = nullptr,
+	           const Arena* arena = nullptr) override {
 		interf.clear.send(IKVSClearRequest{ range, ReplyPromise<Void>() });
 	}
 
diff --git a/fdbserver/Resolver.actor.cpp b/fdbserver/Resolver.actor.cpp
index 6b6b3d39ab9..976d3a20701 100644
--- a/fdbserver/Resolver.actor.cpp
+++ b/fdbserver/Resolver.actor.cpp
@@ -26,7 +26,6 @@
 #include "fdbclient/SystemData.h"
 #include "fdbserver/ApplyMetadataMutation.h"
 #include "fdbserver/ConflictSet.h"
-#include "fdbserver/IKeyValueStore.h"
 #include "fdbserver/Knobs.h"
 #include "fdbserver/LogSystem.h"
 #include "fdbserver/LogSystemDiskQueueAdapter.h"
@@ -34,7 +33,6 @@
 #include "fdbserver/ResolverInterface.h"
 #include "fdbserver/RestoreUtil.h"
 #include "fdbserver/ServerDBInfo.h"
-#include "fdbserver/StorageMetrics.h"
 #include "fdbserver/WaitFailure.h"
 #include "fdbserver/WorkerInterface.actor.h"
 #include "flow/ActorCollection.h"
diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp
index 3ce16af146c..63c8dec6ea0 100644
--- a/fdbserver/VersionedBTree.actor.cpp
+++ b/fdbserver/VersionedBTree.actor.cpp
@@ -7820,7 +7820,9 @@ class KeyValueStoreRedwood : public IKeyValueStore {
 
 	Future<Void> getError() const override { return delayed(m_error.getFuture()); };
 
-	void clear(KeyRangeRef range, const Arena* arena = 0) override {
+	void clear(KeyRangeRef range,
+	           const StorageServerMetrics* storageMetrics = nullptr,
+	           const Arena* arena = 0) override {
 		debug_printf("CLEAR %s\n", printable(range).c_str());
 		m_tree->clear(range);
 	}
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index c0976acb4fb..dabf470f08f 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -60,7 +60,6 @@
 #include "fdbserver/MoveKeys.actor.h"
 #include "fdbserver/MutationTracking.h"
 #include "fdbserver/RecoveryState.h"
-#include "fdbserver/StorageMetrics.h"
 #include "fdbserver/ServerCheckpoint.actor.h"
 #include "fdbserver/ServerDBInfo.h"
 #include "fdbserver/TLogInterface.h"
@@ -7779,7 +7778,7 @@ void setAssignedStatus(StorageServer* self, KeyRangeRef keys, bool nowAssigned)
 }
 
 void StorageServerDisk::clearRange(KeyRangeRef keys) {
-	storage->clear(keys);
+	storage->clear(keys, &data->metrics);
 	++(*kvClearRanges);
 }
 
@@ -7793,7 +7792,7 @@ void StorageServerDisk::writeMutation(MutationRef mutation) {
 		storage->set(KeyValueRef(mutation.param1, mutation.param2));
 		*kvCommitLogicalBytes += mutation.expectedSize();
 	} else if (mutation.type == MutationRef::ClearRange) {
-		storage->clear(KeyRangeRef(mutation.param1, mutation.param2));
+		storage->clear(KeyRangeRef(mutation.param1, mutation.param2), &data->metrics);
 		++(*kvClearRanges);
 	} else
 		ASSERT(false);
@@ -7808,7 +7807,7 @@ void StorageServerDisk::writeMutations(const VectorRef<MutationRef>& mutations,
 			storage->set(KeyValueRef(m.param1, m.param2));
 			*kvCommitLogicalBytes += m.expectedSize();
 		} else if (m.type == MutationRef::ClearRange) {
-			storage->clear(KeyRangeRef(m.param1, m.param2));
+			storage->clear(KeyRangeRef(m.param1, m.param2), &data->metrics);
 			++(*kvClearRanges);
 		}
 	}
@@ -8218,7 +8217,7 @@ ACTOR Future<bool> restoreDurableState(StorageServer* data, IKeyValueStore* stor
 				++data->counters.kvSystemClearRanges;
 				// TODO(alexmiller): Figure out how to selectively enable spammy data distribution events.
 				// DEBUG_KEY_RANGE("clearInvalidVersion", invalidVersion, clearRange);
-				storage->clear(clearRange);
+				storage->clear(clearRange, &data->metrics);
 				++data->counters.kvSystemClearRanges;
 				data->byteSampleApplyClear(clearRange, invalidVersion);
 			}

From 426ded698cd5f9b29cad0c308365dff953b0b817 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Fri, 28 Oct 2022 13:55:33 -0700
Subject: [PATCH 715/740] Adding boundaries to rocksdb read iterator pool.
 (#8606)

---
 fdbclient/ServerKnobs.cpp                |  2 +
 fdbclient/ServerKnobs.h                  |  2 +
 fdbserver/KeyValueStoreRocksDB.actor.cpp | 86 ++++++++++++++++++++----
 3 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index eb50e601c40..bfd25bcd841 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -388,6 +388,8 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( ROCKSDB_HISTOGRAMS_SAMPLE_RATE,                      0.001 ); if( randomize && BUGGIFY ) ROCKSDB_HISTOGRAMS_SAMPLE_RATE = 0;
 	init( ROCKSDB_READ_RANGE_ITERATOR_REFRESH_TIME,             30.0 ); if( randomize && BUGGIFY ) ROCKSDB_READ_RANGE_ITERATOR_REFRESH_TIME = 0.1;
 	init( ROCKSDB_READ_RANGE_REUSE_ITERATORS,                   true ); if( randomize && BUGGIFY ) ROCKSDB_READ_RANGE_REUSE_ITERATORS = deterministicRandom()->coinflip() ? true : false;
+	init( ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS,          false ); if( randomize && BUGGIFY ) ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS = deterministicRandom()->coinflip() ? true : false;
+	init( ROCKSDB_READ_RANGE_BOUNDED_ITERATORS_MAX_LIMIT,        200 );
 	// Set to 0 to disable rocksdb write rate limiting. Rate limiter unit: bytes per second.
 	init( ROCKSDB_WRITE_RATE_LIMITER_BYTES_PER_SEC,                0 );
 	// If true, enables dynamic adjustment of ROCKSDB_WRITE_RATE_LIMITER_BYTES according to the recent demand of background IO.
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index f94a4ff803c..92d5ef9f46c 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -317,6 +317,8 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	double ROCKSDB_HISTOGRAMS_SAMPLE_RATE;
 	double ROCKSDB_READ_RANGE_ITERATOR_REFRESH_TIME;
 	bool ROCKSDB_READ_RANGE_REUSE_ITERATORS;
+	bool ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS;
+	int ROCKSDB_READ_RANGE_BOUNDED_ITERATORS_MAX_LIMIT;
 	int64_t ROCKSDB_WRITE_RATE_LIMITER_BYTES_PER_SEC;
 	bool ROCKSDB_WRITE_RATE_LIMITER_AUTO_TUNE;
 	std::string DEFAULT_FDB_ROCKSDB_COLUMN_FAMILY;
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
index 9e92ae3b740..121812776d8 100644
--- a/fdbserver/KeyValueStoreRocksDB.actor.cpp
+++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -396,13 +396,23 @@ struct Counters {
 };
 
 struct ReadIterator {
-	CF& cf;
 	uint64_t index; // incrementing counter to uniquely identify read iterator.
 	bool inUse;
 	std::shared_ptr<rocksdb::Iterator> iter;
 	double creationTime;
+	KeyRange keyRange;
+	std::shared_ptr<rocksdb::Slice> beginSlice, endSlice;
 	ReadIterator(CF& cf, uint64_t index, DB& db, rocksdb::ReadOptions& options)
-	  : cf(cf), index(index), inUse(true), creationTime(now()), iter(db->NewIterator(options, cf)) {}
+	  : index(index), inUse(true), creationTime(now()), iter(db->NewIterator(options, cf)) {}
+	ReadIterator(CF& cf, uint64_t index, DB& db, rocksdb::ReadOptions options, KeyRange keyRange)
+	  : index(index), inUse(true), creationTime(now()), keyRange(keyRange) {
+		beginSlice = std::shared_ptr<rocksdb::Slice>(new rocksdb::Slice(toSlice(keyRange.begin)));
+		options.iterate_lower_bound = beginSlice.get();
+		endSlice = std::shared_ptr<rocksdb::Slice>(new rocksdb::Slice(toSlice(keyRange.end)));
+		options.iterate_upper_bound = endSlice.get();
+
+		iter = std::shared_ptr<rocksdb::Iterator>(db->NewIterator(options, cf));
+	}
 };
 
 /*
@@ -425,42 +435,92 @@ class ReadIteratorPool {
 		readRangeOptions.auto_prefix_mode = (SERVER_KNOBS->ROCKSDB_PREFIX_LEN > 0);
 		TraceEvent("ReadIteratorPool", id)
 		    .detail("KnobRocksDBReadRangeReuseIterators", SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS)
+		    .detail("KnobRocksDBReadRangeReuseBoundedIterators",
+		            SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS)
+		    .detail("KnobRocksDBReadRangeBoundedIteratorsMaxLimit",
+		            SERVER_KNOBS->ROCKSDB_READ_RANGE_BOUNDED_ITERATORS_MAX_LIMIT)
 		    .detail("KnobRocksDBPrefixLen", SERVER_KNOBS->ROCKSDB_PREFIX_LEN);
+		if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS &&
+		    SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS) {
+			TraceEvent(SevWarn, "ReadIteratorKnobsMismatch");
+		}
 	}
 
 	// Called on every db commit.
 	void update() {
-		if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS) {
+		if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS ||
+		    SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS) {
 			std::lock_guard<std::mutex> lock(mutex);
 			iteratorsMap.clear();
 		}
 	}
 
 	// Called on every read operation.
-	ReadIterator getIterator() {
+	ReadIterator getIterator(KeyRange keyRange) {
 		if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS) {
-			std::lock_guard<std::mutex> lock(mutex);
+			mutex.lock();
 			for (it = iteratorsMap.begin(); it != iteratorsMap.end(); it++) {
 				if (!it->second.inUse) {
 					it->second.inUse = true;
 					iteratorsReuseCount++;
-					return it->second;
+					ReadIterator iter = it->second;
+					mutex.unlock();
+					return iter;
+				}
+			}
+			index++;
+			uint64_t readIteratorIndex = index;
+			mutex.unlock();
+
+			ReadIterator iter(cf, readIteratorIndex, db, readRangeOptions);
+			mutex.lock();
+			iteratorsMap.insert({ readIteratorIndex, iter });
+			mutex.unlock();
+			return iter;
+		} else if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS &&
+		           iteratorsMap.size() < SERVER_KNOBS->ROCKSDB_READ_RANGE_BOUNDED_ITERATORS_MAX_LIMIT) {
+			// Not storing more than ROCKSDB_READ_RANGE_BOUNDED_ITERATORS_MAX_LIMIT of iterators
+			// to avoid 'out of memory' issues.
+			// TODO: Based on the datasize in the keyrange, decide whether to store the iterator for reuse.
+			mutex.lock();
+			for (it = iteratorsMap.begin(); it != iteratorsMap.end(); it++) {
+				if (!it->second.inUse && it->second.keyRange.contains(keyRange)) {
+					it->second.inUse = true;
+					iteratorsReuseCount++;
+					ReadIterator iter = it->second;
+					mutex.unlock();
+					return iter;
 				}
 			}
 			index++;
-			ReadIterator iter(cf, index, db, readRangeOptions);
-			iteratorsMap.insert({ index, iter });
+			uint64_t readIteratorIndex = index;
+			mutex.unlock();
+
+			ReadIterator iter(cf, readIteratorIndex, db, readRangeOptions, keyRange);
+			mutex.lock();
+			iteratorsMap.insert({ readIteratorIndex, iter });
+			mutex.unlock();
+			return iter;
+		} else if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS) {
+			// If the iterator size reaches the ROCKSDB_READ_RANGE_BOUNDED_ITERATORS_MAX_LIMIT.
+			mutex.lock();
+			index++;
+			uint64_t readIteratorIndex = index;
+			mutex.unlock();
+
+			ReadIterator iter(cf, readIteratorIndex, db, readRangeOptions, keyRange);
 			return iter;
 		} else {
 			index++;
-			ReadIterator iter(cf, index, db, readRangeOptions);
+			ReadIterator iter(cf, index, db, readRangeOptions, keyRange);
 			return iter;
 		}
 	}
 
 	// Called on every read operation, after the keys are collected.
 	void returnIterator(ReadIterator& iter) {
-		if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS) {
+		if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS ||
+		    SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS) {
 			std::lock_guard<std::mutex> lock(mutex);
 			it = iteratorsMap.find(iter.index);
 			// iterator found: put the iterator back to the pool(inUse=false).
@@ -767,7 +827,7 @@ uint64_t PerfContextMetrics::getRocksdbPerfcontextMetric(int metric) {
 }
 
 ACTOR Future<Void> refreshReadIteratorPool(std::shared_ptr<ReadIteratorPool> readIterPool) {
-	if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS) {
+	if (SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_ITERATORS || SERVER_KNOBS->ROCKSDB_READ_RANGE_REUSE_BOUNDED_ITERATORS) {
 		loop {
 			wait(delay(SERVER_KNOBS->ROCKSDB_READ_RANGE_ITERATOR_REFRESH_TIME));
 			readIterPool->refreshIterators();
@@ -1647,7 +1707,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			rocksdb::Status s;
 			if (a.rowLimit >= 0) {
 				double iterCreationBeginTime = a.getHistograms ? timer_monotonic() : 0;
-				ReadIterator readIter = readIterPool->getIterator();
+				ReadIterator readIter = readIterPool->getIterator(a.keys);
 				if (a.getHistograms) {
 					metricPromiseStream.send(std::make_tuple(threadIndex,
 					                                         ROCKSDB_READRANGE_NEWITERATOR_HISTOGRAM.toString(),
@@ -1677,7 +1737,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 				readIterPool->returnIterator(readIter);
 			} else {
 				double iterCreationBeginTime = a.getHistograms ? timer_monotonic() : 0;
-				ReadIterator readIter = readIterPool->getIterator();
+				ReadIterator readIter = readIterPool->getIterator(a.keys);
 				if (a.getHistograms) {
 					metricPromiseStream.send(std::make_tuple(threadIndex,
 					                                         ROCKSDB_READRANGE_NEWITERATOR_HISTOGRAM.toString(),

From bb3ae4a288818f9e312120c000c4cfff90700a85 Mon Sep 17 00:00:00 2001
From: neethuhaneesha <nbingi@apple.com>
Date: Fri, 28 Oct 2022 12:24:53 -0700
Subject: [PATCH 716/740] Enable clear range eager reads knob for rocksdb.

---
 fdbclient/ServerKnobs.cpp         |  3 ++-
 fdbclient/ServerKnobs.h           |  1 +
 fdbserver/storageserver.actor.cpp | 21 +++++++++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index bfd25bcd841..6d3b22f4a23 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -406,10 +406,11 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	// Enable this knob only for experminatal purpose, never enable this in production.
 	// If enabled, all the committed in-memory memtable writes are lost on a crash.
 	init( ROCKSDB_DISABLE_WAL_EXPERIMENTAL,                    false );
-	// If ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE is enabled, disable ENABLE_CLEAR_RANGE_EAGER_READS knob.
+	// If ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE is enabled, disable ROCKSDB_ENABLE_CLEAR_RANGE_EAGER_READS knob.
 	// These knobs have contrary functionality.
 	init( ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE,             false ); if( randomize && BUGGIFY ) ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE = deterministicRandom()->coinflip() ? false : true;
 	init( ROCKSDB_SINGLEKEY_DELETES_BYTES_LIMIT,              200000 ); // 200KB
+	init( ROCKSDB_ENABLE_CLEAR_RANGE_EAGER_READS,               true ); if( randomize && BUGGIFY ) ROCKSDB_ENABLE_CLEAR_RANGE_EAGER_READS = deterministicRandom()->coinflip() ? false : true;
 	// Can commit will delay ROCKSDB_CAN_COMMIT_DELAY_ON_OVERLOAD seconds for
 	// ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD times, if rocksdb overloaded.
 	// Set ROCKSDB_CAN_COMMIT_DELAY_TIMES_ON_OVERLOAD to 0, to disable
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 92d5ef9f46c..4decaf30f44 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -334,6 +334,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	bool ROCKSDB_DISABLE_WAL_EXPERIMENTAL;
 	bool ROCKSDB_SINGLEKEY_DELETES_ON_CLEARRANGE;
 	int64_t ROCKSDB_SINGLEKEY_DELETES_BYTES_LIMIT;
+	bool ROCKSDB_ENABLE_CLEAR_RANGE_EAGER_READS;
 	int64_t ROCKSDB_COMPACTION_READAHEAD_SIZE;
 	int64_t ROCKSDB_BLOCK_SIZE;
 
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index dabf470f08f..edda4be1901 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -337,6 +337,9 @@ struct UpdateEagerReadInfo {
 	std::vector<Optional<Value>> value;
 
 	Arena arena;
+	bool enableClearRangeEagerReads;
+
+	UpdateEagerReadInfo(bool enableClearRangeEagerReads) : enableClearRangeEagerReads(enableClearRangeEagerReads) {}
 
 	void addMutations(VectorRef<MutationRef> const& mutations) {
 		for (auto& m : mutations)
@@ -345,11 +348,10 @@ struct UpdateEagerReadInfo {
 
 	void addMutation(MutationRef const& m) {
 		// SOMEDAY: Theoretically we can avoid a read if there is an earlier overlapping ClearRange
-		if (m.type == MutationRef::ClearRange && !m.param2.startsWith(systemKeys.end) &&
-		    SERVER_KNOBS->ENABLE_CLEAR_RANGE_EAGER_READS)
+		if (m.type == MutationRef::ClearRange && !m.param2.startsWith(systemKeys.end) && enableClearRangeEagerReads)
 			keyBegin.push_back(m.param2);
 		else if (m.type == MutationRef::CompareAndClear) {
-			if (SERVER_KNOBS->ENABLE_CLEAR_RANGE_EAGER_READS)
+			if (enableClearRangeEagerReads)
 				keyBegin.push_back(keyAfter(m.param1, arena));
 			if (keys.size() > 0 && keys.back().first == m.param1) {
 				// Don't issue a second read, if the last read was equal to the current key.
@@ -366,7 +368,7 @@ struct UpdateEagerReadInfo {
 	}
 
 	void finishKeyBegin() {
-		if (SERVER_KNOBS->ENABLE_CLEAR_RANGE_EAGER_READS) {
+		if (enableClearRangeEagerReads) {
 			std::sort(keyBegin.begin(), keyBegin.end());
 			keyBegin.resize(std::unique(keyBegin.begin(), keyBegin.end()) - keyBegin.begin());
 		}
@@ -4452,7 +4454,7 @@ void getQueuingMetrics(StorageServer* self, StorageQueuingMetricsRequest const&
 ACTOR Future<Void> doEagerReads(StorageServer* data, UpdateEagerReadInfo* eager) {
 	eager->finishKeyBegin();
 
-	if (SERVER_KNOBS->ENABLE_CLEAR_RANGE_EAGER_READS) {
+	if (eager->enableClearRangeEagerReads) {
 		std::vector<Future<Key>> keyEnd(eager->keyBegin.size());
 		for (int i = 0; i < keyEnd.size(); i++)
 			keyEnd[i] = data->storage.readNextKeyInclusive(eager->keyBegin[i], IKeyValueStore::ReadType::EAGER);
@@ -4646,7 +4648,7 @@ void expandClear(MutationRef& m,
 	i = d.lastLessOrEqual(m.param2);
 	if (i && i->isClearTo() && i->getEndKey() >= m.param2) {
 		m.param2 = i->getEndKey();
-	} else if (SERVER_KNOBS->ENABLE_CLEAR_RANGE_EAGER_READS) {
+	} else if (eager->enableClearRangeEagerReads) {
 		// Expand to the next set or clear (from storage or latestVersion), and if it
 		// is a clear, engulf it as well
 		i = d.lower_bound(m.param2);
@@ -6946,6 +6948,10 @@ ACTOR Future<Void> tssDelayForever() {
 ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 	state double updateStart = g_network->timer();
 	state double start;
+	state bool enableClearRangeEagerReads = data->storage.getKeyValueStoreType() == KeyValueStoreType::SSD_ROCKSDB_V1
+	                                            ? SERVER_KNOBS->ROCKSDB_ENABLE_CLEAR_RANGE_EAGER_READS
+	                                            : SERVER_KNOBS->ENABLE_CLEAR_RANGE_EAGER_READS;
+	state UpdateEagerReadInfo eager(enableClearRangeEagerReads);
 	try {
 
 		// If we are disk bound and durableVersion is very old, we need to block updates or we could run out of
@@ -7040,7 +7046,6 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 		data->ssVersionLockLatencyHistogram->sampleSeconds(now() - start);
 
 		start = now();
-		state UpdateEagerReadInfo eager;
 		state FetchInjectionInfo fii;
 		state Reference<ILogSystem::IPeekCursor> cloneCursor2;
 
@@ -7109,7 +7114,7 @@ ACTOR Future<Void> update(StorageServer* data, bool* pReceivedUpdate) {
 			            // again.
 			// SOMEDAY: Theoretically we could check the change counters of individual shards and retry the reads
 			// only selectively
-			eager = UpdateEagerReadInfo();
+			eager = UpdateEagerReadInfo(enableClearRangeEagerReads);
 		}
 		data->eagerReadsLatencyHistogram->sampleSeconds(now() - start);
 

From 9381f02ab1ad174aa4ca7685e138fbb1a5549573 Mon Sep 17 00:00:00 2001
From: Steve Atherton <steve.atherton@snowflake.com>
Date: Mon, 31 Oct 2022 22:06:07 -0700
Subject: [PATCH 717/740] File write() buffer lifetime fix in DiskQueue.
 (Cherry-pick #8646 to release-7.1)

---
 fdbserver/DiskQueue.actor.cpp | 38 ++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/fdbserver/DiskQueue.actor.cpp b/fdbserver/DiskQueue.actor.cpp
index 03f30be7317..14c1d87d23d 100644
--- a/fdbserver/DiskQueue.actor.cpp
+++ b/fdbserver/DiskQueue.actor.cpp
@@ -55,7 +55,7 @@ struct StringBuffer {
 	StringBuffer(UID fromFileID) : reserved(0), id(fromFileID) {}
 
 	int size() const { return str.size(); }
-	StringRef& ref() { return str; }
+	Standalone<StringRef> get() { return str; }
 	void clear() {
 		str = Standalone<StringRef>();
 		reserved = 0;
@@ -63,19 +63,19 @@ struct StringBuffer {
 	void clearReserve(int size) {
 		str = Standalone<StringRef>();
 		reserved = size;
-		ref() = StringRef(new (str.arena()) uint8_t[size], 0);
+		str.contents() = StringRef(new (str.arena()) uint8_t[size], 0);
 	}
 	void append(StringRef x) { memcpy(append(x.size()), x.begin(), x.size()); }
 	void* append(int bytes) {
 		ASSERT(str.size() + bytes <= reserved);
 		void* p = const_cast<uint8_t*>(str.end());
-		ref() = StringRef(str.begin(), str.size() + bytes);
+		str.contents() = StringRef(str.begin(), str.size() + bytes);
 		return p;
 	}
 	StringRef pop_front(int bytes) {
 		ASSERT(bytes <= str.size());
 		StringRef result = str.substr(0, bytes);
-		ref() = str.substr(bytes);
+		str.contents() = str.substr(bytes);
 		return result;
 	}
 	void alignReserve(int alignment, int size) {
@@ -101,7 +101,7 @@ struct StringBuffer {
 			if (str.size() > 0) {
 				memcpy(p, str.begin(), str.size());
 			}
-			ref() = StringRef(p, str.size());
+			str.contents() = StringRef(p, str.size());
 		}
 	}
 };
@@ -196,7 +196,7 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 		stallCount.init(LiteralStringRef("RawDiskQueue.StallCount"));
 	}
 
-	Future<Void> pushAndCommit(StringRef pageData, StringBuffer* pageMem, uint64_t poppedPages) {
+	Future<Void> pushAndCommit(Standalone<StringRef> pageData, StringBuffer* pageMem, uint64_t poppedPages) {
 		return pushAndCommit(this, pageData, pageMem, poppedPages);
 	}
 
@@ -332,13 +332,13 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 	}
 #endif
 
-	Future<Future<Void>> push(StringRef pageData, std::vector<Reference<SyncQueue>>* toSync) {
+	Future<Future<Void>> push(Standalone<StringRef> pageData, std::vector<Reference<SyncQueue>>* toSync) {
 		return push(this, pageData, toSync);
 	}
 
-	ACTOR static Future<Future<Void>> push(RawDiskQueue_TwoFiles* self,
-	                                       StringRef pageData,
-	                                       std::vector<Reference<SyncQueue>>* toSync) {
+	ACTOR static UNCANCELLABLE Future<Future<Void>> push(RawDiskQueue_TwoFiles* self,
+	                                                     Standalone<StringRef> pageData,
+	                                                     std::vector<Reference<SyncQueue>>* toSync) {
 		// Write the given data (pageData) to the queue files, swapping or extending them if necessary.
 		// Don't do any syncs, but push the modified file(s) onto toSync.
 		ASSERT(self->readingFile == 2);
@@ -357,8 +357,9 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 					toSync->push_back(self->files[1].syncQueue);
 					/*TraceEvent("RDQWriteAndSwap", this->dbgid).detail("File1name", self->files[1].dbgFilename).detail("File1size", self->files[1].size)
 					    .detail("WritingPos", self->writingPos).detail("WritingBytes", p);*/
-					waitfor.push_back(self->files[1].f->write(pageData.begin(), p, self->writingPos));
-					pageData = pageData.substr(p);
+					waitfor.push_back(uncancellable(
+					    holdWhile(pageData, self->files[1].f->write(pageData.begin(), p, self->writingPos))));
+					pageData.contents() = pageData.substr(p);
 				}
 
 				self->dbg_file0BeginSeq += self->files[0].size;
@@ -426,7 +427,8 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 		    .detail("WritingPos", self->writingPos).detail("WritingBytes", pageData.size());*/
 		self->files[1].size = std::max(self->files[1].size, self->writingPos + pageData.size());
 		toSync->push_back(self->files[1].syncQueue);
-		waitfor.push_back(self->files[1].f->write(pageData.begin(), pageData.size(), self->writingPos));
+		waitfor.push_back(uncancellable(
+		    holdWhile(pageData, self->files[1].f->write(pageData.begin(), pageData.size(), self->writingPos))));
 		self->writingPos += pageData.size();
 
 		return waitForAllReadyThenThrow(waitfor);
@@ -435,7 +437,7 @@ class RawDiskQueue_TwoFiles : public Tracked<RawDiskQueue_TwoFiles> {
 	// Write the given data (pageData) to the queue files of self, sync data to disk, and delete the memory (pageMem)
 	// that hold the pageData
 	ACTOR static UNCANCELLABLE Future<Void> pushAndCommit(RawDiskQueue_TwoFiles* self,
-	                                                      StringRef pageData,
+	                                                      Standalone<StringRef> pageData,
 	                                                      StringBuffer* pageMem,
 	                                                      uint64_t poppedPages) {
 		state Promise<Void> pushing, committed;
@@ -983,7 +985,7 @@ class DiskQueue final : public IDiskQueue, public Tracked<DiskQueue> {
 
 		lastCommittedSeq = backPage().endSeq();
 		auto f = rawQueue->pushAndCommit(
-		    pushed_page_buffer->ref(), pushed_page_buffer, poppedSeq / sizeof(Page) - lastPoppedSeq / sizeof(Page));
+		    pushed_page_buffer->get(), pushed_page_buffer, poppedSeq / sizeof(Page) - lastPoppedSeq / sizeof(Page));
 		lastPoppedSeq = poppedSeq;
 		pushed_page_buffer = 0;
 		return f;
@@ -1179,7 +1181,7 @@ class DiskQueue final : public IDiskQueue, public Tracked<DiskQueue> {
 			Standalone<StringRef> pagedData = wait(readPages(self, start, end));
 			const int startOffset = start % _PAGE_SIZE;
 			const int dataLen = end - start;
-			ASSERT(pagedData.substr(startOffset, dataLen).compare(buffer->ref().substr(0, dataLen)) == 0);
+			ASSERT(pagedData.substr(startOffset, dataLen).compare(buffer->get().substr(0, dataLen)) == 0);
 		} catch (Error& e) {
 			if (e.code() != error_code_io_error) {
 				delete buffer;
@@ -1546,9 +1548,9 @@ class DiskQueue final : public IDiskQueue, public Tracked<DiskQueue> {
 	StringBuffer* pushed_page_buffer;
 	Page& backPage() {
 		ASSERT(pushedPageCount());
-		return ((Page*)pushed_page_buffer->ref().end())[-1];
+		return ((Page*)pushed_page_buffer->get().end())[-1];
 	}
-	Page const& backPage() const { return ((Page*)pushed_page_buffer->ref().end())[-1]; }
+	Page const& backPage() const { return ((Page*)pushed_page_buffer->get().end())[-1]; }
 	int pushedPageCount() const { return pushed_page_buffer ? pushed_page_buffer->size() / sizeof(Page) : 0; }
 
 	// Recovery state

From cd9a8c2c25ef9c3f505ff28699ef41787b38a9b1 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 1 Nov 2022 09:33:55 -0700
Subject: [PATCH 718/740] Fix assertion failure due to empty rwImpls in
 SpecialKeySpaceCorrectness workload

---
 fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
index 495dd050dfe..05b509bc252 100644
--- a/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
+++ b/fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
@@ -83,7 +83,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 			Key startKey(baseKey + "/");
 			Key endKey(baseKey + "/\xff");
 			self->keys.push_back_deep(self->keys.arena(), KeyRangeRef(startKey, endKey));
-			if (deterministicRandom()->random01() < 0.2) {
+			if (deterministicRandom()->random01() < 0.2 && !self->rwImpls.empty()) {
 				self->asyncReadImpls.push_back(std::make_shared<SKSCTestAsyncReadImpl>(KeyRangeRef(startKey, endKey)));
 				cx->specialKeySpace->registerKeyRange(SpecialKeySpace::MODULE::TESTONLY,
 				                                      SpecialKeySpace::IMPLTYPE::READONLY,
@@ -105,6 +105,8 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 				               Value(deterministicRandom()->randomAlphaNumeric(self->valBytes)));
 			}
 		}
+		ASSERT(rwImpls.size() > 0);
+
 		return Void();
 	}
 	ACTOR Future<Void> _start(Database cx, SpecialKeySpaceCorrectnessWorkload* self) {
@@ -249,6 +251,7 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
 	}
 
 	KeyRange randomRWKeyRange() {
+		ASSERT(rwImpls.size() > 0);
 		Key prefix = rwImpls[deterministicRandom()->randomInt(0, rwImpls.size())]->getKeyRange().begin;
 		Key rkey1 = Key(deterministicRandom()->randomAlphaNumeric(deterministicRandom()->randomInt(0, keyBytes)))
 		                .withPrefix(prefix);

From 5545b90147adde2ef6cf94b00d75e7249e37bd24 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Mon, 31 Oct 2022 16:57:24 -0700
Subject: [PATCH 719/740] Remove unnecessary decodeServerTagValue calls

---
 fdbserver/ApplyMetadataMutation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index cd9d15b958b..5303d916d42 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -747,7 +747,7 @@ class ApplyMetadataMutationsImpl {
 				    .detail("Tag", tag.toString())
 				    .detail("Server", decodeServerTagKey(kv.key));
 				if (!forResolver) {
-					logSystem->pop(popVersion, decodeServerTagValue(kv.value));
+					logSystem->pop(popVersion, tag);
 					(*tag_popped)[tag] = popVersion;
 				}
 				ASSERT_WE_THINK(forResolver ^ (tag_popped != nullptr));
@@ -759,7 +759,7 @@ class ApplyMetadataMutationsImpl {
 
 					TraceEvent(SevDebug, "SendingPrivatized_ClearServerTag", dbgid).detail("M", privatized);
 
-					toCommit->addTag(decodeServerTagValue(kv.value));
+					toCommit->addTag(tag);
 					toCommit->writeTypedMessage(privatized);
 				}
 			}

From 8535cbb8fa1858bb7492c9ad33660b34e2ddf54c Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Tue, 1 Nov 2022 10:12:20 -0700
Subject: [PATCH 720/740] Save a copy for param2

---
 fdbserver/ApplyMetadataMutation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index 5303d916d42..7ff4e000c3b 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -755,7 +755,7 @@ class ApplyMetadataMutationsImpl {
 				if (toCommit) {
 					MutationRef privatized = m;
 					privatized.param1 = kv.key.withPrefix(systemKeys.begin, arena);
-					privatized.param2 = keyAfter(kv.key, arena).withPrefix(systemKeys.begin, arena);
+					privatized.param2 = keyAfter(privatized.param1, arena);
 
 					TraceEvent(SevDebug, "SendingPrivatized_ClearServerTag", dbgid).detail("M", privatized);
 

From 2f25e2ee7440683ce2a7d7f9222d5c3316039bd4 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Tue, 1 Nov 2022 16:02:42 -0700
Subject: [PATCH 721/740] Fix a race condition between batched peek and pop,
 where the server removal pop may be lost

---
 fdbclient/ServerKnobs.cpp                   |   1 +
 fdbclient/ServerKnobs.h                     |   1 +
 fdbserver/LogRouter.actor.cpp               |  53 ++++-----
 fdbserver/TLogServer.actor.cpp              | 115 ++++++++++----------
 fdbserver/TagPartitionedLogSystem.actor.cpp |   3 +-
 5 files changed, 90 insertions(+), 83 deletions(-)

diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp
index 6d3b22f4a23..c479e293bae 100644
--- a/fdbclient/ServerKnobs.cpp
+++ b/fdbclient/ServerKnobs.cpp
@@ -116,6 +116,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
 	init( ENABLE_DETAILED_TLOG_POP_TRACE,                      false ); if ( randomize && BUGGIFY ) ENABLE_DETAILED_TLOG_POP_TRACE = true;
 	init( PEEK_BATCHING_EMPTY_MSG,                             false ); if ( randomize && BUGGIFY ) PEEK_BATCHING_EMPTY_MSG = true;
 	init( PEEK_BATCHING_EMPTY_MSG_INTERVAL,                    0.001 ); if ( randomize && BUGGIFY ) PEEK_BATCHING_EMPTY_MSG_INTERVAL = 0.01;
+	init( POP_FROM_LOG_DELAY,                                      1 ); if ( randomize && BUGGIFY ) POP_FROM_LOG_DELAY = 0;
 
 	// disk snapshot max timeout, to be put in TLog, storage and coordinator nodes
 	init( MAX_FORKED_PROCESS_OUTPUT,                            1024 );
diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h
index 4decaf30f44..2034b61f4e7 100644
--- a/fdbclient/ServerKnobs.h
+++ b/fdbclient/ServerKnobs.h
@@ -115,6 +115,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
 	double BLOCKING_PEEK_TIMEOUT;
 	bool PEEK_BATCHING_EMPTY_MSG;
 	double PEEK_BATCHING_EMPTY_MSG_INTERVAL;
+	double POP_FROM_LOG_DELAY;
 
 	// Data distribution queue
 	double HEALTH_POLL_TIME;
diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp
index f0c5a5fc4a0..a47e011da6f 100644
--- a/fdbserver/LogRouter.actor.cpp
+++ b/fdbserver/LogRouter.actor.cpp
@@ -519,35 +519,38 @@ Future<Void> logRouterPeekMessages(PromiseType replyPromise,
 	}
 
 	state double startTime = now();
-
-	Version poppedVer = poppedVersion(self, reqTag);
-
-	if (poppedVer > reqBegin || reqBegin < self->startVersion) {
-		// This should only happen if a packet is sent multiple times and the reply is not needed.
-		// Since we are using popped differently, do not send a reply.
-		TraceEvent(SevWarnAlways, "LogRouterPeekPopped", self->dbgid)
-		    .detail("Begin", reqBegin)
-		    .detail("Popped", poppedVer)
-		    .detail("Start", self->startVersion);
-		if (std::is_same<PromiseType, Promise<TLogPeekReply>>::value) {
-			// kills logRouterPeekStream actor, otherwise that actor becomes stuck
-			throw operation_obsolete();
-		}
-		replyPromise.send(Never());
-		if (reqSequence.present()) {
-			auto& trackerData = self->peekTracker[peekId];
-			auto& sequenceData = trackerData.sequence_version[sequence + 1];
-			if (!sequenceData.isSet()) {
-				sequenceData.send(std::make_pair(reqBegin, reqOnlySpilled));
-			}
-		}
-		return Void();
-	}
-
+	state Version poppedVer;
 	state Version endVersion;
 	// Run the peek logic in a loop to account for the case where there is no data to return to the caller, and we may
 	// want to wait a little bit instead of just sending back an empty message. This feature is controlled by a knob.
 	loop {
+
+		poppedVer = poppedVersion(self, reqTag);
+
+		if (poppedVer > reqBegin || reqBegin < self->startVersion) {
+			// This should only happen if a packet is sent multiple times and the reply is not needed.
+			// Since we are using popped differently, do not send a reply.
+			TraceEvent(SevWarnAlways, "LogRouterPeekPopped", self->dbgid)
+			    .detail("Begin", reqBegin)
+			    .detail("Popped", poppedVer)
+			    .detail("Start", self->startVersion);
+			if (std::is_same<PromiseType, Promise<TLogPeekReply>>::value) {
+				// kills logRouterPeekStream actor, otherwise that actor becomes stuck
+				throw operation_obsolete();
+			}
+			replyPromise.send(Never());
+			if (reqSequence.present()) {
+				auto& trackerData = self->peekTracker[peekId];
+				auto& sequenceData = trackerData.sequence_version[sequence + 1];
+				if (!sequenceData.isSet()) {
+					sequenceData.send(std::make_pair(reqBegin, reqOnlySpilled));
+				}
+			}
+			return Void();
+		}
+		
+		ASSERT_WE_THINK(reqBegin >= poppedVersion(self, reqTag) && reqBegin >= self->startVersion);
+
 		endVersion = self->version.get() + 1;
 		peekMessagesFromMemory(self, reqTag, reqBegin, messages, endVersion);
 
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index 52ede1164a3..f69c1d93afe 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -1805,73 +1805,76 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 	}
 
 	state double workStart = now();
+	state Version poppedVer;
+	state Version endVersion;
+	state bool onlySpilled;
 
-	state Version poppedVer = poppedVersion(logData, reqTag);
-
-	if (SERVER_KNOBS->ENABLE_VERSION_VECTOR && poppedVer <= reqBegin &&
-	    reqBegin > logData->persistentDataDurableVersion && !reqOnlySpilled && reqTag.locality >= 0 &&
-	    !reqReturnIfBlocked) {
-		state double startTime = now();
-		// TODO (version vector) check if this should be included in "status details" json
-		// TODO (version vector) all tags may be too many, instead,  standard deviation?
-		wait(waitForMessagesForTag(logData, reqTag, reqBegin, SERVER_KNOBS->BLOCKING_PEEK_TIMEOUT));
-		double latency = now() - startTime;
-		if (logData->blockingPeekLatencies.find(reqTag) == logData->blockingPeekLatencies.end()) {
-			UID ssID = nondeterministicRandom()->randomUniqueID();
-			std::string s = "BlockingPeekLatencies-" + reqTag.toString();
-			logData->blockingPeekLatencies.try_emplace(
-			    reqTag, s, ssID, SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL, SERVER_KNOBS->LATENCY_SAMPLE_SIZE);
-		}
-		LatencySample& sample = logData->blockingPeekLatencies.at(reqTag);
-		sample.addMeasurement(latency);
+	// Run the peek logic in a loop to account for the case where there is no data to return to the caller, and we may
+	// want to wait a little bit instead of just sending back an empty message. This feature is controlled by a knob.
+	loop {
 		poppedVer = poppedVersion(logData, reqTag);
-	}
 
-	DisabledTraceEvent("TLogPeekMessages1", self->dbgid)
-	    .detail("LogId", logData->logId)
-	    .detail("Tag", reqTag.toString())
-	    .detail("ReqBegin", reqBegin)
-	    .detail("PoppedVer", poppedVer);
-	if (poppedVer > reqBegin) {
-		TLogPeekReply rep;
-		rep.maxKnownVersion = logData->version.get();
-		rep.minKnownCommittedVersion = logData->minKnownCommittedVersion;
-		rep.popped = poppedVer;
-		rep.end = poppedVer;
-		rep.onlySpilled = false;
+		if (SERVER_KNOBS->ENABLE_VERSION_VECTOR && poppedVer <= reqBegin &&
+		    reqBegin > logData->persistentDataDurableVersion && !reqOnlySpilled && reqTag.locality >= 0 &&
+		    !reqReturnIfBlocked) {
+			state double startTime = now();
+			// TODO (version vector) check if this should be included in "status details" json
+			// TODO (version vector) all tags may be too many, instead,  standard deviation?
+			wait(waitForMessagesForTag(logData, reqTag, reqBegin, SERVER_KNOBS->BLOCKING_PEEK_TIMEOUT));
+			double latency = now() - startTime;
+			if (logData->blockingPeekLatencies.find(reqTag) == logData->blockingPeekLatencies.end()) {
+				UID ssID = nondeterministicRandom()->randomUniqueID();
+				std::string s = "BlockingPeekLatencies-" + reqTag.toString();
+				logData->blockingPeekLatencies.try_emplace(
+				    reqTag, s, ssID, SERVER_KNOBS->LATENCY_METRICS_LOGGING_INTERVAL, SERVER_KNOBS->LATENCY_SAMPLE_SIZE);
+			}
+			LatencySample& sample = logData->blockingPeekLatencies.at(reqTag);
+			sample.addMeasurement(latency);
+			poppedVer = poppedVersion(logData, reqTag);
+		}
 
-		if (reqSequence.present()) {
-			auto& trackerData = logData->peekTracker[peekId];
-			auto& sequenceData = trackerData.sequence_version[sequence + 1];
-			trackerData.lastUpdate = now();
-			if (trackerData.sequence_version.size() && sequence + 1 < trackerData.sequence_version.begin()->first) {
-				replyPromise.sendError(operation_obsolete());
-				if (!sequenceData.isSet())
-					sequenceData.sendError(operation_obsolete());
-				return Void();
-			}
-			if (sequenceData.isSet()) {
-				if (sequenceData.getFuture().get().first != rep.end) {
-					TEST(true); // tlog peek second attempt ended at a different version
+		DisabledTraceEvent("TLogPeekMessages1", self->dbgid)
+		    .detail("LogId", logData->logId)
+		    .detail("Tag", reqTag.toString())
+		    .detail("ReqBegin", reqBegin)
+		    .detail("PoppedVer", poppedVer);
+
+		if (poppedVer > reqBegin) {
+			TLogPeekReply rep;
+			rep.maxKnownVersion = logData->version.get();
+			rep.minKnownCommittedVersion = logData->minKnownCommittedVersion;
+			rep.popped = poppedVer;
+			rep.end = poppedVer;
+			rep.onlySpilled = false;
+
+			if (reqSequence.present()) {
+				auto& trackerData = logData->peekTracker[peekId];
+				auto& sequenceData = trackerData.sequence_version[sequence + 1];
+				trackerData.lastUpdate = now();
+				if (trackerData.sequence_version.size() && sequence + 1 < trackerData.sequence_version.begin()->first) {
 					replyPromise.sendError(operation_obsolete());
+					if (!sequenceData.isSet())
+						sequenceData.sendError(operation_obsolete());
 					return Void();
 				}
-			} else {
-				sequenceData.send(std::make_pair(rep.end, rep.onlySpilled));
+				if (sequenceData.isSet()) {
+					if (sequenceData.getFuture().get().first != rep.end) {
+						TEST(true); // tlog peek second attempt ended at a different version
+						replyPromise.sendError(operation_obsolete());
+						return Void();
+					}
+				} else {
+					sequenceData.send(std::make_pair(rep.end, rep.onlySpilled));
+				}
+				rep.begin = reqBegin;
 			}
-			rep.begin = reqBegin;
-		}
 
-		replyPromise.send(rep);
-		return Void();
-	}
+			replyPromise.send(rep);
+			return Void();
+		}
 
-	state Version endVersion;
-	state bool onlySpilled;
+		ASSERT_WE_THINK(reqBegin >= poppedVersion(logData, reqTag));
 
-	// Run the peek logic in a loop to account for the case where there is no data to return to the caller, and we may
-	// want to wait a little bit instead of just sending back an empty message. This feature is controlled by a knob.
-	loop {
 		endVersion = logData->version.get() + 1;
 		onlySpilled = false;
 
diff --git a/fdbserver/TagPartitionedLogSystem.actor.cpp b/fdbserver/TagPartitionedLogSystem.actor.cpp
index 755ff7a1147..bb132750fa4 100644
--- a/fdbserver/TagPartitionedLogSystem.actor.cpp
+++ b/fdbserver/TagPartitionedLogSystem.actor.cpp
@@ -1449,8 +1449,7 @@ void TagPartitionedLogSystem::pop(Version upTo, Tag tag, Version durableKnownCom
 				}
 				if (prev == 0) {
 					// pop tag from log upto version defined in outstandingPops[].first
-					popActors.add(
-					    popFromLog(this, log, tag, /*delayBeforePop*/ 1.0, /*popLogRouter=*/false)); //< FIXME: knob
+					popActors.add(popFromLog(this, log, tag, SERVER_KNOBS->POP_FROM_LOG_DELAY, /*popLogRouter=*/false));
 				}
 			}
 		}

From 1866c5716ebe1cfdab6df693cce85cdb20e664c6 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Tue, 1 Nov 2022 22:28:15 -0700
Subject: [PATCH 722/740] Apply clang format

---
 fdbserver/LogRouter.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp
index a47e011da6f..1276d5b24fc 100644
--- a/fdbserver/LogRouter.actor.cpp
+++ b/fdbserver/LogRouter.actor.cpp
@@ -548,7 +548,7 @@ Future<Void> logRouterPeekMessages(PromiseType replyPromise,
 			}
 			return Void();
 		}
-		
+
 		ASSERT_WE_THINK(reqBegin >= poppedVersion(self, reqTag) && reqBegin >= self->startVersion);
 
 		endVersion = self->version.get() + 1;

From 2b7ed1d16b7d31f0fc097810ac608b0a6a820e37 Mon Sep 17 00:00:00 2001
From: Zhe Wu <halfprice@users.noreply.github.com>
Date: Wed, 2 Nov 2022 10:13:16 -0700
Subject: [PATCH 723/740] Change ASSERT_WE_THINK to ASSERT when checking that
 peek reply start version must be greater than latest pop version

---
 fdbserver/LogRouter.actor.cpp  | 2 +-
 fdbserver/TLogServer.actor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp
index 1276d5b24fc..c142da42157 100644
--- a/fdbserver/LogRouter.actor.cpp
+++ b/fdbserver/LogRouter.actor.cpp
@@ -549,7 +549,7 @@ Future<Void> logRouterPeekMessages(PromiseType replyPromise,
 			return Void();
 		}
 
-		ASSERT_WE_THINK(reqBegin >= poppedVersion(self, reqTag) && reqBegin >= self->startVersion);
+		ASSERT(reqBegin >= poppedVersion(self, reqTag) && reqBegin >= self->startVersion);
 
 		endVersion = self->version.get() + 1;
 		peekMessagesFromMemory(self, reqTag, reqBegin, messages, endVersion);
diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp
index f69c1d93afe..4064f37c071 100644
--- a/fdbserver/TLogServer.actor.cpp
+++ b/fdbserver/TLogServer.actor.cpp
@@ -1873,7 +1873,7 @@ Future<Void> tLogPeekMessages(PromiseType replyPromise,
 			return Void();
 		}
 
-		ASSERT_WE_THINK(reqBegin >= poppedVersion(logData, reqTag));
+		ASSERT(reqBegin >= poppedVersion(logData, reqTag));
 
 		endVersion = logData->version.get() + 1;
 		onlySpilled = false;

From caade5134f098576e380c4af8dd736b8785c28c4 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 2 Nov 2022 15:15:07 -0700
Subject: [PATCH 724/740] Add 7.1.24, 7.1.25 release notes

---
 .../source/release-notes/release-notes-710.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index 0edeccf5199..d06c952b018 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -4,6 +4,24 @@
 Release Notes
 #############
 
+7.1.25
+======
+* Same as 7.1.24 release with AVX enabled.
+
+7.1.24
+======
+* Released with AVX disabled.
+* Fixed a transaction log data corruption bug. `(PR #8525) <https://github.com/apple/foundationdb/pull/8525>`_, `(PR #8562) <https://github.com/apple/foundationdb/pull/8562>`_, and `(PR #8647) <https://github.com/apple/foundationdb/pull/8647>`_
+* Fixed a rare data race in transaction logs when PEEK_BATCHING_EMPTY_MSG is enabled. `(PR #8660) <https://github.com/apple/foundationdb/pull/8660>`_
+* Changed consistency check to report all corruptions. `(PR #8571) <https://github.com/apple/foundationdb/pull/8571>`_
+* Fixed a rare storage server crashing bug after recovery. `(PR #8468) <https://github.com/apple/foundationdb/pull/8468>`_
+* Added client knob UNLINKONLOAD_FDBCLIB to control deletion of external client libraries. `(PR #8434) <https://github.com/apple/foundationdb/pull/8434>`_
+* Updated the default peer latency degradation percentile to 0.5. `(PR #8370) <https://github.com/apple/foundationdb/pull/8370>`_
+* Made exclusion less pessimistic when warning about low space usage. `(PR #8347) <https://github.com/apple/foundationdb/pull/8347>`_ 
+* Added storage server readrange and update latency metrics. `(PR #8353) <https://github.com/apple/foundationdb/pull/8353>`_
+* Increased the default PEER_DEGRADATION_CONNECTION_FAILURE_COUNT value to 5s. `(PR #8336) <https://github.com/apple/foundationdb/pull/8336>`_
+* Increased RocksDB block cache size. `(PR #8274) <https://github.com/apple/foundationdb/pull/8274>`_
+
 7.1.23
 ======
 * Same as 7.1.22 release with AVX enabled.

From 6af4626fddaf1cb84fa24b2a575d541a1a0233a3 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew.noyes@snowflake.com>
Date: Tue, 10 May 2022 14:45:00 -0700
Subject: [PATCH 725/740] outputBuffer may not be null-terminated, so don't
 convert to std::string

This fixes a heap buffer overflow caught by ASAN, and importantly not
valgrind, since valgrind currently doesn't run on the first binary in a
restarting test. The next commit will change that so we always run
valgrind on the binary under test.
---
 fdbserver/FDBExecHelper.actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdbserver/FDBExecHelper.actor.cpp b/fdbserver/FDBExecHelper.actor.cpp
index 3e34fc8e258..6835acabec3 100644
--- a/fdbserver/FDBExecHelper.actor.cpp
+++ b/fdbserver/FDBExecHelper.actor.cpp
@@ -266,7 +266,7 @@ static auto fork_child(const std::string& path, std::vector<char*>& paramList) {
 static void setupTraceWithOutput(TraceEvent& event, size_t bytesRead, char* outputBuffer) {
 	// get some errors printed for spawned process
 	std::cout << "Output bytesRead: " << bytesRead << std::endl;
-	std::cout << "output buffer: " << std::string(outputBuffer) << std::endl;
+	std::cout << "output buffer: " << std::string_view(outputBuffer, bytesRead) << std::endl;
 	if (bytesRead == 0)
 		return;
 	ASSERT(bytesRead <= SERVER_KNOBS->MAX_FORKED_PROCESS_OUTPUT);

From 6d0291d498d72e9a89ca5c03cd6f2cda681840d1 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 3 Nov 2022 12:10:41 -0700
Subject: [PATCH 726/740] Fix ASan failure heap use after free

"incomplete_reasons" may already be destroyed.
---
 fdbserver/Status.actor.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 8b0d938ecb9..844eab845e3 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -764,6 +764,8 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 				// Map the address of the worker to the error message object
 				tracefileOpenErrorMap[traceFileErrorsItr->first.toString()] = msgObj;
 			} catch (Error& e) {
+				if (e.code() == error_code_actor_cancelled)
+					throw;
 				incomplete_reasons->insert("file_open_error details could not be retrieved");
 			}
 		}
@@ -1070,6 +1072,8 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 			}
 
 		} catch (Error& e) {
+			if (e.code() == error_code_actor_cancelled)
+				throw;
 			// Something strange occurred, process list is incomplete but what was built so far, if anything, will be
 			// returned.
 			incomplete_reasons->insert("Cannot retrieve all process status information.");
@@ -1400,6 +1404,8 @@ ACTOR static Future<JsonBuilderObject> latencyProbeFetcher(Database cx,
 
 		wait(waitForAll(probes));
 	} catch (Error& e) {
+		if (e.code() == error_code_actor_cancelled)
+			throw;
 		incomplete_reasons->insert(format("Unable to retrieve latency probe information (%s).", e.what()));
 	}
 
@@ -1439,6 +1445,8 @@ ACTOR static Future<Void> consistencyCheckStatusFetcher(Database cx,
 			}
 		}
 	} catch (Error& e) {
+		if (e.code() == error_code_actor_cancelled)
+			throw;
 		incomplete_reasons->insert(format("Unable to retrieve consistency check settings (%s).", e.what()));
 	}
 	return Void();
@@ -1526,6 +1534,8 @@ ACTOR static Future<Void> logRangeWarningFetcher(Database cx,
 			}
 		}
 	} catch (Error& e) {
+		if (e.code() == error_code_actor_cancelled)
+			throw;
 		incomplete_reasons->insert(format("Unable to retrieve log ranges (%s).", e.what()));
 	}
 	return Void();
@@ -1659,7 +1669,9 @@ static JsonBuilderObject configurationFetcher(Optional<DatabaseConfiguration> co
 		}
 		int count = coordinators.clientLeaderServers.size();
 		statusObj["coordinators_count"] = count;
-	} catch (Error&) {
+	} catch (Error& e) {
+		if (e.code() == error_code_actor_cancelled)
+			throw;
 		incomplete_reasons->insert("Could not retrieve all configuration status information.");
 	}
 	return statusObj;
@@ -2657,6 +2669,8 @@ ACTOR Future<JsonBuilderObject> layerStatusFetcher(Database cx,
 		}
 	} catch (Error& e) {
 		TraceEvent(SevWarn, "LayerStatusError").error(e);
+		if (e.code() == error_code_actor_cancelled)
+			throw;
 		incomplete_reasons->insert(format("Unable to retrieve layer status (%s).", e.what()));
 		json.create("_error") = format("Unable to retrieve layer status (%s).", e.what());
 		json.create("_valid") = false;

From 6757d5232fc7f84efe81a02f6105eea40428b5a2 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 3 Nov 2022 12:19:30 -0700
Subject: [PATCH 727/740] Update 7.1 release notes

---
 documentation/sphinx/source/release-notes/release-notes-710.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/sphinx/source/release-notes/release-notes-710.rst b/documentation/sphinx/source/release-notes/release-notes-710.rst
index d06c952b018..2df927160c5 100644
--- a/documentation/sphinx/source/release-notes/release-notes-710.rst
+++ b/documentation/sphinx/source/release-notes/release-notes-710.rst
@@ -13,6 +13,7 @@ Release Notes
 * Released with AVX disabled.
 * Fixed a transaction log data corruption bug. `(PR #8525) <https://github.com/apple/foundationdb/pull/8525>`_, `(PR #8562) <https://github.com/apple/foundationdb/pull/8562>`_, and `(PR #8647) <https://github.com/apple/foundationdb/pull/8647>`_
 * Fixed a rare data race in transaction logs when PEEK_BATCHING_EMPTY_MSG is enabled. `(PR #8660) <https://github.com/apple/foundationdb/pull/8660>`_
+* Fixed a heap-use-after-free bug in cluster controller.  `(PR #8683) <https://github.com/apple/foundationdb/pull/8683>`_
 * Changed consistency check to report all corruptions. `(PR #8571) <https://github.com/apple/foundationdb/pull/8571>`_
 * Fixed a rare storage server crashing bug after recovery. `(PR #8468) <https://github.com/apple/foundationdb/pull/8468>`_
 * Added client knob UNLINKONLOAD_FDBCLIB to control deletion of external client libraries. `(PR #8434) <https://github.com/apple/foundationdb/pull/8434>`_

From 333a8bfbe0095e9afb85399b4b168c87667b6c36 Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Thu, 3 Nov 2022 13:59:00 -0700
Subject: [PATCH 728/740] Add braces

---
 fdbserver/Status.actor.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/fdbserver/Status.actor.cpp b/fdbserver/Status.actor.cpp
index 844eab845e3..06e1a6c5aaa 100644
--- a/fdbserver/Status.actor.cpp
+++ b/fdbserver/Status.actor.cpp
@@ -764,8 +764,9 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 				// Map the address of the worker to the error message object
 				tracefileOpenErrorMap[traceFileErrorsItr->first.toString()] = msgObj;
 			} catch (Error& e) {
-				if (e.code() == error_code_actor_cancelled)
+				if (e.code() == error_code_actor_cancelled) {
 					throw;
+				}
 				incomplete_reasons->insert("file_open_error details could not be retrieved");
 			}
 		}
@@ -1072,8 +1073,9 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
 			}
 
 		} catch (Error& e) {
-			if (e.code() == error_code_actor_cancelled)
+			if (e.code() == error_code_actor_cancelled) {
 				throw;
+			}
 			// Something strange occurred, process list is incomplete but what was built so far, if anything, will be
 			// returned.
 			incomplete_reasons->insert("Cannot retrieve all process status information.");
@@ -1404,8 +1406,9 @@ ACTOR static Future<JsonBuilderObject> latencyProbeFetcher(Database cx,
 
 		wait(waitForAll(probes));
 	} catch (Error& e) {
-		if (e.code() == error_code_actor_cancelled)
+		if (e.code() == error_code_actor_cancelled) {
 			throw;
+		}
 		incomplete_reasons->insert(format("Unable to retrieve latency probe information (%s).", e.what()));
 	}
 
@@ -1445,8 +1448,9 @@ ACTOR static Future<Void> consistencyCheckStatusFetcher(Database cx,
 			}
 		}
 	} catch (Error& e) {
-		if (e.code() == error_code_actor_cancelled)
+		if (e.code() == error_code_actor_cancelled) {
 			throw;
+		}
 		incomplete_reasons->insert(format("Unable to retrieve consistency check settings (%s).", e.what()));
 	}
 	return Void();
@@ -1534,8 +1538,9 @@ ACTOR static Future<Void> logRangeWarningFetcher(Database cx,
 			}
 		}
 	} catch (Error& e) {
-		if (e.code() == error_code_actor_cancelled)
+		if (e.code() == error_code_actor_cancelled) {
 			throw;
+		}
 		incomplete_reasons->insert(format("Unable to retrieve log ranges (%s).", e.what()));
 	}
 	return Void();
@@ -1670,8 +1675,9 @@ static JsonBuilderObject configurationFetcher(Optional<DatabaseConfiguration> co
 		int count = coordinators.clientLeaderServers.size();
 		statusObj["coordinators_count"] = count;
 	} catch (Error& e) {
-		if (e.code() == error_code_actor_cancelled)
+		if (e.code() == error_code_actor_cancelled) {
 			throw;
+		}
 		incomplete_reasons->insert("Could not retrieve all configuration status information.");
 	}
 	return statusObj;
@@ -2669,8 +2675,9 @@ ACTOR Future<JsonBuilderObject> layerStatusFetcher(Database cx,
 		}
 	} catch (Error& e) {
 		TraceEvent(SevWarn, "LayerStatusError").error(e);
-		if (e.code() == error_code_actor_cancelled)
+		if (e.code() == error_code_actor_cancelled) {
 			throw;
+		}
 		incomplete_reasons->insert(format("Unable to retrieve layer status (%s).", e.what()));
 		json.create("_error") = format("Unable to retrieve layer status (%s).", e.what());
 		json.create("_valid") = false;

From 5e9f96ecec5755759a202592597c3ab8a6c1ed6b Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 7 Nov 2022 23:12:28 +0000
Subject: [PATCH 729/740] disable AVX for 7.1.24 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index 398dfe5fb61..cbd7935e464 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From 1405bd66736c105dde316cf018bd26da768cf57f Mon Sep 17 00:00:00 2001
From: FoundationDB CI <foundationdb_ci@apple.com>
Date: Mon, 7 Nov 2022 23:12:42 +0000
Subject: [PATCH 730/740] enable AVX and update version for 7.1.24 release

---
 cmake/ConfigureCompiler.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index cbd7935e464..398dfe5fb61 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -253,7 +253,7 @@ else()
       set(USE_AVX512F OFF)
     endif()
   endif()
-  set(USE_AVX OFF CACHE BOOL "Enable AVX instructions")
+  set(USE_AVX ON CACHE BOOL "Enable AVX instructions")
   if (USE_AVX)
     if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
       add_compile_options(-mavx)

From a71c4f8c578e40ebffbf1899ef3512cdd4f9f564 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Fri, 11 Nov 2022 12:51:08 +0300
Subject: [PATCH 731/740] Bumped to the new revision

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50f13463723..bdedb09eb34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
 endif()
 
 project(foundationdb
-  VERSION 7.1.24
+  VERSION 7.1.25
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

From d7ce18df7f33884b531e7a383d78ba65ada3c2ae Mon Sep 17 00:00:00 2001
From: 1inker <67271937+1inker@users.noreply.github.com>
Date: Fri, 11 Nov 2022 14:47:44 +0300
Subject: [PATCH 732/740] Fixed github warning about set-output deprecation
 (#20)

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e664f42b920..4171213c647 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,10 +36,10 @@ jobs:
             RELEASE_FLAG=ON
           fi
 
-          echo "::set-output name=project_ver::$PROJECT_VERSION"
-          echo "::set-output name=build_ver::$BUILD_VERSION"
-          echo "::set-output name=full_ver::$PROJECT_VERSION-$BUILD_VERSION"
-          echo "::set-output name=release_flag::$RELEASE_FLAG"
+          echo "project_ver=$PROJECT_VERSION" >>$GITHUB_OUTPUT
+          echo "build_ver=$BUILD_VERSION" >>$GITHUB_OUTPUT
+          echo "full_ver=$PROJECT_VERSION-$BUILD_VERSION" >>$GITHUB_OUTPUT
+          echo "release_flag=$RELEASE_FLAG" >>$GITHUB_OUTPUT
 
       - name: Display versions
         run: |

From ad151024d108dec3cb8771a44d49f965d7726e5d Mon Sep 17 00:00:00 2001
From: 1inker <67271937+1inker@users.noreply.github.com>
Date: Fri, 11 Nov 2022 22:58:29 +0300
Subject: [PATCH 733/740] github actions update to suppress warnings about
 actions deprecations (#22)

---
 .github/workflows/build.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4171213c647..f7441aeb0bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,3 +1,4 @@
+---
 name: Build
 
 on:
@@ -19,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Calculate versions
         id: vers
@@ -78,7 +79,7 @@ jobs:
           sudo apt install -y mono-complete
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
@@ -124,7 +125,7 @@ jobs:
       #  run: rm -rf ${{github.workspace}}bld/packages/*${{needs.calc_ver.outputs.full_ver}}.versioned*
 
       - name: Upload result
-        uses: nanoufo/action-upload-artifacts-and-release-assets@v1.4
+        uses: nanoufo/action-upload-artifacts-and-release-assets@v1.5
         with:
           path: |
             ${{github.workspace}}/bld/packages/*${{needs.calc_ver.outputs.full_ver}}*

From adcbe2307690505b87ed5e4cc1b5da3e3abc5735 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Sat, 12 Nov 2022 11:04:31 +0300
Subject: [PATCH 734/740] Updated github action actions/download-artifact to
 suppress warnings about actions deprecations

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7441aeb0bd..22ab09502ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -251,7 +251,7 @@ jobs:
           pip3 install 'foundationdb==${{ env.JOSHUA_DB_VER }}'
 
       - name: Download the correctness package
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         id: download_correctness
         with:
           name: correctness-${{needs.calc_ver.outputs.full_ver}}.tar.gz

From b66bc7561f1e38b9d739f91eed0fb2335bfa77c5 Mon Sep 17 00:00:00 2001
From: Dmitry Fedchenko <dfedchenko@openintegration.inc>
Date: Thu, 1 Dec 2022 14:54:48 +0300
Subject: [PATCH 735/740] PBOX-104744: Tarball with documantation would have
 extention .tgz instead of .tar.gz because of DMS requirements

---
 documentation/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
index 23f998e28a8..c194b8cbcb3 100644
--- a/documentation/CMakeLists.txt
+++ b/documentation/CMakeLists.txt
@@ -97,7 +97,7 @@ add_custom_target(docpreview
   USES_TERMINAL)
 add_dependencies(docpreview html)
 
-set(tar_file ${CMAKE_BINARY_DIR}/packages/${CMAKE_PROJECT_NAME}-docs-${FDB_VERSION}.tar.gz)
+set(tar_file ${CMAKE_BINARY_DIR}/packages/${CMAKE_PROJECT_NAME}-docs-${FDB_VERSION}.tgz)
 add_custom_command(
   OUTPUT ${tar_file}
   COMMAND ${CMAKE_COMMAND} -E tar czf ${tar_file} .

From fc8cc7c0b5950c894586eafdb587c729940a6d26 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin68@gmail.com>
Date: Thu, 22 Dec 2022 11:16:19 +0300
Subject: [PATCH 736/740] Revert "Try to fix Python 3.11 incapability with
 Sphinx 1.5.6" because it is not compatible with cmake 3.16 (#31)

This reverts commit 6d2f06cd1276cbdb2def90f242ddb1a7df29ee1f.
---
 cmake/FDBComponents.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/FDBComponents.cmake b/cmake/FDBComponents.cmake
index 31bb9133a3b..865e2f79dc9 100644
--- a/cmake/FDBComponents.cmake
+++ b/cmake/FDBComponents.cmake
@@ -107,7 +107,7 @@ endif()
 ################################################################################
 
 option(BUILD_DOCUMENTATION "build documentation" ON)
-find_package(Python3 3.0...<3.11 COMPONENTS Interpreter)
+find_package(Python3 COMPONENTS Interpreter)
 if (WITH_PYTHON AND Python3_Interpreter_FOUND AND BUILD_DOCUMENTATION)
   set(WITH_DOCUMENTATION ON)
 else()

From 0549fbd2cf11662fe4072b58fa6249b866bb3898 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin68@gmail.com>
Date: Thu, 22 Dec 2022 11:17:20 +0300
Subject: [PATCH 737/740] Fixed build errors on a pure ubuntu 18.04 (#30)

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22ab09502ec..02cec1a9452 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,9 +70,9 @@ jobs:
         shell: bash
         run: |
           sudo apt update
-          sudo apt install -y sudo git cmake g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm clang-10
+          sudo DEBIAN_FRONTEND=noninteractive apt install -y sudo git cmake g++ build-essential libssl-dev default-jdk python3 python3-pip liblz4-dev ninja-build rpm clang-10 clang python3-venv
           sudo pip3 install virtualenv
-          sudo apt install -y dirmngr gnupg apt-transport-https ca-certificates
+          sudo DEBIAN_FRONTEND=noninteractive apt install -y dirmngr gnupg apt-transport-https ca-certificates
           sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
           sudo sh -c 'echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" > /etc/apt/sources.list.d/mono-official-stable.list'
           sudo apt update

From ea4c2e8e8023539c706881c7de4305bfe2f5ce85 Mon Sep 17 00:00:00 2001
From: Oleg Samarin <osamarin68@gmail.com>
Date: Thu, 22 Dec 2022 11:18:28 +0300
Subject: [PATCH 738/740] Ow fork 7.1 xdb 128 (#32)

- Removed .el8 from the rpm file names
- Added -version-client-versioned or version-server-versioned to the package names
- Made rpm/deb file names according the package names
- Removed double dependency of server on clients from deb packages
---
 .github/workflows/build.yml | 12 ++++++------
 cmake/InstallLayout.cmake   | 28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02cec1a9452..3dfd3fba6bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -164,8 +164,8 @@ jobs:
         run: |
           MY_ARCH=`uname -m`
           curr_path="${{ github.workspace }}"
-          server="foundationdb-server-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
-          clients="foundationdb-clients-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
+          server="foundationdb-server-${{ needs.calc_ver.outputs.full_ver }}.${MY_ARCH}.rpm"
+          clients="foundationdb-clients-${{ needs.calc_ver.outputs.full_ver }}.${MY_ARCH}.rpm"
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
           podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${clients} && grep -q foundationdb /etc/passwd" || { echo "User foundationdb is not created after $clients installation"; exit 3; }
@@ -175,8 +175,8 @@ jobs:
         run: |
           MY_ARCH=`uname -m`
           curr_path="${{ github.workspace }}"
-          server="foundationdb-server-versioned-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
-          clients="foundationdb-clients-versioned-${{ needs.calc_ver.outputs.full_ver }}.el8.${MY_ARCH}.rpm"
+          server="foundationdb-${{ needs.calc_ver.outputs.full_ver }}-server-versioned-${{ needs.calc_ver.outputs.full_ver }}.${MY_ARCH}.rpm"
+          clients="foundationdb-${{ needs.calc_ver.outputs.full_ver }}-clients-versioned-${{ needs.calc_ver.outputs.full_ver }}.${MY_ARCH}.rpm"
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
           podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.RHEL_IMAGE_NAME }} /bin/bash -c "dnf install -y /home/${clients} && grep -q foundationdb /etc/passwd" && { echo "User foundationdb was created after $clients installation"; exit 3; }
@@ -198,8 +198,8 @@ jobs:
         run: |
           MY_ARCH=`dpkg-architecture -q DEB_BUILD_ARCH`
           curr_path="${{ github.workspace }}"
-          server="foundationdb-server-versioned_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
-          clients="foundationdb-clients-versioned_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
+          server="foundationdb-${{ needs.calc_ver.outputs.full_ver }}-server-versioned_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
+          clients="foundationdb-${{ needs.calc_ver.outputs.full_ver }}-clients-versioned_${{ needs.calc_ver.outputs.full_ver }}_${MY_ARCH}.deb"
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server}" && { echo "Installation $server have to fail"; exit 1; }
           podman run --rm -v ${curr_path}/${server}/${server}:/home/${server} -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${server} /home/${clients}" || { echo "Installation $server and $clients have to success"; exit 2; }
           podman run --rm -v ${curr_path}/${clients}/${clients}:/home/${clients} ${{ env.UBUNTU_IMAGE_NAME }} /bin/bash -c "apt-get update && apt-get install -y /home/${clients} && grep -q foundationdb /etc/passwd" && { echo "User foundationdb was created after $clients installation"; exit 3; }
diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index a2a22137dad..073d01e334e 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -205,12 +205,12 @@ set(CPACK_COMPONENT_SERVER-VERSIONED_DEPENDS clients-versioned)
 set(CPACK_COMPONENT_SERVER-EL8_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-DEB_DISPLAY_NAME "foundationdb-server")
 set(CPACK_COMPONENT_SERVER-TGZ_DISPLAY_NAME "foundationdb-server")
-set(CPACK_COMPONENT_SERVER-VERSIONED_DISPLAY_NAME "foundationdb${FDB_VERSION}-server")
+set(CPACK_COMPONENT_SERVER-VERSIONED_DISPLAY_NAME "foundationdb-${FDB_VERSION}-server")
 
 set(CPACK_COMPONENT_CLIENTS-EL8_DISPLAY_NAME "foundationdb-clients")
 set(CPACK_COMPONENT_CLIENTS-DEB_DISPLAY_NAME "foundationdb-clients")
 set(CPACK_COMPONENT_CLIENTS-TGZ_DISPLAY_NAME "foundationdb-clients")
-set(CPACK_COMPONENT_CLIENTS-VERSIONED_DISPLAY_NAME "foundationdb${FDB_VERSION}-clients")
+set(CPACK_COMPONENT_CLIENTS-VERSIONED_DISPLAY_NAME "foundationdb-${FDB_VERSION}-clients")
 
 
 # MacOS needs a file extension for the LICENSE file
@@ -240,8 +240,8 @@ endif()
 set(package_basename                   "foundationdb")
 set(clients_package_basename           "${package_basename}-clients")
 set(server_package_basename            "${package_basename}-server")
-set(clients_versioned_package_basename "${package_basename}${FDB_VERSION}-clients")
-set(server_versioned_package_basename  "${package_basename}${FDB_VERSION}-server")
+set(clients_versioned_package_basename "${package_basename}-${FDB_VERSION}-clients-versioned")
+set(server_versioned_package_basename  "${package_basename}-${FDB_VERSION}-server-versioned")
 
 string(REPLACE "-" "_" FDB_PACKAGE_VERSION ${FDB_VERSION})
 set(unversioned_postfix "${FDB_VERSION}${not_fdb_release_string}")
@@ -249,14 +249,14 @@ set(unversioned_postfix "${FDB_VERSION}${not_fdb_release_string}")
 # RPM filenames
 set(rpm-clients-filename "${clients_package_basename}-${unversioned_postfix}")
 set(rpm-server-filename "${server_package_basename}-${unversioned_postfix}")
-set(rpm-clients-versioned-filename "${clients_package_basename}-versioned-${unversioned_postfix}")
-set(rpm-server-versioned-filename "${server_package_basename}-versioned-${unversioned_postfix}")
+set(rpm-clients-versioned-filename "${clients_versioned_package_basename}-${unversioned_postfix}")
+set(rpm-server-versioned-filename "${server_versioned_package_basename}-${unversioned_postfix}")
 
 # Deb filenames
 set(deb-clients-filename "${clients_package_basename}_${unversioned_postfix}")
 set(deb-server-filename "${server_package_basename}_${unversioned_postfix}")
-set(deb-clients-versioned-filename "${clients_package_basename}-versioned_${unversioned_postfix}")
-set(deb-server-versioned-filename "${server_package_basename}-versioned_${unversioned_postfix}")
+set(deb-clients-versioned-filename "${clients_versioned_package_basename}_${unversioned_postfix}")
+set(deb-server-versioned-filename "${server_versioned_package_basename}_${unversioned_postfix}")
 
 ################################################################################
 # Configuration for RPM
@@ -264,13 +264,13 @@ set(deb-server-versioned-filename "${server_package_basename}-versioned_${unvers
 set(CPACK_RPM_PACKAGE_LICENSE                              "Apache 2.0")
 
 set(CPACK_RPM_CLIENTS-EL8_PACKAGE_NAME                     "${clients_package_basename}")
-set(CPACK_RPM_CLIENTS-EL8_FILE_NAME                        "${rpm-clients-filename}.el8.${CMAKE_SYSTEM_PROCESSOR}.rpm")
+set(CPACK_RPM_CLIENTS-EL8_FILE_NAME                        "${rpm-clients-filename}.${CMAKE_SYSTEM_PROCESSOR}.rpm")
 set(CPACK_RPM_CLIENTS-EL8_PRE_INSTALL_SCRIPT_FILE          ${CMAKE_SOURCE_DIR}/packaging/rpm/scripts/preclients.sh)
 set(CPACK_RPM_CLIENTS-EL8_POST_INSTALL_SCRIPT_FILE         ${CMAKE_SOURCE_DIR}/packaging/rpm/scripts/postclients.sh)
 set(CPACK_RPM_CLIENTS-EL8_USER_FILELIST                    "%dir /etc/foundationdb")
 
 set(CPACK_RPM_SERVER-EL8_PACKAGE_NAME                      "${server_package_basename}")
-set(CPACK_RPM_SERVER-EL8_FILE_NAME                         "${rpm-server-filename}.el8.${CMAKE_SYSTEM_PROCESSOR}.rpm")
+set(CPACK_RPM_SERVER-EL8_FILE_NAME                         "${rpm-server-filename}.${CMAKE_SYSTEM_PROCESSOR}.rpm")
 set(CPACK_RPM_SERVER-EL8_PACKAGE_REQUIRES                  "${CPACK_RPM_CLIENTS-EL8_PACKAGE_NAME} = ${FDB_VERSION}")
 set(CPACK_RPM_SERVER-EL8_PRE_INSTALL_SCRIPT_FILE           ${CMAKE_SOURCE_DIR}/packaging/rpm/scripts/preserver.sh)
 set(CPACK_RPM_SERVER-EL8_POST_INSTALL_SCRIPT_FILE          ${CMAKE_SOURCE_DIR}/packaging/rpm/scripts/postserver.sh)
@@ -280,12 +280,12 @@ set(CPACK_RPM_SERVER-EL8_USER_FILELIST                     "%config(noreplace) /
                                                            "%attr(0700,foundationdb,foundationdb) /var/lib/foundationdb")
 
 set(CPACK_RPM_CLIENTS-VERSIONED_PACKAGE_NAME               "${clients_versioned_package_basename}")
-set(CPACK_RPM_CLIENTS-VERSIONED_FILE_NAME                  "${rpm-clients-versioned-filename}.el8.${CMAKE_SYSTEM_PROCESSOR}.rpm")
+set(CPACK_RPM_CLIENTS-VERSIONED_FILE_NAME                  "${rpm-clients-versioned-filename}.${CMAKE_SYSTEM_PROCESSOR}.rpm")
 set(CPACK_RPM_CLIENTS-VERSIONED_POST_INSTALL_SCRIPT_FILE   ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/postinst)
 set(CPACK_RPM_CLIENTS-VERSIONED_PRE_UNINSTALL_SCRIPT_FILE  ${CMAKE_BINARY_DIR}/packaging/multiversion/clients/prerm)
 
 set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_NAME                "${server_versioned_package_basename}")
-set(CPACK_RPM_SERVER-VERSIONED_FILE_NAME                   "${rpm-server-versioned-filename}.el8.${CMAKE_SYSTEM_PROCESSOR}.rpm")
+set(CPACK_RPM_SERVER-VERSIONED_FILE_NAME                   "${rpm-server-versioned-filename}.${CMAKE_SYSTEM_PROCESSOR}.rpm")
 set(CPACK_RPM_SERVER-VERSIONED_PACKAGE_REQUIRES            "${CPACK_RPM_CLIENTS-VERSIONED_PACKAGE_NAME} = ${FDB_VERSION}")
 set(CPACK_RPM_SERVER-VERSIONED_POST_INSTALL_SCRIPT_FILE    ${CMAKE_BINARY_DIR}/packaging/multiversion/server/postinst-rpm)
 set(CPACK_RPM_SERVER-VERSIONED_PRE_UNINSTALL_SCRIPT_FILE   ${CMAKE_BINARY_DIR}/packaging/multiversion/server/prerm)
@@ -347,11 +347,11 @@ set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_NAME "${clients_package_basename}")
 set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_NAME  "${server_versioned_package_basename}")
 set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_NAME "${clients_versioned_package_basename}")
 
-set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb-clients (= ${FDB_VERSION})")
+set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 set(CPACK_DEBIAN_SERVER-DEB_PACKAGE_RECOMMENDS "python (>= 2.6)")
 set(CPACK_DEBIAN_CLIENTS-DEB_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 
-set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12), foundationdb${FDB_VERSION}-clients")
+set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 set(CPACK_DEBIAN_SERVER-VERSIONED_PACKAGE_RECOMMENDS "python (>= 2.6)")
 set(CPACK_DEBIAN_CLIENTS-VERSIONED_PACKAGE_DEPENDS "adduser, libc6 (>= 2.12)")
 

From 8ec0860d15aa6e8ee5e9bbabc788fec67fb6a4ea Mon Sep 17 00:00:00 2001
From: 1inker <67271937+1inker@users.noreply.github.com>
Date: Thu, 22 Dec 2022 11:20:55 +0300
Subject: [PATCH 739/740] XDB-130: Do not restart FDB during update procedure
 in HA cluster (#25)

---
 .../deb/DEBIAN-foundationdb-server/postinst   | 38 +++++++++++++------
 .../deb/DEBIAN-foundationdb-server/preinst    |  3 +-
 packaging/rpm/foundationdb.spec.in            | 14 ++++++-
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/packaging/deb/DEBIAN-foundationdb-server/postinst b/packaging/deb/DEBIAN-foundationdb-server/postinst
index 610b5dbf137..0ff48717917 100755
--- a/packaging/deb/DEBIAN-foundationdb-server/postinst
+++ b/packaging/deb/DEBIAN-foundationdb-server/postinst
@@ -29,24 +29,40 @@ if [ "$1" = configure ]; then
             chmod 0664 /etc/foundationdb/fdb.cluster
             NEWDB=1
         fi
-    fi
 
-    # Start the service with systemd if it is available.
-    if pidof systemd > /dev/null; then
-        # Use deb-systemd-invoke if available to respect policy-rc.d.
-        systemctl=$(command -v deb-systemd-invoke || command -v systemctl)
-        systemctl --system daemon-reload > /dev/null || true
-        systemctl start foundationdb.service
-    else
-        /etc/init.d/foundationdb start
-    fi
+        # Start the service with systemd if it is available.
+        if pidof systemd > /dev/null; then
+            # Use deb-systemd-invoke if available to respect policy-rc.d.
+            systemctl=$(command -v deb-systemd-invoke || command -v systemctl)
+            systemctl --system daemon-reload > /dev/null || true
+            systemctl start foundationdb.service
+        else
+            /etc/init.d/foundationdb start
+        fi
 
-    if [ "$2" = "" ]; then
         update-rc.d foundationdb defaults
 
         if [ "$NEWDB" != "" ]; then
             /usr/bin/fdbcli -C /etc/foundationdb/fdb.cluster --exec "configure new single memory; status" --timeout 20
         fi
+    else
+        DORESTART=1
+
+        if test -f /etc/foundationdb/owtech.conf; then
+            value=`grep -E "^RestartWhenUpdate" /etc/foundationdb/owtech.conf | awk -F "=" '{ print $2 }' | tr -d " " | tr "a-z" "A-Z"`
+            test "$value" = "NO" -o "$value" = "FALSE" -o "$value" = "0" && DORESTART=0
+        fi
+
+        if test $DORESTART -eq 1; then
+            if pidof systemd > /dev/null; then
+                # Use deb-systemd-invoke if available to respect policy-rc.d.
+                systemctl=$(command -v deb-systemd-invoke || command -v systemctl)
+                systemctl --system daemon-reload > /dev/null || true
+                systemctl condrestart foundationdb.service > /dev/null || true
+            else
+                /etc/init.d/foundationdb restart
+            fi
+        fi
     fi
 fi
 
diff --git a/packaging/deb/DEBIAN-foundationdb-server/preinst b/packaging/deb/DEBIAN-foundationdb-server/preinst
index eb678077b94..7b556be9135 100755
--- a/packaging/deb/DEBIAN-foundationdb-server/preinst
+++ b/packaging/deb/DEBIAN-foundationdb-server/preinst
@@ -10,7 +10,8 @@
 # the debian-policy package
 
 if [ "$1" = upgrade ]; then
-    invoke-rc.d foundationdb stop || :
+    # XDB-130: Restart FDB now is conditional, so do not stop it here
+    # invoke-rc.d foundationdb stop || :
     # old versions could leave this behind
     rm -f /usr/lib/foundationdb/argparse.py /usr/lib/foundationdb/argparse.pyc
 fi
diff --git a/packaging/rpm/foundationdb.spec.in b/packaging/rpm/foundationdb.spec.in
index 5e618ea6dd1..6e8e96227de 100644
--- a/packaging/rpm/foundationdb.spec.in
+++ b/packaging/rpm/foundationdb.spec.in
@@ -86,7 +86,19 @@ ifdef(`RHEL6', `
         /usr/bin/fdbcli -C /etc/foundationdb/fdb.cluster --exec "configure new single memory" --timeout 20 >/dev/null 2>&1
     fi
 else
-ifdef(`RHEL6', `/sbin/service foundationdb condrestart >/dev/null 2>&1', `/usr/bin/systemctl condrestart foundationdb >/dev/null 2>&1')
+   DORESTART=1
+   if test -f /etc/foundationdb/owtech.conf; then
+      value=$(grep -E "^RestartWhenUpdate" /etc/foundationdb/owtech.conf | awk -F "=" '{ print $2 }' | tr -d " " | tr "a-z" "A-Z")
+      test "$value" = "NO" -o "$value" = "FALSE" -o "$value" = "0" && DORESTART=0
+   fi
+
+   if test $DORESTART -eq 1; then
+ifdef(`RHEL6', `
+      /sbin/service foundationdb condrestart >/dev/null 2>&1
+', `
+      /usr/bin/systemctl condrestart foundationdb >/dev/null 2>&1
+')
+   fi
 fi
 exit 0
 

From 9aa20796f96cb0c37bfdab4198e1b4e6530e5e92 Mon Sep 17 00:00:00 2001
From: Makar Sukalo <msukalo@openintegration.inc>
Date: Mon, 30 Jan 2023 05:06:13 +0000
Subject: [PATCH 740/740] Updated requirements.txt We can see an error "The
 alabaster extension used by this project needs at least Sphinx v1.6; it
 therefore cannot be built with this version."
 https://github.com/owtech/foundationdb/actions/runs/3958476939/jobs/6795913802#step:6:1993
 We've checked which version of alabaster has been installed "Successfully
 installed Jinja2-3.0.3 MarkupSafe-2.0.1 Pygments-2.14.0 alabaster-0.7.13"
 https://github.com/owtech/foundationdb/actions/runs/3958476939/jobs/6795913802#step:6:1959
 Checked that version of alabaster 0.7.13 is latest :
 https://github.com/bitprophet/alabaster After that we had seen documentation
 https://alabaster.readthedocs.io/en/latest/index.html?highlight=Sphinx#what-is-alabaster
 and saw "It requires Python 3.8 or newer and Sphinx 1.6 or newer." Checked
 repo alabaster and saw new commit bitprophet/alabaster@0bd2b35 Comment is
 containing text "Require Sphinx 1.6 or newer"

---
 documentation/sphinx/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/sphinx/requirements.txt b/documentation/sphinx/requirements.txt
index ae8cd4c4413..787d5d80bdb 100644
--- a/documentation/sphinx/requirements.txt
+++ b/documentation/sphinx/requirements.txt
@@ -1,5 +1,5 @@
 --index-url https://pypi.python.org/simple
-sphinx==1.5.6
+sphinx==1.6.7
 sphinx-bootstrap-theme==0.4.8
 docutils==0.16
 Jinja2==3.0.3